app-arch/pixz: version bump and fix 9999

Package-Manager: portage-2.2.20.1

4 files changed, 35 insertions, 56 deletions

diff --git a/app-arch/pixz/Manifest b/app-arch/pixz/Manifest
index f5ce1c9665c..671dcf325be 100644
--- a/app-arch/pixz/Manifest
+++ b/app-arch/pixz/Manifest
@@ -1 +1 @@
-DIST pixz-1.0.2.tgz 21425 SHA256 af9dac41edd6bf57953471f7fcbd4793810003bf911593ba4c84f7cccb5f74af SHA512 ea3f37b725a0f08e87a6bc0af19522e92bb5b34fad49cfbfcc04e7054f4537cb09c8f3b56abda7f6d27ce64535b158a676a9e69f92141190840bd9ba255961f3 WHIRLPOOL 76b8af8833b9d87718b0a1fa5f596f6aa820b176b17cbde25f7cd0cf1f6b0cdce6c4d7b7c3d82b3f7b018a60bd6ce1ae6f43263875f0eeef5c93ae889856c60e
+DIST pixz-1.0.3.tar.gz 27105 SHA256 49f44520b411315ec4b02891eb77ba6060bdfd77ab5112e9c3e21de581c3384d SHA512 e33e038fc760a51b5bbc52c4faca2b165a5e4546438cd1bf9b41b91d6c8aabad43be367750ac1e7a7007c6d2544ce6dd4662fa60c99c763d96d918eeed002fa7 WHIRLPOOL 29ba24955280051d2d7562aca0b908c1228d0345beb7a6b1e330714ac8c39f6e86a87d60581c91a578950a9dfabbc96c59f64e8afecd2100499c64d4007f5477
diff --git a/app-arch/pixz/files/pixz-1.0.2-lm.patch b/app-arch/pixz/files/pixz-1.0.2-lm.patch
deleted file mode 100644
index 7db039a54a9..00000000000
--- a/app-arch/pixz/files/pixz-1.0.2-lm.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6c9d6b9020c599f850c0b719cc9c041f1667671b Mon Sep 17 00:00:00 2001
-From: Dave Vasilevsky <dave@vasilevsky.ca>
-Date: Thu, 10 Jan 2013 08:28:06 -0500
-Subject: [PATCH] Fix linking bug (issue 11)
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index fe605f2..3b27690 100644
---- a/Makefile
-+++ b/Makefile
-@@ -12,7 +12,7 @@ MYCFLAGS = $(patsubst %,-I%/include,$(LIBPREFIX)) $(OPT) -std=gnu99 \
- MYLDFLAGS = $(patsubst %,-L%/lib,$(LIBPREFIX)) $(OPT) -Wall
- 
- THREADS = -lpthread
--LIBADD = $(THREADS) -llzma -larchive
-+LIBADD = $(THREADS) -lm -llzma -larchive
- 
- CC = gcc
- COMPILE = $(CC) $(MYCFLAGS) $(CFLAGS) -c -o
--- 
-1.8.1.2
-
diff --git a/app-arch/pixz/pixz-1.0.2.ebuild b/app-arch/pixz/pixz-1.0.3.ebuild
index 4d3d7d56816..4a04aab854c 100644
--- a/app-arch/pixz/pixz-1.0.2.ebuild
+++ b/app-arch/pixz/pixz-1.0.3.ebuild
@@ -4,20 +4,10 @@
 
 EAPI=5
 
-inherit toolchain-funcs flag-o-matic eutils
+inherit toolchain-funcs flag-o-matic autotools
 
 DESCRIPTION="Parallel Indexed XZ compressor"
 HOMEPAGE="https://github.com/vasi/pixz"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/vasi/pixz.git"
-	inherit git-2
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="static"
@@ -26,14 +16,26 @@ LIB_DEPEND=">=app-arch/libarchive-2.8:=[static-libs(+)]
 	>=app-arch/xz-utils-5[static-libs(+)]"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
+	static? ( ${LIB_DEPEND} )
+	app-text/asciidoc"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/vasi/${PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/vasi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-lm.patch
+	eautoreconf
 }
 
 src_configure() {
 	use static && append-ldflags -static
+	append-flags -std=gnu99
+	econf
 }
 
 src_compile() {
@@ -41,7 +43,7 @@ src_compile() {
 }
 
 src_install() {
-	dobin pixz
-	doman pixz.1
-	dodoc README TODO
+	dobin src/pixz
+	doman src/pixz.1
+	dodoc README.md TODO
 }
diff --git a/app-arch/pixz/pixz-9999.ebuild b/app-arch/pixz/pixz-9999.ebuild
index 57941097e60..4a04aab854c 100644
--- a/app-arch/pixz/pixz-9999.ebuild
+++ b/app-arch/pixz/pixz-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit toolchain-funcs flag-o-matic
+inherit toolchain-funcs flag-o-matic autotools
 
 DESCRIPTION="Parallel Indexed XZ compressor"
 HOMEPAGE="https://github.com/vasi/pixz"
@@ -16,32 +16,34 @@ LIB_DEPEND=">=app-arch/libarchive-2.8:=[static-libs(+)]
 	>=app-arch/xz-utils-5[static-libs(+)]"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
+	static? ( ${LIB_DEPEND} )
+	app-text/asciidoc"
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/vasi/pixz.git"
-	inherit git-2
+	EGIT_REPO_URI="https://github.com/vasi/${PN}.git"
+	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/vasi/${PN}/archive/v${PV}.zip -> ${P}.zip"
+	SRC_URI="https://github.com/vasi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
-	DEPEND="${DEPEND} app-text/asciidoc"
 fi
 
+src_prepare() {
+	eautoreconf
+}
+
 src_configure() {
 	use static && append-ldflags -static
+	append-flags -std=gnu99
+	econf
 }
 
 src_compile() {
-	if [[ ${PV} == "9999" ]] ; then
-		emake CC="$(tc-getCC)" OPT="" all pixz.1
-	else
-		emake CC="$(tc-getCC)" OPT="" all
-	fi
+	emake CC="$(tc-getCC)" OPT=""
 }
 
 src_install() {
-	dobin pixz
-	doman pixz.1
-	dodoc README TODO
+	dobin src/pixz
+	doman src/pixz.1
+	dodoc README.md TODO
 }