EAPI bump (w/ Prefix-related fixes), general ebuild cleanup with flexibility in mind (now user should be even able to add additional configs through user patches).

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

3 files changed, 34 insertions, 15 deletions

diff --git a/app-arch/zpaq-extras/ChangeLog b/app-arch/zpaq-extras/ChangeLog
index b75bf7b3fe1f..fdbb9e8ad688 100644
--- a/app-arch/zpaq-extras/ChangeLog
+++ b/app-arch/zpaq-extras/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/zpaq-extras
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq-extras/ChangeLog,v 1.1 2011/01/04 23:20:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq-extras/ChangeLog,v 1.2 2011/01/05 23:30:36 mgorny Exp $
+
+  05 Jan 2011; Michał Górny <mgorny@gentoo.org>
+  zpaq-extras-0_p20100426.ebuild:
+  EAPI bump (w/ Prefix-related fixes), general ebuild cleanup with flexibility
+  in mind (now user should be even able to add additional configs through user
+  patches).
 
 *zpaq-extras-0_p20100426 (04 Jan 2011)
 
diff --git a/app-arch/zpaq-extras/Manifest b/app-arch/zpaq-extras/Manifest
index 615319cf53a1..879c0f5fd025 100644
--- a/app-arch/zpaq-extras/Manifest
+++ b/app-arch/zpaq-extras/Manifest
@@ -7,13 +7,13 @@ DIST bwt_slowmode1.zip 138176 RMD160 71d456f7ebfa8af38f9e7e379105c4a3a7151637 SH
 DIST exe_j1.zip 9828 RMD160 5a2c83290a03fd54e6261ae4d791df5775500458 SHA1 28fa03a186aa47f7217201727fa3cdbd2ee7f635 SHA256 8e13ca38ed6fb7fd9ae5244c44b045f179b068c3d3281f1f2690c352e45ca239
 DIST fast.cfg 359 RMD160 345ebcc3a7faa880d1e1c215cc9ceb4fa059a6b4 SHA1 9268e938c04a7aebe16da1d55953db033b195222 SHA256 2cf9605ba5eb73a58146509844d4b360c07ae55ebc2ab92d485d0c907166cfda
 DIST jpg_test2.zip 12189 RMD160 5c8e133aa613aa5d2769ef8394fb9d4f65d9ce00 SHA1 da31b4afa85dc46e924bf407c018f2495cf0ef85 SHA256 b09eedf0760826fa6822d266c1e262e67ad4ac119e11235e192e208e558e4855
-EBUILD zpaq-extras-0_p20100426.ebuild 1087 RMD160 d04859d9a2cc296fd5bf0a4873ae19cf05cced7d SHA1 5764fc7d8f720e8d531d96bf3645ae3867195bcc SHA256 5afe5f396f2fb4bf88953c6154cbb0f74957ea52f8f8aecade79a5bca4915314
-MISC ChangeLog 442 RMD160 2e5124209ef15d26128060cbd03cdb899c2b2333 SHA1 98f3c0cef5753760ed28c26ee10ed4f94327a8c0 SHA256 0341e08efa1175b3300a79dc001e3b3b31c7b1233bbce6e4413e2d676d3bfe2b
+EBUILD zpaq-extras-0_p20100426.ebuild 1268 RMD160 7648e79ea29b75d35b45e23a161a07742ace696c SHA1 2720b04fa51149d4ac7c2d5b8bc6f16bcf0aeea9 SHA256 22b24bf7f40c9545078d5bda2798e34be532c43e6ba7905e0acae5e8b55ba403
+MISC ChangeLog 697 RMD160 68bbc42338800c6d86bacd8a8455b82c621bd3d0 SHA1 e2d546cd95e7f7d5f2fc0115f9da8433ea7fc7af SHA256 fa3589e4b0e940d1c34e157486115aa145fdc1e02cf8c168639b50f0737b9fd0
 MISC metadata.xml 255 RMD160 b5f39d5799b7c36dbd279e5433753376c082afa8 SHA1 a4698c0973522834fc27ba7dc0757453338268af SHA256 fbdf23d280480a82b5640acbe75500ca6067b5f565223f62fbd525bda216b972
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0jqpAACgkQnGSe5QXeB7tnaACfR+0sWA0ozjV2R+SKn0FemDPb
-qzQAoLeuJSYV0JNTsPuqXHXyNdiZ/Ysq
-=drHI
+iEYEARECAAYFAk0k/lAACgkQnGSe5QXeB7vMBQCgilzJGFbSobl2gvN+4RY/4K15
+pR8An2kyKY0ozLBo0zJCKeJcvAd19F8x
+=NDAE
 -----END PGP SIGNATURE-----
diff --git a/app-arch/zpaq-extras/zpaq-extras-0_p20100426.ebuild b/app-arch/zpaq-extras/zpaq-extras-0_p20100426.ebuild
index 1ec944496bb5..f7dd464ee756 100644
--- a/app-arch/zpaq-extras/zpaq-extras-0_p20100426.ebuild
+++ b/app-arch/zpaq-extras/zpaq-extras-0_p20100426.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq-extras/zpaq-extras-0_p20100426.ebuild,v 1.1 2011/01/04 23:20:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq-extras/zpaq-extras-0_p20100426.ebuild,v 1.2 2011/01/05 23:30:36 mgorny Exp $
 
-inherit toolchain-funcs
+EAPI=3
+inherit base toolchain-funcs
 
 DESCRIPTION="A set of additional compression profiles for app-arch/zpaq"
 HOMEPAGE="http://mattmahoney.net/dc/zpaq.html"
@@ -21,15 +22,27 @@ IUSE=""
 DEPEND="app-arch/unzip"
 RDEPEND=""
 
-src_compile() {
-	tc-export CXX
-	progs='bwtpre bwt_ jpeg_jo exe_jo'
-	emake ${progs} || die
+S=${WORKDIR}
 
+src_unpack() {
+	default
+	cp "${DISTDIR}"/fast.cfg . || die
+}
+
+src_configure() {
 	sed \
-		-e 's:^pcomp zpaq r:pcomp /usr/bin/zpaq r/usr/share/zpaq/:' \
-		-e 's:^pcomp \([^/]\):pcomp /usr/libexec/zpaq/\1:' \
+		-e "s:^pcomp zpaq r:pcomp ${EPREFIX}/usr/bin/zpaq r${EPREFIX}/usr/share/zpaq/:" \
+		-e "s:^pcomp \([^/]\):pcomp ${EPREFIX}/usr/libexec/zpaq/\1:" \
 		-i *.cfg || die
+
+	local sources=( *.cpp )
+	# (the following assignment flattens the array)
+	progs=${sources[@]%.cpp}
+}
+
+src_compile() {
+	tc-export CXX
+	emake ${progs} || die
 }
 
 src_install() {
@@ -37,5 +50,5 @@ src_install() {
 	doexe ${progs} || die
 
 	insinto /usr/share/zpaq
-	doins *.cfg "${DISTDIR}"/fast.cfg || die
+	doins *.cfg || die
 }