1 |
aballier 13/07/30 22:07:48 |
2 |
|
3 |
Modified: ChangeLog libpng-1.6.3-r1.ebuild |
4 |
Log: |
5 |
Fix MULTILIB_USEDEP on zlib, make emul-libs blockers so that it is slatted for baselibs -r2, remove multilib_src_install which is just the default. |
6 |
|
7 |
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 160F534A) |
8 |
|
9 |
Revision Changes Path |
10 |
1.414 media-libs/libpng/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libpng/ChangeLog?rev=1.414&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libpng/ChangeLog?rev=1.414&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libpng/ChangeLog?r1=1.413&r2=1.414 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v |
19 |
retrieving revision 1.413 |
20 |
retrieving revision 1.414 |
21 |
diff -u -r1.413 -r1.414 |
22 |
--- ChangeLog 22 Jul 2013 11:51:02 -0000 1.413 |
23 |
+++ ChangeLog 30 Jul 2013 22:07:48 -0000 1.414 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for media-libs/libpng |
26 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.413 2013/07/22 11:51:02 ssuominen Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.414 2013/07/30 22:07:48 aballier Exp $ |
29 |
+ |
30 |
+ 30 Jul 2013; Alexis Ballier <aballier@g.o> libpng-1.6.3-r1.ebuild: |
31 |
+ Fix MULTILIB_USEDEP on zlib, make emul-libs blockers so that it is slatted |
32 |
+ for baselibs -r2, remove multilib_src_install which is just the default. |
33 |
|
34 |
*libpng-1.5.17 (22 Jul 2013) |
35 |
|
36 |
|
37 |
|
38 |
|
39 |
1.2 media-libs/libpng/libpng-1.6.3-r1.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libpng/libpng-1.6.3-r1.ebuild?rev=1.2&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libpng/libpng-1.6.3-r1.ebuild?rev=1.2&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libpng/libpng-1.6.3-r1.ebuild?r1=1.1&r2=1.2 |
44 |
|
45 |
Index: libpng-1.6.3-r1.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.6.3-r1.ebuild,v |
48 |
retrieving revision 1.1 |
49 |
retrieving revision 1.2 |
50 |
diff -u -r1.1 -r1.2 |
51 |
--- libpng-1.6.3-r1.ebuild 20 Jul 2013 17:42:12 -0000 1.1 |
52 |
+++ libpng-1.6.3-r1.ebuild 30 Jul 2013 22:07:48 -0000 1.2 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2013 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.6.3-r1.ebuild,v 1.1 2013/07/20 17:42:12 ssuominen Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.6.3-r1.ebuild,v 1.2 2013/07/30 22:07:48 aballier Exp $ |
58 |
|
59 |
EAPI=5 |
60 |
|
61 |
@@ -16,8 +16,9 @@ |
62 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" |
63 |
IUSE="apng neon static-libs" |
64 |
|
65 |
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[abi_x86_32?] |
66 |
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224 )" |
67 |
+RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] |
68 |
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 |
69 |
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" |
70 |
DEPEND="${RDEPEND} |
71 |
app-arch/xz-utils" |
72 |
|
73 |
@@ -36,10 +37,6 @@ |
74 |
--enable-arm-neon=$(usex neon) |
75 |
} |
76 |
|
77 |
-multilib_src_install() { |
78 |
- emake DESTDIR="${D}" install |
79 |
-} |
80 |
- |
81 |
multilib_src_install_all() { |
82 |
dodoc ANNOUNCE CHANGES libpng-manual.txt README TODO |
83 |
prune_libtool_files --all |