use unpack_zip from unpacker.eclass instead of unzip

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

16 files changed, 134 insertions, 83 deletions

diff --git a/games-fps/darkplaces/ChangeLog b/games-fps/darkplaces/ChangeLog
index e5bae7327e7a..f70ee12ae122 100644
--- a/games-fps/darkplaces/ChangeLog
+++ b/games-fps/darkplaces/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/darkplaces
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/ChangeLog,v 1.18 2013/01/22 18:39:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/ChangeLog,v 1.19 2013/03/29 16:02:26 hasufell Exp $
+
+  29 Mar 2013; Julian Ospald <hasufell@gentoo.org> darkplaces-20110628.ebuild,
+  darkplaces-20121222.ebuild:
+  use unpack_zip from unpacker.eclass instead of unzip
 
   22 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
   darkplaces-20121222.ebuild:
diff --git a/games-fps/darkplaces/Manifest b/games-fps/darkplaces/Manifest
index 74c8997cbcd9..ceb816a7e18b 100644
--- a/games-fps/darkplaces/Manifest
+++ b/games-fps/darkplaces/Manifest
@@ -1,8 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST darkplacesengine20110628.zip 23377408 SHA256 d2464c681e3fdcc66cb090e79c44c0c173a43b6f181a12e500b0b1fd7d73ffce SHA512 bf44933470be2856a80ebd73a0cb531c6d22e69da5be24bc52175998ab687b4112c88423a6b42a9a4ed746e0f96c1bb39e188a037a98ea596cf7b6183e390038 WHIRLPOOL b4214be8a9c9aadf02a92c9b7e54d508df38f9e38f650f839a8ea43d9c0768641dbf59c71b210d337f591fac2d77a21a14e7900a3038d1af828f064bf3368071
 DIST darkplacesengine20121222.zip 20105650 SHA256 13f3a2e5703cc6de1006d071dbdfd44627ead21425df35a3a9eb525e4b8c439f SHA512 3ad04b734562d2b21d1b5df500038fa198256ec2ccd15ded83287bc4724c74630c52ff335a7a73c95e7ba9bd07042c80d7e4cde03ee918b83009ac4b31285a51 WHIRLPOOL 7d1b1c8ee8acc3ad175ab20a93a0a5c62e0eccdded463adeb74ebfb5a9b5500e196e96386d2f66820a79b007d551b958528b383221dbd5191f5a6fc13df8524c
 DIST fuhquake-lits.rar 8388829 SHA256 066fd58e2a6d157a1aa7925334d7e3e6cffa7f5c556e707bc31da8bfecea873c SHA512 6e59f5e08a6c401b329b86b0cd677a04b1a5aee11f24973c77c9e7ea50cab9dedf4fc15c4f3d6b73bdc87bacdc9612a3c244d0a4ceceef943abb6e256ac23925 WHIRLPOOL d398b57c03d02c8180f8ca93f6964ac2118ef50cace3ecbc9da9113b1e91ed3a7b7e5473ebb9ad2f5198828eb8565c7c0470aea2095152b2898335562bef821d
 DIST id1.pk3 350470 SHA256 f1ee6e144d1942ebf91a8c71d0333eac94c73efae35377fbe7ae43e0e4ab37dc SHA512 d4d7233bc1e5049e89d09448818219b0ce7941fecde5381cd95933e4c96ebc9b4e34ff7eae5eb5d0d1e3cc2ceb4f5254f4d600aded7dda373713149817621331 WHIRLPOOL 30fe7e6d6ac6408c54e704586d4f4e15d139c0330e4f3e758651bfc2e6582eadae08c590e87264cfb26faae56a7033b383d51f93bf54ddfce7db38e47d569280
