Version bump, drop old

(Portage version: 2.2.8-r1/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key A188FBD4)

2 files changed, 27 insertions, 7 deletions

diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
index aaa75743a96e..2a5efc0c9f25 100644
--- a/app-emulation/emul-linux-x86-gtklibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/emul-linux-x86-gtklibs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.118 2014/03/04 03:25:28 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.119 2014/04/06 09:07:02 pacho Exp $
+
+*emul-linux-x86-gtklibs-20140406 (06 Apr 2014)
+
+  06 Apr 2014; Pacho Ramos <pacho@gentoo.org>
+  +emul-linux-x86-gtklibs-20140406.ebuild,
+  -emul-linux-x86-gtklibs-20130224.ebuild:
+  Version bump, drop old
 
   04 Mar 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
   emul-linux-x86-gtklibs-20131008-r4.ebuild:
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20130224.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140406.ebuild
index 2342db5eed7e..659619c01ea2 100644
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20130224.ebuild
+++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140406.ebuild
@@ -1,17 +1,25 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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-20130224.ebuild,v 1.2 2013/03/16 15:20:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140406.ebuild,v 1.1 2014/04/06 09:07:02 pacho Exp $
 
 EAPI=5
 inherit emul-linux-x86
 
 LICENSE="GPL-2 LGPL-2 FTL LGPL-2.1 LGPL-3 MPL-1.1 MIT"
-KEYWORDS="-* amd64"
+KEYWORDS="-* ~amd64"
+IUSE="abi_x86_32"
 
 DEPEND=""
 RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
 	~app-emulation/emul-linux-x86-xlibs-${PV}
-	~app-emulation/emul-linux-x86-opengl-${PV}"
+	~app-emulation/emul-linux-x86-opengl-${PV}
+	abi_x86_32? (
+		>=x11-libs/pixman-0.30.2-r1[abi_x86_32(-)]
+		>=x11-libs/cairo-1.12.16-r1[abi_x86_32(-)]
+		>=x11-libs/gdk-pixbuf-2.30.5-r1[abi_x86_32(-)]
+		>=x11-libs/pango-1.36.2-r1[abi_x86_32(-)]
+		>=x11-libs/pangox-compat-0.0.2-r1[abi_x86_32(-)]
+	)"
 # RDEPEND on opengl stuff needed due cairo, bug #410213
 
 my_gdk_pixbuf_query_loaders() {
@@ -81,6 +89,9 @@ src_prepare() {
 	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
+
+	# Remove migrated stuff.
+	use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native-${PVR}")
 }
 
 pkg_preinst() {
@@ -91,9 +102,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	my_pango_querymodules
 	my_gtk_query_immodules
-	my_gdk_pixbuf_query_loaders
+	if ! use abi_x86_32; then
+		my_pango_querymodules
+		my_gdk_pixbuf_query_loaders
+	fi
 
 	# gdk-pixbuf.loaders should be in their CHOST directories respectively.
 	if [[ -e "${ROOT}/etc/gtk-2.0/gdk-pixbuf.loaders" ]] ; then