Fix QA issues. Remove unused eclass. Add zlib to DEPEND too. Prevent elibtoolize...

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

diff --git a/dev-libs/libzip/ChangeLog b/dev-libs/libzip/ChangeLog
index 1bb19fa85b950a7fd6696ce519b798e2832d5eaf..a361e40d6f255e0e1a2b86afd6706cc685aee7d8 100644 (file)
--- a/dev-libs/libzip/ChangeLog
+++ b/dev-libs/libzip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libzip
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/ChangeLog,v 1.31 2012/01/04 22:28:35 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/ChangeLog,v 1.32 2012/01/07 15:34:10 johu Exp $
+
+  07 Jan 2012; Johannes Huber <johu@gentoo.org> libzip-0.10-r1.ebuild:
+  Fix QA issues. Remove unused eclass. Add zlib to DEPEND too. Prevent
+  elibtoolize run twice bug #397751.
 
   04 Jan 2012; Brent Baude <ranger@gentoo.org> libzip-0.10-r1.ebuild:
   Marking libzip-0.10-r1 ppc for bug 396903

diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index aa28f54a0d556aef8771c4f4a0b9f09c7378572e..a2e2ab54c52aa22d5bdfe7519ce6359e5a0db316 100644 (file)
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,7 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX libzip-0.10-fix_pkgconfig.patch 542 RMD160 ad95be0ed4fcf82a14995c81cc90e191e1a0ec21 SHA1 9e01568f3d645f3f0d2396e37c45aa7416077443 SHA256 1b85d2ca6d0dda57ee6eb641e58807d12aab4fbaaae8141da31d929e79262e9c
 AUX libzip-0.10_rc1-fix_headers.patch 501 RMD160 219d52b45a6872dc623f74f70fa83bdb330732ce SHA1 210aa4e03ca39ae6d02e1a6b220bb4feb9b4aef2 SHA256 02198832803b0b4aba395766c5d0166862451de954e6790aa721ba51303f9469
 DIST libzip-0.10.tar.gz 849790 RMD160 84a9f0602dba2c2a75d6b9dc52c0000c103f4429 SHA1 0425e8fc4966f78198f3067c52646518a50d21c7 SHA256 b7afa964e2115cf9d72e90537b7fb4928232f2c3173439fa5e04814f28ebd7d2
-EBUILD libzip-0.10-r1.ebuild 1107 RMD160 d7d9fa3dc213749750bd5f97bbe7a04148d25366 SHA1 b650ed347597e0a791a6e7f5efd55eeed95817b4 SHA256 12750a86cf6405d7b603372761f6ac26e3af943c1826704ae45011ffbd436dc2
+EBUILD libzip-0.10-r1.ebuild 1114 RMD160 cc07e8601d0c08cc01db35735465309f41a55a60 SHA1 846bcc625eef029815891ab8bf529f1dc4b53035 SHA256 a53e05d08fe5175c53f971b0122ca2b85c6e31a3b1999e3a97b2d0e13c52721c
 EBUILD libzip-0.10.ebuild 1012 RMD160 0211ea21b27e593c078e6a2ecde33010bf6842a7 SHA1 6d1bf7f459c3fb262a9351c62fd0d031cec7fb2e SHA256 780e793cbd777a5a106a9cf72348c0f7cbca0a8ecbb401162b5eded2e27b1cce
-MISC ChangeLog 4316 RMD160 b121fde447565ce7bfcce0033367bd5c2160cc15 SHA1 9f6129b2dcbd8f55b709e9551f4bd576b15f5fad SHA256 c3ec5f5964e550e3a3f1e0f86286164ba41f092f7b1b872d36f1af900f282ddd
+MISC ChangeLog 4494 RMD160 023b91378c883f52eacc5920550edbe5f9d96fa2 SHA1 d660b62333309426f6315525d924ebe5cc1b141a SHA256 f9859e0b453c4907098d9198c98572155ce51a728d2e5fc69a89bd04210289b3
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBCgAGBQJPCGXSAAoJEO+t9ga+3I3azUIH/1cToJ1neL/97p8ZpJCET3ZR
+5OZv5b0JGue7bAavoU2Ty2aPPZAeFzp4FaeLS+Me2Gakm0LBVq/x0qORjAfurAo3
+n5h08YpKQIHE2XpM0DEWBY2+aq+X+oMOPeRLndswMbXU66sQDUdJB7yzy0HmSBKB
+cE94sfZ3/vyGDG/yXyKgRDYnSisBYK4nUpdUFzQxpD2KgIuS6b3lMuqdgzHSaHzB
+JZyFa1jyPIRh9UurKFKbo8iUA7XseLfAe59ywoK+Ck5fMkr9Ddz+h2xTIIQNEjic
+iCZ6tqCj1qNthiI191EQDJ2DTJ4VVCcZIXCv0u5o72jzSgAZ5Z7xoJyWwGIzUoY=
+=PE1s
+-----END PGP SIGNATURE-----

diff --git a/dev-libs/libzip/libzip-0.10-r1.ebuild b/dev-libs/libzip/libzip-0.10-r1.ebuild
index ae1b57ab813f01077855bb6c18f218f5e2e9a541..30d697b65853fefec54f93ddea82e5900d0a120a 100644 (file)
--- a/dev-libs/libzip/libzip-0.10-r1.ebuild
+++ b/dev-libs/libzip/libzip-0.10-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/libzip-0.10-r1.ebuild,v 1.4 2012/01/04 22:28:35 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/libzip-0.10-r1.ebuild,v 1.5 2012/01/07 15:34:10 johu Exp $
 
 EAPI=3
 
 MY_P=${P/_}
-inherit autotools-utils autotools
+inherit autotools-utils
 
 DESCRIPTION="Library for manipulating zip archives"
 HOMEPAGE="http://www.nih.at/libzip/"
@@ -16,10 +16,8 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
-DEPEND=""
-RDEPEND="${DEPEND}
-       sys-libs/zlib
-"
+DEPEND="sys-libs/zlib"
+RDEPEND="${DEPEND}"
 
 DOCS=( NEWS README THANKS AUTHORS )
 
@@ -34,7 +32,8 @@ AUTOTOOLS_IN_SOURCE_BUILD=1
 
 src_prepare() {
        autotools-utils_src_prepare
-       eautoreconf # run due to fix_headers patch
+       # run due to fix_headers patch
+       AT_NOELIBTOOLIZE=yes eautoreconf
        #elibtoolize # FreeBSD .so version
 
        # fix test return state