All: fixed one QA warning (dohtml -r needed)

Testing: added doc and static-libs USE flags, xmlto removed from dependencies, moved python to DEPEND
ACK from Mike
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-libs/zziplib/ChangeLog b/dev-libs/zziplib/ChangeLog
index c1fdda866563ac3bd2e777dd5c20120e913d5deb..16d8125db13b9e3346324abfb871be403690f207 100644 (file)
--- a/dev-libs/zziplib/ChangeLog
+++ b/dev-libs/zziplib/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/zziplib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/ChangeLog,v 1.71 2010/02/21 00:12:40 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/ChangeLog,v 1.72 2010/03/14 20:22:32 reavertm Exp $
+
+*zziplib-0.13.58-r1 (14 Mar 2010)
+
+  14 Mar 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  zziplib-0.13.49-r1.ebuild, -zziplib-0.13.58.ebuild,
+  +zziplib-0.13.58-r1.ebuild:
+  All: fixed one QA warning (dohtml -r needed), Testing: added doc and
+  static-libs USE flags, xmlto removed from dependencies, moved python
+  to DEPEND, ACK from Mike
 
   21 Feb 2010; Jonathan Callen <abcd@gentoo.org> zziplib-0.13.58.ebuild:
   Transfer prefix keywords, dep on app-text/xmlto on Darwin

diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 22b8074943e7faf55cfcde8b16791cf46c484e4e..e43ceaf9bbecd8687bb8043e8552ee3aabdb759e 100644 (file)
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX zziplib-0.13.49-SDL-test.patch 392 RMD160 07322bd7d56a58f3aa603d728e2f41a34dd5e43d SHA1 acdb46dc6146c870dcf3b1e7d6088c7fc9cb380e SHA256 88554ed81a8d07677ac27caddb4b622b00ac0bfe199e42d82ccfc6ca83815078
 AUX zziplib-0.13.49-configure-sed.patch 533 RMD160 cd6f0f54198ef9cb84ef857ab141c508d055b62a SHA1 684f2e7cd3559413094f8e94dd9d01b83c4b9d66 SHA256 b3cbc83d5eec056168a96d70be46f5da4c0cd3013868e7263189181a547b9882
 AUX zziplib-0.13.49-parallel-docs.patch 1757 RMD160 ab782781fc97039cb6800a8aeddbb3dc4a0c9017 SHA1 c0eec0c1262eb2b66d189dab0b62dc72b88fd461 SHA256 c6c647c99a4dcff0a21dc94dd52a8f6a7a636ea99136fcce71e837f5274528e0
@@ -10,14 +7,7 @@ AUX zziplib-0.13.50-configure-sed.patch 544 RMD160 86a912a3e58beddfad5c729a0f850
 AUX zziplib-0.13.50-sparc-aligned-access.patch 1465 RMD160 ceecb9151c7e68658e1b8afa4db8ae7374a4969a SHA1 6ca2c2202bd488d1a093ac1e232c643c58e3585e SHA256 58960a5ce72eea9c4effafa94da2d2529495ec388f33a153ce459eb59fc40e5c
 DIST zziplib-0.13.49.tar.bz2 654842 RMD160 3ba64880298edaf192a9a773262810ff08d710e4 SHA1 72825fcbab93377d7866a8e6a9dfdef53f0343fa SHA256 f57c4e33eb2cdd87a6c2f01bfa4794340fbe61ea1a1cfc7dac3b6671e1dd22af
 DIST zziplib-0.13.58.tar.bz2 697043 RMD160 d58946b65c3c0b726710d487751f5ecb52a01aa0 SHA1 4255290de3b66deb4a7233ab41727c1b56739e8c SHA256 5508809fd1f5a204363bf1e332ddc564407414649947936a6918f48ca271498e
