gentoo resync : 16.06.2018

4 files changed, 55 insertions, 57 deletions

diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 2e5a734fea4c..9943b59037ce 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/avadon/Manifest b/games-rpg/avadon/Manifest
index 5d46033334b5..439eefa10167 100644
--- a/games-rpg/avadon/Manifest
+++ b/games-rpg/avadon/Manifest
@@ -1,3 +1,3 @@
-DIST avadon-black-fortress_1.0.4_all.run 109767395 SHA256 1619401aa42abe055b3eabf8b63d4ada3ce55affb054d0d6a6da09affe1c76fe SHA512 7c1acbb1ce3bbfb33052454c9b93060fa97b13fbf4202ee2bb0d70fb59423efc05dfe0bca07cce1e711af9f2757b79c590f237dea5f92aa11aa5979c35d018a7 WHIRLPOOL 751b5ce976a0dcb23065786d5078a32468c0f9a7a1df8eac6884923ad244996c43b7ad25044ee5fd7f680bcaa78982add53b9e248c5794f1c647309c5dbf2afc
-EBUILD avadon-1.0.4.ebuild 1152 BLAKE2B 763ca242dcb0556f548daeaa62fb6c5f5f4cd5ba2c03fb03993c299fba57c41a53022b4d87745035c109788f8c9e99f82aac498b5ce5f53e3aa808ef8ebcff68 SHA512 ca47a52f27d923fd2c9fae4404144223f8084abfde073253a0ed8046c119d32d2383daedfe5339bf7422f8be70e69e02e548609a754dd8a3365a41f449937e3c
+DIST avadon-linux-1331768904-bin.txt 109767395 BLAKE2B ba89e4cc9d7374b4c140f36860bb3e2682bc8639503500d0371a7783c0ce7fc1b40ac2c552285f03d564ecae21d5f887f822e6785a30034fdeaba9d0837ee6eb SHA512 7c1acbb1ce3bbfb33052454c9b93060fa97b13fbf4202ee2bb0d70fb59423efc05dfe0bca07cce1e711af9f2757b79c590f237dea5f92aa11aa5979c35d018a7
+EBUILD avadon-1.0.4_p1331768904.ebuild 1237 BLAKE2B 9b10a153d3e102359b91971cfbb4696ca89f10d867c746154c92ca02e28afb4e550fb3c66cc714e0423cf9ab67fa9e301043408dee520e2e337327221bdaa216 SHA512 a43fd6f3b37e3decf7c510e160b2a6fbe43f9a74bc0abe3bc04f808530a7f962d890ae64263e6196c528f3c99875a53e9168c555ab3b6c2aaa37531ea54ff2c7
 MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638
diff --git a/games-rpg/avadon/avadon-1.0.4.ebuild b/games-rpg/avadon/avadon-1.0.4.ebuild
deleted file mode 100644
index 02402a4db16b..000000000000
--- a/games-rpg/avadon/avadon-1.0.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils unpacker games
-
-DESCRIPTION="Epic fantasy role-playing adventure in an enormous and unique world"
-HOMEPAGE="http://www.spiderwebsoftware.com/avadon/index.html"
-SRC_URI="avadon-black-fortress_${PV}_all.run"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="fetch bindist"
-
-QA_PREBUILT="${GAMES_PREFIX_OPT#/}/${PN}/Avadon*"
-
-RDEPEND="media-libs/libsdl[X,opengl,video]
-	media-libs/openal"
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/data
-
-pkg_nofetch() {
-	einfo
-	einfo "Please buy & download \"${SRC_URI}\" from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move/link it to \"${DISTDIR}\""
-	einfo
-}
-
-src_unpack() {
-	unpack_zip ${A}
-}
-
-src_install() {
-	local dir=${GAMES_PREFIX_OPT}/${PN}
-	local arch=$(usex amd64 "amd64" "x86")
-
-	insinto "${dir}"
-	doins -r "avadon files" icon.bmp
-
-	exeinto "${dir}"
-	doexe Avadon-${arch}
-
-	newicon Avadon.png ${PN}.png
-	games_make_wrapper ${PN} "./Avadon-${arch}" "${dir}"
-	make_desktop_entry ${PN} "Avadon: The Black Fortress"
-
-	dodoc README-linux.txt
-
-	prepgamesdirs
-}
diff --git a/games-rpg/avadon/avadon-1.0.4_p1331768904.ebuild b/games-rpg/avadon/avadon-1.0.4_p1331768904.ebuild
new file mode 100644
index 000000000000..4a9ff4f3cecd
--- /dev/null
+++ b/games-rpg/avadon/avadon-1.0.4_p1331768904.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils unpacker
+
+DESCRIPTION="Epic fantasy role-playing adventure in an enormous and unique world"
+HOMEPAGE="https://www.spiderwebsoftware.com/avadon"
+SRC_URI="avadon-linux-${PV#*_p}-bin.txt" # .txt is odd but that's what Humble Bundle sends.
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="fetch bindist"
+
+QA_PREBUILT="opt/${PN}/Avadon"
+
+RDEPEND="media-libs/libsdl[opengl,video]
+	media-libs/openal"
+
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/data"
+
+pkg_nofetch() {
+	einfo "Please buy and download ${SRC_URI} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and move it to your distfiles directory."
+}
+
+src_unpack() {
+	unpack_zip ${A}
+}
+
+src_install() {
+	local dir=/opt/${PN}
+
+	insinto "${dir}"
+	doins -r "avadon files" icon.bmp
+
+	exeinto "${dir}"
+	newexe Avadon-$(usex amd64 amd64 x86) Avadon
+	dosym "../..${dir}"/Avadon /usr/bin/${PN}
+
+	newicon -s 512 Avadon.png ${PN}.png
+	make_desktop_entry ${PN} "Avadon: The Black Fortress"
+
+	dodoc README-linux.txt
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }