new release, mark 2.6.2 x86 cleanup

4 files changed, 11 insertions, 13 deletions

diff --git a/x11-libs/gtk+/files/digest-gtk+-2.6.1-r1 b/x11-libs/gtk+/files/digest-gtk+-2.6.1-r1
deleted file mode 100644
index 3b2b31081039..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.6.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 146ed9d12c9506fcf8745ddb2c22530a gtk+-2.6.1.tar.bz2 11070668
-MD5 ea90aff86c5f7d059bceb6b3550e6aac gtk+-2.6-smoothscroll-r2.patch 26277
-MD5 5a046e852e4a0145197fca14969dcd4d gtk+-2.6.1-lib64.patch.bz2 6047
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.6.4 b/x11-libs/gtk+/files/digest-gtk+-2.6.4
new file mode 100644
index 000000000000..462edcd5e422
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.6.4
@@ -0,0 +1,2 @@
+MD5 4749fce7b082b784a71a076aa586dc25 gtk+-2.6.4.tar.bz2 11222426
+MD5 ea90aff86c5f7d059bceb6b3550e6aac gtk+-2.6-smoothscroll-r2.patch 26277
diff --git a/x11-libs/gtk+/gtk+-2.6.2.ebuild b/x11-libs/gtk+/gtk+-2.6.2.ebuild
index d1f5a617727e..b4ad43dd7b0f 100644
--- a/x11-libs/gtk+/gtk+-2.6.2.ebuild
+++ b/x11-libs/gtk+/gtk+-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.1 2005/02/05 06:56:32 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.6.2.ebuild,v 1.2 2005/03/02 21:53:19 foser Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.6/${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 static"
 
 RDEPEND="virtual/x11
@@ -35,6 +35,8 @@ src_unpack() {
 
 	unpack ${A}
 
+	epunt_cxx
+
 	cd ${S}
 	# Turn of --export-symbols-regex for now, since it removes
 	# the wrong symbols
diff --git a/x11-libs/gtk+/gtk+-2.6.1-r1.ebuild b/x11-libs/gtk+/gtk+-2.6.4.ebuild
index c46f1c420589..b13c1eb2f90b 100644
--- a/x11-libs/gtk+/gtk+-2.6.1-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.6.4.ebuild
@@ -1,8 +1,8 @@
 # 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-r1.ebuild,v 1.2 2005/01/22 17:47:40 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.6.4.ebuild,v 1.1 2005/03/02 21:53:19 foser Exp $
 
-inherit libtool flag-o-matic eutils
+inherit flag-o-matic eutils
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/"
@@ -35,18 +35,14 @@ src_unpack() {
 
 	unpack ${A}
 
+	epunt_cxx
+
 	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
-	# fix empty filechooser combo (http://bugzilla.gnome.org/show_bug.cgi?id=164290)
-	cd ${S}/gtk
-	epatch ${FILESDIR}/${P}-empty_default_combo.patch
 
 	cd ${S}
 	# use an arch-specific config directory so that 32bit and 64bit versions
@@ -55,6 +51,7 @@ src_unpack() {
 	# 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.6.1-lib64.patch.bz2
+
 	# patch for ppc64 (#64359)
 	use ppc64 && epatch ${FILESDIR}/${PN}-2.4.9-ppc64.patch
 	use ppc64 && append-flags -mminimal-toc