use unpack_zip from unpacker.eclass instead of unzip

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

6 files changed, 55 insertions, 23 deletions

diff --git a/games-action/descent1-demodata/ChangeLog b/games-action/descent1-demodata/ChangeLog
index 4819f6750c64..b636cd1b544f 100644
--- a/games-action/descent1-demodata/ChangeLog
+++ b/games-action/descent1-demodata/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/descent1-demodata
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/descent1-demodata/ChangeLog,v 1.3 2010/01/31 05:08:20 mr_bones_ Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/descent1-demodata/ChangeLog,v 1.4 2013/03/29 15:28:31 hasufell Exp $
+
+  29 Mar 2013; Julian Ospald <hasufell@gentoo.org>
+  descent1-demodata-1.4.ebuild:
+  use unpack_zip from unpacker.eclass instead of unzip
 
   31 Jan 2010; Michael Sterrett <mr_bones_@gentoo.org>
   descent1-demodata-1.4.ebuild:
diff --git a/games-action/descent1-demodata/Manifest b/games-action/descent1-demodata/Manifest
index 2adf3188a358..200d467f2420 100644
--- a/games-action/descent1-demodata/Manifest
+++ b/games-action/descent1-demodata/Manifest
@@ -1,4 +1,18 @@
-DIST desc14sw.exe 2892216 RMD160 2a3818a1bc4f52e21fff12b4692d7455742d8eae SHA1 0364a8280b8c10ccab009cf7ab8bb64ab6c27d90 SHA256 3dadb7fbc01efce2904d0908c55d9a9cf1f402e83bf771970552efaca15efcb0
-EBUILD descent1-demodata-1.4.ebuild 1382 RMD160 321529aed61a918a2f0efc8e7b725dd54f508754 SHA1 7ad5902214d9f47d593874c3338b6d0287ca4652 SHA256 fd712a052c29e0775cd299df3667c793f99259ceb88d024d5d97f003324e86c7
-MISC ChangeLog 767 RMD160 d63cef9107388c63247725fbb678c20f9dd1fd94 SHA1 7bc84eba630cbfa32886add07088facaf7072eec SHA256 e872252e754ed41a3d3e7a0b75676ef3a60320b10506c152aa1e4f90dfecf124
-MISC metadata.xml 469 RMD160 2de98a09129bab257dae1b034568d3956b6de6b2 SHA1 16c945613235e3ea7f83dc72176da9a518e4c24b SHA256 2f3b8f55c783f0769e7d174e5ad54b6431c375cbc9a0deca11f489d9990f1163
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST desc14sw.exe 2892216 SHA256 3dadb7fbc01efce2904d0908c55d9a9cf1f402e83bf771970552efaca15efcb0 SHA512 121bd909285138eef3009af4a46174a4af241b139230eda5c232fe710b17419e385ffeb97e13678c253390e6393615006c739a8dd4b0e14b375678491629ab3e WHIRLPOOL 5fbc95c6cbb5d26c30c3a5b9cf79b0fe0932d1a1b3886dc4db1e396854592c63e22e7f539b5fef04cb0eefaf902202a1de397d85adab8a7e2466c98127108534
+EBUILD descent1-demodata-1.4.ebuild 1356 SHA256 04f9da958c8ab3c5b38b47081663f51390c3dfdcaa561a66776819ea75b8009e SHA512 b34ef8f6fa8366789efc17634a20e853eb8d57dddeb13126ac50366ed3e411c6235210787ec8c3bd45c114733acc982dc452c6929d5cd4a5bcaf31d4344b9d65 WHIRLPOOL 33b998be4bb511dd414e67306f5d63136f2cffe1869206395b4032516815fa7ec1ae55ed71064d3bc98d70d23f3c206d6ca31ca715c7493c1ac47afae4a4a15e
+MISC ChangeLog 905 SHA256 08187c667ca36fa1cef6ac600e5d765aec0500717a373cc1a9e6950ab084ecda SHA512 6a0ebf47d7d59635164d881f99228af7d459697bb2008a6c0c41d967115cb5d6a007729844957576e286554dd46b190f65944b3e15eccf7a5713a6a3fbf5dea2 WHIRLPOOL 540b26d84cc1630d6decb6b4f5e92b02c3f2c4d9ec68d597a95cc4367407e08955c84d7dffe3a385edc688119aa771e09554a531e6374d5df2d17db87039c800
+MISC metadata.xml 469 SHA256 2f3b8f55c783f0769e7d174e5ad54b6431c375cbc9a0deca11f489d9990f1163 SHA512 60e30fa189fb9539bf0cde0e3806f9c3b0b8b4ca4ed3534ac68139508435e1046751e25cf911c1322df5564a47c003a48dbe6f7dce567b51fed2cb2cc6058d1f WHIRLPOOL e30c39f9b9d647fc92050485df77bd1adbc356a732df6a4edd93fb05bbf8f2b74d5d135333128b78f4f06ca015de3243eb6066ca3f6753151d8adef602ab3ecf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEbBAEBCAAGBQJRVbMjAAoJEFpvPKfnPDWzIUMH+LLcFh2xzVkxtIVVhh1XR1S7
+qEZohYQyAVFGInhSW0GR1tjp6nt9eROWhTa0pabkTaG89AzsPGrVn9AAy1PFUc7j
+zEJe/brcaG4w+L3Q5RXH/jkhupDZdOTzP8187pBboL8ztWN1DO1ZFazrLatUePRu
+saN8Al+Xr3PE9Glx2ZCEFxPqUw3qkuzPHvKTGJRDMUGRCgUQmAzCDMe2+Niuvfb+
+d0tBsphzpXaDiOkTkgCnzVfDAeDTZbCqinoszOVz9H0y2Bxe1I6NbH/ha3AzofN0
+5c6OSWO4LGfvE/h4SRJIcJWS2DoV+LWv9/JXZtOrhloevcwf6ceEufyUq7Hl1Q==
+=Dd5m
+-----END PGP SIGNATURE-----
diff --git a/games-action/descent1-demodata/descent1-demodata-1.4.ebuild b/games-action/descent1-demodata/descent1-demodata-1.4.ebuild
index 2a45daa57d2d..2b67905aeca9 100644
--- a/games-action/descent1-demodata/descent1-demodata-1.4.ebuild
+++ b/games-action/descent1-demodata/descent1-demodata-1.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/descent1-demodata/descent1-demodata-1.4.ebuild,v 1.4 2010/01/31 05:08:20 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/descent1-demodata/descent1-demodata-1.4.ebuild,v 1.5 2013/03/29 15:28:31 hasufell Exp $
 
