New version of gtk+

4 files changed, 117 insertions, 1 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index c4fb54124e6b..7a5673d0e402 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.130 2004/11/21 23:09:22 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.131 2004/12/11 04:30:12 obz Exp $
+
+*gtk+-2.4.14 (11 Dec 2004)
+
+  11 Dec 2004; Mike Gardiner <obz@gentoo.org> +gtk+-2.4.14.ebuild:
+  New version of gtk+
 
 *gtk+-2.4.13-r1 (21 Nov 2004)
 
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 48916a5671fb..20da96cc0489 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,5 +1,7 @@
 MD5 71531996ce3e654b8c2f1de597b99481 gtk+-1.2.10-r11.ebuild 1789
+MD5 eb8a7bcf1068a653e57d57ba8536004f .gtk+-2.4.14.ebuild.swp 12288
 MD5 5bc8b28e97d15e3fe3fb12d77059bb3d gtk+-2.4.13-r1.ebuild 3123
+MD5 9192a5aea56642f02bfc302bf7fb8ee4 gtk+-2.4.14.ebuild 2746
 MD5 1aa3638017cfffe3060e9102e2fb2865 gtk+-2.4.9-r1.ebuild 3135
 MD5 745da6d8feb5c80670d33a3c43400bf5 gtk+-1.2.10-r10.ebuild 1719
 MD5 fa068764c3070b343bd599a782d3d7b5 ChangeLog 19668
@@ -11,6 +13,7 @@ MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
 MD5 df6efc98861d335b1a09eab5c6011620 files/gtk+-2.4-smoothscroll.patch 29006
 MD5 69a6335566f344b004a5db02b68008ed files/gtk+-2.0.6-exportsymbols.patch 558
 MD5 28fa6c231f22418b560385c58a179543 files/digest-gtk+-2.4.9-r1 133
+MD5 549c22c55ac1f423f716d7bc28564c17 files/digest-gtk+-2.4.14 208
 MD5 96b708d4ee80d6f31674d4a83e950276 files/digest-gtk+-2.4.13-r1 208
 MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
 MD5 06d8be5421935ac9ed4da45830bb68bc files/gtk+-2.4.9-xpm_ico_secure.patch 3291
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.4.14 b/x11-libs/gtk+/files/digest-gtk+-2.4.14
new file mode 100644
index 000000000000..06787ceafb5e
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.4.14
@@ -0,0 +1,3 @@
+MD5 10470d574933460809e4ac488e579e26 gtk+-2.4.14.tar.bz2 9641695
+MD5 5aac24d5f86eb87ca6e9b9f024782555 gtk+-2.4-smoothscroll-r1.patch 25007
+MD5 8608e20184bd9f4d3eca98d7c01c98ee gtk+-2.4.1-lib64.patch.bz2 6982
diff --git a/x11-libs/gtk+/gtk+-2.4.14.ebuild b/x11-libs/gtk+/gtk+-2.4.14.ebuild
new file mode 100644
index 000000000000..af26ae0312f6
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.4.14.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.4.14.ebuild,v 1.1 2004/12/11 04:30:12 obz Exp $
+
+inherit libtool flag-o-matic eutils
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.4/${P}.tar.bz2
+	mirror://gentoo/gtk+-2.4-smoothscroll-r1.patch
+	amd64? ( http://dev.gentoo.org/~lv/gtk+-2.4.1-lib64.patch.bz2 )"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64"
+IUSE="doc tiff jpeg"
+
+RDEPEND="virtual/x11
+	>=dev-libs/glib-2.4
+	>=dev-libs/atk-1.0.1
+	>=x11-libs/pango-1.4
+	x11-misc/shared-mime-info
+	>=media-libs/libpng-1.2.1
+	jpeg? ( >=media-libs/jpeg-6b-r2 )
+	tiff? ( >=media-libs/tiff-3.5.7 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	sys-devel/autoconf
+	>=sys-devel/automake-1.7.9
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# Turn of --export-symbols-regex for now, since it removes
+	# the wrong symbols
+	epatch ${FILESDIR}/gtk+-2.0.6-exportsymbols.patch
+	# beautifying patch for disabled icons
+	epatch ${FILESDIR}/${PN}-2.2.1-disable_icons_smooth_alpha.patch
+	# add smoothscroll support for usability reasons
+	# http://bugzilla.gnome.org/show_bug.cgi?id=103811
+	epatch ${DISTDIR}/${PN}-2.4-smoothscroll-r1.patch
+
+	# use an arch-specific config directory so that 32bit and 64bit versions
+	# dont clash on multilib systems
+	use amd64 && epatch ${DISTDIR}/gtk+-2.4.1-lib64.patch.bz2
+	# and this line is just here to make building emul-linux-x86-gtklibs a bit
+	# easier, so even this should be amd64 specific.
+	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && epatch ${DISTDIR}/gtk+-2.4.1-lib64.patch.bz2
+
+	autoconf || die
+	automake || die
+
+}
+
+src_compile() {
+
+	# bug 8762
+	replace-flags "-O3" "-O2"
+
+	elibtoolize
+
+	econf \
+		`use_enable doc gtk-doc` \
+		`use_with jpeg libjpeg` \
+		`use_with tiff libtiff` \
+		--with-png \
+		--with-gdktarget=x11 \
+		--with-xinput \
+		|| die
+
+	# gtk+ isn't multithread friendly due to some obscure code generation bug
+	MAKEOPTS="${MAKEOPTS} -j1" emake || die
+
+}
+
+src_install() {
+
+	dodir /etc/gtk-2.0
+	use amd64 && dodir /etc/gtk-2.0/${CHOST}
+	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && dodir /etc/gtk-2.0/${CHOST}
+
+	make DESTDIR=${D} install || die
+
+	# Enable xft in environment as suggested by <utx@gentoo.org>
+	dodir /etc/env.d
+	echo "GDK_USE_XFT=1" >${D}/etc/env.d/50gtk2
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+}
+
+pkg_postinst() {
+
+	use amd64 && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
+
+	gtk-query-immodules-2.0 >	/${GTK2_CONFDIR}/gtk.immodules
+	gdk-pixbuf-query-loaders >	/${GTK2_CONFDIR}/gdk-pixbuf.loaders
+
+}