Version bump, remove old.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 11 insertions, 72 deletions

diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
index 69ea20d00a29..f218b2da263d 100644
--- a/app-emulation/emul-linux-x86-gtklibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/emul-linux-x86-gtklibs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.81 2010/06/27 13:14:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.82 2010/09/15 11:42:05 pacho Exp $
+
+*emul-linux-x86-gtklibs-20100915 (15 Sep 2010)
+
+  15 Sep 2010; Pacho Ramos <pacho@gentoo.org>
+  -emul-linux-x86-gtklibs-20100220-r2.ebuild,
+  -emul-linux-x86-gtklibs-20100409-r1.ebuild,
+  +emul-linux-x86-gtklibs-20100915.ebuild:
+  Version bump, remove old.
 
   27 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
   emul-linux-x86-gtklibs-20100611.ebuild:
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100220-r2.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100220-r2.ebuild
deleted file mode 100644
index d56a601f7f4d..000000000000
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100220-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100220-r2.ebuild,v 1.3 2010/03/22 13:58:58 pacho Exp $
-
-inherit emul-linux-x86
-
-SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2
-	http://dev.gentoo.org/~pacho/emul-linux-x86-${PV}/libglade-2.0.so.0.0.7"
-
-LICENSE="GPL-3 GPL-2 LGPL-2 LGPL-2.1 FTL MIT || ( LGPL-2.1 MPL-1.1 )"
-KEYWORDS="-* amd64"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
-	~app-emulation/emul-linux-x86-xlibs-${PV}"
-
-src_unpack() {
-	query_tools="${S}/usr/bin/gtk-query-immodules-2.0|${S}/usr/bin/gdk-pixbuf-query-loaders|${S}/usr/bin/pango-querymodules"
-	ALLOWED="(${S}/etc/env.d|${S}/etc/gtk-2.0|${S}/etc/pango/i686-pc-linux-gnu|${query_tools})"
-	emul-linux-x86_src_unpack
-
-	# these tools generate an index in /etc/{pango,gtk-2.0}/${CHOST}
-	mv -f "${S}/usr/bin/pango-querymodules"{,32} || die
-	mv -f "${S}/usr/bin/gtk-query-immodules-2.0"{,-32} || die
-	mv -f "${S}/usr/bin/gdk-pixbuf-query-loaders"{,32} || die
-}
-
-src_install() {
-	emul-linux-x86_src_install
-	insinto /usr/lib32/
-	doins "${DISTDIR}"/libglade-2.0.so.0.0.7 || die
-	dosym libglade-2.0.so.0.0.7 /usr/lib32/libglade-2.0.so.0 || die
-	dosym libglade-2.0.so.0.0.7 /usr/lib32/libglade-2.0.so || die
-}
-
-pkg_preinst() {
-	#bug 169058
-	for l in "${ROOT}/usr/lib32/{pango,gtk-2.0}" ; do
-		[[ -L ${l} ]] && rm -f ${l}
-	done
-}
-
-pkg_postinst() {
-	PANGO_CONFDIR="/etc/pango/i686-pc-linux-gnu"
-	if [[ ${ROOT} == "/" ]] ; then
-		einfo "Generating pango modules listing..."
-		mkdir -p ${PANGO_CONFDIR}
-		pango-querymodules32 > ${PANGO_CONFDIR}/pango.modules
-	fi
-
-	GTK2_CONFDIR="/etc/gtk-2.0/i686-pc-linux-gnu"
-	einfo "Generating gtk+ immodules/gdk-pixbuf loaders listing..."
-	mkdir -p ${GTK2_CONFDIR}
-	gtk-query-immodules-2.0-32 > "${ROOT}${GTK2_CONFDIR}/gtk.immodules"
-	gdk-pixbuf-query-loaders32 > "${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders"
-
-	# gdk-pixbuf.loaders should be in their CHOST directories respectively.
-	if [[ -e ${ROOT}/etc/gtk-2.0/gdk-pixbuf.loaders ]] ; then
-		ewarn
-		ewarn "File /etc/gtk-2.0/gdk-pixbuf.loaders shouldn't be present on"
-		ewarn "multilib systems, please remove it by hand."
-		ewarn
-	fi
-}
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100409-r1.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100915.ebuild
index 17355832451e..c03296cfaf76 100644
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100409-r1.ebuild
+++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100915.ebuild
@@ -1,14 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100409-r1.ebuild,v 1.2 2010/06/02 13:37:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100915.ebuild,v 1.1 2010/09/15 11:42:05 pacho Exp $
 
 inherit emul-linux-x86
 
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~pacho/emul-linux-x86-${PV}/gtk+-2.18.6.tbz2"
-
 LICENSE="GPL-3 GPL-2 LGPL-2 LGPL-2.1 FTL MIT || ( LGPL-2.1 MPL-1.1 )"
-KEYWORDS="-* amd64"
+KEYWORDS="-* ~amd64"
 
 IUSE=""