gentoo resync : 08.05.2018

14 files changed, 53 insertions, 32 deletions

diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 528cbb0afbbd..f895a6cdf6a4 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/adonthell/Manifest b/games-rpg/adonthell/Manifest
index 7fc3c6b669d3..71027757e66c 100644
--- a/games-rpg/adonthell/Manifest
+++ b/games-rpg/adonthell/Manifest
@@ -1,7 +1,8 @@
 AUX adonthell-0.3.5-configure.in.patch 3314 BLAKE2B 8361ee19dae579666d6adc585a6ac3da1b0059fdf70f446c0db9a75ee34df86f26f781624ed736f1b23c598e30359b2a6d4e006fb7da9b619c51ed9ad7518cd9 SHA512 4bd82920dac28c28b96b4ec0e5251c3627a3284ebe6e55eb889e542494ba44b13de8e24210b229e9f37f2259c941743792133d0e9a4b91219b6dc366584d16ed
 AUX adonthell-0.3.5-format.patch 320 BLAKE2B c73d15a7aefc3b15df17740c3db7bfa9eabf0d5e322cf5db040d1a202c8a17b5fed6e485815a797eca3b1a98fce1c05d893c5c61231cb38196d6efacf5a1e2d0 SHA512 901d0cc307b1fbf78708a2d6cd8e6d6284ee66c9ac23bed64b1bd0685bc5adc113a8816bca80c44999d5558e6b6e635bd58c1d1894d8e8631fa97da6309b554f
+AUX adonthell-0.3.5-freetype_pkgconfig.patch 422 BLAKE2B 302dd008224d1e5a48bbd7a450c0b9dfcf533c3e75dfdcf5b170a91c16ad27c23553484ad652dfbbbc623ca7bd40fa55ed690b1a43093b2dd1545dd4bc95c1f8 SHA512 027d2b6ddd9448e305b5a2fea80a345d9af578fe37361501e8653e9647acb4b046887438f8dee7c2c38c371f6b001e3d2fcb0662e61d049876c4425954af4bcf
 AUX adonthell-0.3.5-gcc46.patch 432 BLAKE2B 66706aea9dbcd8827dd3a7054242066a49546e742ff3c2b8edc6262a786230f1269cb1f7f552373af5da95ee3b8136a6fbba490ffeda60ea56236ed992c073d6 SHA512 57d23fc4ef209b6e07b5e9d039db257c564e874914d0b9d9abda5d62608b9f6b32252667fa4638e9dfc7632111cafec5fad634992dce7b76309d177450fb0404
 AUX adonthell-0.3.5-glibc-2.10.patch 792 BLAKE2B 26a724ff84b31a66f6a8ed2dfdc917b220dc1083a017b4a2311c7a91d8ed5b493ca4ba3ac507c2e243980dd18dd1f9fffb434ad38968bb950a3747a5fb16b812 SHA512 6aaf6eced04b777804271dbee082c3ac0d39381e079065ff714bbb66b3ac8be96094e37bfa5e5f986ef91ffe6902f91f8ca7777ae7f3b277c56db37562958aff
 DIST adonthell-src-0.3.5.tar.gz 877439 BLAKE2B 995102c30b5557aaa02ab463a9c609251175b1a590e8bc89b457feead74391dc3756c8c06bba580a5f2b02cbe4cd87f27249364be3355409e3507269fb653094 SHA512 bf970b809b22a8563b196d6817553dd58dc9cb09b3bd99eb99d5c8e6f0828cf59965633acd4fdf7835dd9cb732cbb3290d3663521201ece7569cad2f494fb15d
-EBUILD adonthell-0.3.5-r2.ebuild 1438 BLAKE2B 309f6f73e5a09e2331beaa9f41babefdd1a6def20b0720b343cb65f3f613096208b949651db5462958a6b169f8f891d06c9c3a13159944d4d3bd9d8dc4105064 SHA512 8797ac4d9885365904051e5c31ba3f86386d233cdf506711f0e8cbfa23f5394797ec208ae20a9663cf6b1f59daa9f8510f8d6c198c0c235d34350fd3ba8a3e8f
+EBUILD adonthell-0.3.5-r2.ebuild 1499 BLAKE2B 2c786671b7f8dfdebe8d861f1e665134e3c50395cf36b7e99f4087e6863fddc1a8192401c2ed232b8c82709f512e5144af393219030b9ecc5cb0d3d8f926ff2e SHA512 2b5c22570ee96b127f89fb85640e61b6a46ec7d213fe28a16bfb7ed5f3ea21da18599924d3f2a450f88932c86ffbcc2db4522c6fd6dce5f91c7345c856588dd9
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild b/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild
index 75039371fbab..f8dc851093b5 100644
--- a/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild
+++ b/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit autotools eutils python-single-r1
 
 DESCRIPTION="roleplaying game engine"
