[gentoo-commits] gentoo-x86 commit in media-libs/libpng: ChangeLog libpng-1.6.3-r1.ebuild

[Alexis Ballier (aballier)]

aballier    13/07/30 22:07:48

  Modified:             ChangeLog libpng-1.6.3-r1.ebuild
  Log:
  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.
  
  (Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.414                media-libs/libpng/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libpng/ChangeLog?rev=1.414&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libpng/ChangeLog?rev=1.414&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libpng/ChangeLog?r1=1.413&r2=1.414

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -r1.413 -r1.414
--- ChangeLog	22 Jul 2013 11:51:02 -0000	1.413
+++ ChangeLog	30 Jul 2013 22:07:48 -0000	1.414
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libpng
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.413 2013/07/22 11:51:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.414 2013/07/30 22:07:48 aballier Exp $
+
+  30 Jul 2013; Alexis Ballier <aballier@g.o> libpng-1.6.3-r1.ebuild:
+  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.
 
 *libpng-1.5.17 (22 Jul 2013)
 



1.2                  media-libs/libpng/libpng-1.6.3-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libpng/libpng-1.6.3-r1.ebuild?rev=1.2&view=markup
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
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libpng/libpng-1.6.3-r1.ebuild?r1=1.1&r2=1.2

Index: libpng-1.6.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.6.3-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libpng-1.6.3-r1.ebuild	20 Jul 2013 17:42:12 -0000	1.1
+++ libpng-1.6.3-r1.ebuild	30 Jul 2013 22:07:48 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
 
 EAPI=5
 
@@ -16,8 +16,9 @@
 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"
 IUSE="apng neon static-libs"
 
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[abi_x86_32?]
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224 )"
+RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils"
 
@@ -36,10 +37,6 @@
 		--enable-arm-neon=$(usex neon)
 }
 
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
 multilib_src_install_all() {
 	dodoc ANNOUNCE CHANGES libpng-manual.txt README TODO
 	prune_libtool_files --all