Bump to EAPI 5. Restrict libzpaq dependency since it does not work with zpaq-7.04.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 32 insertions, 24 deletions

diff --git a/app-arch/zpipe/ChangeLog b/app-arch/zpipe/ChangeLog
index 0422f032cdd0..ecb96f47c9ad 100644
--- a/app-arch/zpipe/ChangeLog
+++ b/app-arch/zpipe/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/zpipe
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zpipe/ChangeLog,v 1.2 2014/12/27 14:57:23 bircoph Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zpipe/ChangeLog,v 1.3 2015/04/16 09:08:00 mgorny Exp $
+
+*zpipe-2.01-r1 (16 Apr 2015)
+
+  16 Apr 2015; Michał Górny <mgorny@gentoo.org> +zpipe-2.01-r1.ebuild,
+  -zpipe-2.01.ebuild:
+  Bump to EAPI 5. Restrict libzpaq dependency since it does not work with
+  zpaq-7.04.
 
   27 Dec 2014; Andrew Savchenko <bircoph@gentoo.org> zpipe-2.01.ebuild:
   Add ~x86 keyword, bug 531934.
@@ -10,4 +17,3 @@
   05 Jan 2011; Michał Górny <mgorny@gentoo.org> +zpipe-2.01.ebuild,
   +metadata.xml:
   New ebuild for zpipe (ZPAQ pipe compressor) per bug #350631.
-
diff --git a/app-arch/zpipe/Manifest b/app-arch/zpipe/Manifest
index 216ba9b1e12a..58ace8125138 100644
--- a/app-arch/zpipe/Manifest
+++ b/app-arch/zpipe/Manifest
@@ -2,23 +2,25 @@
 Hash: SHA256
 
 DIST zpipe.201.zip 42173 SHA256 742f0da404fd279683e87e66001093bef7cca268b59a774d580c54bfeff4f1a5 SHA512 4c7fc5afd96c3db806679a56863752a18889d8e8dad7648b993a32bfa7ceb426782ec5f83567ad58ca5c5b79f145e8953667dc1a3b854fc8a76eaac165e28cb7 WHIRLPOOL 1ec1f7ca647fe6375900fdf61dc43a1a6a69f62ebd574b2190d5f12a0c45a6852d09fd856aa23ac1ac53f048d438b6179810cc0bf1e6c28091509601e8925b07