-HOMEPAGE="http://adonthell.linuxgames.com/"
+HOMEPAGE="http://adonthell.nongnu.org/"
 SRC_URI="https://savannah.nongnu.org/download/${PN}/${PN}-src-${PV}.tar.gz"
 
 LICENSE="GPL-2"
@@ -27,6 +27,7 @@ RDEPEND="${PYTHON_DEPS}
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	dev-lang/swig
+	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen
 		media-gfx/graphviz
@@ -40,6 +41,7 @@ PATCHES=(
 		"${FILESDIR}"/${P}-format.patch
 		"${FILESDIR}"/${P}-gcc46.patch
 		"${FILESDIR}"/${P}-glibc-2.10.patch
+		"${FILESDIR}"/${P}-freetype_pkgconfig.patch
 )
 
 pkg_setup() {
diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-freetype_pkgconfig.patch b/games-rpg/adonthell/files/adonthell-0.3.5-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..ff11ffa96f5f
--- /dev/null
+++ b/games-rpg/adonthell/files/adonthell-0.3.5-freetype_pkgconfig.patch
@@ -0,0 +1,21 @@
+--- adonthell-0.3.5/configure.in
++++ adonthell-0.3.5/configure.in
+@@ -17,6 +17,8 @@
+ CPPFLAGS=""
+ DEFS=""
+ 
++PKG_PROG_PKG_CONFIG
++
+ dnl ********************
+ dnl Checks for programs.
+ dnl ********************
+@@ -144,8 +146,7 @@
+ dnl Check for FreeType2
+ dnl *******************
+ 
+-AC_CHECK_FT2(6.0.0,
+-    :,
++PKG_CHECK_MODULES(FT2, freetype2 >= 6.0.0,,
+     AC_MSG_ERROR([*** Freetype version >= 6.0.0 not found!])
+ )
+ 
diff --git a/games-rpg/bastion/Manifest b/games-rpg/bastion/Manifest
index 983781cbac8d..a39f5d15c3ab 100644
--- a/games-rpg/bastion/Manifest
+++ b/games-rpg/bastion/Manifest
@@ -1,3 +1,3 @@
 DIST Bastion-HIB-2012-06-20.sh 1055161705 SHA256 f1e67f8e8dd0ba823cab0f16f2269dc8d9230ebca7a304927ff540320169c431 SHA512 e81b5dfa6f61ec2b35b30693c156a612cd3242c2169f4414b6d66839b7d8cc2e6ea8776f55baae67fa8131ee96bc221e1a15004410612eecaa9f7204dcc673ad WHIRLPOOL 2ec712724f263d9cbd181a128a0adc22f38465447db03f1d382aa231bad98e637b27ec2e73b2acf66a5775f53b0406c82cf0cd36befdc13f6afc5434887ac040
-EBUILD bastion-20120620-r1.ebuild 1848 BLAKE2B 43b87e808bc3dac45022b72f5c4193a7a94d9b3d502e41821eda2dbf892f70b4b4468d6c2c50b03d8111deb57578d313a5c828239bda5e029d3512e827761dcd SHA512 63430a315913a156123d928ab605496f93e868312eaa7f988d800cb903ba9b6f97098fc3c7af471c9c5e3afe1415efa82f844d5b4523f6fd7af69a1c5061613e
+EBUILD bastion-20120620-r1.ebuild 1736 BLAKE2B a5481b9378150691661bb3368da5b3df2496ead46d4150e4dd33f1766a713277e504031d3e6ac16783b65f34d2fc6e3effcbef8be25c0d5454a1c6cb4c9ff3bd SHA512 58ea2462dab384d36f182e66980f06a0d03229d60ac5a036684090db32242bb415c7b35ffed82f2a187ab56247ca26c39f144a91734ba9e5cc7a854f2b407c63
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/bastion/bastion-20120620-r1.ebuild b/games-rpg/bastion/bastion-20120620-r1.ebuild
index d7f001068b71..56c1f4d020fd 100644
--- a/games-rpg/bastion/bastion-20120620-r1.ebuild
+++ b/games-rpg/bastion/bastion-20120620-r1.ebuild
@@ -76,9 +76,6 @@ pkg_preinst() {
 pkg_postinst() {
 	games_pkg_postinst
 
-	elog "If you are using opensource drivers you should consider installing:"
-	elog "    media-libs/libtxc_dxtn"
-
 	gnome2_icon_cache_update
 }
 
diff --git a/games-rpg/dear-esther/Manifest b/games-rpg/dear-esther/Manifest
index c9a212d4298b..817b23221cb3 100644
--- a/games-rpg/dear-esther/Manifest
+++ b/games-rpg/dear-esther/Manifest
@@ -1,3 +1,3 @@
-DIST dearesther-linux-06082013-bin 1007461686 SHA256 4b3368e9cd83f371b6ea63814ce1ec5db733d5ef3229e3f78bdc530c268076a4 SHA512 c66a2b068b4caaebfb63e4617102af4a5df153dfe76854d1fa94305fb95b15e4362c9ca5e715ea4b29966916a9a585fa71bfc2b2b33b878f26e3785b7d93722e WHIRLPOOL 022d2fe66dfb2f4bea71898afd6f011ffe5870c5af27e3adb04fe5caa76a41bce75ee931408edda41dc24956ddae4f2399719f3938d72fe9cf94b2a9e2e703ea
+DIST dearesther-linux-06082013-bin 1007461686 BLAKE2B 0ffb2387490beef790ad00f110a8393bb69f0fe762799795a655eab748aed08eb8665c199ea0f588c764bafaa68eae3ba6884296614abbd66ecd1b72810b2c88 SHA512 c66a2b068b4caaebfb63e4617102af4a5df153dfe76854d1fa94305fb95b15e4362c9ca5e715ea4b29966916a9a585fa71bfc2b2b33b878f26e3785b7d93722e
 EBUILD dear-esther-20130608.ebuild 1545 BLAKE2B aaef94c15b08c7ffa99809a5f450132b07bfcceb88e379bbebcbe681fbbcc10813f17bc13981508d871e1aa0bf18ac8a1ddecf155b7d9e1046929e58fef45e15 SHA512 63685a6da8d06d0baa6fa377be3532181a677892c612550e9c22658f78cb05b82371ff796175e74c88791d1001e01d4cb9e03aa9310a6533571421fd4af0f46c
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/draci-historie/Manifest b/games-rpg/draci-historie/Manifest
index 3297aa114340..09c53099bf86 100644
--- a/games-rpg/draci-historie/Manifest
+++ b/games-rpg/draci-historie/Manifest
@@ -2,5 +2,5 @@ DIST dh-cz-2012.zip 29293879 BLAKE2B 5f8d4199de6f418d041c409bbc25b383021721b062b
 DIST dh-de-2012.zip 3316443 BLAKE2B 99a495be5d2add5e6f375904d249bda06f556e5e8ede4b33348d6ee46778de15b704016f9b498ca5b68ad678b3f2bd572034c37bc7dde2dfcd9d46ef2f4b242a SHA512 088f372e8de59cb52555a70cb7918ec14bb4abbb712a3867b40ce9eef80dc3f03b6c28402b9e0c9ee7e02f1938ee5f140abc02aef801716e38af84d66dafd5aa
 DIST dh-en-2012.zip 3310860 BLAKE2B 22c8dc8102f5f1d984a760d51fd8f7f028cca6a28b1a4e0f459c44eec68255e3ecd526ef80426b57f2137c33f6a5ba0d16b2c760b42a67413c2ffa3cec9ec648 SHA512 a9b5ff15305c961f288fdf915f56ca204a2ebe5370dcf56c20a0057cf721c45445a20479a39fe1f5443e79e7c95bd5771abef2115396c418442d2e5e400ce10a
 DIST dh-pl-2012.zip 36041498 BLAKE2B 29f6daeac610aa83f4df4a7698d19540f7c97d3a019a66078e784492010891860fa6af9b3151457c0aefeeb5eb3f90b8336693a1367b64e97592e017a7e9f247 SHA512 627f85a14362e032e00ed36275df696b6a468965734db7c8bb459d689b548c05033fe387ffee9855a83fe634f14b98a5c5ea51aefdf169c7243e9282fa1c19a5
-EBUILD draci-historie-2012-r1.ebuild 2395 BLAKE2B 322d37e2d3d677b42414b795d2b5beffad501e53e48c340bfbb1e096a3d60c09e85e673849681a318f09b222bf94094463d5d2063e5fdf14865e0ed57ab619d0 SHA512 26666cb7445d33fb241bca6d2e82fbc1407aab7664ce37ae5fb86910e8ed6a7ffff32cec0ba899fff4d40ca3ecfbf2f8513c750ec37bd6112c8b86b685c74ef3
+EBUILD draci-historie-2012-r1.ebuild 2365 BLAKE2B c908bcbfc5b1cb9aefc3eb73d55ff3b50045af923d57ef45857e173ca64ff4a7142897e4e645342aee5b163b8ff5dc6cec759d55dfdb1591cd3a755a9d9359b9 SHA512 a54f1a29806cd8a2f270a0dc232a6ac1b34fad9f76d0843919a0aac2e40fc043dfe0def47887be40d97c68224bb8bbf789a3bb2f74f0bb2d62cd7b2684d533db
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-rpg/draci-historie/draci-historie-2012-r1.ebuild b/games-rpg/draci-historie/draci-historie-2012-r1.ebuild
index 8998b3837a2a..3982a8538d15 100644
--- a/games-rpg/draci-historie/draci-historie-2012-r1.ebuild
+++ b/games-rpg/draci-historie/draci-historie-2012-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils unpacker
+inherit eutils
 
 DESCRIPTION="Bert the little dragon searches for his father"
 HOMEPAGE="http://www.ucw.cz/draci-historie/index-en.html"
@@ -21,29 +21,29 @@ KEYWORDS="~amd64 ~x86"
 IUSE="l10n_cs l10n_de l10n_en l10n_pl"
 
 RDEPEND=">=games-engines/scummvm-1.1"
-DEPEND="$(unpacker_src_uri_depends)"
+DEPEND="app-arch/unzip"
 
 S="${WORKDIR}"
 
 src_unpack() {
 	if use l10n_en || ( ! use l10n_cs && ! use l10n_de && ! use l10n_en && ! use l10n_pl ) ; then
 		mkdir en || die
-		unpacker dh-en-${PV}.zip
+		unpack dh-en-${PV}.zip
 		mv *.{dfw,fon,mid,sam} en/ || die
 	fi
 	if use l10n_cs ; then
 		mkdir cs || die
-		unpacker dh-cz-${PV}.zip
+		unpack dh-cz-${PV}.zip
 		mv *.{dfw,fon,mid,sam,zzz} cs/ || die
 	fi
 	if use l10n_de ; then
 		mkdir de || die
-		unpacker dh-de-${PV}.zip
+		unpack dh-de-${PV}.zip
 		mv *.{dfw,fon,mid,sam} de/ || die
 	fi
 	if use l10n_pl ; then
 		mkdir pl || die
-		unpacker dh-pl-${PV}.zip
+		unpack dh-pl-${PV}.zip
 		mv *.{dfw,fon,mid,sam,zzz} pl/ || die
 	fi
 }
diff --git a/games-rpg/dreamweb/Manifest b/games-rpg/dreamweb/Manifest
index 7e3925a11c7a..1824827a5c64 100644
--- a/games-rpg/dreamweb/Manifest
+++ b/games-rpg/dreamweb/Manifest
@@ -6,5 +6,5 @@ DIST dreamweb-cd-it-1.1.zip 225726238 BLAKE2B 9f796895b3cf34db4086726044b1688bac
 DIST dreamweb-cd-uk-1.1.zip 226067188 BLAKE2B b0309fb48158256d676198e46d2b7c689ec816baccf4140c0da4bb103c043e0864a1df7f58b2b3a7b754127fe6b1297e971d7e5a0a51ff0c2a88355ec6664208 SHA512 5e3c11f06ab0518a18cf1feffbc7b016363bc258e6e4d282bbdb5aa88f9540d5fdc10e4d59571d626aeab61a4ab6c4266620c73b2944b9c6963c1e5b66eecd9d
 DIST dreamweb-cd-us-1.1.zip 226360597 BLAKE2B 68825cf5683a321aec70e498e2b611d93384e38952468d1c006136ceb4bebd74156baa006c291da29513da5e71b4f4a25e9fc28a29b1057830357e2ecd0a0359 SHA512 cca33b2f4fd373eb0bc6d12df9ad3ba8417e0fd27cc09e1e0a3201ab4567ddeea127529aa1d1742060225888870c892f8dc983078017c5ae9253b6e028171cb8
 DIST dreamweb-manuals-en-highres.zip 186406397 BLAKE2B c394c32e0caaa1251461cd688348d8be9b57c792190cd84991a9a47915ea313456659d72a9db7fdb9f09b4f71e0d9ea932f702eb5cd4f67390992a64328d0c2e SHA512 a67d3eadeb2ea7579d23315cd9c9fbb31d9e7aa88fdd3c4bc8656801e4b064ad94356167cfbf0ee6e18ad02316297dad0d07616b34080aae68467868de421305
-EBUILD dreamweb-1.1-r1.ebuild 3483 BLAKE2B e2a4dd527ee2cc93b46c963d495c58a9c6d03537fd982d9fdcc998c2e533607fea16d65d7c59b3723dfb8c18361db6259c904318ac597205f721242c2b3a65ae SHA512 955fea59c2099d8b7fb69ace195b62d3e97af542c12b0134f0d29ac4075462e1c0f6566f3ae30faa7d79badb824b3dca133970b3c99cacd8381bae1e6ea94863
+EBUILD dreamweb-1.1-r1.ebuild 3447 BLAKE2B 4fccc989292181ea0c066c1b7faff22b26aa47526cb6a5f378b3f19bc91b1e755d66c785ade84e41753b9827860ffb16469afb2d4390d7472b0c4e53a45c963d SHA512 089c98fd23b8b29468532571eef9126f3635d7e8cd3c3ed3a9f829d9cab22dd33bdcf601b6d36253266bea4f30949d46b9f1447b1c3836c8a34e459d5e8a05e0
 MISC metadata.xml 459 BLAKE2B f764c68b92e4614c49c37cee671b5b69ed25eb3938f4d6efdc1061ff34f2a12d1dd896f2dd9ac9ba91e7cbfa5c77aab9c6437b0ec1d685a930dbe7ca6b96823c SHA512 06373bf69e200ed3a6b86bb7f914147c26ea4d4b00f3592b3235917d878e45ed2b86f33136057a64471bdc711cdc5740a35f80b39a92e7fbe55304d8c98c1474
diff --git a/games-rpg/dreamweb/dreamweb-1.1-r1.ebuild b/games-rpg/dreamweb/dreamweb-1.1-r1.ebuild
index c685cb39ad41..6fd1f4a55baf 100644
--- a/games-rpg/dreamweb/dreamweb-1.1-r1.ebuild
+++ b/games-rpg/dreamweb/dreamweb-1.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit unpacker eutils
+inherit eutils
 
 DESCRIPTION="Top-down adventure game set in a gritty futuristic/dystopian city"
 HOMEPAGE="http://wiki.scummvm.org/index.php/Dreamweb"
@@ -23,7 +23,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc l10n_de l10n_en l10n_en-GB l10n_es l10n_fr l10n_it"
 
 RDEPEND=">=games-engines/scummvm-1.7[flac]"
-DEPEND="$(unpacker_src_uri_depends)"
+DEPEND="app-arch/unzip"
 
 S="${WORKDIR}"
 
@@ -31,38 +31,38 @@ src_unpack() {
 	if use l10n_de ; then
 		mkdir -p "${S}"/de || die
 		cd "${S}"/de || die
-		unpacker ${PN}-cd-de-${PV}.zip
+		unpack ${PN}-cd-de-${PV}.zip
 	fi
 	if use l10n_en || ( ! use l10n_de && ! use l10n_en && ! use l10n_en-GB && \
 			! use l10n_es && ! use l10n_fr && ! use l10n_it ) ; then
 		mkdir -p "${S}"/en_US || die
 		cd "${S}"/en_US || die
-		unpacker ${PN}-cd-us-${PV}.zip
+		unpack ${PN}-cd-us-${PV}.zip
 	fi
 	if use l10n_en-GB ; then
 		mkdir -p "${S}"/en_GB || die
 		cd "${S}"/en_GB || die
-		unpacker ${PN}-cd-uk-${PV}.zip
+		unpack ${PN}-cd-uk-${PV}.zip
 	fi
 	if use l10n_es ; then
 		mkdir -p "${S}"/es || die
 		cd "${S}"/es || die
-		unpacker ${PN}-cd-es-${PV}.zip
+		unpack ${PN}-cd-es-${PV}.zip
 	fi
 	if use l10n_fr ; then
 		mkdir -p "${S}"/fr || die
 		cd "${S}"/fr || die
-		unpacker ${PN}-cd-fr-${PV}.zip
+		unpack ${PN}-cd-fr-${PV}.zip
 	fi
 	if use l10n_it ; then
 		mkdir -p "${S}"/it || die
 		cd "${S}"/it || die
-		unpacker ${PN}-cd-it-${PV}.zip
+		unpack ${PN}-cd-it-${PV}.zip
 	fi
 	if use doc ; then
 		mkdir -p "${S}"/doc || die
 		cd "${S}"/doc || die
-		unpacker ${PN}-manuals-en-highres.zip
+		unpack ${PN}-manuals-en-highres.zip
 	fi
 }
 
diff --git a/games-rpg/dungeon-defenders/Manifest b/games-rpg/dungeon-defenders/Manifest
index 83493f5b29b2..e45bc19fa0ff 100644
--- a/games-rpg/dungeon-defenders/Manifest
+++ b/games-rpg/dungeon-defenders/Manifest
@@ -1,3 +1,3 @@
-DIST dundef-linux-03052013.mojo.run 5384683543 SHA256 bc81021859871169285111ef7b1806952dcc17b128f3e387d9b5072918490c61 SHA512 911d1691411d870cee62d08b0c559ac80588edc9ba0c9d622c7528f7f8635d86eae962f7a2b1bfed27be1d780c033216374f69072ed7828e8624855e9b0b9aca WHIRLPOOL a5d75261ad542cf182829d6bd9cb053696d2228e44a6560a400e26f0697d9993037410cb9a2311e882b5076aefc612ba4b490d709ee281a6422b122e2a644402
+DIST dundef-linux-03052013.mojo.run 5384683543 BLAKE2B 76b4f8b64ffc89f2e53b36a6002b312c6523840d9ac96acacf7ec094271af70302ff26b8a73e2b16828cd90311a3f6b45b930b3e3d8083ea4ee7b8bda2ca27c9 SHA512 911d1691411d870cee62d08b0c559ac80588edc9ba0c9d622c7528f7f8635d86eae962f7a2b1bfed27be1d780c033216374f69072ed7828e8624855e9b0b9aca
 EBUILD dungeon-defenders-20130305.ebuild 2634 BLAKE2B 6e1f4306894c9fd63b0b2b3f71fb446c9360d40e1319ece854057f6ae3a08f0b6c884a013ba6142d584bbd12cc5df2dd2aed85818dc1cd75a2ed53698a347f52 SHA512 eaebd5f69e0a5ec3dbbe1196daa1c3aff8e6cb212995f564a556dd123223008a37a25e07509ff54f0cebbf43abe812a9fb211ffdb36df3e917bb4d109a5707d5
 MISC metadata.xml 355 BLAKE2B 2ebe0923f754bb09445457bb7f266a9fb673682281d31d70b39a05f1cd0beb682fa26e89861c46e9dab0f77428b916f9f99d8324b3780c795f317b6e06efde84 SHA512 78f8cc8f1f1be915da206e4b8be196a21b58a6f209023594755e481136a1b86ee31c8d0dfedd516d756a47db624e89728875b073b71c3b08ac94a5cde8ff3b83
diff --git a/games-rpg/soltys/Manifest b/games-rpg/soltys/Manifest
index 2befca3dbe46..be517d7221a3 100644
--- a/games-rpg/soltys/Manifest
+++ b/games-rpg/soltys/Manifest
@@ -2,5 +2,5 @@ DIST cat-soltys.png 1917 BLAKE2B c33be51239b1df521b117c44ad2a6e427c26b64a37a1c72
 DIST soltys-en-v1.0.zip 3484518 BLAKE2B 04d49de79af0d18a5e35ee618de18c0c70b0d9670f9533ce29759aae34542038d31d9b096b25f7d7ee830bea6d0933df9d782b705b7dcaa46144023b9d88a037 SHA512 92637d760033c044b3979dfe21f617db0b2cf98c48587e058910f877b38e0887fed8102782f1dfac85bc8eefa68d3791d7ff2d6074396bea2728a128e37cee1d
 DIST soltys-es-v1.0.zip 3527349 BLAKE2B ac567c7727c8150b75d681e8f416aab859725a665c8e0b6ec628c7a0f101b0ffcf9fb2822d0dafbbd252c1a92f01bcb43f05c8f39447ef8dcf4a591afa441b8a SHA512 eac3aa60e274720f65504ffe5bc18f99401a24c5775c3bc6eb893aef2af7e02055eb52e3da162f124babe5b611f93ff5444aca6e2ea26e5baa98a2131dd49da0
 DIST soltys-pl-v1.0.zip 3483638 BLAKE2B 35269130a2d4699cd709deaeaf96cd95786dcb3b4ceb77b00682f865ab796245e7830805ff4989d4298e54bcc963c45ef8e58ef2200376b41722df33a82b41b5 SHA512 b8c04366d360eb4b7f296718ae46a2e417b676f9bddd6fb8555069d8972ae2ff1706c67fc473a52a5009cb433ff58db377e5f02ff6b27e68e35d2a89c8108f24
-EBUILD soltys-1.0-r2.ebuild 1847 BLAKE2B c64aa1f932ad08c97086074f104f6c2e42ad9271d7057e20da2cdacdfc1fa1f3af130bab2954e9c49f90116a6e74b5c09882a9162b2c75132f1bd35ff4318ad1 SHA512 be924a39d779d6ac1a9f62cbfcebaa9a7479887b27aec88736c9fe8e14ef2c5755be4b326aa087b086a5763d6f812be323ab98db0336c67851ae12d0ce6753d3
+EBUILD soltys-1.0-r2.ebuild 1819 BLAKE2B ea89b54fd17e3dabcfe84994b373ba26ffd06fc149797eea9134f6ae9e12ae279811087e87c1d7ce3635d0d6b4ccd4f660cf3dcdca7bec93da74c468728984e4 SHA512 19504fc8f85901d85d07d57f9d85b9cec7f7101fdc691851904ee0824cd006add695531ff0cf0ef3a54bdaa1536b3f5cee215f063eebfef85f3e19a118a8711f
 MISC metadata.xml 330 BLAKE2B 4f070e6c8bc4c2f6b4efb4f0eb84ea861773fba85acda1f4dec223a6594e2cdf4ac90c895a98819e2fab2ba2cd30081aee591554d2e932025a9da6d3c16a275b SHA512 4541c93daab84bd6d0764adccf44bb4986ba02303e731b5b9a7a8060bb88a32c1cef91e2b2910e15915b67cf3ea2b5f31b4e637909d1d0b7c3b627f1134206dc
diff --git a/games-rpg/soltys/soltys-1.0-r2.ebuild b/games-rpg/soltys/soltys-1.0-r2.ebuild
index e709836c31e9..f3e8b8ccb22a 100644
--- a/games-rpg/soltys/soltys-1.0-r2.ebuild
+++ b/games-rpg/soltys/soltys-1.0-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit unpacker eutils
+inherit eutils
 
 DESCRIPTION="Classic adventure game"
 HOMEPAGE="http://wiki.scummvm.org/index.php/Soltys"
@@ -18,24 +18,24 @@ KEYWORDS="~amd64 ~x86"
 IUSE="l10n_en l10n_es l10n_pl"
 
 RDEPEND=">=games-engines/scummvm-1.5"
-DEPEND="$(unpacker_src_uri_depends)"
+DEPEND="app-arch/unzip"
 
 S="${WORKDIR}"
 
 src_unpack() {
 	if use l10n_en || ( ! use l10n_en && ! use l10n_es && ! use l10n_pl ) ; then
 		mkdir -p en || die
-		unpacker ${PN}-en-v${PV}.zip
+		unpack ${PN}-en-v${PV}.zip
 		mv vol.{cat,dat} en/ || die
 	fi
 	if use l10n_es ; then
 		mkdir -p es || die
-		unpacker ${PN}-es-v${PV}.zip
+		unpack ${PN}-es-v${PV}.zip
 		mv soltys-es-v1-0/vol.{cat,dat} es/ || die
 	fi
 	if use l10n_pl ; then
 		mkdir -p pl || die
-		unpacker ${PN}-pl-v${PV}.zip
+		unpack ${PN}-pl-v${PV}.zip
 		mv vol.{cat,dat} pl/ || die
 	fi
 }