-inherit eutils games
+inherit eutils unpacker games
 
 MY_PV=${PV/./}
 DEMO="desc${MY_PV}sw.exe"
@@ -27,7 +27,7 @@ DEPEND="app-arch/unzip
 S=${WORKDIR}
 
 src_unpack() {
-	unzip -qo "${DISTDIR}/${A}" || die "unzip failed"
+	unpack_zip ${A}
 
 	unarj e DESCENT1.SOW || die "unarj DESCENT1.SOW failed"
 	mv descent.pig{,1}
diff --git a/games-action/lugaru/ChangeLog b/games-action/lugaru/ChangeLog
index 63050d946210..80b04a95c90a 100644
--- a/games-action/lugaru/ChangeLog
+++ b/games-action/lugaru/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-action/lugaru
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/lugaru/ChangeLog,v 1.1 2010/05/12 04:21:55 vapier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/lugaru/ChangeLog,v 1.2 2013/03/29 15:30:29 hasufell Exp $
+
+  29 Mar 2013; Julian Ospald <hasufell@gentoo.org> lugaru-1.0c.ebuild:
+  use unpack_zip from unpacker.eclass instead of unzip
 
 *lugaru-1.0c (12 May 2010)
 
diff --git a/games-action/lugaru/Manifest b/games-action/lugaru/Manifest
index ea6be9ed4ee8..81226a3bb0ce 100644
--- a/games-action/lugaru/Manifest
+++ b/games-action/lugaru/Manifest
@@ -1,4 +1,18 @@
-DIST lugaru-full-linux-x86-1.0c.bin 35539077 RMD160 4a7755cd7facc3c1cde7a4d6e3bdc1a80028cfca SHA1 2349bdea3d595c3aaedca0810229d12f96323874 SHA256 fde77b630c15e94e7f9b28fead0baeb233901eb94dd0b8a898c27d3fcf22f040
-EBUILD lugaru-1.0c.ebuild 1266 RMD160 03d57b01ab2f33f7338013e29c937c652dbde9f2 SHA1 06e371404601fc93f6add9616a8ec3c0e9eb1b14 SHA256 c4182e966df37ae0be422adcdd8fa0c6390e0600db94063516e39daf80d9c5b2
-MISC ChangeLog 382 RMD160 2701d87ed4df896f1bf2374ad77cb112423c73e6 SHA1 3c3bee3d090de995b00d2ec2ccd7c49198936ecd SHA256 149b8db1f93e0463de5c2b13875312ab649403cf7a8a9a149744b6b7b98f524b
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST lugaru-full-linux-x86-1.0c.bin 35539077 SHA256 fde77b630c15e94e7f9b28fead0baeb233901eb94dd0b8a898c27d3fcf22f040
+EBUILD lugaru-1.0c.ebuild 1172 SHA256 d16e18252db98b0700043ff3ee5222e8f31a457cca0f83dd9bbacf6cb69a8c1b SHA512 1ea187ca0cd94abdc6ba44f976f47d8b969e56c0136fcfa4cb8eec3c7f749a5cace7723f555c8ee15ddce5dba147685e973c91186fa402d8df20bbd3f0e95597 WHIRLPOOL 2e4af51d0fddffe3c369a41611dd1698d90c4e9d7a9f6b740f07cce04ec3010fd0e7d67c0abd6100314c5ab9a1e28e23cff39a63cf510c59ecf8e7be0be66fc5
+MISC ChangeLog 511 SHA256 4522c47c71fa1e94d1eff78180e88d9b53d1fdf6b0e78eaae27cd01420de34b5 SHA512 5e8f4ed89758c899e44b07f5e6303c6eaf47018e055e98d6538769ce863c7a63b1c9320ae0e50d501ecee72cb5edb3e624be4c0fe9ad96c5a8e533fa46b9d2fb WHIRLPOOL fbeb6aa08d856b09e2b63359f5f4788691d78680b4fe2377431c1d0bda727a1df085e2e184b065d5cef515802f97be25681114e87788349daae6b6bd529ecef1
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRVbOXAAoJEFpvPKfnPDWzLygIAK3ubH32kUJ16eRxdotquKh5
+PU4zIhcgbXABilOeBZ+rugfjujF7/y6COpH9loYmg3wuoGrTuO+OSLdcMalPMZKy
+HY+fsX3rjGipq7gq8FdWBEizr4cX/z32/nAIIQ5gR7TFj4zIaWnVRIuj3USmF+K5
+QtzL4EZTbIGNE94Ha74h6qPYvBXTPSrbJKkZFC4iNX5Ip7sLnZWh9hMrLkpdP5Sx
+GSGLUl5GWI3d+kbYoSt7qaL2p9v500XwFgHNnvZ0xcmJiYbIrTWeUzkkSo1R1j6t
+5/1mauRYd4QV+717igmUh32bQV2aewHh5SqD2CfKxBeShiBwlerUiTIrPObDGDE=
+=eiGS
+-----END PGP SIGNATURE-----
diff --git a/games-action/lugaru/lugaru-1.0c.ebuild b/games-action/lugaru/lugaru-1.0c.ebuild
index 74e97c8ef513..f321530fda8b 100644
--- a/games-action/lugaru/lugaru-1.0c.ebuild
+++ b/games-action/lugaru/lugaru-1.0c.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/lugaru/lugaru-1.0c.ebuild,v 1.2 2010/05/12 15:48:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/lugaru/lugaru-1.0c.ebuild,v 1.3 2013/03/29 15:30:29 hasufell Exp $
 
-inherit eutils games
+inherit eutils unpacker games
 
 DESCRIPTION="3D arcade with unique fighting system and anthropomorphic characters"
 HOMEPAGE="http://www.wolfire.com/lugaru"
@@ -26,10 +26,7 @@ S=${WORKDIR}/data
 
 src_unpack() {
 	# self unpacking zip archive; unzip warns about the exe stuff
-	local a=${DISTDIR}/${A}
-	echo ">>> Unpacking ${a} to ${PWD}"
-	unzip -q "${a}"
-	[ $? -gt 1 ] && die "unpacking failed"
+	unpack_zip ${A}
 
 	# Duplicate file and can't be handled by portage, bug #14983
 	rm -f "${S}/Data/Textures/Quit.png "