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, 43 insertions, 35 deletions

diff --git a/games-fps/ut2004-hamsterbash/ChangeLog b/games-fps/ut2004-hamsterbash/ChangeLog
index 734b70080cf7..faefc6eca945 100644
--- a/games-fps/ut2004-hamsterbash/ChangeLog
+++ b/games-fps/ut2004-hamsterbash/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/ut2004-hamsterbash
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-hamsterbash/ChangeLog,v 1.3 2009/10/08 18:33:16 nyhm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-hamsterbash/ChangeLog,v 1.4 2013/03/29 16:21:26 hasufell Exp $
+
+  29 Mar 2013; Julian Ospald <hasufell@gentoo.org> ut2004-hamsterbash-1.ebuild:
+  use unpack_zip from unpacker.eclass instead of unzip
 
   08 Oct 2009; Tristan Heaven <nyhm@gentoo.org> ut2004-hamsterbash-1.ebuild:
   EAPI=2
@@ -14,4 +17,3 @@
   +ut2004-hamsterbash-1.ebuild:
   Initial import. Original ebuild by Paul Bredbury <brebs@sent.com> and ported
   to the games-mods eclass by me. Closing bug #118838.
-
diff --git a/games-fps/ut2004-hamsterbash/Manifest b/games-fps/ut2004-hamsterbash/Manifest
index 84c4c8e44cbf..bb3298d0efc7 100644
--- a/games-fps/ut2004-hamsterbash/Manifest
+++ b/games-fps/ut2004-hamsterbash/Manifest
@@ -1,14 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST HamsterBashFinal.zip 98608028 RMD160 76aaa6ebd490556e7e370d1080c7e6b1ffba98e5 SHA1 cb9c27fc19a8793aeb11efdbe983373629284644 SHA256 104a2c09dd5c698877301f3f899dbb6a1b092e31b1c8112ad119824468ca8d9b
-EBUILD ut2004-hamsterbash-1.ebuild 681 RMD160 43fac50cf001d5953bb73e3ac6f4880f01d74c23 SHA1 666225d5fe4cdcd19a187e567ae587103f2842ae SHA256 8d98620a64bd50dfb3616940edb2c2694df178bf94614c8158800de3484831fe
-MISC ChangeLog 730 RMD160 7b57a0df8f7cbc1e63bd586f74d2fd9e47058ed6 SHA1 78d2cdada03d911226815bc34cf1e9b50a180006 SHA256 0f55c2a59347626007a3b18dcfeed64606e7483872c6f3497da9b75dfbcdb6c1
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+DIST HamsterBashFinal.zip 98608028 SHA256 104a2c09dd5c698877301f3f899dbb6a1b092e31b1c8112ad119824468ca8d9b
+EBUILD ut2004-hamsterbash-1.ebuild 636 SHA256 c727981d0861d6e60da584b7ef6899bf04f60b7737b6f76dfa6444860cba3cf4 SHA512 102ab6614d1bfc50d7415c0ba416bc6471835aaddeb71bb558b264a483b4efd609209233e84f017aacd792eeb468bddee394a5702f7338352cff0837a6714f28 WHIRLPOOL 434111a4ed07e9dd102795359d05693ef307d3b87e407c303bbecc5e30b7ee21928bbfe6a9f80001cbfbd9ed0cc00036e0df4341fbd000786567b54a9342e211
+MISC ChangeLog 869 SHA256 0036467e31bfa225baa799f633d3dae7dd0439953f95c7b4ee7265e6885435ed SHA512 37ac456143a015ea7fc8ee6a67648484921b6b62c07acb6f9599b316cae60fa7593ebfe4af87ff1f80733fb1326d6ab70cb4a95881314a7be1ac28aedaa8a611 WHIRLPOOL c6091995c4f938d35e693b5bca63c0cf2a42a1d31a497e963e5274b475f7e762c9b69ce33230ba92b4450ed19fc2373896f98373d2a7d4a05193cc75b4b3efef
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAkrOMHIACgkQdz7hIScOURHcdQCfePeDIg13ZFEW2tolECO7lmV0
-xfcAn0ew17+PBorpKyrTuBHMgRHsLJBR
-=f0rs
+iQEcBAEBCAAGBQJRVb+IAAoJEFpvPKfnPDWzDKsH/izp7Io/Af9F9nS/I60KKuE3
+rv4S2k1Rd4lIy7Ks9miwbRLwoDIq0qsWPjB1kHZA0WFoNqNrlI2aEmSBMD3J8VpG
++KwJ0njOIn1ITctlafhP8wxp/rlt6O8zxY4pWnYGytKtBwUpIaF2dgW/qFongZ7W
+2yggrO7oOZAH10DT88aBVJXmqzIeOm8EanzicaXilq1w3M4vo68gIQt5EPQKiW1D
+5PGxzGT7finNiFXk8Bh8/BIZA46nbzObzFvJN7iOpJzZLqxqm8ZgVPXG4WdwNJbf
+MCcI7S1/b5V4BP7Rkqo8+HHSBtAFBF5qNZfYqURiyhoVKspH2Rnez6wxmKy/Vzg=
+=WDh4
 -----END PGP SIGNATURE-----