-EBUILD zziplib-0.13.49-r1.ebuild 1601 RMD160 af3d56fe4be58a7ae5170c1e8d44c810a10cae7a SHA1 ec4466c1ad15d46967f4722ee384a58bcc8dd712 SHA256 edd19f5b6997f416885cc3a4396b88b4b2416aa5dc8ccd69e140a5338ba16347
-EBUILD zziplib-0.13.58.ebuild 1641 RMD160 5955687607d8eb0a2c904989debe9d5153d9ece3 SHA1 5ed1c768fc564499e96ace3ad70f4ad2d5f2ac28 SHA256 a370f786d8fbebafcefbace5138b19b8e78139fdd06ef3e761840a1ce963b6c9
-MISC ChangeLog 9705 RMD160 662655ddb7e121bc898e60b75e90cfd82aa69b9a SHA1 c874953541dfa40e903af302f1c92dabb3ec4441 SHA256 932455ea96832b55a15c9ebe3d325b3882569d6931758bd6511b1dccd07c996d
+EBUILD zziplib-0.13.49-r1.ebuild 1604 RMD160 9cdb7d886e18822f39cb01ba8325985eb0ea5c15 SHA1 a9d0696e2df694901ac1949c63049a03a3bdb5db SHA256 ecf16ca961bc11725904dab93539965ad39ff5d9d67c27f2b99155ead949bc95
+EBUILD zziplib-0.13.58-r1.ebuild 1848 RMD160 76366a408558c732857645aa138f680048ac9f9f SHA1 20bb66b76634add514dd901c3959ebe133d5ec8d SHA256 334ba0adb7203b20c2be314dcc8d3102be50006efb77ffde69a7b964d65b8439
+MISC ChangeLog 10052 RMD160 abc2242e25ed58063dea413b2f18396350487007 SHA1 d3c47ea3ba3b8afcce09d81b13be602ad0771c20 SHA256 9e68f8933fc92593e397638c9c0a76fad2fc62b920eea7e158f62c05703d6732
 MISC metadata.xml 285 RMD160 3faddc79f99fd2e176331b7691ab303d68afff1f SHA1 bf0a1e4c233011a630921773d4968d1e5fe96265 SHA256 aabbb33ddce6a4c9c25c0e405250095050964ba66593fdeef74ac0023bdb301c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuBxgoACgkQ/ejvha5XGaOEzwCePeAOWrk9hVZsKAOuacdLF+ND
-SBMAoJiuMM6h3MRY5kknY9gD6mYyywOg
-=B+qf
------END PGP SIGNATURE-----

diff --git a/dev-libs/zziplib/zziplib-0.13.49-r1.ebuild b/dev-libs/zziplib/zziplib-0.13.49-r1.ebuild
index 6c50ff017b8bb313c0d21cfc1c7e677c15b69c76..43fc3ee5e44b74ca7348f852a8e32f569ed4257b 100644 (file)
--- a/dev-libs/zziplib/zziplib-0.13.49-r1.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.49-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/zziplib-0.13.49-r1.ebuild,v 1.14 2009/01/07 17:48:46 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/zziplib-0.13.49-r1.ebuild,v 1.15 2010/03/14 20:22:33 reavertm Exp $
 
 inherit libtool fixheadtails eutils
 
@@ -48,5 +48,5 @@ src_test() {
 src_install() {
        emake DESTDIR="${D}" install install-man3 || die "make install failed"
        dodoc ChangeLog README TODO
-       dohtml docs/*
+       dohtml -r docs/*
 }

diff --git a/dev-libs/zziplib/zziplib-0.13.58.ebuild b/dev-libs/zziplib/zziplib-0.13.58-r1.ebuild
similarity index 73%
rename from dev-libs/zziplib/zziplib-0.13.58.ebuild
rename to dev-libs/zziplib/zziplib-0.13.58-r1.ebuild
index f23460af79243ad7f07722c67ae453ed98eb5748..28cccc84c367cff7f21d4c2a49aa5217cf3db2b7 100644 (file)
--- a/dev-libs/zziplib/zziplib-0.13.58.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.58-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/zziplib-0.13.58.ebuild,v 1.2 2010/02/21 00:12:40 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/zziplib-0.13.58-r1.ebuild,v 1.1 2010/03/14 20:22:33 reavertm Exp $
 
 EAPI="2"
 
@@ -13,15 +13,14 @@ SRC_URI="mirror://sourceforge/zziplib/${P}.tar.bz2"
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="sdl test"
+IUSE="doc sdl static-libs test"
 
-RDEPEND=">=dev-lang/python-2.4
-       sys-libs/zlib
+RDEPEND="sys-libs/zlib
        sdl? ( >=media-libs/libsdl-1.2.6 )"
 DEPEND="${RDEPEND}
+       >=dev-lang/python-2.4
        dev-util/pkgconfig
-       test? ( app-arch/zip )
-       kernel_Darwin? ( app-text/xmlto )"
+       test? ( app-arch/zip )"
 
 src_prepare() {
        epatch "${FILESDIR}"/${PN}-0.13.49-SDL-test.patch
@@ -33,7 +32,10 @@ src_prepare() {
 
 src_configure() {
        append-flags -fno-strict-aliasing # bug reported upstream
-       econf $(use_enable sdl)
+       export ac_cv_path_XMLTO=
+       econf \
+               $(use_enable sdl) \
+               $(use_enable static-libs static)
 }
 
 src_test() {
@@ -43,7 +45,16 @@ src_test() {
 }
 
 src_install() {
-       emake DESTDIR="${D}" install install-man3 || die "make install failed"
+       emake DESTDIR="${D}" install || die "make install failed"
+
+       if ! use static-libs; then
+               find "${D}" -type f -name '*.la' -exec rm {} + \
+                       || die "la removal failed"
+       fi
+
        dodoc ChangeLog README TODO
-       dohtml docs/*
+
+       if use doc; then
+               dohtml -r docs/* || die 'dohtml failed'
+       fi
 }