Remove vulnerable versions, bug 271705

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

11 files changed, 14 insertions, 478 deletions

diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
index 645ffd0db9ab..6090eb5f094a 100644
--- a/app-emulation/emul-linux-x86-gtklibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-emulation/emul-linux-x86-gtklibs
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.61 2008/11/11 18:43:58 kingtaco Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.62 2009/06/06 22:21:57 darkside Exp $
+
+  06 Jun 2009; Jeremy Olexa <darkside@gentoo.org>
+  -emul-linux-x86-gtklibs-2.3.ebuild, -emul-linux-x86-gtklibs-2.8.8.ebuild,
+  -emul-linux-x86-gtklibs-2.10.6.3.ebuild,
+  -emul-linux-x86-gtklibs-2.10.6.3-r3.ebuild,
+  -emul-linux-x86-gtklibs-10.0-r1.ebuild,
+  -emul-linux-x86-gtklibs-11.0.ebuild,
+  -emul-linux-x86-gtklibs-20071114.ebuild,
+  -emul-linux-x86-gtklibs-20071118.ebuild,
+  -emul-linux-x86-gtklibs-20071121.ebuild,
+  -emul-linux-x86-gtklibs-20071210.ebuild:
+  Remove vulnerable versions, bug 271705
 
 *emul-linux-x86-gtklibs-20081109 (10 Nov 2008)
 
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-10.0-r1.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-10.0-r1.ebuild
deleted file mode 100644
index 009ccca3096e..000000000000
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-10.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2007 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-10.0-r1.ebuild,v 1.5 2007/03/05 15:19:54 blubb Exp $
-
-inherit emul-libs
-
-SRC_URI="mirror://gentoo/atk-1.12.3.tbz2
-	mirror://gentoo/cairo-1.2.4.tbz2
-	mirror://gentoo/gtk+-1.2.10-r12.tbz2
-	mirror://gentoo/gtk+-2.10.6.tbz2
-	mirror://gentoo/gtk-engines-2.8.2.tbz2
-	qt3? ( mirror://gentoo/gtk-engines-qt-0.7-r1.tbz2 )
-	mirror://gentoo/gtk-engines-xfce-2.2.8-r1.tbz2
-	mirror://gentoo/imlib-1.9.14-r3.tbz2
-	mirror://gentoo/pango-1.14.9.tbz2"
-
-LICENSE="GPL-2 LGPL-2 LGPL-2.1 FTL || ( LGPL-2.1 MPL-1.1 )"
-KEYWORDS="-* amd64"
-
-IUSE="qt3"
-
-DEPEND=""
-RDEPEND=">=app-emulation/emul-linux-x86-baselibs-10.2
-	qt3? ( >=app-emulation/emul-linux-x86-qtlibs-10.0 )
-	>=app-emulation/emul-linux-x86-xlibs-10.0"
-
-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-libs_src_unpack
-
-	# these tools generate an index in /etc/{pango,gtk-2.0}/${CHOST}
-	mv -f "${S}/usr/bin/pango-querymodules"{,32}
-	mv -f "${S}/usr/bin/gtk-query-immodules-2.0"{,-32}
-	mv -f "${S}/usr/bin/gdk-pixbuf-query-loaders"{,32}
-
-	[[ -f ${S}/usr/lib32/kde3/kcm_kcmgtk.so ]] && rm -f ${S}/usr/lib32/kde3/kcm_kcmgtk.so
-}
-
-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
-	else
-		ewarn "You'll have to run the following command after chrooting into ${ROOT}:"
-		ewarn "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
-}
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-11.0.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-11.0.ebuild
deleted file mode 100644
index dc695d71159a..000000000000
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-11.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2007 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-11.0.ebuild,v 1.1 2007/08/18 15:29:17 tester Exp $
-
-inherit emul-libs
-
-SRC_URI="mirror://gentoo/atk-1.18.0.tbz2
-	mirror://gentoo/cairo-1.4.10.tbz2
-	mirror://gentoo/gtk+-1.2.10-r12.tbz2
-	mirror://gentoo/gtk+-2.10.13.tbz2
-	mirror://gentoo/gtk-engines-2.10.2.tbz2
-	qt3? ( mirror://gentoo/gtk-engines-qt-0.7-r1.tbz2 )
-	mirror://gentoo/gtk-engines-xfce-2.4.1-r1.tbz2
-	mirror://gentoo/imlib-1.9.14-r3.tbz2
-	mirror://gentoo/pango-1.16.4.tbz2"
-
-LICENSE="GPL-2 LGPL-2 LGPL-2.1 FTL || ( LGPL-2.1 MPL-1.1 )"
-KEYWORDS="-* ~amd64"
-
-IUSE="qt3"
-
-DEPEND=""
-RDEPEND=">=app-emulation/emul-linux-x86-baselibs-10.2
-	qt3? ( >=app-emulation/emul-linux-x86-qtlibs-10.0 )
-	>=app-emulation/emul-linux-x86-xlibs-10.0"
-
-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-libs_src_unpack
-
-	# these tools generate an index in /etc/{pango,gtk-2.0}/${CHOST}
-	mv -f "${S}/usr/bin/pango-querymodules"{,32}
-	mv -f "${S}/usr/bin/gtk-query-immodules-2.0"{,-32}
-	mv -f "${S}/usr/bin/gdk-pixbuf-query-loaders"{,32}
-
-	[[ -f ${S}/usr/lib32/kde3/kcm_kcmgtk.so ]] && rm -f ${S}/usr/lib32/kde3/kcm_kcmgtk.so
-}
-
-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
-	else
-		ewarn "You'll have to run the following command after chrooting into ${ROOT}:"
-		ewarn "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
-}
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-2.10.6.3-r3.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-2.10.6.3-r3.ebuild
deleted file mode 100644
index 87ca7702969e..000000000000
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-2.10.6.3-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2007 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-2.10.6.3-r3.ebuild,v 1.4 2007/07/02 13:52:36 peper Exp $
-
-inherit eutils
-
-DESCRIPTION="Gtk+ 1/2 for emulation of 32bit x86 on amd64"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~tester/dist/emul/${P}.tar.bz2
-	mirror://gentoo/${P}-r2-emul.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64"
-IUSE="qt3"
-RESTRICT="strip"
-
-RDEPEND=">=app-emulation/emul-linux-x86-xlibs-7.0-r7
-	>=app-emulation/emul-linux-x86-baselibs-2.5.5-r2
-	x11-libs/pango
-	>=x11-libs/gtk+-2.10
-	>=x11-themes/gtk-engines-2.8
-	qt3? ( >=app-emulation/emul-linux-x86-qtlibs-3.4.4-r3 )"
-
-S=${WORKDIR}
-
-QA_EXECSTACK_amd64="usr/lib32/libgdk_pixbuf.so.2.0.0
-	usr/lib32/libgdk_pixbuf_xlib.so.2.0.0"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	mkdir usr
-	mv emul/linux/x86/usr/lib usr/lib32 || die
-	rmdir emul/linux/x86/usr emul/linux/x86 emul/linux emul || die
-	use !qt3 && rm usr/lib32/gtk-2.0/2.10.0/engines/libqtengine.so
-	cp -a ${WORKDIR}{,.old}
-	sed -i \
-		-e 's:/emul/linux/x86/usr/lib/:/usr/lib32/:g' \
-		etc/*/i686-pc-linux-gnu/* || die
-	epatch ${P}-r2-emul.patch
-	rm ${P}-r2-emul.patch || die
-}
-
-src_install() {
-	cp -a "${WORKDIR}"/* "${D}"/ || die
-}
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-2.10.6.3.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-2.10.6.3.ebuild
deleted file mode 100644
index c4c36f2c910d..000000000000
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-2.10.6.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2007 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-2.10.6.3.ebuild,v 1.3 2007/07/02 13:52:36 peper Exp $
-
-DESCRIPTION="Gtk+ 1/2 for emulation of 32bit x86 on amd64"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-		http://dev.gentoo.org/~tester/dist/emul/${P}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="-* amd64"
-IUSE="qt3"
-
-QA_EXECSTACK_amd64="emul/linux/x86/usr/lib/libgdk_pixbuf.so.2.0.0
-	emul/linux/x86/usr/lib/libgdk_pixbuf_xlib.so.2.0.0"
-
-S="${WORKDIR}"
-
-RDEPEND=">=app-emulation/emul-linux-x86-xlibs-7.0-r3
-	>=app-emulation/emul-linux-x86-baselibs-2.5.3
-	x11-libs/pango
-	>=x11-libs/gtk+-2.10
-	>=x11-themes/gtk-engines-2.8
-	qt3? ( >=app-emulation/emul-linux-x86-qtlibs-3.4.4 )"
-
-RESTRICT="strip"
-
-src_install() {
-	# Avoid dep on qtlibs if qt support not required
-	use !qt3 && rm -f "${WORKDIR}/emul/linux/x86/usr/lib/gtk-2.0/2.10.0/engines/libqtengine.so"
-
-	cp -RPvf ${WORKDIR}/* ${D}/
-	doenvd ${FILESDIR}/50emul-linux-x86-gtklibs
-}
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-2.3.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-2.3.ebuild
deleted file mode 100644
index 426e0344c474..000000000000
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-2.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2007 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-2.3.ebuild,v 1.5 2007/07/02 13:52:36 peper Exp $
-
-DESCRIPTION="Gtk+ 1/2 for emulation of 32bit x86 on amd64"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-		http://dev.gentoo.org/~herbs/emul/${P}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="-* amd64"
-IUSE=""
-
-S="${WORKDIR}"
-
-RDEPEND=">=app-emulation/emul-linux-x86-xlibs-2.0
-	>=app-emulation/emul-linux-x86-baselibs-2.0"
-
-RESTRICT="strip"
-
-src_install() {
-	cp -RPvf ${WORKDIR}/* ${D}/
-	doenvd ${FILESDIR}/50emul-linux-x86-gtklibs
-}
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-2.8.8.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-2.8.8.ebuild
deleted file mode 100644
index c4dd5e0d1768..000000000000
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-2.8.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2007 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-2.8.8.ebuild,v 1.8 2007/07/02 13:52:36 peper Exp $
-
-DESCRIPTION="Gtk+ 1/2 for emulation of 32bit x86 on amd64"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-		http://dev.gentoo.org/~herbs/emul/${P}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="-* amd64"
-IUSE="qt3"
-
-QA_EXECSTACK_amd64="emul/linux/x86/usr/lib/libgdk_pixbuf.so.2.0.0
-	emul/linux/x86/usr/lib/libgdk_pixbuf_xlib.so.2.0.0"
-
-S="${WORKDIR}"
-
-RDEPEND=">=app-emulation/emul-linux-x86-xlibs-2.0
-	>=app-emulation/emul-linux-x86-baselibs-2.5
-	qt3? ( >=app-emulation/emul-linux-x86-qtlibs-3.4.4 )"
-
-RESTRICT="strip"
-
-src_install() {
-	# Avoid dep on qtlibs if qt support not required
-	use !qt3 && rm -f "${WORKDIR}/emul/linux/x86/usr/lib/gtk-2.0/2.4.0/engines/libqtengine.so"
-
-	cp -RPvf ${WORKDIR}/* ${D}/
-	doenvd ${FILESDIR}/50emul-linux-x86-gtklibs
-}
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20071114.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20071114.ebuild
deleted file mode 100644
index 4ce5155b7e24..000000000000
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20071114.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2007 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-20071114.ebuild,v 1.4 2007/11/15 17:53:07 mr_bones_ Exp $
-
-inherit emul-linux-x86
-
-LICENSE="GPL-2 LGPL-2 LGPL-2.1 FTL || ( LGPL-2.1 MPL-1.1 )"
-KEYWORDS="-* ~amd64"
-
-IUSE="qt3"
-
-DEPEND=""
-RDEPEND=">=app-emulation/emul-linux-x86-baselibs-20071114
-	>=app-emulation/emul-linux-x86-xlibs-20071114"
-
-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}
-	mv -f "${S}/usr/bin/gtk-query-immodules-2.0"{,-32}
-	mv -f "${S}/usr/bin/gdk-pixbuf-query-loaders"{,32}
-}
-
-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"
-	ewarn "If you have problems with fonts and warnings from 32bit programs, try this:"
-	ewarn "gdk-pixbuf-query-loaders32 >> /etc/gtk+-2.0/gdk-pixbuf.loaders"
-	ewarn "pango-querymodules32 >> /etc/pango/pango.modules"
-}
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20071118.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20071118.ebuild
deleted file mode 100644
index 2f515bd29eda..000000000000
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20071118.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2007 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-20071118.ebuild,v 1.2 2007/11/18 17:07:05 mr_bones_ Exp $
-
-inherit emul-linux-x86
-
-LICENSE="GPL-2 LGPL-2 LGPL-2.1 FTL || ( LGPL-2.1 MPL-1.1 )"
-KEYWORDS="-* ~amd64"
-
-IUSE="qt3"
-
-DEPEND=""
-RDEPEND=">=app-emulation/emul-linux-x86-baselibs-20071114
-	>=app-emulation/emul-linux-x86-xlibs-20071114"
-
-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}
-	mv -f "${S}/usr/bin/gtk-query-immodules-2.0"{,-32}
-	mv -f "${S}/usr/bin/gdk-pixbuf-query-loaders"{,32}
-}
-
-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"
-	ewarn "If you have problems with fonts and warnings from 32bit programs, try this:"
-	ewarn "gdk-pixbuf-query-loaders32 >> /etc/gtk+-2.0/gdk-pixbuf.loaders"
-	ewarn "pango-querymodules32 >> /etc/pango/pango.modules"
-}
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20071121.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20071121.ebuild
deleted file mode 100644
index 57a1f95047cd..000000000000
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20071121.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2007 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-20071121.ebuild,v 1.3 2007/11/24 01:20:18 kingtaco Exp $
-
-inherit emul-linux-x86
-
-LICENSE="GPL-2 LGPL-2 LGPL-2.1 FTL || ( LGPL-2.1 MPL-1.1 )"
-KEYWORDS="-* amd64"
-
-IUSE="qt3"
-
-DEPEND=""
-RDEPEND=">=app-emulation/emul-linux-x86-baselibs-20071114
-	>=app-emulation/emul-linux-x86-xlibs-20071114"
-
-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}
-	mv -f "${S}/usr/bin/gtk-query-immodules-2.0"{,-32}
-	mv -f "${S}/usr/bin/gdk-pixbuf-query-loaders"{,32}
-}
-
-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-20071210.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20071210.ebuild
deleted file mode 100644
index a315bf77f55e..000000000000
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20071210.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2007 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-20071210.ebuild,v 1.2 2007/12/13 21:43:53 welp Exp $
-
-inherit emul-linux-x86
-
-LICENSE="GPL-2 LGPL-2 LGPL-2.1 FTL || ( LGPL-2.1 MPL-1.1 )"
-KEYWORDS="-* amd64"
-
-IUSE="qt3"
-
-DEPEND=""
-RDEPEND=">=app-emulation/emul-linux-x86-baselibs-20071114
-	>=app-emulation/emul-linux-x86-xlibs-20071114"
-
-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}
-	mv -f "${S}/usr/bin/gtk-query-immodules-2.0"{,-32}
-	mv -f "${S}/usr/bin/gdk-pixbuf-query-loaders"{,32}
-}
-
-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
-}