Version bump. The new version replaces libzpaq.txt with a manpage.

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

4 files changed, 41 insertions, 22 deletions

diff --git a/app-arch/libzpaq/ChangeLog b/app-arch/libzpaq/ChangeLog
index eee1ea918f63..a175634f40fb 100644
--- a/app-arch/libzpaq/ChangeLog
+++ b/app-arch/libzpaq/ChangeLog
@@ -1,6 +1,13 @@
 # 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.1 2011/01/05 16:08:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libzpaq/ChangeLog,v 1.2 2011/01/06 16:41:08 mgorny Exp $
+
+*libzpaq-2.02a (06 Jan 2011)
+
+  06 Jan 2011; Michał Górny <mgorny@gentoo.org>
+  files/0001-Add-autotools-files.patch, -libzpaq-2.02.ebuild,
+  +libzpaq-2.02a.ebuild:
+  Version bump. The new version replaces libzpaq.txt with a manpage.
 
 *libzpaq-2.02 (05 Jan 2011)
 
diff --git a/app-arch/libzpaq/Manifest b/app-arch/libzpaq/Manifest
index 1e2fea54bb5b..4d3d8b8cb226 100644
--- a/app-arch/libzpaq/Manifest
+++ b/app-arch/libzpaq/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 0001-Add-autotools-files.patch 1035 RMD160 20dcdaca6f20b576353769950b1639585d4f27bb SHA1 500558c1bca1b416f6f4746adf3e22df3c1494c1 SHA256 45984785b16701dc1af614f829bb455ef4c1d61eb43d5e7acc29a552a17772c1
-DIST libzpaq.202.zip 27561 RMD160 951f019c3c07134eac14199ad7d3410835a9b8dd SHA1 c2952c0a320e1a9e06b0d5ca0deb30ebc2f5d3a3 SHA256 661e146267852a887f3f7bad247aa4d295e0427b6fc64deab26ec1ba9f574319
-EBUILD libzpaq-2.02.ebuild 735 RMD160 b322254bf9d8f77a2707008e5f37e205c8a32566 SHA1 0649652a65e3c55c0afb0c6ee31195cd89296ce8 SHA256 fb57ef7005b52f65f5d8021d2b366284303cf807b809eae290096c7b105ab792
-MISC ChangeLog 399 RMD160 dcfd9f60749cff31d83ac4662772d90260110c5b SHA1 fb905e83cd9d8ec68d4c1a748f88059212464689 SHA256 3e32a74160640b1bd51fd9c82b15ac9ede5950a0f0c68a97ed22a81a5bf3f649
+AUX 0001-Add-autotools-files.patch 1401 RMD160 0f9768c59777f065b9fbf3ef73d453211c880b71 SHA1 db5664da14aa21bc7e0160122af1918889897e32 SHA256 cc437841205a51b96419f8d06b8f0639a9d6c68049a2ac0c6131218adc314588
+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
 MISC metadata.xml 255 RMD160 b5f39d5799b7c36dbd279e5433753376c082afa8 SHA1 a4698c0973522834fc27ba7dc0757453338268af SHA256 fbdf23d280480a82b5640acbe75500ca6067b5f565223f62fbd525bda216b972
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0klqEACgkQnGSe5QXeB7vz4gCgrRAhhxdxFO//x+t6/rmCEWQx
-jPgAn2WIpWczlWoHnIrNYoW2qpIY9o9w
-=BpqH
+iEYEARECAAYFAk0l79cACgkQnGSe5QXeB7vhyQCgpFJDiQfCyHYDmc0T9QCnpxWH
+6fAAoMp8giDCo3tt9iTC2J1w3QwpjjVw
+=50Ix
 -----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 7720d3efc22a..5a7ae63be9b6 100644
--- a/app-arch/libzpaq/files/0001-Add-autotools-files.patch
+++ b/app-arch/libzpaq/files/0001-Add-autotools-files.patch
@@ -1,34 +1,42 @@
-From 2f190ea930d18d491bff127fdf9a58f1e8282aee Mon Sep 17 00:00:00 2001
+From 63be9c605605464b667b880df9e5f5c9e64989a7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 4 Jan 2011 21:04:53 +0100
+Date: Thu, 6 Jan 2011 17:30:56 +0100
 Subject: [PATCH] Add autotools files.
 
 ---
- Makefile.am  |    7 +++++++
- configure.ac |   10 ++++++++++
- 2 files changed, 17 insertions(+), 0 deletions(-)
+ Makefile.am  |   15 +++++++++++++++
+ configure.ac |   16 ++++++++++++++++
+ 2 files changed, 31 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..533e717
+index 0000000..3fee852
 --- /dev/null
 +++ b/Makefile.am
-@@ -0,0 +1,7 @@
+@@ -0,0 +1,15 @@
 +lib_LIBRARIES = libzpaq.a
 +include_HEADERS = libzpaq.h
 +
++if HAVE_POD2MAN
++man3_MANS = libzpaq.3
++
++libzpaq.3: libzpaq.3.pod
++	$(POD2MAN) $< > $@
++endif
++
 +libzpaq_a_SOURCES = libzpaq.cpp libzpaqo.cpp libzpaq.h
 +AM_CPPFLAGS = -DNDEBUG
 +
-+EXTRA_DIST = libzpaq.txt
++MOSTLYCLEANFILES = libzpaq.3
++EXTRA_DIST = libzpaq.3.pod
 diff --git a/configure.ac b/configure.ac
 new file mode 100644
-index 0000000..a272f11
+index 0000000..6fda526
 --- /dev/null
 +++ b/configure.ac
-@@ -0,0 +1,10 @@
+@@ -0,0 +1,16 @@
 +AC_PREREQ([2.60])
 +AC_INIT([zpaq], [2.04])
 +AC_CONFIG_AUX_DIR([build-aux])
@@ -37,8 +45,14 @@ index 0000000..a272f11
 +AC_PROG_CXX
 +AC_PROG_RANLIB
 +
++AC_CHECK_PROG([POD2MAN], [pod2man], [pod2man])
++AM_CONDITIONAL([HAVE_POD2MAN], [test x"$POD2MAN" != x""])
++AS_IF([test "x$POD2MAN" = x], [
++   AC_MSG_WARN([Unable to find pod2man, manpage will not be generated])
++])
++
 +AC_CONFIG_FILES([Makefile])
 +AC_OUTPUT
 -- 
-1.7.3.4
+1.7.4.rc1
 
diff --git a/app-arch/libzpaq/libzpaq-2.02.ebuild b/app-arch/libzpaq/libzpaq-2.02a.ebuild
index c842041d78fc..c831a21bdebf 100644
--- a/app-arch/libzpaq/libzpaq-2.02.ebuild
+++ b/app-arch/libzpaq/libzpaq-2.02a.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.02.ebuild,v 1.1 2011/01/05 16:08:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libzpaq/libzpaq-2.02a.ebuild,v 1.1 2011/01/06 16:41:08 mgorny Exp $
 
 EAPI=3
 
@@ -21,8 +21,6 @@ RDEPEND="!=app-arch/zpaq-2.04"
 
 S=${WORKDIR}
 
-DOCS=( libzpaq.txt )
-
 src_prepare() {
 	EPATCH_OPTS+=-p1 epatch "${FILESDIR}"/0001-Add-autotools-files.patch
 	autotools-utils_src_prepare