-EBUILD darkplaces-20110628.ebuild 4881 SHA256 b8070a0c9e1c43e75c2248607a4d95d0b92dce5cb816763a5f565be7531a7208 SHA512 026afbda5cd71e97d63d97d9958802169601548b0f81b68a85fa49a7ceeb88b784f70e80e66096c0f2d77634286b69b593b6e828dab7a8f0bbf5ea8ed38657ee WHIRLPOOL 9583099ef34d792d124a771b32ecdc9e6caaaa73402cb6623066f83d914d04918bf062405933b94eb19b8925c6a4cd57b716d76a1360efcac7a0ca288ea715d7
-EBUILD darkplaces-20121222.ebuild 4613 SHA256 f031d95447a5e52e19136a534499c112c77b9568db998f6b85be41b836ae6204 SHA512 4fc2161546fca4a08af2a2b0c9fdf38fd6f3cb296fef26229f12cdf397f94adfc0a7c6b06a7f42023d6b1d7b96d336500eb7ecbd1d825fb603df99d7693d6684 WHIRLPOOL ff2467915b3711b917bcb68faebcac4f460f53bf8e80cc90bbdc6f59b5ea71c48c3caceaf48b0670d27d79b2d6e8c0aa2cb6e7be8dfa2269ecaa49649b5c2ad5
-MISC ChangeLog 2826 SHA256 a002c2c636f7dadff2e89014d22ff824df25c2b357fee29392cda6cc0d326006 SHA512 aa47a51c8264657f8f25f5b7eb654214af6f6a72ca7d7c96a8064579c31845028122e07f4b0c90d3d1d03b962d94695cc19a49d1dd3df88bd907de204dceb539 WHIRLPOOL cb00fbef9adac2463dedb34ac736ccf893a937067f70e631a16349b0ee071d16165fe614abb2f5c7ec8a5695a41b4ff04a72232fa3f0da559212e66a8488d9e8
+EBUILD darkplaces-20110628.ebuild 4866 SHA256 f5cd8d0341eda97ce209a629a3ba72bb2af976e08c2168076e6827a6e290bc8e SHA512 e3a82d061f13966d786e17df2b49726ee4a7206a120ad50664779338e70803f0d724001ff1110855d4abb3a033502d58243da4d849cba340b12edef2f365d46a WHIRLPOOL 53234b5186b4ca4b91da90f8a4f89942c24993913d7fc9f86047389755a45de0ee4260055a3622d2a7bfa3ee14978baac7775e2990256bbb308e369fa5d1db23
+EBUILD darkplaces-20121222.ebuild 4615 SHA256 96cf565cb735a987f6a416a1c2df1ccea9d590f9f6cda3bc1bbc65aa6b6e7e42 SHA512 8c3d2c968cbf96b9ec63ff4696c20206ad7b347bdf057ec4d2a72234abb91f9bdb7d6b4dda8ab9f5349f07cd66f397573fd67ca15acf46889fab1b07421a96b2 WHIRLPOOL 16d6d8f0d665a330080dc9cfda879dc8705ca13ebf7874513f4fddbe0c67f48f376b10fff1616c7b3f69d07cd9bce6c123bff8ff1913e7df5bb1a96041d2c8a1
+MISC ChangeLog 2990 SHA256 50ae378e59d7aa8ee742376f2d303781970fe9fb82b8d8be12bf8399b74aef70 SHA512 06e62476623e63d574dad0d5566ff73aaaf3c67bb1aca04bf722c2653ed2e51f1980deae063f42638397f79fe8f21978f5b88e5d42d8ea45eb8b67d9025d982c WHIRLPOOL aea8f30324403ed5c8a0f5b390b383dbc0404c163a98f658f0f4977c56edbb87764151b6414b788d8e577938072c614cea27b29097797f1cc120996648bc362a
 MISC metadata.xml 468 SHA256 3071980a808b9bbd6e15ec792f7545ffba8c9c0f3b037ed5cb78c31c54e50f0b SHA512 5d8c8c29c93544753f98fd4ea77d50c2e1991b639d99114c938380ca560364e43179fa0bfea275abf5da556229e4b791c7fda650adeecdbb88713d1dde84f9e3 WHIRLPOOL 874df2951bfd97a48b25796ddec99246438e92c31c042bdd5fa7d92406e651e201b117db36fe390d1526b60df66342566fc67721637201352ef2bc3d2afa9691
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRVbsYAAoJEFpvPKfnPDWz/xEH+wcQ/vsVgAMHLe1dCRt8W7AP
+CpE5yvng7y+1tItYDNyeidyy0pFs4jKUbkjpMQ4Wix0l6EZ211hBrBCVo6NuRaJu
+rt47I/FdWAf/5BSjeIYkqExiPOLrFZkEDKplUzoxvUTQJHAWrUA/Hu30pvIvd9vs
+uOf93G+pcMmPgzbgGK1zFXRPYo1v7cJW+7vMSZKhmHwReYr/KYP9klwoJ4cTq7B1
+ASHA00XKtmE7Ea/ngw9L2GxBHuaMkpAt4SunLDWftRFfGnthplcNLRdJHANhNa2s
++AyXd25u8ePEURYh7n3CU4dh2JW9evDkXSaRCRNJNudfFIXv3JUxCtWB5b80jg0=
+=FnZg
+-----END PGP SIGNATURE-----
diff --git a/games-fps/darkplaces/darkplaces-20110628.ebuild b/games-fps/darkplaces/darkplaces-20110628.ebuild
index d8b01f3871e9..86ca2a32e23f 100644
--- a/games-fps/darkplaces/darkplaces-20110628.ebuild
+++ b/games-fps/darkplaces/darkplaces-20110628.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 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/darkplaces/darkplaces-20110628.ebuild,v 1.3 2012/06/21 19:34:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/darkplaces-20110628.ebuild,v 1.4 2013/03/29 16:02:26 hasufell Exp $
 
 EAPI=2
-inherit eutils flag-o-matic games
+inherit unpacker eutils flag-o-matic games
 
 # Latest versions are in http://icculus.org/twilight/darkplaces/files/
 MY_PV=${PV/_beta/beta}