diff --git a/games-fps/ut2004-hamsterbash/ut2004-hamsterbash-1.ebuild b/games-fps/ut2004-hamsterbash/ut2004-hamsterbash-1.ebuild
index 4de1acacbc36..cd14bdc5be8b 100644
--- a/games-fps/ut2004-hamsterbash/ut2004-hamsterbash-1.ebuild
+++ b/games-fps/ut2004-hamsterbash/ut2004-hamsterbash-1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-hamsterbash/ut2004-hamsterbash-1.ebuild,v 1.3 2009/10/08 18:33:16 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-hamsterbash/ut2004-hamsterbash-1.ebuild,v 1.4 2013/03/29 16:21:26 hasufell Exp $
 
 EAPI=2
 
@@ -8,7 +8,7 @@ MOD_DESC="Cute and violent hamster cage rampage mod"
 MOD_NAME="Hamster Bash"
 MOD_DIR="hamsterbash"
 
-inherit games games-mods
+inherit unpacker games games-mods
 
 HOMEPAGE="http://www.eigensoft.com/hamsterbash.htm"
 SRC_URI="http://server088.eigensoft.com/HamsterBashFinal.zip"
@@ -17,10 +17,6 @@ LICENSE="freedist"
 KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
-src_unpack() {
-	unzip "${DISTDIR}"/${A} # unpack fails
-}
-
 src_prepare() {
 	mv -f HamsterBash ${MOD_DIR} || die
 	rm -rf System
diff --git a/games-fps/ut2004-muralis/ChangeLog b/games-fps/ut2004-muralis/ChangeLog
index ba6952f8ae2f..2248d7e389e5 100644
--- a/games-fps/ut2004-muralis/ChangeLog
+++ b/games-fps/ut2004-muralis/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/ut2004-muralis
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-muralis/ChangeLog,v 1.4 2009/10/08 20:03:40 nyhm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-muralis/ChangeLog,v 1.5 2013/03/29 16:19:21 hasufell Exp $
+
+  29 Mar 2013; Julian Ospald <hasufell@gentoo.org> ut2004-muralis-1.15.ebuild:
+  use unpack_zip from unpacker.eclass instead of unzip
 
   08 Oct 2009; Tristan Heaven <nyhm@gentoo.org> ut2004-muralis-1.15.ebuild:
   EAPI=2; RESTRICT=fetch
@@ -18,4 +21,3 @@
   +ut2004-muralis-1.15.ebuild:
   Initial import. Original ebuild by Paul Bredbury <brebs@sent.com> and ported
   to the games-mods eclass by myself. Closing bug #118612.
-
diff --git a/games-fps/ut2004-muralis/Manifest b/games-fps/ut2004-muralis/Manifest
index fe81b894c173..ed7f6e93ef22 100644
--- a/games-fps/ut2004-muralis/Manifest
+++ b/games-fps/ut2004-muralis/Manifest
@@ -1,14 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST muralis-v1.15-zip.zip 62575050 RMD160 3739b10c4e107a619fda94e634fefbcd1c5dc0e3 SHA1 24b45b0d59adfabe0a09647e48c71d7172852a2c SHA256 99d3d86585511cf0b9a37fb3b475a6685d1a4a414684def9e82befdc793fd77f
-EBUILD ut2004-muralis-1.15.ebuild 778 RMD160 e5d059f722312ffb1a7297919d53c90c0fa03420 SHA1 1f991e62b39cab42437414cd2dd261b898c20315 SHA256 2725234b33d9111740ccb39e645fcaaa6420f9cbe5069c22d598d4637fc0fbdc
-MISC ChangeLog 847 RMD160 6424a408ca6724c026718ac13079659dc8ffb4cb SHA1 f4a514e757fff21051f3dbd993a40893f0048fd9 SHA256 7003a4a677c1567f878a83f535e30a41b40c174b559deae294b5e2c7b626e0e1
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+DIST muralis-v1.15-zip.zip 62575050 SHA256 99d3d86585511cf0b9a37fb3b475a6685d1a4a414684def9e82befdc793fd77f
+EBUILD ut2004-muralis-1.15.ebuild 768 SHA256 2cdf6aa078884f0a51ac5e3bffbf6ac1fde028be501730add1b33e685399fd85 SHA512 b09b90e2cfdbb6b57c28c8e45b5661057a75abf4d3ec4748e7acebdd4f4efdec755e94500e1834b9b3f839d38bbb3b0aaf24edb256776adca20ab70c0136e191 WHIRLPOOL 33482ee18870c7bdaf63fec6916de52e240fa7f66b80942f0be2fac7d2cbaa6812d2a74bb067a82f1a714ff59b83f1dcb6aa7dbea6f33d7ad7fc3b283a56f685
+MISC ChangeLog 985 SHA256 7039f75de0b3d41a2e98ee3b7c14041e63b918770f774981e1c1f3243e288140 SHA512 962ca00cde8bf27e50c34991f0904e54dbb4e22ea1632cf4897eb6414e069bc587c929854dea6c7ddad12dd382596e4bcbf95eaad3737c605c76dcd325831937 WHIRLPOOL 932f20825d78348d0dff1f3a866d0f4595e9952d263f6f2ff0163a6e9603b6862e5b29f8371cb0963aa702de43a7a0474fd92e5d6d141592a0519e480aa64e6d
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAkrORaEACgkQdz7hIScOURGxAQCg3U1vfbiQ9iziseLk56Eg7cmP
-8sYAn37F4Zhlsxx6zxqv6hVRnxNvpCmk
-=fbQH
+iQEcBAEBCAAGBQJRVb8KAAoJEFpvPKfnPDWz0P0H/1dFNfXWrzhIpjiWzneGyVUd
+IuAzmUyJkWXksCrwOCaSYMJBgiwjK92FwHd4Ut30p1mW9Bpkl6Oftezu9HuZ1K8H
+/l9mJLFSqzPkazhaktotjUWNgm1/5iWL5FP6FGGOmuydeKBMzkOlse7v/OW+ArPQ
+GKX7sF1Xm6XyJzUY6kycshyLIQExwN1GByUO0kMLmuKApjsAFXaopaTxJoBREOXc
+LHFy2AHPCc0Q0Lu9HjrdS5QZBzw+afdByZEuf/t/rbVOyYelq3hrNQL6JGgk+v4A
+VI2PtKi6zrecJ+1Bth55TnU56CRMhx77SQejb9K658KXFdk1ALz60nKPxSGsMDw=
+=CQcl
 -----END PGP SIGNATURE-----
diff --git a/games-fps/ut2004-muralis/ut2004-muralis-1.15.ebuild b/games-fps/ut2004-muralis/ut2004-muralis-1.15.ebuild
index 2f6c991cc271..8fc5e30c73c5 100644
--- a/games-fps/ut2004-muralis/ut2004-muralis-1.15.ebuild
+++ b/games-fps/ut2004-muralis/ut2004-muralis-1.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-muralis/ut2004-muralis-1.15.ebuild,v 1.4 2009/10/08 20:03:40 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-muralis/ut2004-muralis-1.15.ebuild,v 1.5 2013/03/29 16:19:21 hasufell Exp $
 
 EAPI=2
 
@@ -8,7 +8,7 @@ MOD_DESC="third-person hand-to-hand single/multiplayer mod"
 MOD_NAME="Muralis"
 MOD_DIR="muralis"
 
-inherit games games-mods
+inherit unpacker games games-mods
 
 HOMEPAGE="http://www.ascensiongames.com/"
 SRC_URI="muralis-v${PV}-zip.zip"
@@ -25,7 +25,7 @@ pkg_nofetch() {
 }
 
 src_unpack() {
-	unzip "${DISTDIR}"/${A} # unpack fails
+	unpack_zip ${A}
 }
 
 src_prepare() {