diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2011-04-29 11:00:54 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-04-29 11:00:54 +0000 |
commit | 58c18f2b5422d061796a35b27ecfb26a60f1ed44 (patch) | |
tree | eb1383c5e19e858f9a72818a50e6e9198c67bc54 /dev-libs/libzip | |
parent | Fix build with new (?) glext.h Bug #365013 (diff) | |
download | gentoo-2-58c18f2b5422d061796a35b27ecfb26a60f1ed44.tar.gz gentoo-2-58c18f2b5422d061796a35b27ecfb26a60f1ed44.tar.bz2 gentoo-2-58c18f2b5422d061796a35b27ecfb26a60f1ed44.zip |
Drop older. Revision bump to fix pkgconfig file that had wrong include defined.
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/libzip')
-rw-r--r-- | dev-libs/libzip/ChangeLog | 9 | ||||
-rw-r--r-- | dev-libs/libzip/files/libzip-0.10-fix_pkgconfig.patch | 18 | ||||
-rw-r--r-- | dev-libs/libzip/libzip-0.10-r1.ebuild | 44 | ||||
-rw-r--r-- | dev-libs/libzip/libzip-0.9.ebuild | 24 |
4 files changed, 70 insertions, 25 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/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 -} |