much anticipated commit, mark 2.4.14 x86

5 files changed, 135 insertions, 18 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 3796c1f83372..b48ed4f4e01e 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.138 2004/12/28 21:58:33 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.139 2005/01/12 16:56:35 foser Exp $
+
+*gtk+-2.6.1 (12 Jan 2005)
+
+  12 Jan 2005; foser <foser@gentoo.org> gtk+-2.6.1.ebuild :
+  New release, closes a whole lot of empty bugs
 
   28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index e0db9418d83b..929b34e8b4a4 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,21 +1,23 @@
-MD5 1c32aec676734b9b6846877939a1d374 gtk+-2.4.14.ebuild 2926
 MD5 71531996ce3e654b8c2f1de597b99481 gtk+-1.2.10-r11.ebuild 1789
-MD5 0bd94247d2a74568aea68575de797658 ChangeLog 20772
-MD5 745da6d8feb5c80670d33a3c43400bf5 gtk+-1.2.10-r10.ebuild 1719
+MD5 42a96f5d633c999e3d7cac24c6a85961 gtk+-2.4.13-r1.ebuild 3118
+MD5 b132235dc08b0a9d45b22680df96cbfe gtk+-2.6.1.ebuild 2955
+MD5 a9ee5c645811089f4044b10a981bd623 gtk+-2.4.14.ebuild 2923
 MD5 1aa3638017cfffe3060e9102e2fb2865 gtk+-2.4.9-r1.ebuild 3135
-MD5 b85e869ed4c071b73911a92a65c50166 gtk+-2.4.9-r2.ebuild 3177
+MD5 745da6d8feb5c80670d33a3c43400bf5 gtk+-1.2.10-r10.ebuild 1719
+MD5 e5ef6a59c1eb052b3ff9aef58e22dff3 ChangeLog 20906
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 42a96f5d633c999e3d7cac24c6a85961 gtk+-2.4.13-r1.ebuild 3118
+MD5 b85e869ed4c071b73911a92a65c50166 gtk+-2.4.9-r2.ebuild 3177
+MD5 62148845aad329080cce9bc619761761 files/digest-gtk+-2.6.1 139
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
-MD5 0df92cf64a9324ef85fc72885a4285b1 files/gtk+-2.4.9-ppc64.patch 1732
-MD5 06d8be5421935ac9ed4da45830bb68bc files/gtk+-2.4.9-xpm_ico_secure.patch 3291
+MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138
+MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
 MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
-MD5 96b708d4ee80d6f31674d4a83e950276 files/digest-gtk+-2.4.13-r1 208
+MD5 df6efc98861d335b1a09eab5c6011620 files/gtk+-2.4-smoothscroll.patch 29006
 MD5 69a6335566f344b004a5db02b68008ed files/gtk+-2.0.6-exportsymbols.patch 558
-MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
-MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
+MD5 28fa6c231f22418b560385c58a179543 files/digest-gtk+-2.4.9-r1 133
 MD5 28fa6c231f22418b560385c58a179543 files/digest-gtk+-2.4.9-r2 133
-MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138
 MD5 549c22c55ac1f423f716d7bc28564c17 files/digest-gtk+-2.4.14 208
-MD5 28fa6c231f22418b560385c58a179543 files/digest-gtk+-2.4.9-r1 133
-MD5 df6efc98861d335b1a09eab5c6011620 files/gtk+-2.4-smoothscroll.patch 29006
+MD5 96b708d4ee80d6f31674d4a83e950276 files/digest-gtk+-2.4.13-r1 208
+MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
+MD5 0df92cf64a9324ef85fc72885a4285b1 files/gtk+-2.4.9-ppc64.patch 1732
+MD5 06d8be5421935ac9ed4da45830bb68bc files/gtk+-2.4.9-xpm_ico_secure.patch 3291
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.6.1 b/x11-libs/gtk+/files/digest-gtk+-2.6.1
new file mode 100644
index 000000000000..a24b27e96ca3
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.6.1
@@ -0,0 +1,2 @@
+MD5 146ed9d12c9506fcf8745ddb2c22530a gtk+-2.6.1.tar.bz2 11070668
+MD5 ea90aff86c5f7d059bceb6b3550e6aac gtk+-2.6-smoothscroll-r2.patch 26277
diff --git a/x11-libs/gtk+/gtk+-2.4.14.ebuild b/x11-libs/gtk+/gtk+-2.4.14.ebuild
index 69a9ce052482..8d8081efce11 100644
--- a/x11-libs/gtk+/gtk+-2.4.14.ebuild
+++ b/x11-libs/gtk+/gtk+-2.4.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.2 2004/12/26 10:03:25 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.4.14.ebuild,v 1.3 2005/01/12 16:56:35 foser Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.4/${P}.tar.bz2
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64"
+KEYWORDS="x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64"
 IUSE="doc tiff jpeg"
 
 RDEPEND="virtual/x11
diff --git a/x11-libs/gtk+/gtk+-2.6.1.ebuild b/x11-libs/gtk+/gtk+-2.6.1.ebuild
new file mode 100644
index 000000000000..b901a734bf3e
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.6.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.6.1.ebuild,v 1.1 2005/01/12 16:56:35 foser Exp $
+
+inherit libtool flag-o-matic eutils
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.6/${P}.tar.bz2
+	mirror://gentoo/gtk+-2.6-smoothscroll-r2.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 static"
+
+RDEPEND="virtual/x11
+	>=dev-libs/glib-2.6
+	>=dev-libs/atk-1.0.1
+	>=x11-libs/pango-1.8
+	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.6-smoothscroll-r2.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
+	# patch for ppc64 (#64359)
+	use ppc64 && epatch ${FILESDIR}/${PN}-2.4.9-ppc64.patch
+
+	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` \
+		`use_enable static` \
+		--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
+
+}