Remove old broken revision with missing workarounds and remove the commented out line on the cups patch, as it was included in upstream and we have no need to reference it

(Portage version: 2.1.4)

3 files changed, 1 insertions, 165 deletions

diff --git a/x11-libs/gtk+/files/digest-gtk+-2.12.5 b/x11-libs/gtk+/files/digest-gtk+-2.12.5
deleted file mode 100644
index db496d6173a4..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.12.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 588c7fb3d9ebadf4f5a1ab4c534e4db5 gtk+-2.12.5.tar.bz2 15963537
-RMD160 3eefe0fee421cc592a24de4e6b275319ce76fdbf gtk+-2.12.5.tar.bz2 15963537
-SHA256 9e364df3d7368c1e69dab1b2352a68bc8ac07e35bf647bf23f3445d902bb4a4c gtk+-2.12.5.tar.bz2 15963537
diff --git a/x11-libs/gtk+/gtk+-2.12.5-r1.ebuild b/x11-libs/gtk+/gtk+-2.12.5-r1.ebuild
index 8c7066ab3939..82a6fbd9e9c8 100644
--- a/x11-libs/gtk+/gtk+-2.12.5-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.12.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.12.5-r1.ebuild,v 1.1 2008/01/13 22:12:33 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.12.5-r1.ebuild,v 1.2 2008/01/14 04:53:48 leio Exp $
 
 inherit gnome.org flag-o-matic eutils autotools virtualx
 
@@ -78,9 +78,6 @@ src_unpack() {
 	# Firefox print review crash fix, bug #195644
 	epatch "${FILESDIR}/${PN}-2.12.1-firefox-print-preview.patch"
 
-	# Fix printing on ppc64.  Bug #197639
-	#epatch "${FILESDIR}/${PN}-2.12.1-cupsutils.patch"
-
 	# -O3 and company cause random crashes in applications. Bug #133469
 	replace-flags -O3 -O2
 	strip-flags
diff --git a/x11-libs/gtk+/gtk+-2.12.5.ebuild b/x11-libs/gtk+/gtk+-2.12.5.ebuild
deleted file mode 100644
index 4c0c0428b290..000000000000
--- a/x11-libs/gtk+/gtk+-2.12.5.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.12.5.ebuild,v 1.1 2008/01/10 21:39:39 eva Exp $
-
-inherit gnome.org flag-o-matic eutils autotools virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cups debug doc jpeg tiff vim-syntax xinerama"
-
-RDEPEND="x11-libs/libXrender
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXt
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.13.5
-	>=x11-libs/pango-1.17.3
-	>=dev-libs/atk-1.10.1
-	>=x11-libs/cairo-1.2.0
-	media-libs/fontconfig
-	x11-misc/shared-mime-info
-	>=media-libs/libpng-1.2.1
-	cups? ( net-print/cups )
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( >=media-libs/tiff-3.5.7 )"
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	>=dev-util/pkgconfig-0.9
-	=sys-devel/automake-1.7*
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/inputproto
-	x11-proto/damageproto
-	xinerama? ( x11-proto/xineramaproto )
-	doc? (
-			>=dev-util/gtk-doc-1.6
-			~app-text/docbook-xml-dtd-4.1.2
-		 )"
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
-
-pkg_setup() {
-	if ! built_with_use x11-libs/cairo X; then
-		eerror "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}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# 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"
-
-	# Firefox print review crash fix, bug #195644
-	epatch "${FILESDIR}/${PN}-2.12.1-firefox-print-preview.patch"
-
-	# Fix printing on ppc64.  Bug #197639
-	#epatch "${FILESDIR}/${PN}-2.12.1-cupsutils.patch"
-
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	use ppc64 && append-flags -mminimal-toc
-
-	# remember, eautoreconf applies elibtoolize.
-	# if you remove this, you should manually run elibtoolize
-	export WANT_AUTOMAKE=1.7
-	cp aclocal.m4 old_macros.m4
-	AT_M4DIR="." eautoreconf
-
-	epunt_cxx
-}
-
-src_compile() {
-	# png always on to display icons (foser)
-	local myconf="$(use_enable doc gtk-doc) \
-		$(use_with jpeg libjpeg) \
-		$(use_with tiff libtiff) \
-		$(use_enable xinerama) \
-		--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"
-
-	emake || die "compile failed"
-}
-
-src_test() {
-	Xemake check || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	set_gtk2_confdir
-	dodir ${GTK2_CONFDIR}
-	keepdir ${GTK2_CONFDIR}
-
-	# see bug #133241
-	echo 'gtk-fallback-icon-theme = "gnome"' > "${D}/${GTK2_CONFDIR}/gtkrc"
-
-	# 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*
-
-	# This has to be removed, because it's multilib specific; generated in
-	# postinst
-	rm "${D}/etc/gtk-2.0/gtk.immodules"
-}
-
-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
-
-	if [ -e /usr/lib/gtk-2.0/2.[^1]* ]; then
-		elog "You need to rebuild ebuilds that installed into" /usr/lib/gtk-2.0/2.[^1]*
-		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC /usr/lib/gtk-2.0/2.[^1]*)"
-	fi
-
-	elog "Please install app-text/evince for print preview functionality"
-}