Fix headers placement. Per bug #357359.

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

4 files changed, 33 insertions, 6 deletions

diff --git a/dev-libs/libzip/ChangeLog b/dev-libs/libzip/ChangeLog
index 7bd10ba1d2ce..0ae60e497ba2 100644
--- a/dev-libs/libzip/ChangeLog
+++ b/dev-libs/libzip/ChangeLog
@@ -1,6 +1,12 @@
 # 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.18 2011/03/04 12:17:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/ChangeLog,v 1.19 2011/03/05 00:13:16 scarabeus Exp $
+
+*libzip-0.10_rc1-r1 (05 Mar 2011)
+
+  05 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> -libzip-0.10_rc1.ebuild,
+  +libzip-0.10_rc1-r1.ebuild, +files/libzip-0.10_rc1-fix_headers.patch:
+  Fix headers placement. Per bug #357359.
 
 *libzip-0.10_rc1 (04 Mar 2011)
 
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index a6d44c0ff5b2..033ab8d83c01 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,8 +1,9 @@
+AUX libzip-0.10_rc1-fix_headers.patch 499 RMD160 046a421dc7e92b887a770e350eb0751a6c65b8c7 SHA1 c1950548413e137b4a3211dd2326c69d83de58bd SHA256 e2a1023d13228b072a32f3bc9517a9ac9039cb882a1e3379b161be2f2109b47d
 DIST libzip-0.10rc1.tar.gz 487172 RMD160 89572df841f70f459ad05899e61553402e58dd7f SHA1 e61907f223c377a7e1269913a57885f6be62ced1 SHA256 afeb1f54e9e03c6b04e7b1772d0073fd5d47958b4ff5b4a6f41eef32737b80e1
 DIST libzip-0.9.3.tar.gz 392740 RMD160 ab806c32c7033acf629ebaef703b71fd09b734a7 SHA1 0e7d5110b3611a72c5384898ef0e202651b530fb SHA256 0e282dfed9e3da7d52223a0ccaee7c950782f10ed73f9b778243128a03c8cb1c
 DIST libzip-0.9.tar.gz 424124 RMD160 db43b0f54f92b6c8cbd4f53a4bde50b0eddd1fde SHA1 8cb2d875447b4efd0323627aa9b700c13ab8eae8 SHA256 b0d0a768f9ef8fef14683adade0b819549dd3e61b9a5bf8ab8a92e378d87a05f
-EBUILD libzip-0.10_rc1.ebuild 816 RMD160 51b2f928464417058b694dae760b9b602538f2d7 SHA1 456ff88b08f8504248eb78851caa857bd47e69e8 SHA256 e2e0b9fd1a8b0e6084c5ae11690963f94a20f815460859ce3251586b7753200c
+EBUILD libzip-0.10_rc1-r1.ebuild 886 RMD160 b95b66171f9c47e62ef9881995fa8c487cfd4005 SHA1 d7210cb7999be03ca43c00b881c803519179e27a SHA256 521490208852c2be673cc65155229c8016c5d6a8ee7b9051d715852b90dc2d89
 EBUILD libzip-0.9.3.ebuild 775 RMD160 002e1c70b6cfae631adb64d10593e64662800c24 SHA1 5b8fccb747a6437dfef167ffea94b9d10b76ab7c SHA256 e21ab6d9f71f97fe610fb5e44e0de39aedb169e7f3fc0a382ca254fdf60832ce
 EBUILD libzip-0.9.ebuild 622 RMD160 d6f84c791ebfa32da1e1b31845263850d2d1b23b SHA1 563feb8017ab5e5d7b9e3e1d309edceb4d1b77dd SHA256 4e59c7bcef7c49e6c4abe281ea2d45178f617d190c45fc50dcfccf348b978df8
-MISC ChangeLog 2435 RMD160 be28c15e68eb400ee02e083a42231a923c3fef4c SHA1 ed712320451accb9a93d83516e7e8557c75d79bb SHA256 d6575f0d029736668cd5ac51b5fc5fe2b824bce3847136d55cb7a1f835ef4491
+MISC ChangeLog 2665 RMD160 f85e88fa085476f500a244840be3b0fd8768ffd7 SHA1 4d0cba727a278afa1358d01f264d0eb86fac2161 SHA256 f522dead532a43786c973518e503c7b1c9e20a3779a2d904d6bb85748e9ae869
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/dev-libs/libzip/files/libzip-0.10_rc1-fix_headers.patch b/dev-libs/libzip/files/libzip-0.10_rc1-fix_headers.patch
new file mode 100644
index 000000000000..8a60d45096c5
--- /dev/null
+++ b/dev-libs/libzip/files/libzip-0.10_rc1-fix_headers.patch
@@ -0,0 +1,15 @@
+diff -urN libzip-0.10rc1.old/lib/Makefile.am libzip-0.10rc1/lib/Makefile.am
+--- libzip-0.10rc1.old/lib/Makefile.am	2011-03-05 01:07:33.921722002 +0100
++++ libzip-0.10rc1/lib/Makefile.am	2011-03-05 01:08:04.626722002 +0100
+@@ -2,8 +2,9 @@
+ 
+ lib_LTLIBRARIES = libzip.la
+ noinst_HEADERS = zipint.h
+-include_HEADERS = zip.h
+-libinclude_HEADERS = zipconf.h
++include_HEADERS = \
++	zip.h
++	zipconf.h
+ 
+ # also update CMakeLists.txt when changing version
+ libzip_la_LDFLAGS=-no-undefined -version-info 2:0
diff --git a/dev-libs/libzip/libzip-0.10_rc1.ebuild b/dev-libs/libzip/libzip-0.10_rc1-r1.ebuild
index f5e929504135..33bf86c8d4bb 100644
--- a/dev-libs/libzip/libzip-0.10_rc1.ebuild
+++ b/dev-libs/libzip/libzip-0.10_rc1-r1.ebuild
@@ -1,11 +1,11 @@
 # 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_rc1.ebuild,v 1.1 2011/03/04 12:17:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/libzip-0.10_rc1-r1.ebuild,v 1.1 2011/03/05 00:13:16 scarabeus Exp $
 
 EAPI=3
 
 MY_P=${P/_}
-inherit autotools-utils libtool
+inherit autotools-utils autotools
 
 DESCRIPTION="Library for manipulating zip archives"
 HOMEPAGE="http://www.nih.at/libzip/"
@@ -20,11 +20,16 @@ DOCS=( NEWS README THANKS AUTHORS )
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix_headers.patch"
+)
+
 AUTOTOOLS_IN_SOURCE_BUILD=1
 
 src_prepare() {
 	autotools-utils_src_prepare
-	elibtoolize # FreeBSD .so version
+	eautoreconf
+	#elibtoolize # FreeBSD .so version
 }
 
 src_install() {