Add lazy2 & update bmp filter. Switch to new-style /usr/lib libexecdir.

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

3 files changed, 92 insertions, 17 deletions

diff --git a/app-arch/zpaq-extras/ChangeLog b/app-arch/zpaq-extras/ChangeLog
index 8c34d8943668..22b367b09303 100644
--- a/app-arch/zpaq-extras/ChangeLog
+++ b/app-arch/zpaq-extras/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/zpaq-extras
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq-extras/ChangeLog,v 1.7 2014/02/19 16:57:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq-extras/ChangeLog,v 1.8 2014/06/17 15:22:36 mgorny Exp $
+
+*zpaq-extras-3 (17 Jun 2014)
+
+  17 Jun 2014; Michał Górny <mgorny@gentoo.org> +zpaq-extras-3.ebuild:
+  Add lazy2 & update bmp filter. Switch to new-style /usr/lib libexecdir.
 
   19 Feb 2014; Michał Górny <mgorny@gentoo.org> -zpaq-extras-1.ebuild:
   Drop old.
diff --git a/app-arch/zpaq-extras/Manifest b/app-arch/zpaq-extras/Manifest
index 9d9662748b81..5a7e6db0ee46 100644
--- a/app-arch/zpaq-extras/Manifest
+++ b/app-arch/zpaq-extras/Manifest
@@ -2,35 +2,38 @@
 Hash: SHA256
 
 DIST bmp_j4b.zip 2654 SHA256 131a4cce96a56a5f4c61fd9a226b22b5d19f1838076b25f91e5815d9b40f32de SHA512 deb3aaffbe8f1e1e2fa33bbc4c87446ac1f0144788098c468a9218871715ef87e7f63b406ed43db77b6d02a5a3b73e38c230707766cb4a32162c5c8978c312dc WHIRLPOOL c0d5c5bd4d77c24478744daab6c929688ff12a3f9c75c89d5208e7d6b22a42e7d9e59af079d289fe3fee3573a7614ea716abd3693f67be1bbcd38d1db2574f94
+DIST bmp_j4c.zip 2511 SHA256 98fe722a89ac107f637d54bf609673402fa9ede87d19ed68ee28633e64e879a7 SHA512 36e51f9ccef19069cb5bc93f3f8139e458406c8f1bd50b8e15440bed8808c43284248e0e2d436c613bb8afd1953703d5e9b681f95857b801d891e9497992bc6d WHIRLPOOL cda7d004d40102c198557e18d8e8fd08d16fe1aa4f2d66869349c7e75bd12b0c000a1388658e593b9ad971fb37c8638e7183addc94fe4ac3b42dca8c42c3f56e
 DIST bwt_j3.zip 16535 SHA256 c5e75abdd8d8a3fb6effa3c467e98aeb3175068bd454a635baae79de024b9120 SHA512 8a34909cd70cae76ee2c19b1d90895ab75422b7b2053cf6a4555250871a9ec1f585fe6d115abd6c0ea4cf092711ab71ab48906b4ec5b0230b4fe62b989177f33 WHIRLPOOL 153dd0f98201218d867360f73ef3eceda4f7a784e4e46927c34615a442bd63ecaca00ad59cf42ce2da3a80461ea5e8a6d3bff02d51b5d33d4226876fb4ffbf3e
 DIST bwt_slowmode1.zip 138176 SHA256 3b7fb3c4a2491b4f8b2c243f7f67a4f2c7d2b793558207001b2565f06e145a92 SHA512 d415b049f284dc4d3d2211830db260489f26e6b1cc00fd60c16b6d138196299ce247fd0e20b58bef016451a3d5aaf9f55e53585ce97f95d1cfa5672735e4316a WHIRLPOOL fc4b56621de29fd1ec424924678e80191247b64e8f07a84ea1d9fd4dd273ca2e4a4c6eb6102a668e837aafe53035a542741b614ce76dc51ee165e229da764de5
 DIST exe_j1.zip 9828 SHA256 8e13ca38ed6fb7fd9ae5244c44b045f179b068c3d3281f1f2690c352e45ca239 SHA512 9b62486823a21b91ffefbf8de78e6fcd4a291c98549226b1e17a6a4c71ce510c678b71cb74cf9b38364385b3310f0b6dfecaf96652f82a0eab367a2122176596 WHIRLPOOL f7973d7b68614363a2f06d16e4fa96b9f54cda0d9b93a72d61f9ed7b78382c854808dc080cde09553d33d0dadcfa0a6c4b1c1aa70799cb533e7d8df440628b6a
 DIST jpg_test2.zip 12189 SHA256 b09eedf0760826fa6822d266c1e262e67ad4ac119e11235e192e208e558e4855 SHA512 a866812a9d9e77a777d06b6acfef4bd09e7af1b55e3d47eb75bd24d8f5b02ec455991efda7f7ee2a5db035602cf9843e01133fa8a7f75488cd94f1eeeac70bb0 WHIRLPOOL 82915421c0c22d31472d61421bc503426d07ed725568ed3548c9b3e1e8536ca056094b1115457cda018adef13dd216d88afca310e498d128f0acd3ee18559f35
 DIST lazy100.zip 14958 SHA256 6c4366a7260c3013eb85db0aa7209ea19d41d3d2427b95a4526595cc9b64b44e SHA512 2102d268bd15843773653fae8934b9f5ebbdb98a5c519a465c57ee58a6cd104228ab79b885f1c7a6cc127930b890c1ca14b09b799d9129d973c2cf83bd03be3d WHIRLPOOL a462ffa7fd30537b7937479203de02521c01a29af2fd3c6df1d719c172d57f8d80bec4923795a1e55428419c0df0eb3db298353c0eea3d273003b15026042bae
+DIST lazy210.zip 15867 SHA256 7c6d55c316b366328d711ada5fd8302e4db89916dfd66449d696416d7f60d735 SHA512 9a45b281f3e0c2a24d2679b7eecfa9b5e8b5a13894faf23924784cec09f90edb17513ec3e13001ed283dc4ef2a56b764f32808c45443b5871d8acdd919a4f353 WHIRLPOOL 10cde6b1f3139579c48465e6066dfe6c9476d608503261890dcf0556df3e978a5d662f956b71f5e73d8074f02a962c94cb50ce8116975187121f8fcdae26a055
 DIST lz1.zip 10012 SHA256 2817e3d300edee5c1d65d702feb58b51bd459817dc32a2a29d82d0f92a0ea7d9 SHA512 b03c84351a361531e59242904763f7cd13ec9b809bcbfbec5c270b139ab80ac1a99ccf745ba7a797587c0e71cb7dbc083f643fd62cd3b56906ff5bde8944a1a1 WHIRLPOOL 4f73c5ce636d968c65582ec313a91c0315267719140aeecfb1c8b471bc8ea43f4cea3e0cea4b8738ef5be07ba9bdc4003946801c415328fc79d74e7bd9c1682a
 DIST min.zip 9560 SHA256 7209ffaf0d48f5e10e3134826d766e2dc52ed914ed5dbad415023db10b4e1113 SHA512 e2ce1283438793abf5c8f62e6419249fb86f9d386a2cdc40acc72c4fbaa44469be2cb7c7271355af13d40070d386d87e12268aedccbf4cd6ec9feb91cd92e65e WHIRLPOOL e73a58647dccdcf5db1de8709929b4e72600d61c1f6b474b34c3a661b972d39769327ef8c0cc1203f694f62798e4414dc1a9d76a72f99a29b0359226a86521ec
 DIST zpaq-fast.cfg 359 SHA256 2cf9605ba5eb73a58146509844d4b360c07ae55ebc2ab92d485d0c907166cfda SHA512 3f1118bdb61bea4c8df4e7a88a9ae079aecbe9f1dfc2aa7935334d330d374a248ab2327da9524857ca9c2b214ac32f3d2dad6ad420f0688b65384c2263147e57 WHIRLPOOL 79f8d8e6e75dfd44148e42271a2c34a74fbd3f7fbc0ee9dca26f4a5a7fa3332810207784e0ccc9df39b2978b2e8f1a402a385ce3bf73de69ba7066347c3d7d86
 DIST zpaq-max.cfg 1754 SHA256 7965863923d5558409f5792167c74914a9c0d07f813ef385587450e7b5a156b7 SHA512 12758ea633cb37619c26753f8a4f368a1adc1b682a3ec738e36b8f39bff06f81dd9b37f9b58839ad43488d9b821690a9cb43e276da88f36d1b20f842cbcab70e WHIRLPOOL 2653a3eb7c33cc9d6ee13511919f3f79664d2df0d3fc692df2c14f8b7b5c2b08567c1963fc3140f432a1e631f56aee76e74d3447fd793f1c751078bed3d35b74
 DIST zpaq-mid.cfg 786 SHA256 51dd9dc78513e36217033c501f4a3331d30820df875e466052b6b6175bc9bafa SHA512 ef08f70b5541396a690b7df630ddbb9fb3093b7617acb26394e9f7da40d5191343500bb0b6f0e66ed73fc840b7d5666cbc47a74f7eabba6abbe3743de7db7235 WHIRLPOOL c7ff0e6497e0f03083d1cc7d787800194092f03db292831ba1d07dfa3f8f00f52c60d8e948d84cd121fcfc2040ac4f71e9556c2885971ae3d99921bfaa962160
 EBUILD zpaq-extras-2.ebuild 1609 SHA256 870d41d2a5281a7df5edbdc4786ec5bd6e565e3e2d05f0be1549191b1ae3e1fd SHA512 82a3d9bfc6ee7ee5c320277419e97bfa06d03c97097b9a98a906f5593391a7299e6160baad6659478d933a270f92aa3aa4cd95345d83253dad69da5003ad2ef7 WHIRLPOOL 9df4d5c12f0349a2780ae2c3970016be903fe15e5aa761074e88d3edb4251e5839cd89eb3a991fd663c56f796328d2b71bca57df6b6cfc2b403d14c499a03a51
-MISC ChangeLog 1518 SHA256 b6804012f23c55052f7a577fcdf9fa499ed3215783cc0c7510e842adbad0f5a5 SHA512 4d366bb2119c53e82501c0ddbe63a9248e178e7de66b4b5ee9beb2a2d9a0dea08e8312f4e16090ff13e1a8e94d6e6e0bbd561dc446533cfd82b79b963ef413ff WHIRLPOOL c0bba7469c4fc873e17691b79396dd4d5251e74a47e7eba5df89a569b5b284f113fe41447ccd51862a5ee451ca540bd82497ec0a013bd5aa7d933db601d06738
+EBUILD zpaq-extras-3.ebuild 1638 SHA256 edbc763b910cf8067d4abd17479cae3825f563984a69a5fc99d5c6f6cd593d40 SHA512 3d7e947c3dc45666c72528fcd5add774758addf670cea3d0668f338446f1ff9e01390899d68e70abd03fa58275b0e61781eb7223928172b410ec7e96363788b8 WHIRLPOOL 66ecd4158af38d700ad48d0cfbdacf4de3cb8e330958c07e32b1d4fd04116fd295fb498b611a5d183befd310b8dc5cb08443960c28d82dac52d1321bbbd39c33
+MISC ChangeLog 1696 SHA256 713d6e588f35aeceab7f8b6701a5db540c52817f835979da72a348cc16dc4b7f SHA512 727d1237c5c96bd7629c5d10fb1eb49904e4b07e750a546d3b132750dd2a76473ba2201cb69ca6c1f8920ea05d10706999e0b9a8452268b56d5d4e2e37103415 WHIRLPOOL 0deda3766dd8abb93f3f0ac71f863d410d600792cadc785621c90dc4c88fd74e43867197d9bcd0b7b52d5f1e546aa6107b74ca8569dc510e9a2ef7c9857b4646
 MISC metadata.xml 233 SHA256 fd88d74157f79eb4a06067443b7138cfb56fe1c66bfa5dfe72bda038ea5a9dda SHA512 6676f74cc1b612ba4f95101b64570f257e4b37cfd803a987e3afd9e12ef9b1480918c5d6e4fa955b8447eba9e319c94aac11abe247187870406986b476b154e8 WHIRLPOOL 3c1f192d1fb5e213e407a70a7be417170b651f3049b32ddf1f6b1c1983dedbcb498fa92eb96a41463c0ff0754044930150f0e5940708a6584923e12b86200349
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTBOKTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJToF0+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOT+wQAMUsVhuQSUFbV8hzfh1FCFl1
-NhR5GPDj3e2JM/Cf7QQqyYLMVd11SaShi8SiL2A5v2576/j0Ew0MoJcZ+uywYTuE
-BtilI5w1mUQgEtlay0LS5LQXiIjXnxp0tiwa7fYyoNlID3m2PxV1OjmzA9g3IP+u
-wYd8jn0MBo4cFCprMej9JZVZfxhIfOJDO8/RA3jQBckUiDqhVX8gntmVjs4Fp1EP
-F6U60Ckx04xVYseEwRYwQtcy3Z/+vsR68hDdQ3OvU+aFnYO4GZzyozrrQZPKl9oV
-BS1mZXPy1O9/w9w8yUw9MKeg1koCad6tLBcbQL+OYCBUqaUWBG4MuhDs3QxhhnIC
-Cud/2U9lTyNg+R4x66zCUqi/cDHm3hOYOI8QeuVVWdFtBjcvWnxXrMmsdKKBJxey
-YnMBXn+jpqXoTqPAIPbW/Ea/JeSqO1ejTcbbTvTv6It8sPhITiZVbB4eCCafhwGY
-CfB/FjYr8XtT1qKj2QXNR3PpUdrX5Q2ikDuuPP4HrXWZ1cfO7ONVQohLK4Kylczc
-819iUtVth4+1htCLkbnCt2jaYrlywfaNWl/U0Uq09WmYgiKzLUEEkNGK/4GP17YV
-s5cepdSwL+ty4+MRwo2ROVqltAHDTDMlQGadcdLS3LXXvGtJ6ZqFLD8MoFmbxLTI
-IQqTUyqT2CyvxHc69w2Y
-=TUvk
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOTq4P/jfbfws4HbWfmlHf7G1htbDr
+AWFwE3xwFjDpwffhrt/eVvnccHu/m9mz44UR4A1i/XFSMcRUP2VupmkCtObgF2bn
+kpH3dGfNaW2OSprEpOFyBeAyi7QD8PiKMABPGFZdN2sl09InhWek/d5RNaWSt2GL
+Wf2G35CUOeYx2fM6t9lYNxHtIaRZb4rCk68MWxz6XbQMggmCeZpo1SdX+3Mrjc2D
+gzVOMh57bM/wFXOlmEc6hqHpIk7BOkCWubxZflpKp7NfgA7Adv68qz0hLG6PaKLy
+rc8FNRQ2h4UHi8Yc/aaSuNPyiE43Z4OVEd37CmESJVS9Nx2n2pzLoF/0McAnQJ5v
+UWKzWMmlF3K3J0ApxbN3OLDeEbSp70307+vrrKJQ7Zv7sh20i62SO/EUwFIaf32n
+d9mdLSRRf+QZnw2TuOqzZ2q/ML3yFvvI68HUF1YtOOPpTtZiFZqnf2QQ67BjPOSX
+CjXAS/OQfsi6mIE34xTsdP3n0zCSKzfJOhFqXfcfjmhq9znRTftZaWO2DYC6rHBr
+/19oN+7mcBfYcwumMfln7HQezj4LICNZwdWYJeOxHNPmyqWlAuYM8ne0WmNQnyNK
+hVrmzZ92yCkPjZOt2B5tRo3e1cLem817s0CCd5wrPbNSCQTPCyv92YF5zqDJ5XQD
+q8yiQin8Mjp7ezFB2Jle
+=jkRG
 -----END PGP SIGNATURE-----
