Version bump. Support installing shared libs.

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

5 files changed, 87 insertions, 23 deletions

diff --git a/app-arch/libzpaq/ChangeLog b/app-arch/libzpaq/ChangeLog
index a175634f40fb..73c40399c07f 100644
--- a/app-arch/libzpaq/ChangeLog
+++ b/app-arch/libzpaq/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-arch/libzpaq
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libzpaq/ChangeLog,v 1.2 2011/01/06 16:41:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libzpaq/ChangeLog,v 1.3 2011/08/25 10:24:36 mgorny Exp $
+
+*libzpaq-3.00 (25 Aug 2011)
+*libzpaq-2.02a-r1 (25 Aug 2011)
+
+  25 Aug 2011; Michał Górny <mgorny@gentoo.org> -libzpaq-2.02a.ebuild,
+  +libzpaq-2.02a-r1.ebuild, +libzpaq-3.00.ebuild,
+  files/0001-Add-autotools-files.patch:
+  Version bump. Support installing shared libs.
 
 *libzpaq-2.02a (06 Jan 2011)
 
diff --git a/app-arch/libzpaq/Manifest b/app-arch/libzpaq/Manifest
index 4d3d8b8cb226..e905370a530d 100644
--- a/app-arch/libzpaq/Manifest
+++ b/app-arch/libzpaq/Manifest
@@ -1,15 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 0001-Add-autotools-files.patch 1401 RMD160 0f9768c59777f065b9fbf3ef73d453211c880b71 SHA1 db5664da14aa21bc7e0160122af1918889897e32 SHA256 cc437841205a51b96419f8d06b8f0639a9d6c68049a2ac0c6131218adc314588
+AUX 0001-Add-autotools-files.patch 1704 RMD160 42d846eebd924657b864803256bbdceb2c7347ff SHA1 dcf6127e430b39d505034ce1a512de58ff3cb519 SHA256 dd96581f0dcc61be21db94201b4a4d5b8256b73b12e1738a60c17b5fa33b70cd
 DIST libzpaq.202a.zip 35631 RMD160 59373106fe24dc67bdd5a322882be30b7785434e SHA1 8504c8cc3407b6659ea2262679f7968a55a42143 SHA256 9b4c0ec9e605c5ba49c1ab691a4149e4385f7a76c41f4c782d09d2f5d5a53605
-EBUILD libzpaq-2.02a.ebuild 714 RMD160 289af3bcbda8b478a6b6d3f795d3fe3f1e36ab88 SHA1 db4a0a48eaee1c85c6a4ceff384580b8592dc85f SHA256 e62352ffa9545c6823ebe84064c2d143fbc289ad0bf5637e742327535a7721d4
-MISC ChangeLog 636 RMD160 454e6d5c385c641d942c2a1902aa2f1a14ec31cd SHA1 4605631bc38b1e429aef61d5def26984826789de SHA256 b20e6998be2cf89bc6a648b36b9fcd4a3482a9b78653e16c1e9f7da5ad20bc69
+DIST libzpaq300.zip 37531 RMD160 c0db1361e9f4ffa1949b2dc4a34d52231277ebe7 SHA1 f9cb1e761a558237667b3dde1e5ae31a33a516bf SHA256 b0fd5f5d4e12236b361ca832c28007c7b00d5df0f088f5be583790e50abd25c8
+EBUILD libzpaq-2.02a-r1.ebuild 836 RMD160 be7b98c589065f64caed8076609f00ae59eb1cb3 SHA1 9062733f23d8d514ef66d5b463e0bfbd31b7170d SHA256 0259a791b10a2a98766cb586fef2d66e6699401af0b565f9a2beb96c2ec4779a
+EBUILD libzpaq-3.00.ebuild 802 RMD160 7c9570d87bbd20fc531ff3e7e852d0b560c13b5a SHA1 44568973de72993263f4eed9c78e57dfda6ebc73 SHA256 b3112622f896d82d03bc9b9b45269959540e6e363cf274ee4270f1af5135222f
+MISC ChangeLog 909 RMD160 1660dbea409c8d074d775d6dac545bcb7d774373 SHA1 377b4fbeaca7747c7b4a6c6262d0b1a2e1ea3a2c SHA256 96bffea10189d5c9e71f95aa63285a6fe1a0430ca1024e62797283b8c88a2db0
 MISC metadata.xml 255 RMD160 b5f39d5799b7c36dbd279e5433753376c082afa8 SHA1 a4698c0973522834fc27ba7dc0757453338268af SHA256 fbdf23d280480a82b5640acbe75500ca6067b5f565223f62fbd525bda216b972
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk0l79cACgkQnGSe5QXeB7vhyQCgpFJDiQfCyHYDmc0T9QCnpxWH
-6fAAoMp8giDCo3tt9iTC2J1w3QwpjjVw
-=50Ix
+iJwEAQEIAAYFAk5WI1QACgkQfXuS5UK5QB2hxQQAncZlKq7oIpSRgINXQZHqWXx8
++KBm7O8o5FZe9pgxUYHcO98pceWiaSkOUnw3jAbMU+1gCoh0C9sJ/6OajfnBwgKp
+WWpEOhk4lhbufM3LBRcKP2j+wXFJO/1x5pSinnMECcUgPAX9WYKoYugb0eCr9u5S
+chQi59KlJyqCNkTOSHs=
+=hGrA
 -----END PGP SIGNATURE-----
