app-arch/zpaq-extras: Use emake to compile executables, explicitly specify the filena...

svn path=/sunrise/; revision=10642

diff --git a/app-arch/zpaq-extras/ChangeLog b/app-arch/zpaq-extras/ChangeLog
index 6d3ea678cea10788a9c64e435ba450d93482f16b..d6af34b4763fe6264376cb694dbd66a3a8d5c333 100644 (file)
--- a/app-arch/zpaq-extras/ChangeLog
+++ b/app-arch/zpaq-extras/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Jun 2010; Michał Górny (sedzimir) <gentoo@mgorny.alt.pl>
+  zpaq-extras-0_p20100426.ebuild:
+  Use emake to compile executables, explicitly specify the filename of profile
+  taken from DISTDIR.
+
   15 May 2010; Michał Górny (sedzimir) <gentoo@mgorny.alt.pl>
   -zpaq-extras-0_p20091101.ebuild, +zpaq-extras-0_p20100426.ebuild:
   Version bump (adding fast.cfg).

diff --git a/app-arch/zpaq-extras/Manifest b/app-arch/zpaq-extras/Manifest
index e8552fd7a110a322e02baffc1ccc1e90033a83bf..5bc5b6f1cffb640e068ff14e08ed6f165fae7e7e 100644 (file)
--- a/app-arch/zpaq-extras/Manifest
+++ b/app-arch/zpaq-extras/Manifest
@@ -4,6 +4,6 @@ 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 1078 RMD160 d13aa3dd3b71716eac4c23b9b05f97a4a6704aab SHA1 3ac2e96b246145c8f54ae1a7bbffa74df9d46370 SHA256 7c3948bf9d02ff715114cfaa957bd420591f224f3e8e4c9fe2552177678bdde2
-MISC ChangeLog 439 RMD160 26f2723c2a8f4201024d379ab5ac23ef86894d20 SHA1 f302100aa9ea6a2f0689e246d097daa8d2de6499 SHA256 eee3a3efa94907d15501fcf505c163fcb409cfebe95aef13957fb712e6ec9f82
+EBUILD zpaq-extras-0_p20100426.ebuild 941 RMD160 cb0d87dfdca02f873dff27093a3b653a4adf9c9f SHA1 97108c582c140079e8cd4050c43847de6a31821d SHA256 206fae21997ea5912b06a10d3d18564c9e9b486b5227aaa4f9b70ceb7fb7cd2b
+MISC ChangeLog 639 RMD160 2cbb8dfe0efb28ce4557f7efec5fd06c4a6afbe5 SHA1 eb06421b94f7bb1b3a8f31106c9649efde8dc919 SHA256 a6ba3d088f44085b644c82e12cc7506f1212c32133ac771570143e066a7722bd
 MISC metadata.xml 231 RMD160 6aebfea93d789d2b96ea6d8259dc842dd1fdacd3 SHA1 e10a04c4c18a66af326abc1f40c61b28cc610fae SHA256 48054ea190d00518c1e035fc6663b2368854cdea5ff69a94830e4f9a38260987

diff --git a/app-arch/zpaq-extras/zpaq-extras-0_p20100426.ebuild b/app-arch/zpaq-extras/zpaq-extras-0_p20100426.ebuild
index 5fe547b8c8d0a6d8dafc5573edc01146c6a47283..9743ec64942f2187d587056b406b2bbf805aa9a2 100644 (file)
--- a/app-arch/zpaq-extras/zpaq-extras-0_p20100426.ebuild
+++ b/app-arch/zpaq-extras/zpaq-extras-0_p20100426.ebuild
@@ -22,24 +22,20 @@ DEPEND="app-arch/unzip"
 RDEPEND=""
 
 src_compile() {
-       local _prog
-
-       mkdir bin
-       for _prog in bwtpre bwt_ jpeg_jo exe_jo; do
-               "$(tc-getCXX)" ${CXXFLAGS} ${_prog}.cpp -o bin/${_prog} \
-                       || die "compiling ${_prog} failed"
-       done
+       tc-export CXX
+       progs='bwtpre bwt_ jpeg_jo exe_jo'
+       emake ${progs} || die
 
        sed \
                -e 's:^pcomp zpaq r:pcomp /usr/bin/zpaq r/usr/share/zpaq/:' \
                -e 's:^pcomp \([^/]\):pcomp /usr/libexec/zpaq/\1:' \
-               -i *.cfg || die 'sed failed'
+               -i *.cfg || die
 }
 
 src_install() {
        exeinto /usr/libexec/zpaq
-       doexe bin/* || die 'dobin failed'
+       doexe ${progs} || die
 
        insinto /usr/share/zpaq
-       doins *.cfg "${DISTDIR}"/*.cfg || die 'doins failed'
+       doins *.cfg "${DISTDIR}"/fast.cfg || die
 }