Drop older. Revision bump to fix pkgconfig file that had wrong include defined.

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

5 files changed, 76 insertions, 33 deletions

diff --git a/dev-libs/libzip/ChangeLog b/dev-libs/libzip/ChangeLog
index 8e118c88b4ad..11ece46ba61c 100644
--- a/dev-libs/libzip/ChangeLog
+++ b/dev-libs/libzip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libzip
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/ChangeLog,v 1.27 2011/04/26 10:53:33 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/ChangeLog,v 1.28 2011/04/29 11:00:54 scarabeus Exp $
+
+*libzip-0.10-r1 (29 Apr 2011)
+
+  29 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> -libzip-0.9.ebuild,
+  +libzip-0.10-r1.ebuild, +files/libzip-0.10-fix_pkgconfig.patch:
+  Drop older. Revision bump to fix pkgconfig file that had wrong include
+  defined.
 
   26 Apr 2011; Kacper Kowalik <xarthisius@gentoo.org> libzip-0.10.ebuild:
   ppc64 stable wrt #359899
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 4f41ae52c3e1..acacde08e1d2 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,19 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+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
-DIST libzip-0.9.tar.gz 424124 RMD160 db43b0f54f92b6c8cbd4f53a4bde50b0eddd1fde SHA1 8cb2d875447b4efd0323627aa9b700c13ab8eae8 SHA256 b0d0a768f9ef8fef14683adade0b819549dd3e61b9a5bf8ab8a92e378d87a05f
+EBUILD libzip-0.10-r1.ebuild 1065 RMD160 4921748c0066fcc2889a50647d415c828ffc2f26 SHA1 c5072c769bd060f88e50c336cf6e7a8aa447a7c1 SHA256 eff133c74e6078f87f004546e2e37570616c2ea7cdca75d7de80965e79f5da74
 EBUILD libzip-0.10.ebuild 1012 RMD160 0211ea21b27e593c078e6a2ecde33010bf6842a7 SHA1 6d1bf7f459c3fb262a9351c62fd0d031cec7fb2e SHA256 780e793cbd777a5a106a9cf72348c0f7cbca0a8ecbb401162b5eded2e27b1cce
-EBUILD libzip-0.9.ebuild 622 RMD160 d6f84c791ebfa32da1e1b31845263850d2d1b23b SHA1 563feb8017ab5e5d7b9e3e1d309edceb4d1b77dd SHA256 4e59c7bcef7c49e6c4abe281ea2d45178f617d190c45fc50dcfccf348b978df8
-MISC ChangeLog 3735 RMD160 1ada1465528f39d0bfa853c943f423eb37e41b3b SHA1 38bbc969f8944ae1b0b6eeb429d36ed0978cceca SHA256 a4b71c05276b7435ca6de0b3fceadacdebc3ecb1ab5f5396c89809ed5544482d
+MISC ChangeLog 3991 RMD160 697a5109b0bd0e70969a297360f3372432f70940 SHA1 2ddd10013420d91b240ad3c957d505b60691ea02 SHA256 bee233a4c7407c5551b8bef65e45599eea85b039383200624952d1f2057e2007
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk22pDMACgkQIiMqcbOVdxQ7wwP/UULZCGqVUjhzoJrcAlwCQBtt
-cpjbqTYVmrr+UhBQ/MUyDog1GCS9MRV9M4vfepVLjIWzhFXcK7OqUZ8x+r5dF62k
-7WheOCfX18IqCY36VhxSU+NY66ZYolpZ9oRDQ2K24XJ7xdtej77lJTbECIifLvHS
-ra58apqKVTIDlSP8YF8=
-=LxIe
+iEYEARECAAYFAk26mmEACgkQHB6c3gNBRYfPcgCaAxZ2810fKqQ2LKHsUJoRePHz
+OSQAn1udZG7zyaBw6WPjXoVB08PyGAIn
+=x5bj
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libzip/files/libzip-0.10-fix_pkgconfig.patch b/dev-libs/libzip/files/libzip-0.10-fix_pkgconfig.patch
new file mode 100644
index 000000000000..30766fd02d7e
--- /dev/null
+++ b/dev-libs/libzip/files/libzip-0.10-fix_pkgconfig.patch
@@ -0,0 +1,18 @@
+diff -urN libzip-0.10.old/libzip.pc.in libzip-0.10/libzip.pc.in
+--- libzip-0.10.old/libzip.pc.in	2011-04-29 12:54:23.000000000 +0200
++++ libzip-0.10/libzip.pc.in	2011-04-29 12:55:28.000000000 +0200
+@@ -2,7 +2,6 @@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+-libincludedir=@libdir@/libzip/include
+ 
+ zipcmp=@prefix@/bin/zipcmp
+ 
+@@ -10,5 +9,5 @@
+ Description: library for handling zip archives
+ Version: @VERSION@
+ Libs: -L${libdir} -lzip @LIBS@
+-Cflags: -I${includedir} -I${libincludedir}
++Cflags: -I${includedir}
+ 
diff --git a/dev-libs/libzip/libzip-0.10-r1.ebuild b/dev-libs/libzip/libzip-0.10-r1.ebuild
new file mode 100644
index 000000000000..1c662a62deb9
--- /dev/null
+++ b/dev-libs/libzip/libzip-0.10-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2011 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.1 2011/04/29 11:00:54 scarabeus Exp $
+
+EAPI=3
+
+MY_P=${P/_}
+inherit autotools-utils autotools
+
+DESCRIPTION="Library for manipulating zip archives"
+HOMEPAGE="http://www.nih.at/libzip/"
+SRC_URI="http://www.nih.at/libzip/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="static-libs"
+
+DOCS=( NEWS README THANKS AUTHORS )
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.10_rc1-fix_headers.patch"
+	"${FILESDIR}/${PN}-0.10-fix_pkgconfig.patch"
+)
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+	autotools-utils_src_prepare
+	eautoreconf # run due to fix_headers patch
+	#elibtoolize # FreeBSD .so version
+
+	# fix test return state
+	sed -i \
+		-e 's:19/2:19/0:' \
+		regress/open_nonarchive.test || die
+}
+
+src_install() {
+	autotools-utils_src_install
+	remove_libtool_files all
+}
diff --git a/dev-libs/libzip/libzip-0.9.ebuild b/dev-libs/libzip/libzip-0.9.ebuild
deleted file mode 100644
index 47e8907ba65c..000000000000
--- a/dev-libs/libzip/libzip-0.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/libzip-0.9.ebuild,v 1.10 2010/01/19 02:16:28 jer Exp $
-
-EAPI=2
-inherit libtool
-
-DESCRIPTION="Library for manipulating zip archives"
-HOMEPAGE="http://www.nih.at/libzip/"
-SRC_URI="http://www.nih.at/libzip/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-src_prepare() {
-	elibtoolize # FreeBSD .so version
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc NEWS README THANKS AUTHORS
-}