diff --git a/app-arch/zpaq-extras/zpaq-extras-3.ebuild b/app-arch/zpaq-extras/zpaq-extras-3.ebuild
new file mode 100644
index 000000000000..543cf64089b8
--- /dev/null
+++ b/app-arch/zpaq-extras/zpaq-extras-3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq-extras/zpaq-extras-3.ebuild,v 1.1 2014/06/17 15:22:36 mgorny Exp $
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="A set of additional compression profiles for app-arch/zpaq"
+HOMEPAGE="http://mattmahoney.net/dc/zpaq.html"
+SRC_URI="http://mattmahoney.net/dc/bwt_j3.zip
+	http://mattmahoney.net/dc/bwt_slowmode1.zip
+	http://mattmahoney.net/dc/exe_j1.zip
+	http://mattmahoney.net/dc/jpg_test2.zip
+	http://mattmahoney.net/dc/min.zip
+	http://mattmahoney.net/dc/fast.cfg -> zpaq-fast.cfg
+	http://mattmahoney.net/dc/mid.cfg -> zpaq-mid.cfg
+	http://mattmahoney.net/dc/max.cfg -> zpaq-max.cfg
+	http://mattmahoney.net/dc/bmp_j4c.zip
+	http://mattmahoney.net/dc/lz1.zip
+	http://mattmahoney.net/dc/lazy100.zip
+	http://mattmahoney.net/dc/lazy210.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=">=app-arch/zpaq-6.19"
+
+S=${WORKDIR}
+
+src_unpack() {
+	local x
+	for x in ${A}; do
+		if [[ ${x} == *.cfg ]]; then
+			cp "${DISTDIR}"/${x} ${x#zpaq-} || die
+		fi
+	done
+
+	default
+}
+
+src_configure() {
+	sed \
+		-e "/^pcomp zpaq/s:-m:-m${EPREFIX}/usr/share/zpaq/:" \
+		-e "s:^pcomp zpaq:pcomp ${EPREFIX}/usr/bin/zpaq:" \
+		-e "s:^pcomp \([^/]\):pcomp ${EPREFIX}/usr/lib/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() {
+	exeinto /usr/lib/zpaq
+	doexe ${progs} || die
+
+	insinto /usr/share/zpaq
+	doins *.cfg || die
+}