ssuominen 14/08/28 16:49:18 Modified: emul-linux-x86-qtlibs-20140508-r1.ebuild ChangeLog Log: Punt USE="mng" which was pulling in removed version of media-libs/libmng which isn't SLOTted. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path 1.6 app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20140508-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20140508-r1.ebuild?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20140508-r1.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20140508-r1.ebuild?r1=1.5&r2=1.6 Index: emul-linux-x86-qtlibs-20140508-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20140508-r1.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- emul-linux-x86-qtlibs-20140508-r1.ebuild 26 Jun 2014 09:24:30 -0000 1.5 +++ emul-linux-x86-qtlibs-20140508-r1.ebuild 28 Aug 2014 16:49:18 -0000 1.6 @@ -1,6 +1,6 @@ # 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.5 2014/06/26 09:24:30 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20140508-r1.ebuild,v 1.6 2014/08/28 16:49:18 ssuominen Exp $ EAPI=5 inherit eutils emul-linux-x86 @@ -8,7 +8,7 @@ LICENSE="LGPL-2.1 GPL-3" KEYWORDS="-* amd64" -IUSE="mng" +IUSE="" DEPEND="" RDEPEND=" @@ -18,7 +18,6 @@ >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)] >=dev-libs/glib-2.34.3[abi_x86_32(-)] >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)] - mng? ( <media-libs/libmng-2[abi_x86_32(-)] ) >=media-libs/libpng-1.6.10:0/16[abi_x86_32(-)] >=media-libs/tiff-3.9.7-r1[abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] @@ -58,9 +57,8 @@ src_install() { emul-linux-x86_src_install - if ! use mng; then - rm "${D%/}"/usr/"$(get_abi_LIBDIR x86)"/qt4/plugins/imageformats/libqmng.so || die - fi + # Build against libmng-1 SONAME, remove this line once it's build against libmng-2 SONAME: + rm "${D%/}"/usr/"$(get_abi_LIBDIR x86)"/qt4/plugins/imageformats/libqmng.so || die # Set LDPATH for not needing dev-qt/qtcore cat <<-EOF > "${T}/44qt4-emul" 1.98 app-emulation/emul-linux-x86-qtlibs/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/ChangeLog?rev=1.98&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/ChangeLog?rev=1.98&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/ChangeLog?r1=1.97&r2=1.98 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/ChangeLog,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- ChangeLog 26 Jun 2014 09:24:30 -0000 1.97 +++ ChangeLog 28 Aug 2014 16:49:18 -0000 1.98 @@ -1,6 +1,11 @@ # 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.97 2014/06/26 09:24:30 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/ChangeLog,v 1.98 2014/08/28 16:49:18 ssuominen Exp $ + + 28 Aug 2014; Samuli Suominen <ssuomi...@gentoo.org> + emul-linux-x86-qtlibs-20140508-r1.ebuild: + Punt USE="mng" which was pulling in removed version of media-libs/libmng which + isn't SLOTted. 26 Jun 2014; Pacho Ramos <pa...@gentoo.org> emul-linux-x86-qtlibs-20140508-r1.ebuild:
