diff options
| author |   Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2008-10-01 10:08:18 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2008-10-01 10:08:18 +0530 |
| commit | b22b57a987b8e17d372e33e0f1cfd5d5e4729b0c (patch) | |
| tree | 9fddc304d2171c9efe52d954ee7d5db037dee2a9 | |
| parent | EAPI=2 support for gnome2-live.eclass (diff) | |
| download | gnome-live-b22b57a987b8e17d372e33e0f1cfd5d5e4729b0c.tar.gz gnome-live-b22b57a987b8e17d372e33e0f1cfd5d5e4729b0c.tar.bz2 gnome-live-b22b57a987b8e17d372e33e0f1cfd5d5e4729b0c.zip | |
Migrate x11-libs/gtk+ to USE deps (YAY!)
| -rw-r--r-- | x11-libs/gtk+/Manifest | 2 | ||||
| -rw-r--r-- | x11-libs/gtk+/gtk+-2.9999.ebuild | 22 |
2 files changed, 9 insertions, 15 deletions
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index a29f279..38af265 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -1,3 +1,3 @@ AUX gtk+-2.12.0-flash-workaround.patch 532 RMD160 24d6d96f11c1fd8c8d6fe3702de2dc4d824d7ee5 SHA1 7db980e782a5b04d27bffb55e3dc0190ad22e118 SHA256 da2ce04a400e45cc5e5cf78547699006e70e91e6620b4232a8fd7eea4de90007 AUX gtk+-2.8.0-multilib.patch 2456 RMD160 ba94fb0b16f9002dec8e92700ff3f7931f600548 SHA1 e65e843c6f1beecee7a0e1f7ec3292596c2a65a4 SHA256 595bddaa3e50a54f47dbcf30381e11bce0baa1ccd683ac1ba30ca0221b78a4fd -EBUILD gtk+-2.9999.ebuild 4366 RMD160 e45a1304ce867c001b78acb34107015906e76842 SHA1 0673aac2b3415a8c50289ec106979b59e4094a92 SHA256 677c6fda06901c513cd1e198b108512f9fbda8fb35feb155b715cb668dc964b8 +EBUILD gtk+-2.9999.ebuild 4094 RMD160 cc89a395c5e86284fdc84ca2b31b686cc086d52e SHA1 54b575ef575f8bf55b6d6a9c73c7c29a0d1fe461 SHA256 d177c1f9095b3be2c91a10c6e044c1febd9dfd0c93be53fc9650a8a7c48b13ee diff --git a/x11-libs/gtk+/gtk+-2.9999.ebuild b/x11-libs/gtk+/gtk+-2.9999.ebuild index d9fac8c..17025fc 100644 --- a/x11-libs/gtk+/gtk+-2.9999.ebuild +++ b/x11-libs/gtk+/gtk+-2.9999.ebuild @@ -1,6 +1,7 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ +EAPI=2 inherit gnome2-live flag-o-matic virtualx @@ -15,7 +16,6 @@ IUSE="X cups debug doc jpeg jpeg2k tiff vim-syntax xinerama jasper" RDEPEND=">=dev-libs/glib-2.17.6 >=x11-libs/pango-1.20 >=dev-libs/atk-1.13 - >=x11-libs/cairo-1.6 media-libs/fontconfig x11-misc/shared-mime-info >=media-libs/libpng-1.2.1 @@ -30,9 +30,13 @@ RDEPEND=">=dev-libs/glib-2.17.6 x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage + >=x11-libs/cairo-1.6[X] xinerama? ( x11-libs/libXinerama ) ) - !X? ( dev-libs/DirectFB ) + !X? ( + dev-libs/DirectFB + >=x11-libs/cairo-1.6[directfb] + ) cups? ( net-print/cups ) jpeg? ( >=media-libs/jpeg-6b-r2 ) jpeg2k? ( media-libs/jasper ) @@ -56,18 +60,6 @@ PDEPEND="vim-syntax? ( app-vim/gtk-syntax )" PATCHES="${PN}-2.12.0-flash-workaround.patch" pkg_setup() { - if use X ; then - if ! built_with_use x11-libs/cairo X; then - eerror "Please re-emerge x11-libs/cairo with the X USE flag set" - die "cairo needs the X flag set" - fi - else - if ! built_with_use x11-libs/cairo directfb ; then - eerror "Please re-emerge x11-libs/cairo with the directfb USE flag set" - die "cairo needs the directfb flag set" - fi - fi - if has_multilib_profile ; then # use an arch-specific config directory so that 32bit and 64bit versions # dont clash on multilib systems @@ -165,4 +157,6 @@ pkg_postinst() { fi elog "Please install app-text/evince for print preview functionality" + echo + gnome2-live_pkg_postinst } |