diff options
| -rw-r--r-- | x11-libs/gtk+/Manifest | 2 | ||||
| -rw-r--r-- | x11-libs/gtk+/gtk+-2.9999.ebuild | 23 |
2 files changed, 10 insertions, 15 deletions
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index 38af265..2340bd3 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 4094 RMD160 cc89a395c5e86284fdc84ca2b31b686cc086d52e SHA1 54b575ef575f8bf55b6d6a9c73c7c29a0d1fe461 SHA256 d177c1f9095b3be2c91a10c6e044c1febd9dfd0c93be53fc9650a8a7c48b13ee +EBUILD gtk+-2.9999.ebuild 4018 RMD160 9b62fc80a32a7ce0020413cb58d360c9a16f3509 SHA1 9397140c731abf404327a67870b4d41c1cd9a76c SHA256 3cb8a00a88824e097530a77319e9649da562bb11433d6375f634a13d7b35cd65 diff --git a/x11-libs/gtk+/gtk+-2.9999.ebuild b/x11-libs/gtk+/gtk+-2.9999.ebuild index 17025fc..e3fcc33 100644 --- a/x11-libs/gtk+/gtk+-2.9999.ebuild +++ b/x11-libs/gtk+/gtk+-2.9999.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="http://www.gtk.org/" LICENSE="LGPL-2" SLOT="2" KEYWORDS="~amd64 ~x86" -IUSE="X cups debug doc jpeg jpeg2k tiff vim-syntax xinerama jasper" +IUSE="X cups debug doc jpeg jpeg2k tiff vim-syntax xinerama" RDEPEND=">=dev-libs/glib-2.17.6 >=x11-libs/pango-1.20 @@ -66,16 +66,6 @@ pkg_setup() { PATCHES="${PATCHES} ${PN}-2.8.0-multilib.patch" fi -} - -set_gtk2_confdir() { - # An arch specific config directory is used on multilib systems - has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}" - GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0} -} - -src_unpack() { - gnome2-live_src_unpack # -O3 and company cause random crashes in applications. Bug #133469 replace-flags -O3 -O2 @@ -84,7 +74,13 @@ src_unpack() { use ppc64 && append-flags -mminimal-toc } -src_compile() { +set_gtk2_confdir() { + # An arch specific config directory is used on multilib systems + has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}" + GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0} +} + +src_configure() { local myconf= gdk_target= if use X ; then @@ -96,7 +92,7 @@ src_compile() { # png always on to display icons (foser) myconf="$(use_enable doc gtk-doc) $(use_with jpeg libjpeg) - $(use_with jpeg libjasper) + $(use_with jpeg2k libjasper) $(use_with tiff libtiff) $(use_enable xinerama) --with-libpng @@ -107,7 +103,6 @@ src_compile() { use debug && myconf="${myconf} --enable-debug=yes" econf ${myconf} || die "configure failed" - emake || die "compile failed" } src_test() { |