summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2011-01-06 16:41:08 +0000
committerMichał Górny <mgorny@gentoo.org>2011-01-06 16:41:08 +0000
commitac10193fcade144c0b2d213ffb20f2ca0a9668dd (patch)
tree5b9cc404914a8ce2f6c8cab0e58fe5a0abfa9dd7 /app-arch
parentSome Clean up (diff)
downloadgentoo-2-ac10193fcade144c0b2d213ffb20f2ca0a9668dd.tar.gz
gentoo-2-ac10193fcade144c0b2d213ffb20f2ca0a9668dd.tar.bz2
gentoo-2-ac10193fcade144c0b2d213ffb20f2ca0a9668dd.zip
Version bump. The new version replaces libzpaq.txt with a manpage.
(Portage version: 2.2.0_alpha12_p8/cvs/Linux x86_64)
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/libzpaq/ChangeLog9
-rw-r--r--app-arch/libzpaq/files/0001-Add-autotools-files.patch36
-rw-r--r--app-arch/libzpaq/libzpaq-2.02a.ebuild (renamed from app-arch/libzpaq/libzpaq-2.02.ebuild)4
3 files changed, 34 insertions, 15 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/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