@@ -69,7 +69,7 @@ opengl_client() { use opengl || ( ! use dedicated && ! use sdl ) }
 src_unpack() {
 	if use lights ; then
 		unpack "${MY_LIGHTS}"
-		unzip -qo "${DISTDIR}"/id1.pk3 || die "unzip id1.pk3 failed"
+		unpack_zip "${DISTDIR}"/id1.pk3
 		mv *.lit maps/ || die
 		mv ReadMe.txt rtlights.txt
 	fi
diff --git a/games-fps/darkplaces/darkplaces-20121222.ebuild b/games-fps/darkplaces/darkplaces-20121222.ebuild
index bb1c43848f94..ae87d3ee44e8 100644
--- a/games-fps/darkplaces/darkplaces-20121222.ebuild
+++ b/games-fps/darkplaces/darkplaces-20121222.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/darkplaces-20121222.ebuild,v 1.2 2013/01/22 18:39:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/darkplaces-20121222.ebuild,v 1.3 2013/03/29 16:02:26 hasufell Exp $
 
 EAPI=2
-inherit eutils flag-o-matic games
+inherit unpacker eutils flag-o-matic games
 
 # Latest versions are in http://icculus.org/twilight/darkplaces/files/
 MY_PV=${PV/_beta/beta}
@@ -69,7 +69,7 @@ opengl_client() { use opengl || ( ! use dedicated && ! use sdl ) }
 src_unpack() {
 	if use lights ; then
 		unpack "${MY_LIGHTS}"
-		unzip -qo "${DISTDIR}"/id1.pk3 || die
+		unpack_zip "${DISTDIR}"/id1.pk3
 		mv *.lit maps/ || die
 		mv ReadMe.txt rtlights.txt
 	fi
diff --git a/games-fps/duke3d/ChangeLog b/games-fps/duke3d/ChangeLog
index e7e98bd2dc30..e0ae6be735ec 100644
--- a/games-fps/duke3d/ChangeLog
+++ b/games-fps/duke3d/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/duke3d
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/ChangeLog,v 1.36 2010/10/08 12:55:49 tupone Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/ChangeLog,v 1.37 2013/03/29 16:06:54 hasufell Exp $
+
+  29 Mar 2013; Julian Ospald <hasufell@gentoo.org> duke3d-20040817-r2.ebuild:
+  use unpack_zip from unpacker.eclass instead of unzip
 
   08 Oct 2010; Tupone Alfredo <tupone@gentoo.org> duke3d-20040817-r2.ebuild,
   +files/duke3d-20040817-ldflags.patch:
diff --git a/games-fps/duke3d/Manifest b/games-fps/duke3d/Manifest
index efa49adfa10d..8be766e8749b 100644
--- a/games-fps/duke3d/Manifest
+++ b/games-fps/duke3d/Manifest
@@ -1,16 +1,30 @@
-AUX 20040817-credits.patch 1267 RMD160 bef48612e6e7176e1f7a252bfd837f177814e80b SHA1 2ec3f180611c45c7fe29ab2ccaa2d35822dc1ef3 SHA256 ea4d7540790ea937d97d5e87abdfa893e58b699fcb16abb30e84529edce061a9
-AUX 20040817-duke3d-makefile-opts.patch 863 RMD160 49c36fb8f5907f9ac01fd2d9e4a5c192b7ba5fdf SHA1 a726263c6645c228da4fc9cc844a221fa3614ff6 SHA256 afcc1bfc4e3977dbe02b1f390d184b00d8773b1690dce10f4728c535b9c69d56
-AUX 20040817-endian.patch 772 RMD160 b5657806a89846a9280b7ece2aa95b7816249e8b SHA1 c88d5e0e4efb7bdaf507f8f80f116fab1d74c91f SHA256 e0bd07c16123593627e888c102a84af033e906ace3aa3a1559828d83626ec16e
-AUX 20040817-gcc34.patch 1886 RMD160 971968bf75c8151269ee3ca6a326ca780e2470ad SHA1 9cf88162fb707103465e804325fa98bf14676d67 SHA256 f6f8271c95d898317b17eb22986a90294db4297482b011b01bf659c22686a3d8
-AUX 20040817-gcc4.patch 2169 RMD160 641c45992c2c26447543b9c2175673e9588b71ef SHA1 b892403cb36694e8d6de939194f629a33a8ff79a SHA256 aef2b2b12a04a69ed075df55aae1f8a40d9c4fb9c5abd62f66119da3357c540a
-AUX duke3d-20040817-as-needed.patch 2774 RMD160 b7fe077a233738274782757835bf9b00889ee443 SHA1 03066764748d63d8b791154e86d9d712af3cf1d4 SHA256 b9e9e5040c845974a633987d8248bde62d9c04579d0b3e8e6eab18b8027b6701
-AUX duke3d-20040817-gcc4.patch 10474 RMD160 a83132ef666d8a78da848ccbb40f16e1250750f6 SHA1 79f26bf9ff0718cca1f9428b93a8808027e214b3 SHA256 010ceb7ff130da74d0f6349a9d12ddc206940d8545499cccb319220ba7d9d585
-AUX duke3d-20040817-ldflags.patch 2132 RMD160 1a5ba1669c40889a701cd80c94426ada56246699 SHA1 a058f16c3df876be0428133729b23f34b94edacb SHA256 4044e2877f5b5c81c41cd8e868c5a9e3895f3e32ee2e03b55a2c2b1c3ca69555
-AUX duke3d-20040817-noinline.patch 545 RMD160 976f22ebca57d6392b140915244b01d29559a8cf SHA1 9720bdf7e070ca8baa3bb0d595221a9598f1229e SHA256 9d0783517eefc0a1d28189260e91af8318ab1d0395f336ab5f5c72e86504e0fa
-AUX duke3d.cfg 4314 RMD160 8ba6360d6bc24ae353a8c3ad0b973c47d379ea21 SHA1 a6ac127c82aa845ce2afa3657088bd0084335ed8 SHA256 0ad9477e6185f0d812d726943beacdc7f7581f66c86640f44ee8e5621fe40556
-AUX network.cfg 398 RMD160 4452e8b8a99f0e08b192f2418ff8324c4bce8a7e SHA1 e9e81a204fd5b470dbd48130cde8e7270ec64eed SHA256 fe5806712207d39812906034b76191effc96d7c6efa9c8bd9081e18fab76d7b5
-DIST 3dduke13.zip 5924374 RMD160 b2788f0ef7e8e88bcd1c4e56d22cd741109ea59a SHA1 72b832734d72c829cecaffd8d8ae0eb38995aeb3 SHA256 c67efd179022bc6d9bde54f404c707cbcbdc15423c20be72e277bc2bdddf3d0e
-DIST duke3d-20040817.tar.bz2 1509273 RMD160 d6d4896c6357e21543d68e322f18e8c0c00224d4 SHA1 795b4616c6840023d2f790de3aff2342ef40fa25 SHA256 c0dd72030f9c5b84aea3e4989831311c94ef21641d6a1fdb0f557d04076f641f
-EBUILD duke3d-20040817-r2.ebuild 3462 RMD160 6a33995e7086c5573a57d79ecbe7e2b7f6ce07d6 SHA1 1289b4d489c1f84f0a39eeae9312d795414ee4d4 SHA256 fb9ec6cc17a5c7d53406d3bf166c8a7fb95bcf4e6f3c3d407266091748e33a41
-MISC ChangeLog 5576 RMD160 7959191523aa08ade7aae0b7244b0c5801ddd0d3 SHA1 16aeef26f340ff57ceaab060daafedd616e8d6a1 SHA256 86a4fa0c859aa7aa8165df3790183bd43f6a3203153154aba1817e3a6666191f
-MISC metadata.xml 2752 RMD160 2df49f93014e1986a8c0875b964576c9e4d9d759 SHA1 8dcc3a18482b31a9ff7d811f5f57809129d2d640 SHA256 5a6d0e402c900b36b4f50a77425c0bb5b078ed3bf8dd1f140551def87dcf2f77
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 20040817-credits.patch 1267 SHA256 ea4d7540790ea937d97d5e87abdfa893e58b699fcb16abb30e84529edce061a9 SHA512 a337f40df1bc300110b507f7fd8cb090cef8c3e49d40379c6899a4a0520b80c26c85fca677cfa2a041a3afad84250480bb4611cb59ea0b5072f8074afaa84e3c WHIRLPOOL e6ec21c755818258834e50cbca815854295b5a9c49bd47fc1c9e2a7980cdcd36894824cf4dbda3dd0fd780d68d208c056355c9f7273e604afb690dbea9c72009
+AUX 20040817-duke3d-makefile-opts.patch 863 SHA256 afcc1bfc4e3977dbe02b1f390d184b00d8773b1690dce10f4728c535b9c69d56 SHA512 6475219290d41cc9b9974c47269237099d08d695f940ecc6bc3c21504a85635a3b934f0755e20b13fb6e3c9444e5dccafbe70474ec5d27fabfdb3ae35ec5d75b WHIRLPOOL 3c11bbb05801ae8ffbf2dff959e0b8e2a42a91bd1a1c3bdcd6d98e7a89a1c8c0aa2063b2b62b18266ebde84694fd0ac674e36b9008d315181187d43b128b2622
+AUX 20040817-endian.patch 772 SHA256 e0bd07c16123593627e888c102a84af033e906ace3aa3a1559828d83626ec16e SHA512 4f052ab4328c2d421487479c1cd3a81e108381ad1b7c63a2d8a6366826f72ce631b455558d410fd129fa3584d2a623a8329bc83719726ccc76e7e513f4d16c68 WHIRLPOOL c8cb31e1920c533d615b8ca39db77eb73b83f5da7547f85115d344df686a336381645dcf196090e49dc7118e1c93c3f3c8d6b2e71b72995511cdcccb45f41943
+AUX 20040817-gcc34.patch 1886 SHA256 f6f8271c95d898317b17eb22986a90294db4297482b011b01bf659c22686a3d8 SHA512 96e6ccffaa0334b1acfeb6542cf729eab22be5ea04c8985f5133c3a73d3ba26a568de7de00ff9bfbdc822edfb1b1438740f742d92b5fb3da62887e2aaf3f1076 WHIRLPOOL 5fb4b33c3ea62e92e0e2df1d447c193a5a441b414720dc87d801e023efa5b7b651429c9704c804b2fa146f62029ae918bb970e2a348eaa84fe55b7d81e34ef90
+AUX 20040817-gcc4.patch 2169 SHA256 aef2b2b12a04a69ed075df55aae1f8a40d9c4fb9c5abd62f66119da3357c540a SHA512 722a79f4deff07687e31393b81236827d3e167b8f2bb656069149d1d571fc1a03d7167926aa459d5e3e4a7b195a66104ae5a279999de50cf29b5e8140fd12884 WHIRLPOOL c595aa00b867d86e7f7bac25486c95e68dfdf1b04e84273b4ecdb03eb2a9300515131a0cae4f7b7a6e81eb7901fc248540d2da3293c3cd7652e8ddc12f548370
+AUX duke3d-20040817-as-needed.patch 2774 SHA256 b9e9e5040c845974a633987d8248bde62d9c04579d0b3e8e6eab18b8027b6701 SHA512 b2ae1da82658f0602b0270fd9095f5c848faf974170a3a9b761dae8160b60c7874a4587f10a70e657c9d1f1c5dc782cc4ce71a8d6bec84f2a7bc11cdbb91c327 WHIRLPOOL 0ddedf88ecf9b58c9618227c5a78f057b76c4a6c383e8bd01559636c36a37893f009988ab2926d0dd840303167bd4f94287e36f94dd7a34cb4e006d5775e1619
+AUX duke3d-20040817-gcc4.patch 10474 SHA256 010ceb7ff130da74d0f6349a9d12ddc206940d8545499cccb319220ba7d9d585 SHA512 9b368725ae518c01ea449568e700f1e515098608daae0055a66012a6ee4cb1583dd5a252e9782de6db6520820517dc126ae8b51280261f42b14b38ff0e0db4f3 WHIRLPOOL 81331cde93333b7867c08913cacf650b950e75fa61c88a906d679b6918fbaa77b513f3526dd3ec947db75ca7180d59eec60415cdd3d6c87697baae7760cc4734
+AUX duke3d-20040817-ldflags.patch 2132 SHA256 4044e2877f5b5c81c41cd8e868c5a9e3895f3e32ee2e03b55a2c2b1c3ca69555 SHA512 afdcbc422b98c3c07bc4aea54865f2c7a167838eaa2270109e0066fb2e1db069bf5034bb78c0dd428baa0372465be4614125243a33aedfba19938b8e8f905b27 WHIRLPOOL c616a84b2cce027fa4f4ef0ebcbac94b64ca44fe7d4fdb3cd1eb05b249138b07b945ba1f5ef92eb4d3b6599acb23ca2d4da06488257e15965dd5725ec120f822
+AUX duke3d-20040817-noinline.patch 545 SHA256 9d0783517eefc0a1d28189260e91af8318ab1d0395f336ab5f5c72e86504e0fa SHA512 aad5543419c762083a908b3905c22efa102cc6d9724a7fb5ee5eab96fd490c1afce632395a53049ec1b6d2123aed1c2440e583994773916eb1268bc75471ea79 WHIRLPOOL 12d45e4de548b9c97e4d19d5b41ee6c1624fb0a2610c517a34300c9ca1aed65def477c8ec6f32afec5c3f4f1f02eb2816506490c013b78c2664db31b183dc45d
+AUX duke3d.cfg 4314 SHA256 0ad9477e6185f0d812d726943beacdc7f7581f66c86640f44ee8e5621fe40556 SHA512 5b4d020d6ea9b5bfdc4333c2a0b90667577662ed32a826263560e74bd436372d689d179290a87c86d921c4accbaa75da013a3426d98f49cc7ffb6a1be5fb25a7 WHIRLPOOL e10f70b04d3e82c1a687104082076e41057322dc7eaaf885cfcc81bbdd56c9ab51efc17559f115b5f0453b390aa3ea183dd007feeec241ad1f9568ef3d70f22c
+AUX network.cfg 398 SHA256 fe5806712207d39812906034b76191effc96d7c6efa9c8bd9081e18fab76d7b5 SHA512 89a5261453c5ad14caed7e768ef6a337f601afd2e02809987708cfad9f356847a3249ab7b1fb6f0e084874100afc1494d62e4d898f4433c1f4f763a1e822f26b WHIRLPOOL aad04fdd9e18f7f93a06a377b034ac07ea3df04a8269e50cd99e74fdefab4c24e6a866d4c77e8946903e90d2bd10edb8c868e135cd80e9c73e317667298a8703
+DIST 3dduke13.zip 5924374 SHA256 c67efd179022bc6d9bde54f404c707cbcbdc15423c20be72e277bc2bdddf3d0e SHA512 eb92daa88b4e7cfeebe1fb3d2c021e0a4a66262d0d6e76b5e27fe3cedd382e381d23b392a6d9adb42a418b9318e011c2d8adfbdc77d7c5371e61d8c091c7eb65 WHIRLPOOL 9f3b9620d042a0209c707e83822fa1acff370504c76a558a6c36452b7f7c701e8289f8b389146cdd6899f47783c318a81792a7702f68d1ca62b31fc2c6844921
+DIST duke3d-20040817.tar.bz2 1509273 SHA256 c0dd72030f9c5b84aea3e4989831311c94ef21641d6a1fdb0f557d04076f641f SHA512 a08aa07153458501fb01878769af9797460525015b34d743250e3f04f15ee2dcfbb4110c94c83912ba2435e6d6c48127e2d36c0dc29833e0f6f95e3b925b571c WHIRLPOOL b0e27cae348601980e18f95a6507bc3080a51fe4f70919127eefd9cc90185dcd4cb287e970c2fa1ecc4a6b04422804748a071006e1b4551cde73e4cd18abe40a
+EBUILD duke3d-20040817-r2.ebuild 3448 SHA256 b9d6c18b4f3f3d59af96172359048229d442243457477b061c6fd238d5adabc2 SHA512 572032b02551e7e97d502c238c7c704b66ebc5eb96d988c7f2bc9f7e91e83546a87a4acc1077d07b35e99f69b5fb706bfda63edcda83b288f9f55c85286f7ec5 WHIRLPOOL 8c37499e67c4d3f9cf94a0707a1623de4962700c98313dc26e2beec5659d0d6517f56f691f153e009457dd37dffeb86be5ae6d49944a868f5693455b14fe8e32
+MISC ChangeLog 5712 SHA256 f53c0e8a0e7789c9926d9986e623201e9ed2c2c5afffe06da34793bb27b142a9 SHA512 d838da28c8e6f3563f80c1b64d824be80b025c0cf4975d125dacb87225e768e48cd35a2ec1e5d6fc2d4699ea4fc8cf176a91f6bf132a91d32e40a45b376cd637 WHIRLPOOL fe9c96d67f037ed9b1efc3f368ccf6189308218b777a1d2b330a52274f661700906378ef3bf3baaddaa10e77b44bd97774672ef2f654eb4803a931cd7ba4d8a6
+MISC metadata.xml 2752 SHA256 5a6d0e402c900b36b4f50a77425c0bb5b078ed3bf8dd1f140551def87dcf2f77 SHA512 f19498e674c58438222caff17b5e077e993b069f54685066da7f57bf8b7f2b97268f62c2c2be0177f7af4c8d2abaacbb11305a74273afb2f34d9922731b3ab94 WHIRLPOOL a77e20153c950b1f0448702c3ab8f0a5b38a7443714696071d001a92489311461f24cd3c8eba00ac5da783f83fb2981feb855f19f364a163af715421b71611a4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRVbwgAAoJEFpvPKfnPDWzYfIH/1AH+6UaN+OXhj8qoiytDlbe
+Mq+ZmeJRT2oGIuzxX0dK11D7Xu1COy6p16zA7JhVy+skP0/P+SEIsDNsDSMbtMxp
+dNnl8BMKY8SMcQaUMuL3vLgVs3HPBW8pGGh26VcIuRjEgU6dkyrMt0Kxa3BTYwmF
+g+fg7sTZ2O1G4bZRwYNOCN6Q0jh/s85RwCUlq4k1of9AF/xukCBiKitEWieuNy1M
+gliWp333yLDDU0ZRfP2MaaAU4AwvY8EEJ3BZIQc+VBErsv1m4UJNSYQk2a5T/4hz
+7vi8YqyVdIufUxImOXJcmjhlsk04p2wZF+qXc2m+XJTXV6lX5+0UjY8QbQ37cAo=
+=IvGy
+-----END PGP SIGNATURE-----
diff --git a/games-fps/duke3d/duke3d-20040817-r2.ebuild b/games-fps/duke3d/duke3d-20040817-r2.ebuild
index 998b411dd2a7..f99d7aff3256 100644
--- a/games-fps/duke3d/duke3d-20040817-r2.ebuild
+++ b/games-fps/duke3d/duke3d-20040817-r2.ebuild
@@ -1,6 +1,6 @@
-# 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-fps/duke3d/duke3d-20040817-r2.ebuild,v 1.11 2010/10/08 12:55:49 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/duke3d-20040817-r2.ebuild,v 1.12 2013/03/29 16:06:54 hasufell Exp $
 
 EAPI=2
 fromcvs=0
@@ -8,9 +8,9 @@ ECVS_MODULE="duke3d"
 if [[ ${fromcvs} -eq 1 ]] ; then
 	ECVS_PASS="anonymous"
 	ECVS_SERVER="icculus.org:/cvs/cvsroot"
-	inherit cvs eutils flag-o-matic games
+	inherit unpacker cvs eutils flag-o-matic games
 else
-	inherit eutils flag-o-matic games
+	inherit unpacker eutils flag-o-matic games
 fi
 
 DEMO="3dduke13.zip"
@@ -53,7 +53,7 @@ src_unpack() {
 	fi
 
 	if use demo ; then
-		unzip -qo DN3DSW13.SHR || die "unzip DN3DSW13.SHR failed"
+		unpack_zip DN3DSW13.SHR
 	fi
 }
 
diff --git a/games-fps/etqw-demo/ChangeLog b/games-fps/etqw-demo/ChangeLog
index 13d28c893bf1..9effea6d6666 100644
--- a/games-fps/etqw-demo/ChangeLog
+++ b/games-fps/etqw-demo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/etqw-demo
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/etqw-demo/ChangeLog,v 1.6 2013/01/26 21:03:38 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/etqw-demo/ChangeLog,v 1.7 2013/03/29 16:08:35 hasufell Exp $
+
+  29 Mar 2013; Julian Ospald <hasufell@gentoo.org> etqw-demo-2.0_p1.ebuild:
+  use unpack_zip from unpacker.eclass instead of unzip
 
   26 Jan 2013; Tupone Alfredo <tupone@gentoo.org> etqw-demo-2.0_p1.ebuild:
   Use QA_PREBUILT Bug #432088 by Diego Elio Pettenò
@@ -26,4 +29,3 @@
   +etqw-demo-1.1_p5.ebuild:
   Initial import. Original ebuild by Paul Bredbury <brebs@sent.com> and
   modified by me. Closing bug #195999.
-
diff --git a/games-fps/etqw-demo/Manifest b/games-fps/etqw-demo/Manifest
index c5bc62fbf810..07096a33cf83 100644
--- a/games-fps/etqw-demo/Manifest
+++ b/games-fps/etqw-demo/Manifest
@@ -2,13 +2,17 @@
 Hash: SHA256
 
 DIST ETQW-demo2-client-full.r1.x86.run 691248874 SHA256 dcee7afb734b259808fc7fe079afc57efa7ac23cb4c471d4897f35f3e6ca3c31 SHA512 41332208626449da74bea71a9926258f50986f0af85045d470d4405d27e497085ba318337181802be58eb50c724ab91df6b9c810e5fcc5f8dc131486d6529f38 WHIRLPOOL e564c01afaf249ed740d29a22a55733416b08253790eebbf2b25049994d6139397272ba280971ecad042ae094d9e21d4c7bc974314212cf1ce238656df3765e7
-EBUILD etqw-demo-2.0_p1.ebuild 1636 SHA256 ccec1c8a4b01242ce2ff53cddf92fb76785c0b1b2488039ba473f8d86b983b75 SHA512 86f1ac5e75a7bca8afc7cede96e63e5f0250b4b78da909ef7a1ce7846a09fb28b3e5c087879524e4b5d297c0351568779c1d42fde29b69add9e35b0870d00ace WHIRLPOOL 4a70a57aacf0b0fd880f5bf4520c6ad95f06f124fcff7235f9634a7c73848d3c4d0393c9f164872ae3d283b02e64740554d2ff4ed7cd4539b76471e81ffdae1a
-MISC ChangeLog 1141 SHA256 f02c0c86a12644397a8ba8f50d784bac4fb1cede97784b4c6996223499082a34 SHA512 3f1d920b18cfe0ea5639610c946064aa5abc9b18cd9083472a5aa2284949222ba387bd8a3458bc4c1cb0ec56613f41eb600e820193aa3283ded0a1b8458d7884 WHIRLPOOL 47c0febadef399c16dff7f6f2a9539713c6fcc8ab84ff2ebf6d0e6d80bfe3dc65eb5507beb3012fb2e43ea5fed72f453f08a17a21b8e9476823b431d14263b94
+EBUILD etqw-demo-2.0_p1.ebuild 1533 SHA256 b78d1218b4595410d8f9c6afb404e143f4644a55a58b565c8482398798f4565f SHA512 273ca681e64fadfd6be10b266bd7ec50a0272bc549e2087012969ab1e57974089d674e0da9297393d8bac09dd3b1f999932c048ff04ef7f0b11bb10f68260994 WHIRLPOOL c93d519fc4145aba94cd0739e0df79f8af4714492743bc6cf4a9a6e8768718f51a11fed23b6dc4923ff62b4382b0866f846a2048cf2d0c87c2d7464bfddb3d25
+MISC ChangeLog 1274 SHA256 05e4b1b0bdc7a2b506061afddf90c49f111dbae11535b4759920abfc9ced5a9d SHA512 f4fb911415b30ba35accaa1bc6989109a40fe6b9cae897cd7bc7f42282b69656d1bfa6e3bef6dc0fa8e8d4f06626575b38d94255841acd60358fa3680c3fa680 WHIRLPOOL 62a32fb361dbd51b71f38ac373280db9c0593969e96f80ab2e31db2b943736b8cdf49666fed4080ce60520b45fd3edf17b1d1038c2827eca4ebb491be628bcb2
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEERLAACgkQIY77eQFFFC1AWACg5JCbUlxVn0iELaO7UojZYhKU
-SJ0AnA7AZp58YLzP6Z05aFS4+CF5HIG7
-=gLSI
+iQEcBAEBCAAGBQJRVbyEAAoJEFpvPKfnPDWzr6YIAJvFmfJaoVPXwBznKzwW2p/Z
++khfmOzXmDlWosaJpmAPIW7oR7MNRIbrzU162iJk/nUZigGRe6EOnRm4RM0Ps7jI
+5qkSqUoxbKOAL9IBJMGTnzoM/V7ijjwoAjUCEsZ4cR5JqTW/zngLusMyjCecp57W
+4QU3bi7Z2XuS7fFk4QgM0GKjQqfOQj26aoOlTyHm5C58UPJpzbBnGMP8hBmVxxEk
+OFzHpQbZrvH7fI8mBaO6R551zXEydjtbn6lbgt3OHih5Jq3TapEhvLAjBjBQ7llX
+yzr9QHSzHVnxvFEFBfHMAh693MeZc+rHdvIo1AIIIzgMMYDB8BtbArXEwoDh37c=
+=Tfer
 -----END PGP SIGNATURE-----
diff --git a/games-fps/etqw-demo/etqw-demo-2.0_p1.ebuild b/games-fps/etqw-demo/etqw-demo-2.0_p1.ebuild
index 7c2abd400e12..401b6ed1a979 100644
--- a/games-fps/etqw-demo/etqw-demo-2.0_p1.ebuild
+++ b/games-fps/etqw-demo/etqw-demo-2.0_p1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/etqw-demo/etqw-demo-2.0_p1.ebuild,v 1.4 2013/01/26 21:03:38 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/etqw-demo/etqw-demo-2.0_p1.ebuild,v 1.5 2013/03/29 16:08:35 hasufell Exp $
 
-inherit eutils versionator games
+inherit unpacker eutils versionator games
 
 MY_MAJOR=$(get_major_version)
 MY_REV=$(get_version_component_range 3)
@@ -37,10 +37,8 @@ QA_PREBUILT="${dir:1}/guis/libmojosetupgui_ncurses.so
 	${dir:1}/data/pb/*.so"
 
 src_unpack() {
-	einfo "Ignore 'extra bytes' message from unzip"
-	unzip -q "${DISTDIR}/${A}"
 	# exit status of 1 should just be warnings, not corrupt archive
-	[[ $? -eq 0 || $? -eq 1 ]] || die "unpacking failed"
+	unpack_zip ${A}
 }
 
 src_install() {
diff --git a/games-fps/quake2-data/ChangeLog b/games-fps/quake2-data/ChangeLog
index 5ab8730a3f8e..17b65cac76c6 100644
--- a/games-fps/quake2-data/ChangeLog
+++ b/games-fps/quake2-data/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/quake2-data
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-data/ChangeLog,v 1.16 2012/01/16 19:20:15 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-data/ChangeLog,v 1.17 2013/03/29 16:10:32 hasufell Exp $
+
+  29 Mar 2013; Julian Ospald <hasufell@gentoo.org> quake2-data-3.20.ebuild:
+  use unpack_zip from unpacker.eclass instead of unzip
 
   16 Jan 2012; Ulrich Müller <ulm@gentoo.org> quake2-data-3.20.ebuild:
   Migrate to cdrom.eclass, bug 398809.
diff --git a/games-fps/quake2-data/Manifest b/games-fps/quake2-data/Manifest
index 99473dcc31e7..15296c4958da 100644
--- a/games-fps/quake2-data/Manifest
+++ b/games-fps/quake2-data/Manifest
@@ -1,24 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST q2-3.20-x86-full-ctf.exe 19267584 RMD160 13078f79c57190c0ef601508a0a0bb74cafe0bae SHA1 92f44abf5f7bfad831423bc06985b6129b918c0b SHA256 f82197c8c8089202a4b3a85d8833b0c2e827a709d205c760369407c212488baa
-EBUILD quake2-data-3.20.ebuild 2865 RMD160 0f2191de0d9a8b878a41ea07ebe3fbbcafcaf087 SHA1 448a410c613bc104c592a90acca3c9a436d4338b SHA256 dcb408c716d083542c32cb36cf81ac4fe1c770ef1524f182676d9aa442127579
-MISC ChangeLog 2231 RMD160 46c034b6c2d67f7ec7033a595f4bcd464687afbd SHA1 413dfd6c60a6dec4927cd3063677eb8d98cb63ba SHA256 ded335b470c8e78afe2868bf0e8859bb10ffd7b6aa71be98358f6417378d6b19
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+DIST q2-3.20-x86-full-ctf.exe 19267584 SHA256 f82197c8c8089202a4b3a85d8833b0c2e827a709d205c760369407c212488baa
+EBUILD quake2-data-3.20.ebuild 2799 SHA256 470bac4e5f82d7835ac6a7fe7ced4ad8398708e404437703b42ea9a133e2bae9 SHA512 54e1480c88c6501be1145c1bbbdadcc706680a9491ed32adf91df8377184f6a62466304734575290819d48672b9b76f4e7d27ea2fd888487ca8bbc9b5d0bcadb WHIRLPOOL fba8cb3d27b092cf6853e0bc1a38984ce914b305e949ce5dd66d422c5cc0d98621bca31a9b28e1426744cbf354a72d2e0ca4f45f37f9cc18451959de9058c81f
+MISC ChangeLog 2368 SHA256 4fd17bd7b4382788d25f3df5629c21d21cbe08d988a3c2c634ae21709cb171e0 SHA512 0ce8c3839799bd188f09188002354040ea4027b8cf2da1fb558f5b0278b0f24bf9dc30b2e52e5ab55f913d65adb0c155130b0366d7a902c659a00595059b4bbb WHIRLPOOL 8752138417fdf11e9dcd27ad0e8ceadeeae25dd577d36184780fef6f190a968ed665fc22b8dcf845a4ce928282e1ec99f326661416ad0734352e023854ff6baf
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPFHiFAAoJEDxpGckxwJCBIOYQAJ3tw42LBjvypTCkgadYwYeg
-D0mbuAdfpz6zNW5ihu7znyLQZu7XXB47jb6Teffbv63f0+BodzOvb1vTBJ0kO2DX
-9/B8+Fu1nI0gvotssVp+xHk4hRjeoRRVVXN/vtMwi92M7DnvHUywTlazvUG0+K9P
-kIp3zssIISt2R+AltkBk5tiDbJ8xd/9JXMbpHr+0S9T/N/Br6kUmFkijJh5YVlhF
-m66S2K6alagkGLidm7ySTli9GdQ9y3G4K9bgVRTpDB93pV8JM4ZbEJCiCrH3ArtY
-CJZ5ZSnL5TEg24CywL5HxHkG1/NkkK1QErhFA8vhhfGQce3X9jQdMzi939UevSt+
-f0TDO/nx8mJQdnh+E5I5ECgHHHdQHIiub0/N7r7Biz6OEOxf0qk3lmK6gfvY7bA9
-uPyiuWjnEPPDqT8fNjY3Fw/J4dDBkyRrmzgf3Yom/ge0eZVm4BIQW0Z1kNG1j2UF
-O1qAMJxGyyHvAweKvz9rU8Jl7JBp77y41q/1/42MXIIraVU9NMQZATQ2+7A+mi3R
-VdBXLiUsvK+KorUaE+EkYwnljAKBxjdTBq5lIgsdk+qjtktFiXUDU+minpNykAdW
-sHOstjWel92c2gFpkt5Qd1MGIlAmMytSXttnFexRMRVT3XvDEGriS444h8lqQkbb
-sAyq0KLO1b1/PzGJGRaN
-=dXYf
+iQEcBAEBCAAGBQJRVbz5AAoJEFpvPKfnPDWz8QgH/2mFSBazLUUm42hO5QCqaeQ/
+wbBjP6V6yH+vXmiv/OuAeNlclOlIbzIErU5vCo1NhQY6oU1HLHeRsejo+sDiJIZZ
+EtqpotqHca8GZjk0RRH/F09U3kM3pbN+QightwVEGQeWeJVtyBgfI6T3qhRFiwY4
+mW7qX3qUmOG5rV77C1Vgsmz6mfsFU/00+of4nyljW22ks6n7rBvuyMzMbaKWXlQv
+wzvznwL0nA+tqrVPCHWznYqxCUSPNLrZ573L26TtohSQoFTTGUlmdN7DeUZXzrC5
+uz0Bf6YpyNGQssk1qXFR9uJDYapofCtcoocVFdzTcIzScIYRIbf+xAzn+haz0CE=
+=bZ1K
 -----END PGP SIGNATURE-----
diff --git a/games-fps/quake2-data/quake2-data-3.20.ebuild b/games-fps/quake2-data/quake2-data-3.20.ebuild
index ccb193e0678e..d922c4ad5c09 100644
--- a/games-fps/quake2-data/quake2-data-3.20.ebuild
+++ b/games-fps/quake2-data/quake2-data-3.20.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 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/quake2-data/quake2-data-3.20.ebuild,v 1.26 2012/01/16 19:20:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-data/quake2-data-3.20.ebuild,v 1.27 2013/03/29 16:10:32 hasufell Exp $
 
 EAPI=2
-inherit eutils cdrom games
+inherit unpacker eutils cdrom games
 
 DESCRIPTION="iD Software's Quake 2 ... the data files"
 HOMEPAGE="http://www.idsoftware.com/"
@@ -31,8 +31,7 @@ src_unpack() {
 	export CDROM_NAME_SET=("Existing Install" "Ultimate Quake Edition" "Quake2 CD" "Quake4 Bonus DVD")
 	cdrom_get_cds baseq2:Install/patch:Install:Movies
 	# The .exe is just a self-extracting .zip
-	echo ">>> Unpacking ${A} to ${PWD}"
-	unzip -qo "${DISTDIR}/${A}" || die "Failed to unpack ${A}"
+	unpack_zip ${A}
 }
 
 src_install() {
diff --git a/games-fps/quake2-demodata/ChangeLog b/games-fps/quake2-demodata/ChangeLog
index 689ad34ed5db..0305463e4ff3 100644
--- a/games-fps/quake2-demodata/ChangeLog
+++ b/games-fps/quake2-demodata/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/quake2-demodata
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-demodata/ChangeLog,v 1.6 2009/11/19 18:36:12 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-demodata/ChangeLog,v 1.7 2013/03/29 16:13:55 hasufell Exp $
+
+  29 Mar 2013; Julian Ospald <hasufell@gentoo.org> quake2-demodata-3.14.ebuild:
+  use unpack_zip from unpacker.eclass instead of unzip
 
   19 Nov 2009; Raúl Porcel <armin76@gentoo.org>
   quake2-demodata-3.14.ebuild:
@@ -28,4 +31,3 @@
   +quake2-demodata-3.14.ebuild:
   Initial import. Ebuild by Paul Bredbury <brebs@sent.com>. Closing bug
   #137519.
-
diff --git a/games-fps/quake2-demodata/Manifest b/games-fps/quake2-demodata/Manifest
index a32dda0fc0a8..2f80778e6524 100644
--- a/games-fps/quake2-demodata/Manifest
+++ b/games-fps/quake2-demodata/Manifest
@@ -1,4 +1,18 @@
-DIST q2-314-demo-x86.exe 39015499 RMD160 5a4237cb4288882a713d79abea07d91f10a3d0ac SHA1 5b4dedc59ceee306956a3e48a8bdf6dd33bc91ed SHA256 7ace5a43983f10d6bdc9d9b6e17a1032ba6223118d389bd170df89b945a04a1e
-EBUILD quake2-demodata-3.14.ebuild 2041 RMD160 de434e49ad92f9625074e3eca635161912ebd69b SHA1 7e365f8f0dfc835c7cc4f0ef17c2b1e285b611b2 SHA256 386c9699721720fa08c7732a08333a71577083aa4ef0d8fec920b932c717583b
-MISC ChangeLog 1059 RMD160 0600486690cc0b1d0bacfb27bd18d1d4bfab5159 SHA1 0d49fdccfdcefc9b562ec956b17c160d8196f794 SHA256 d7c4ccb412af277d84246104b79be98b9274a53f298d15b9e43063a44002f027
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST q2-314-demo-x86.exe 39015499 SHA256 7ace5a43983f10d6bdc9d9b6e17a1032ba6223118d389bd170df89b945a04a1e SHA512 9aa5123807a64a6e3e3b113b582efd353f176f093fd0aae6bd01d9cff397374c06948a7147f59748b3aa6f4251769e409fae838157edb66429c9d41381b3df86 WHIRLPOOL 8924090d8fa357dd0a4b5634336976baf3b4afaf59c12a5bb50298b328b974c697dfd11c56d4034afb36d4c16b151b361271252e029111ee10943630b758d522
+EBUILD quake2-demodata-3.14.ebuild 2014 SHA256 c441cf935271b658a0d7673c2995f60e7217036e9d2e8389f0e6444196ff6240 SHA512 8802bbfea374e5cb348a58e6fb1c0ae2123d8d9d171e2d5d8776c4e2bdb064af496adf8a5bc37a6d17df49b241bb20cd30886a2fa07e8f6c2a5227995930df28 WHIRLPOOL 4922ca473e63ef347d015a2b81f9aa9549782bd8ada2e078468d3a2041f65f1016ea2aadc2ebd1c3315ffe60197850bc25a0d85e5d033c0883f7fae49d6c315a
+MISC ChangeLog 1195 SHA256 18da87ac37534e1c7de04213b210a4ec1d89a17a626182f694bce6b4f3b28930 SHA512 1be65c00020e74bd2afff8e6b9806f13c6770a54f0586b5173e843cbf04a983c1944ef45a8c2f8b758c7bbf1088bbaba3ecec523a84a5cb1a9f64048e600bd54 WHIRLPOOL fbb267720366c2a39bf3db360247cbb46e0897cf168c2ae35eb389dcfea5ba70e94524778cc56a0b6cf54aef812a95ecadd0d7450faeca3ca966eef9650b0d0d
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRVb3EAAoJEFpvPKfnPDWzbikH/3w3OpvTZJf2TnBj2Vc6Akf2
+qcoWYoPtj1Lr0xzpOZ/eIZP4N75ylImW8uwCF+j6NY9o0kJuH9VGbNDwXaBx+fKA
+F14mtmZMyy6efYB2U3wZ8b8kVZOZrzxF4fOBFs8i/XwxcaccoL51ObTPXVdbHdqs
+yo9RVKdmydCrM8+g60IubB4pt6RtWdmeFlImFK9POS0LK5OtEnpjMIdeZS6O/nke
+n+LLy2Tzkr6ZOF9OOM9ScYbYrkmbqzSfmYlVRekMy7NmBuFmz+MBydw3Ml2NoKPX
+Zky0J9h7xdyRQ/6GJdzQXln6jZ/d0Q/8rXQioRafDb962i4FTkSbqspZSBs33XI=
+=BDuR
+-----END PGP SIGNATURE-----
diff --git a/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild b/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
index 1862e52b0363..4ef768138786 100644
--- a/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
+++ b/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
@@ -1,8 +1,8 @@
-# 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/quake2-demodata/quake2-demodata-3.14.ebuild,v 1.7 2009/11/19 18:36:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild,v 1.8 2013/03/29 16:13:55 hasufell Exp $
 
-inherit eutils versionator games
+inherit unpacker eutils versionator games
 
 MY_PV=$(delete_all_version_separators)
 MY_PN="quake2"
@@ -54,7 +54,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unzip -qo "${DISTDIR}/${FILE}" || die "unzip failed"
+	unpack_zip ${A}
 }
 
 src_install() {