version bump. cleanup old ebuilds. remove abicheck.sh patch since it is now applied upstream.

Package-Manager: portage-2.0.54

6 files changed, 13 insertions, 172 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 4c9eebbbb36c..2377a006cc38 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.213 2006/01/14 20:30:38 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.214 2006/01/29 17:31:34 allanonjl Exp $
+
+*gtk+-2.8.11 (29 Jan 2006)
+
+  29 Jan 2006; John N. Laliberte <allanonjl@gentoo.org> -gtk+-2.8.9.ebuild,
+  -gtk+-2.8.10.ebuild, +gtk+-2.8.11.ebuild:
+  version bump. cleanup old ebuilds. remove abicheck.sh patch since it is now
+  applied upstream.
 
   14 Jan 2006; <dang@gentoo.org> +files/gtk+-2.8.10-xinerama.patch,
   gtk+-2.8.10.ebuild:
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 902ca6dbe994..9462b8588900 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,13 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 785f66f11a59b26fb3cc84bbedda449a ChangeLog 30588
+MD5 16c784a3fadcdc1a5bc6f11cc869c959 ChangeLog 30840
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138
 MD5 f0e0f202bdf17540985215d5384480ed files/digest-gtk+-2.6.10-r1 212
-MD5 0f77874c9c171c26671e8f2ad570a383 files/digest-gtk+-2.8.10 141
+MD5 3d136a29a973e16c88bb0ead86243644 files/digest-gtk+-2.8.11 141
 MD5 c2395b72772f29144c0b34c311e68b26 files/digest-gtk+-2.8.8 140
-MD5 08ac67047e9ffc29d4e51f7df2d7dc88 files/digest-gtk+-2.8.9 140
 MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
 MD5 0ec83a4bf20f79d85eb2976b58c39465 files/gtk+-1.2.10-m4.patch 220
 MD5 cd1c96c0a81026a3af29449389e455d5 files/gtk+-2-xpm_loader.patch 920
@@ -20,14 +16,6 @@ MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
 MD5 03ae62ac03643ccc0a36779df1bfd6af gtk+-1.2.10-r10.ebuild 1702
 MD5 60b495d6aa1169ba2dc4b20a303b18d7 gtk+-1.2.10-r11.ebuild 1916
 MD5 6017f72966d53602c58c288364dd61a9 gtk+-2.6.10-r1.ebuild 3125
-MD5 d07770ad85c46bcdc72f37cd92873317 gtk+-2.8.10.ebuild 4267
+MD5 98c3798b9681eb69ff09d1147d16e602 gtk+-2.8.11.ebuild 4192
 MD5 98a655345fb0223bea83f0b1318ae056 gtk+-2.8.8.ebuild 4112
-MD5 b1d222ade0fd24eb5aa4b7f22b49fc6d gtk+-2.8.9.ebuild 4122
 MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDyV+oomPajV0RnrERApqLAJ9k2VK7u9oRBpGzlIr3CVbIBvatYQCfQZfi
-Tbf32dIQ73hHsEwayFQJk2A=
-=Bfo/
------END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.8.10 b/x11-libs/gtk+/files/digest-gtk+-2.8.11
index a13ede4eaf42..1fc57631241d 100644
--- a/x11-libs/gtk+/files/digest-gtk+-2.8.10
+++ b/x11-libs/gtk+/files/digest-gtk+-2.8.11
@@ -1,2 +1,2 @@
 MD5 0c7c66269cbac694971341dd2b2adf3d gtk+-2-smoothscroll-r6.patch.bz2 3718
-MD5 c2c0318d4dcd64315486850907b8e78d gtk+-2.8.10.tar.bz2 11964355
+MD5 921ba85da341e52f0994f8fb569f1c61 gtk+-2.8.11.tar.bz2 12072181
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.8.9 b/x11-libs/gtk+/files/digest-gtk+-2.8.9
deleted file mode 100644
index 223aacd221df..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.8.9
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 0c7c66269cbac694971341dd2b2adf3d gtk+-2-smoothscroll-r6.patch.bz2 3718
-MD5 e7a94132ae6353106c80cd4a1106a368 gtk+-2.8.9.tar.bz2 11949090
diff --git a/x11-libs/gtk+/gtk+-2.8.10.ebuild b/x11-libs/gtk+/gtk+-2.8.11.ebuild
index da89750fb40c..4a2897546fd4 100644
--- a/x11-libs/gtk+/gtk+-2.8.10.ebuild
+++ b/x11-libs/gtk+/gtk+-2.8.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.10.ebuild,v 1.2 2006/01/14 20:30:38 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.11.ebuild,v 1.1 2006/01/29 17:31:34 allanonjl Exp $
 
 inherit gnome.org flag-o-matic eutils debug
 