-EBUILD zpipe-2.01.ebuild 645 SHA256 18b2327802085e9101a3e42376379b23a2537422df5aa77e0dc16cd1ad2c87d5 SHA512 8b1b59e74d631ba81c79f0d990de2ee5b23554627b05431a4cf01ef8bb5c73c363d79f9632283d6c1ff9ec94e758623b6ec677630ac56fe180ecfdbea09c1078 WHIRLPOOL 64fcba1f5c64918c09526e45f52d2a4735f27eb552387efc2e4f480b298762fcfa355a0007568a5ce0b2c61684ad1003c39bfd4236d29ec40ce5bc3d68b4ce1d
-MISC ChangeLog 485 SHA256 26f428513cdfc418f40644adfd31c53c0feed30e93174221ba20fdeff7bd8b7a SHA512 58dfdf0c010473506825df58bd9c3702af00f666f8a3288e133fa3036ab2e9344d3920d4b7a78c10cc527f5f48576f8679fd4be7eefbb1b8ca213cd84036237e WHIRLPOOL fd5aa074e798a7c6637ba51cb733b8041705ae9483e7fba0840583ec06d85e7b24a2f97565e5e835f2a470d5718ee6133bbb53e6577a0d47b0bef8645a0f4fe0
+EBUILD zpipe-2.01-r1.ebuild 640 SHA256 e8882dfd4cfe7356bfc60ec77b8f30613ea307690844cbc09289b9d8e77681cf SHA512 94f1d88aaebb306eaf033cb9da9fda17fb8d708aa1a50357cd9d5c6e25fff8ef334ddcc286848a0c4f353e726b3a3648c75d1d36f3b435e74f6d9f69ad32c293 WHIRLPOOL 3a27b85dfdef5fd23cf9439d97cf05c5b8a6183295ce181c8a992544626915c7cdf2575bac154477f9027e16d4b7c61c1689ba9b1842fb58dfec1b86a691de22
+MISC ChangeLog 696 SHA256 e19ea04cd841b2b29626a782c1d6afa4652fd6409367bdb1f7afd210d3ee3c9c SHA512 5f0e0ddd220b68221c1847db76fa98b7a6ca8496e8fe7158015cf75dc5c73bcf224fec12b99164b32d83084f553ed10ba9ce2dc1be54d8eb2dc65f964aa08671 WHIRLPOOL 67b67aa3be4a1faff4c6e5e29e3342d6d5e9ddb749c9e5358963d84c61ef1547ac8aaf416892b69f51a98377b9d0bb47f3a2c115566d07c936ed6b661f528f73
 MISC metadata.xml 233 SHA256 fd88d74157f79eb4a06067443b7138cfb56fe1c66bfa5dfe72bda038ea5a9dda SHA512 6676f74cc1b612ba4f95101b64570f257e4b37cfd803a987e3afd9e12ef9b1480918c5d6e4fa955b8447eba9e319c94aac11abe247187870406986b476b154e8 WHIRLPOOL 3c1f192d1fb5e213e407a70a7be417170b651f3049b32ddf1f6b1c1983dedbcb498fa92eb96a41463c0ff0754044930150f0e5940708a6584923e12b86200349
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUnsjUAAoJEFZZU7lTcnVsct8P/3Wo+drL4Bev04CjbOKqqkcF
-ZCx0ZI2bWqyT2HbQ/IPBVN75JcsVBX6tXUXw/va55ZF/htStm+bcUVJummVh+Bm/
-JD1lQBvjh6IonvbuNCPHDQoInK5QV14qcoHI8slU/FQ6b83ZWlhNtdQOUWlTAmSy
-UoLqopT3ge5H3ZjYfA8EwP/L2wFh5CQA6Q/8dUFB4QjtJPxHKaS6W5LMLtUtUMCF
-ddM7vVJMfoN0q8N3TTgjhR9uCdDd8TNdyq0TZRj/n7or4V4vkpnGRt1Md6NxTwtG
-RxIGb/FDKErlI3ambVNGhZvq1grBlnkR1QbnbU06Y8r8ND+VMiBXWF8gRsaiH6va
-cvXr4v/jJ+Ys4caMAl6kAxyQtBe1qEqo293kTz2DdrVr2EwhN/G6rm8j3KJN4+tZ
-tMU2u5wL8G5sNZLj/aR6w2BdKka8Y2QxcazpijK/mLH/OEk3L/yeuY0nU46HKn6P
-m4oiteN1Aj29ZIJKEZnRB4pGMrbdHBu+Z5NKxn5rCe0pF/c2kK+RXMkq3Lb0pMGa
-P+D+7GBKQyO88LH8Fdaglz2/cEO/u3J8Cz9OlOOYwWy5baGRQjT4+VTEctdEmH27
-GUmnCLQuKWXSI6+gIkbQ8a76mSYQZz6dv4tNAirAqcKuYw1pxTjr5OLIlvfA+URL
-syRNhVbm+hszr6wE56LK
-=tjpW
+iQJ8BAEBCABmBQJVL3vxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO7AsP/0T1pKGsG1V6ixC8pD9jfDSK
+PlJprDESW2ZaGoIUSzErbP2A34GgBSi+35ZOLX28m4u8bIR5f0ifPY4eKONTymae
+1P22D4K399Oe/giXXoBkg4eF1RQnyoikK7SJURhGEi+W2R/zHDwuPI4FQv5CgxUD
+W2Rd/drh7dNYngf4HgMK5UBQBEP75DoKFDNDGuf/9Ue9gJlJfBGI2fGIBcxpCnKE
+SKacOf5+h0e2eDYkytEO6xaKi4vRKLyRWl2DGt8HA6sr4LUCh/ubJa/dESseKfNp
+Mrx2zCwXzHxZnF1bIrDHC3GFDTCkQTfcqH5PVb8p9Yudz/5VERXzTjlnmHrl//y4
+scNAcbP6Y1ujOG0ISdHfY/3VlzW1opH2Tw0LoHRo7pL9CIZ8Gxsh4RwFh42UPRN6
+HwPLXhpJh1NXktdN9ocvd4l0Z6gDOrxeGL3A+Ok+jrW7JsIPIGRklySN0L1S0T5h
+8DLI6Z1Fu23lrAKoURTcK4mLva0H16NsWerzvu6h1GkyTj983BYA3FacxUrRJCX2
+9Z9MSTqKwxtjPLjxB+RTNhbQXDYDepsIWO9laCDUYlJkUpac5hiLWYMPMTyBKkQW
+GkAgv9gmbaqjxUqgeK+mi4LxmIn/BeVDrDwYYmloty8cHU44udigZUZPayybi5Yk
+ESHsVNdX6RLVnpO+/I5+
+=6PX5
 -----END PGP SIGNATURE-----
diff --git a/app-arch/zpipe/zpipe-2.01.ebuild b/app-arch/zpipe/zpipe-2.01-r1.ebuild
index f52af2adde9a..0563fa5a91e7 100644
--- a/app-arch/zpipe/zpipe-2.01.ebuild
+++ b/app-arch/zpipe/zpipe-2.01-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zpipe/zpipe-2.01.ebuild,v 1.2 2014/12/27 14:57:23 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zpipe/zpipe-2.01-r1.ebuild,v 1.1 2015/04/16 09:08:00 mgorny Exp $
 
-EAPI=3
+EAPI=5
 inherit toolchain-funcs
 
 MY_P=${PN}.${PV/./}
@@ -15,14 +15,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="app-arch/libzpaq"
+RDEPEND="<app-arch/libzpaq-7"
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
 src_compile() {
-	emake CXX=$(tc-getCXX) LDLIBS=-lzpaq ${PN} || die
+	emake CXX="$(tc-getCXX)" LDLIBS=-lzpaq "${PN}"
 }
 
 src_install() {
-	dobin ${PN} || die
+	dobin ${PN}
 }