diff --git a/app-arch/libzpaq/files/0001-Add-autotools-files.patch b/app-arch/libzpaq/files/0001-Add-autotools-files.patch
index 5a7ae63be9b6..02204fb2d335 100644
--- a/app-arch/libzpaq/files/0001-Add-autotools-files.patch
+++ b/app-arch/libzpaq/files/0001-Add-autotools-files.patch
@@ -1,22 +1,23 @@
-From 63be9c605605464b667b880df9e5f5c9e64989a7 Mon Sep 17 00:00:00 2001
+From a7f0c119e6daee36953173509762bc001234b86d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
 Date: Thu, 6 Jan 2011 17:30:56 +0100
 Subject: [PATCH] Add autotools files.
 
+Now with libtool support!
 ---
  Makefile.am  |   15 +++++++++++++++
- configure.ac |   16 ++++++++++++++++
- 2 files changed, 31 insertions(+), 0 deletions(-)
+ configure.ac |   23 +++++++++++++++++++++++
+ 2 files changed, 38 insertions(+), 0 deletions(-)
  create mode 100644 Makefile.am
  create mode 100644 configure.ac
 
 diff --git a/Makefile.am b/Makefile.am
 new file mode 100644
-index 0000000..3fee852
+index 0000000..b6dd881
 --- /dev/null
 +++ b/Makefile.am
 @@ -0,0 +1,15 @@
-+lib_LIBRARIES = libzpaq.a
++lib_LTLIBRARIES = libzpaq.la
 +include_HEADERS = libzpaq.h
 +
 +if HAVE_POD2MAN
@@ -26,24 +27,24 @@ index 0000000..3fee852
 +	$(POD2MAN) $< > $@
 +endif
 +
-+libzpaq_a_SOURCES = libzpaq.cpp libzpaqo.cpp libzpaq.h
-+AM_CPPFLAGS = -DNDEBUG
++libzpaq_la_SOURCES = libzpaq.cpp libzpaqo.cpp libzpaq.h
++libzpaq_la_LDFLAGS = -version-info @ABI_VERSION@
 +
 +MOSTLYCLEANFILES = libzpaq.3
 +EXTRA_DIST = libzpaq.3.pod
 diff --git a/configure.ac b/configure.ac
 new file mode 100644
-index 0000000..6fda526
+index 0000000..02d289b
 --- /dev/null
 +++ b/configure.ac
-@@ -0,0 +1,16 @@
+@@ -0,0 +1,23 @@
 +AC_PREREQ([2.60])
-+AC_INIT([zpaq], [2.04])
++AC_INIT([libzpaq], [na])
 +AC_CONFIG_AUX_DIR([build-aux])
 +AM_INIT_AUTOMAKE([1.6 foreign no-dependencies])
 +
++LT_INIT([disable-static])
 +AC_PROG_CXX
-+AC_PROG_RANLIB
 +
 +AC_CHECK_PROG([POD2MAN], [pod2man], [pod2man])
 +AM_CONDITIONAL([HAVE_POD2MAN], [test x"$POD2MAN" != x""])
@@ -51,8 +52,15 @@ index 0000000..6fda526
 +   AC_MSG_WARN([Unable to find pod2man, manpage will not be generated])
 +])
 +
++AC_ARG_WITH([library-version],
++	[AS_HELP_STRING([--with-library-version=<VERSION>],
++		[Set library libtool version])],, [
++	AC_MSG_ERROR([--with-library-version not set])
++])
++AC_SUBST([ABI_VERSION], [$with_library_version])
++
 +AC_CONFIG_FILES([Makefile])
 +AC_OUTPUT
 -- 
-1.7.4.rc1
+1.7.6.1
 
diff --git a/app-arch/libzpaq/libzpaq-2.02a.ebuild b/app-arch/libzpaq/libzpaq-2.02a-r1.ebuild
index c831a21bdebf..6ea001f0fdd7 100644
--- a/app-arch/libzpaq/libzpaq-2.02a.ebuild
+++ b/app-arch/libzpaq/libzpaq-2.02a-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libzpaq/libzpaq-2.02a.ebuild,v 1.1 2011/01/06 16:41:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libzpaq/libzpaq-2.02a-r1.ebuild,v 1.1 2011/08/25 10:24:36 mgorny Exp $
 
 EAPI=3
 
@@ -14,7 +14,7 @@ SRC_URI="http://mattmahoney.net/dc/${MY_P}.zip"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="static-libs"
 
 DEPEND="app-arch/unzip"
 RDEPEND="!=app-arch/zpaq-2.04"
@@ -26,3 +26,11 @@ src_prepare() {
 	autotools-utils_src_prepare
 	eautoreconf
 }
+
+src_configure() {
+	local myeconfargs=(
+		--with-library-version=0:0:0
+	)
+
+	autotools-utils_src_configure
+}
diff --git a/app-arch/libzpaq/libzpaq-3.00.ebuild b/app-arch/libzpaq/libzpaq-3.00.ebuild
new file mode 100644
index 000000000000..44b52e582c14
--- /dev/null
+++ b/app-arch/libzpaq/libzpaq-3.00.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libzpaq/libzpaq-3.00.ebuild,v 1.1 2011/08/25 10:24:35 mgorny Exp $
+
+EAPI=3
+
+inherit autotools autotools-utils
+
+MY_P=${PN}${PV/./}
+DESCRIPTION="Library to compress files or objects in the ZPAQ format"
+HOMEPAGE="http://mattmahoney.net/dc/zpaq.html"
+SRC_URI="http://mattmahoney.net/dc/${MY_P}.zip"
+
+LICENSE="zpaq"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S=${WORKDIR}
+
+src_prepare() {
+	EPATCH_OPTS+=-p1 epatch "${FILESDIR}"/0001-Add-autotools-files.patch
+	autotools-utils_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-library-version=1:0:0
+	)
+
+	autotools-utils_src_configure
+}