| 1 |
ssuominen 14/08/28 16:49:18 |
| 2 |
|
| 3 |
Modified: emul-linux-x86-qtlibs-20140508-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Punt USE="mng" which was pulling in removed version of media-libs/libmng which isn't SLOTted. |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.6 app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20140508-r1.ebuild |
| 11 |
|
| 12 |
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 |
| 13 |
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 |
| 14 |
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 |
| 15 |
|
| 16 |
Index: emul-linux-x86-qtlibs-20140508-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20140508-r1.ebuild,v |
| 19 |
retrieving revision 1.5 |
| 20 |
retrieving revision 1.6 |
| 21 |
diff -u -r1.5 -r1.6 |
| 22 |
--- emul-linux-x86-qtlibs-20140508-r1.ebuild 26 Jun 2014 09:24:30 -0000 1.5 |
| 23 |
+++ emul-linux-x86-qtlibs-20140508-r1.ebuild 28 Aug 2014 16:49:18 -0000 1.6 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $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 $ |
| 28 |
+# $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 $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
inherit eutils emul-linux-x86 |
| 32 |
@@ -8,7 +8,7 @@ |
| 33 |
LICENSE="LGPL-2.1 GPL-3" |
| 34 |
KEYWORDS="-* amd64" |
| 35 |
|
| 36 |
-IUSE="mng" |
| 37 |
+IUSE="" |
| 38 |
|
| 39 |
DEPEND="" |
| 40 |
RDEPEND=" |
| 41 |
@@ -18,7 +18,6 @@ |
| 42 |
>=dev-db/sqlite-3.8.2:3[abi_x86_32(-)] |
| 43 |
>=dev-libs/glib-2.34.3[abi_x86_32(-)] |
| 44 |
>=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)] |
| 45 |
- mng? ( <media-libs/libmng-2[abi_x86_32(-)] ) |
| 46 |
>=media-libs/libpng-1.6.10:0/16[abi_x86_32(-)] |
| 47 |
>=media-libs/tiff-3.9.7-r1[abi_x86_32(-)] |
| 48 |
>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] |
| 49 |
@@ -58,9 +57,8 @@ |
| 50 |
src_install() { |
| 51 |
emul-linux-x86_src_install |
| 52 |
|
| 53 |
- if ! use mng; then |
| 54 |
- rm "${D%/}"/usr/"$(get_abi_LIBDIR x86)"/qt4/plugins/imageformats/libqmng.so || die |
| 55 |
- fi |
| 56 |
+ # Build against libmng-1 SONAME, remove this line once it's build against libmng-2 SONAME: |
| 57 |
+ rm "${D%/}"/usr/"$(get_abi_LIBDIR x86)"/qt4/plugins/imageformats/libqmng.so || die |
| 58 |
|
| 59 |
# Set LDPATH for not needing dev-qt/qtcore |
| 60 |
cat <<-EOF > "${T}/44qt4-emul" |
| 61 |
|
| 62 |
|
| 63 |
|
| 64 |
1.98 app-emulation/emul-linux-x86-qtlibs/ChangeLog |
| 65 |
|
| 66 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/ChangeLog?rev=1.98&view=markup |
| 67 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/ChangeLog?rev=1.98&content-type=text/plain |
| 68 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/ChangeLog?r1=1.97&r2=1.98 |
| 69 |
|
| 70 |
Index: ChangeLog |
| 71 |
=================================================================== |
| 72 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/ChangeLog,v |
| 73 |
retrieving revision 1.97 |
| 74 |
retrieving revision 1.98 |
| 75 |
diff -u -r1.97 -r1.98 |
| 76 |
--- ChangeLog 26 Jun 2014 09:24:30 -0000 1.97 |
| 77 |
+++ ChangeLog 28 Aug 2014 16:49:18 -0000 1.98 |
| 78 |
@@ -1,6 +1,11 @@ |
| 79 |
# ChangeLog for app-emulation/emul-linux-x86-qtlibs |
| 80 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 81 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/ChangeLog,v 1.97 2014/06/26 09:24:30 pacho Exp $ |
| 82 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/ChangeLog,v 1.98 2014/08/28 16:49:18 ssuominen Exp $ |
| 83 |
+ |
| 84 |
+ 28 Aug 2014; Samuli Suominen <ssuominen@g.o> |
| 85 |
+ emul-linux-x86-qtlibs-20140508-r1.ebuild: |
| 86 |
+ Punt USE="mng" which was pulling in removed version of media-libs/libmng which |
| 87 |
+ isn't SLOTted. |
| 88 |
|
| 89 |
26 Jun 2014; Pacho Ramos <pacho@g.o> |
| 90 |
emul-linux-x86-qtlibs-20140508-r1.ebuild: |
Archives