diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-03-05 00:13:16 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-03-05 00:13:16 +0000 |
| commit | 2a1446737702fe6939d04bbd637a2bfe9979b835 (patch) | |
| tree | 40de2cb6107eb118d1221c56e35f1f0afd879c19 | |
| parent | ppc/sparc stable (bug 357069) (diff) | |
| download | gentoo-2-2a1446737702fe6939d04bbd637a2bfe9979b835.tar.gz gentoo-2-2a1446737702fe6939d04bbd637a2bfe9979b835.tar.bz2 gentoo-2-2a1446737702fe6939d04bbd637a2bfe9979b835.zip | |
Fix headers placement. Per bug #357359.
(Portage version: 2.2.0_alpha24/cvs/Linux x86_64)
| -rw-r--r-- | dev-libs/libzip/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-libs/libzip/files/libzip-0.10_rc1-fix_headers.patch | 15 | ||||
| -rw-r--r-- | dev-libs/libzip/libzip-0.10_rc1-r1.ebuild (renamed from dev-libs/libzip/libzip-0.10_rc1.ebuild) | 11 |
3 files changed, 30 insertions, 4 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/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() { |