summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-libs/gtk+/gtk+-2.9999.ebuild')
-rw-r--r--x11-libs/gtk+/gtk+-2.9999.ebuild23
1 files changed, 9 insertions, 14 deletions
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() {