Make zpaq ebuild depend on libzpaq.

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

3 files changed, 29 insertions, 27 deletions

diff --git a/app-arch/zpaq/ChangeLog b/app-arch/zpaq/ChangeLog
index 044b60dca2fb..d39e7cf372f1 100644
--- a/app-arch/zpaq/ChangeLog
+++ b/app-arch/zpaq/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/zpaq
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq/ChangeLog,v 1.1 2011/01/04 23:19:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq/ChangeLog,v 1.2 2011/01/05 16:10:07 mgorny Exp $
+
+*zpaq-2.04-r1 (05 Jan 2011)
+
+  05 Jan 2011; Michał Górny <mgorny@gentoo.org>
+  files/0001-Add-autotools-files.patch, -zpaq-2.04.ebuild,
+  +zpaq-2.04-r1.ebuild:
+  Make zpaq ebuild depend on libzpaq.
 
 *zpaq-2.04 (04 Jan 2011)
 
diff --git a/app-arch/zpaq/files/0001-Add-autotools-files.patch b/app-arch/zpaq/files/0001-Add-autotools-files.patch
index 12ba5a44315b..a93af8a26861 100644
--- a/app-arch/zpaq/files/0001-Add-autotools-files.patch
+++ b/app-arch/zpaq/files/0001-Add-autotools-files.patch
@@ -1,24 +1,23 @@
-From 518123ca0f682ec617c2bab16bdb953380b5352c Mon Sep 17 00:00:00 2001
+From e1d785c3f47252beab63242408a575fe64bc3e52 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
 Subject: [PATCH] Add autotools files.
 
 ---
- Makefile.am  |   22 ++++++++++++++++++++++
- configure.ac |   28 ++++++++++++++++++++++++++++
+ Makefile.am  |   19 +++++++++++++++++++
+ configure.ac |   31 +++++++++++++++++++++++++++++++
  2 files changed, 50 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..3c71e01
+index 0000000..1fc781a
 --- /dev/null
 +++ b/Makefile.am
-@@ -0,0 +1,22 @@
+@@ -0,0 +1,19 @@
 +bin_PROGRAMS = zpaq
-+lib_LIBRARIES = libzpaq.a libzpaqstub.a
-+include_HEADERS = libzpaq.h
++lib_LIBRARIES = libzpaqstub.a
 +
 +if HAVE_POD2MAN
 +man1_MANS = zpaq.1
@@ -27,23 +26,21 @@ index 0000000..3c71e01
 +	$(POD2MAN) $< > $@
 +endif
 +
-+libzpaq_a_SOURCES = libzpaq.cpp libzpaqo.cpp libzpaq.h
-+libzpaqstub_a_SOURCES = libzpaq.cpp zpaq.cpp libzpaq.h
++libzpaqstub_a_SOURCES = zpaq.cpp
 +
 +zpaq_SOURCES = zpaq.cpp libzpaq.h
-+zpaq_LDADD = libzpaq.a
-+zpaq_CPPFLAGS = $(AM_CPPFLAGS) -DOPT='"$(CXX) $(CXXFLAGS) zpaqopt.cpp $(LDFLAGS) @RUNTIME_LDFLAGS@ -o zpaqopt.exe -lzpaqstub"'
++zpaq_CPPFLAGS = $(AM_CPPFLAGS) -DOPT='"$(CXX) $(CXXFLAGS) zpaqopt.cpp $(LDFLAGS) @RUNTIME_LDFLAGS@ -o zpaqopt.exe $(LIBS) -lzpaqstub"'
 +
 +AM_CPPFLAGS = -DNDEBUG
 +
 +MOSTLYCLEANFILES = zpaq.1
-+EXTRA_DIST = zpaq.1.pod libzpaq.txt
++EXTRA_DIST = zpaq.1.pod
 diff --git a/configure.ac b/configure.ac
 new file mode 100644
-index 0000000..d3565e2
+index 0000000..ae211d7
 --- /dev/null
 +++ b/configure.ac
-@@ -0,0 +1,28 @@
+@@ -0,0 +1,31 @@
 +AC_PREREQ([2.60])
 +AC_INIT([zpaq], [2.04])
 +AC_CONFIG_AUX_DIR([build-aux])
@@ -53,6 +50,9 @@ index 0000000..d3565e2
 +AC_PROG_CXX
 +AC_PROG_RANLIB
 +
++AC_CHECK_LIB([zpaq], [main],,
++	[AC_MSG_ERROR([Unable to find libzpaq, please install it before zpaq])])
++
 +runtime_LDFLAGS='-Wl,--strip-all'
 +AC_MSG_CHECKING([whether the linker supports $runtime_LDFLAGS])
 +save_LDFLAGS=$LDFLAGS
diff --git a/app-arch/zpaq/zpaq-2.04.ebuild b/app-arch/zpaq/zpaq-2.04-r1.ebuild
index 5c2dcb80da9f..efa9514a96ca 100644
--- a/app-arch/zpaq/zpaq-2.04.ebuild
+++ b/app-arch/zpaq/zpaq-2.04-r1.ebuild
@@ -1,31 +1,26 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq/zpaq-2.04.ebuild,v 1.1 2011/01/04 23:19:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq/zpaq-2.04-r1.ebuild,v 1.1 2011/01/05 16:10:07 mgorny Exp $
 
 EAPI=3
-
 inherit autotools autotools-utils
 
-LIB_PV=202
-PROG_PV=${PV/./}
-
+MY_P=${PN}.${PV/./}
 DESCRIPTION="A unified compressor for PAQ algorithms"
 HOMEPAGE="http://mattmahoney.net/dc/zpaq.html"
-SRC_URI="http://mattmahoney.net/dc/${PN}.${PROG_PV}.zip
-	http://mattmahoney.net/dc/lib${PN}.${LIB_PV}.zip"
+SRC_URI="http://mattmahoney.net/dc/${MY_P}.zip"
 
-LICENSE="GPL-3 ISOC-rfc"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+RDEPEND="app-arch/libzpaq"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
 
 S=${WORKDIR}
 
-DOCS=( libzpaq.txt )
-
 src_prepare() {
 	EPATCH_OPTS+=-p1 epatch "${FILESDIR}"/0001-Add-autotools-files.patch
 	autotools-utils_src_prepare