Use multilib packages to fulfill remaining pre-built library dependencies instead of pulling in other emul-linux-x86 sets. Remove USE=gtkstyle since the GTK+ style seems not to be included anyway. Add USE=-mng to avoid pulling in baselibs when libmng-2 is installed.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

2 files changed, 80 insertions, 1 deletions

diff --git a/app-emulation/emul-linux-x86-qtlibs/ChangeLog b/app-emulation/emul-linux-x86-qtlibs/ChangeLog
index 9e9c1bf3791e..37697d196bce 100644
--- a/app-emulation/emul-linux-x86-qtlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-qtlibs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/emul-linux-x86-qtlibs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/ChangeLog,v 1.92 2014/05/08 21:47:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/ChangeLog,v 1.93 2014/05/27 19:06:38 mgorny Exp $
+
+*emul-linux-x86-qtlibs-20140508-r1 (27 May 2014)
+
+  27 May 2014; Michał Górny <mgorny@gentoo.org>
+  +emul-linux-x86-qtlibs-20140508-r1.ebuild:
+  Use multilib packages to fulfill remaining pre-built library dependencies
+  instead of pulling in other emul-linux-x86 sets. Remove USE=gtkstyle since the
+  GTK+ style seems not to be included anyway. Add USE=-mng to avoid pulling in
+  baselibs when libmng-2 is installed.
 
 *emul-linux-x86-qtlibs-20140508 (08 May 2014)
 
diff --git a/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20140508-r1.ebuild b/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20140508-r1.ebuild
new file mode 100644
index 000000000000..02a1eb2e6009
--- /dev/null
+++ b/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20140508-r1.ebuild
@@ -0,0 +1,70 @@
+# 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-qtlibs/emul-linux-x86-qtlibs-20140508-r1.ebuild,v 1.1 2014/05/27 19:06:38 mgorny Exp $
+
+EAPI=5
+inherit eutils emul-linux-x86
+
+LICENSE="LGPL-2.1 GPL-3"
+KEYWORDS="-* ~amd64"
+
+IUSE="mng"
+
+DEPEND=""
+RDEPEND="
+	|| (
+		~app-emulation/emul-linux-x86-baselibs-${PV}
+		(
+			dev-db/sqlite:3[abi_x86_32(-)]
+			dev-libs/glib[abi_x86_32(-)]
+			dev-libs/openssl[abi_x86_32(-)]
+			mng? ( <media-libs/libmng-2[abi_x86_32(-)] )
+			media-libs/libpng:0/16[abi_x86_32(-)]
+			media-libs/tiff[abi_x86_32(-)]
+			sys-apps/dbus[abi_x86_32(-)]
+			sys-libs/zlib[abi_x86_32(-)]
+			virtual/jpeg:62[abi_x86_32(-)]
+		)
+	)
+	|| (
+		~app-emulation/emul-linux-x86-medialibs-${PV}
+		(
+			media-libs/gstreamer:0.10[abi_x86_32(-)]
+			media-libs/gst-plugins-base:0.10[abi_x86_32(-)]
+		)
+	)
+	|| (
+		~app-emulation/emul-linux-x86-opengl-${PV}
+		virtual/opengl[abi_x86_32(-)]
+	)
+	|| (
+		~app-emulation/emul-linux-x86-xlibs-${PV}
+		(
+			media-libs/fontconfig[abi_x86_32(-)]
+			media-libs/freetype[abi_x86_32(-)]
+			x11-libs/libICE[abi_x86_32(-)]
+			x11-libs/libSM[abi_x86_32(-)]
+			x11-libs/libX11[abi_x86_32(-)]
+			x11-libs/libXcursor[abi_x86_32(-)]
+			x11-libs/libXext[abi_x86_32(-)]
+			x11-libs/libXfixes[abi_x86_32(-)]
+			x11-libs/libXinerama[abi_x86_32(-)]
+			x11-libs/libXi[abi_x86_32(-)]
+			x11-libs/libXrandr[abi_x86_32(-)]
+			x11-libs/libXrender[abi_x86_32(-)]
+		)
+	)"
+
+src_install() {
+	emul-linux-x86_src_install
+
+	if ! use mng; then
+		rm "${D%/}"/usr/lib32/qt4/plugins/imageformats/libqmng.so || die
+	fi
+
+	# Set LDPATH for not needing dev-qt/qtcore
+	cat <<-EOF > "${T}/44qt4-emul"
+	LDPATH=/usr/lib32/qt4
+	EOF
+	doenvd "${T}/44qt4-emul"
+}