@@ -84,9 +84,6 @@ src_unpack() {
 	# dont clash on multilib systems
 	has_multilib_profile && epatch "${FILESDIR}"/${PN}-2.8.0-multilib.patch
 
-	# fix tests, see #118722
-	epatch "${FILESDIR}"/${PN}-gdk-pixbuf-testfix.patch
-
 	# and this line is just here to make building emul-linux-x86-gtklibs a bit
 	# easier, so even this should be amd64 specific.
 	if use x86 && [ "$(get_libdir)" == "lib32" ]; then
diff --git a/x11-libs/gtk+/gtk+-2.8.9.ebuild b/x11-libs/gtk+/gtk+-2.8.9.ebuild
deleted file mode 100644
index 694250324b46..000000000000
--- a/x11-libs/gtk+/gtk+-2.8.9.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.9.ebuild,v 1.3 2006/01/13 01:10:14 allanonjl Exp $
-
-inherit gnome.org flag-o-matic eutils debug
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gtk+-2-smoothscroll-r6.patch.bz2"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug doc jpeg tiff"
-
-RDEPEND="|| ( (
-			x11-libs/libXrender
-			x11-libs/libX11
-			x11-libs/libXi
-			x11-libs/libXt
-			x11-libs/libXext
-			x11-libs/libXinerama
-			x11-libs/libXcursor
-			x11-libs/libXrandr
-			x11-libs/libXfixes )
-		virtual/x11 )
-
-	>=dev-libs/glib-2.7.1
-	>=x11-libs/pango-1.9
-	>=dev-libs/atk-1.10.1
-	>=x11-libs/cairo-0.9.2
-	x11-misc/shared-mime-info
-	>=media-libs/libpng-1.2.1
-	media-libs/fontconfig
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( >=media-libs/tiff-3.5.7 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	sys-devel/autoconf
-	>=sys-devel/automake-1.7.9
-
-	|| ( (
-			x11-proto/xextproto
-			x11-proto/xproto
-			x11-proto/inputproto
-			x11-proto/xineramaproto )
-		virtual/x11 )
-
-	doc? (
-		>=dev-util/gtk-doc-1.4
-		~app-text/docbook-xml-dtd-4.1.2 )"
-
-
-pkg_setup() {
-	if ! built_with_use x11-libs/cairo X; then
-		einfo "Please re-emerge x11-libs/cairo with the X USE flag set"
-		die "cairo needs the X flag set"
-	fi
-}
-
-set_gtk2_confdir() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	use x86 && [ "$(get_libdir)" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# 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-smoothscroll-r6.patch.bz2
-
-	# use an arch-specific config directory so that 32bit and 64bit versions
-	# dont clash on multilib systems
-	has_multilib_profile && epatch "${FILESDIR}"/${PN}-2.8.0-multilib.patch
-
-	# fix tests, see #118722
-	epatch "${FILESDIR}"/${PN}-gdk-pixbuf-testfix.patch
-
-	# and this line is just here to make building emul-linux-x86-gtklibs a bit
-	# easier, so even this should be amd64 specific.
-	if use x86 && [ "$(get_libdir)" == "lib32" ]; then
-		epatch "${FILESDIR}"/${PN}-2.8.0-multilib.patch
-	fi
-
-	use ppc64 && append-flags -mminimal-toc
-
-	autoconf || die "autoconf failed"
-	automake || die "automake failed"
-
-	epunt_cxx
-}
-
-src_compile() {
-	local myconf="$(use_enable doc gtk-doc) \
-		$(use_with jpeg libjpeg) \
-		$(use_with tiff libtiff) \
-		--with-libpng            \
-		--with-gdktarget=x11     \
-		--with-xinput"
-
-	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
-	econf $myconf || die "./configure failed to run"
-
-	emake || die "gtk+ failed to compile"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-
-	set_gtk2_confdir
-	dodir ${GTK2_CONFDIR}
-	keepdir ${GTK2_CONFDIR}
-
-	# 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() {
-	set_gtk2_confdir
-
-	if [ -d "${ROOT}${GTK2_CONFDIR}" ]; then
-		gtk-query-immodules-2.0  > ${ROOT}${GTK2_CONFDIR}/gtk.immodules
-		gdk-pixbuf-query-loaders > ${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders
-	else
-		ewarn "The destination path ${ROOT}${GTK2_CONFDIR} doesn't exist;"
-		ewarn "to complete the installation of GTK+, please create the"
-		ewarn "directory and then manually run:"
-		ewarn "  cd ${ROOT}${GTK2_CONFDIR}"
-		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
-		ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
-	fi
-
-	einfo "If you experience text corruption issues, turn off RenderAccel"
-	einfo "in your xorg.conf.  NVIDIA is working on this issue. "
-	einfo "See http://bugs.gentoo.org/113123 for more information."
-}