app-arch/zpaq: Install LZP preprocessor in libexec, small fixes.

svn path=/sunrise/; revision=9446

diff --git a/app-arch/zpaq/ChangeLog b/app-arch/zpaq/ChangeLog
index 93e249d240f386cbb7780a77bd757bf188dfb731..cec00f4ee8de3d237446ab99d1b316fae5cfac1c 100644 (file)
--- a/app-arch/zpaq/ChangeLog
+++ b/app-arch/zpaq/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Nov 2009; Michał Górny (sedzimir) <gentoo@mgorny.alt.pl>
+  zpaq-1.09.ebuild:
+  Install LZP preprocessor in libexec, small fixes.
+
   31 Oct 2009; Michał Górny (sedzimir) <gentoo@mgorny.alt.pl>
   -zpaq-1.04.ebuild, +zpaq-1.09.ebuild, metadata.xml:
   Version bump.

diff --git a/app-arch/zpaq/Manifest b/app-arch/zpaq/Manifest
index c6cb97ea8f727e25a377f711a44eda88871fcc66..f90c73f6654aa4ed62727dec79631ebb6556a95e 100644 (file)
--- a/app-arch/zpaq/Manifest
+++ b/app-arch/zpaq/Manifest
@@ -1,4 +1,4 @@
 DIST zpaq109.zip 94431 RMD160 5176503996b530f58d4a468f9b954567109f3788 SHA1 7c175595a0187a10c08ddc06f1857622db06978c SHA256 97a25847ecb01f12c21c4b9edae305b0622bb48625cc1a3d5b2cfb9e66591576
-EBUILD zpaq-1.09.ebuild 1369 RMD160 8cf32fc9cef0b0f0fcfe2a0c7bfc3393d9b4a5e7 SHA1 827aeee5399ddbe2a6c6d3a7205817c8b1864d16 SHA256 27d93e6a6488cc38f3999195b2f4fd3e4aa0b06743d9f7d2d789d49f854dcc4e
-MISC ChangeLog 681 RMD160 adbcc81348326560cd87aa9055b4c83756dac843 SHA1 4caa2b156abe540ddcb6e5afd5ec625c51ffe7fe SHA256 cdb71b1363f908381246e726beb2da1e119bd2c8e2cb3cf94a46688138c8cc7f
+EBUILD zpaq-1.09.ebuild 1629 RMD160 7db80fd17f40c70135d1b65739e84b33eba4f755 SHA1 42d20f35196de3e2852e02cfb7355ce2463b055d SHA256 66c5222ae32a82855beb77406d8bf279fa5444421a54e43afab1e74d6fa445a8
+MISC ChangeLog 818 RMD160 41294c86e29f5c1be1d9eb8335f42275457e9232 SHA1 055b4d8758482015e6761f10fc725d3dc52f1f87 SHA256 00663a6b64504a2689cc82eb1cfa7f000b444f4ecf2b8b2a1787953a23b35261
 MISC metadata.xml 171 RMD160 ed284df01c230fc7990a6b5888b39166d23f29ba SHA1 f3d64a69044b710e23fb874b3ee4cd338858c8b4 SHA256 a7b30fbacd0e4c312c07a3efac112a3794c81d134442d8104325734d03425adf

diff --git a/app-arch/zpaq/zpaq-1.09.ebuild b/app-arch/zpaq/zpaq-1.09.ebuild
index 5289cdb84180a78d4797852cbbd069696b4da650..4b8b484eda454b46ae23cffd2271ede6d4294be0 100644 (file)
--- a/app-arch/zpaq/zpaq-1.09.ebuild
+++ b/app-arch/zpaq/zpaq-1.09.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit multilib toolchain-funcs
+inherit toolchain-funcs
 
 MY_P="${PN}${PV/./}"
 DESCRIPTION="Unified compressor for PAQ algorithms"
@@ -14,21 +14,28 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
 src_compile() {
        # Upstream doesn't provide any Makefile
 
        # -DOPT is broken (at least) on Linux
        "$(tc-getCXX)" ${CXXFLAGS} -DNDEBUG zpaq.cpp -o zpaq || die 'compiling zpaq failed'
-       "$(tc-getCXX)" ${CXXFLAGS} lzppre.cpp -o zpaq-lzppre || die 'compiling lzppre failed'
+       "$(tc-getCXX)" ${CXXFLAGS} lzppre.cpp -o lzppre || die 'compiling lzppre failed'
 
-       sed -e 's/lzppre/zpaq-&/' -i *.cfg || die 'sed failed'
+       sed -e 's:^pcomp :&/usr/libexec/zpaq/:' -i *.cfg || die 'sed failed'
 }
 
 src_install() {
-       dobin zpaq zpaq-lzppre || die 'dobin failed'
+       dobin zpaq || die 'dobin failed'
 
        dodoc readme.txt || die 'dodoc failed'
 
+       # Preprocessors
+       exeinto /usr/libexec/zpaq
+       doexe lzppre || die 'doexe failed'
+
        # These are more like compression profiles, so install them in /usr/share
        insinto /usr/share/zpaq
        doins *.cfg || die 'doins failed'
@@ -42,4 +49,7 @@ pkg_postinst() {
        elog "We install few default configs in /usr/share/zpaq to start with. They can"
        elog "be used like that:"
        elog "  zpaq c/usr/share/zpaq/max.cfg out.zpaq files"
+       elog
+       elog "You may also want to install app-arch/zpaq-extras package which provides"
+       elog "few additional configs and preprocessors for use with zpaq."
 }