gentoo resync : 18.03.2018

8 files changed, 72 insertions, 101 deletions

diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 367ba5dbd989..8c5d68041739 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/solar2/Manifest b/games-action/solar2/Manifest
index 9f23fa3a578c..12ee5c767763 100644
--- a/games-action/solar2/Manifest
+++ b/games-action/solar2/Manifest
@@ -1,4 +1,4 @@
-DIST solar2-linux-1.10.tar.gz 106202569 SHA256 33211605946741db730082478c4a408547a89facfc2e3535b124c6706809d8b2 SHA512 68475cfe9220a1f19608cd2dfb575979e231dcf1bc61e12230db5a39856a03afceeb8c3f2b0ea6d958b36a53945bdb2768261f2b0bcc50a88f2b3eeddc48df9d WHIRLPOOL 86d0ed2c7a28e498323949e871f7ba8f1714f39f98ab625f6dddb0249af7c1e653264ebc4b76cc9be5579f99395e2c578363effcd2c97bb27690b05ec4e73a4e
-DIST solar2.png 6478 SHA256 ab62168651de322dc68a9094baf1ba92524d2d9e76b1650eef60527cd7e3f611 SHA512 b1110d19d62274ac90391f9611fc8efaa1c2ca70cf62f146969768ed2dd76e013054b1a9dfdb123b56536f5ba7788971747219485811eeb6652f22e0867348d9 WHIRLPOOL 358a3fb56c13710abf4ac3115c968579c787ed67f4c8672e0236ce379a56d6540f8c5ad6f8ca16370c0b080ae2763ec2256cbcd1ff2bb0765a7dc5164fc39972
-EBUILD solar2-1.10.ebuild 2475 BLAKE2B 5cc11cd8a939410b13c39f4e8ab34d2f06debee96d5a1e230374767672789b0e4856a5d2c1371c29473e34980525ddd5b9b104b6ef9565647bc815d1ae2df24e SHA512 f8b5eb740a87fa71a8a89429a23a9641888e5c84e0e5b3d3c6ce01b200ffdd7d7b14fc7ab09cf4c0c61809a24f7b3a857d44d0f5bcc2d7a527ccac00f8bce06a
+DIST solar2-linux-1.10.tar.gz 106202569 BLAKE2B 4dc1f0c273aa8363178c581a516969a22707a5345eb11a373f96dd8136af3b390451cd72e7b06bc661ef3e8926f0339d3dad70e9b950210e7820efe9913fe9af SHA512 68475cfe9220a1f19608cd2dfb575979e231dcf1bc61e12230db5a39856a03afceeb8c3f2b0ea6d958b36a53945bdb2768261f2b0bcc50a88f2b3eeddc48df9d
+DIST solar2.png 8260 BLAKE2B cf154377ee73b6d0f3c86e0377b29ca7208ef030183db7bae88b352d5684f3c513d0ad57119121a79906287e72d0a863891285224b631fa44d2ccee12a1eacef SHA512 a85e875e3a159670ea2a3f32687e7e52cf369f29add86f19e6431f05e7835c1a30303ddd4ff406a525c1086298807c2f94773dd987d4d99b89bc7c63150c9c85
+EBUILD solar2-1.10.ebuild 2565 BLAKE2B 54e3e442833df5219b50802340278d5497ab66cf56e9c165557b7d36a06734104a9f2773985ccd5af98befcf69d28b7623968aa96e8066ac8715c63376ef30a1 SHA512 ef5c7201c482e36d987ba02c78324edc0f2b179449915139fa5f695ef18b4f7cc25e3ea11cfa0f3ae3f2a83cf54193bbd457edbd465095cc2bd6ad11db831e0c
 MISC metadata.xml 355 BLAKE2B 2ebe0923f754bb09445457bb7f266a9fb673682281d31d70b39a05f1cd0beb682fa26e89861c46e9dab0f77428b916f9f99d8324b3780c795f317b6e06efde84 SHA512 78f8cc8f1f1be915da206e4b8be196a21b58a6f209023594755e481136a1b86ee31c8d0dfedd516d756a47db624e89728875b073b71c3b08ac94a5cde8ff3b83
diff --git a/games-action/solar2/solar2-1.10.ebuild b/games-action/solar2/solar2-1.10.ebuild
index b39d133c3557..2a092f697e3a 100644
--- a/games-action/solar2/solar2-1.10.ebuild
+++ b/games-action/solar2/solar2-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO: - unbundle libmono for 64bit
@@ -13,7 +13,7 @@ inherit eutils gnome2-utils games
 DESCRIPTION="An open-world, sandbox game set in an infinite abstract universe"
 HOMEPAGE="http://murudai.com/solar/"
 GAMEBALL="${PN}-linux-${PV}.tar.gz"
-ICONFILE="https://dev.gentoo.org/~hasufell/distfiles/${PN}.png"
+ICONFILE="https://dev.gentoo.org/~chewi/distfiles/${PN}.png"
 SRC_URI="${GAMEBALL} ${ICONFILE}"
 
 LICENSE="all-rights-reserved"
@@ -56,11 +56,11 @@ RDEPEND="
 S=${WORKDIR}/Solar2
 
 pkg_nofetch() {
-	einfo "Please buy & download ${GAMEBALL} from:"
+	einfo "Please buy and download ${GAMEBALL} from:"
 	einfo "  ${HOMEPAGE}"
 	einfo "Also download ${ICONFILE}"
-	einfo "and move both to ${DISTDIR}"
-	einfo
+	einfo "and move both to your distfiles directory. The Humble Bundle download"
+	einfo "may have a timestamp appended to the filename."
 }
 
 src_prepare() {
diff --git a/games-action/super-hexagon/Manifest b/games-action/super-hexagon/Manifest
index a43724d682f2..1437b6dd5628 100644
--- a/games-action/super-hexagon/Manifest
+++ b/games-action/super-hexagon/Manifest
@@ -1,3 +1,3 @@
-DIST superhexagon-10272014-bin 29469168 SHA256 f079cd5f644ba69a1123491a3d2bd19069670e6a9884ad756d927be331f3d9c8 SHA512 ec07576e897cddcbb1ef1da104750001b7610ca31d40f41044dc412d8a149fa07b71e9fbc5df8b1d3ad6f110b28e5891dde618e39f4b2565d73fcfae28d3a85a WHIRLPOOL 4c73f6cddce5d4fb6aace87c2b7c660f7e2be9cfcdc37355ba953e83bb06aa3cba554d15e3051ffcbbcc15b0e6473079b811fbf261771a302dfd496e9505057f
-EBUILD super-hexagon-20141027.ebuild 1843 BLAKE2B 4a28531af35613649956658d21f410648d3daf0cbcfe849980648ff2ed4dc91f138b1358798436670c4f6f1a2a9bca04497f1f37cb98989718aaf6736cf28da7 SHA512 621e032a7d3836b18b32ad8af475fdc0409004ab9de05b0fedaacc441bb0e9f73b361ff0f5b39f5981797604242310ca2df6dcf6bb7d183cdf3b0813f19fe667
-MISC metadata.xml 355 BLAKE2B 2ebe0923f754bb09445457bb7f266a9fb673682281d31d70b39a05f1cd0beb682fa26e89861c46e9dab0f77428b916f9f99d8324b3780c795f317b6e06efde84 SHA512 78f8cc8f1f1be915da206e4b8be196a21b58a6f209023594755e481136a1b86ee31c8d0dfedd516d756a47db624e89728875b073b71c3b08ac94a5cde8ff3b83
+DIST superhexagon-02172016-bin 27481878 BLAKE2B bae4d841cd3a03923b92c511a963ea836bf67b79b23dd800fb2731f33344981ad0f8392025173e2840ad3291646427ce42ba6ebd4b4920a29edb68cf9579103b SHA512 ffb54a9c3fd2e78efcdbf491e995f242ea10da40f32d36c17a0e29f6ac5d684426b542abc1dcdc8c281fa62b6a267642f834b8007686c35f54a445568808eb1e
+EBUILD super-hexagon-20160217.ebuild 1370 BLAKE2B a571b58ce34d2aa4889c91fe2a386c725703d9d0c08a9b2d6f472e251e9dbf1d2d45c0f1a53b4a2999531e887e2295a067d899bc28befcafb88e29f8d770d88a SHA512 b68e3ab89479b1e1c89a7242c52295fdb62604edc152478a90611481a0c61731ec50e581def776d2807b472bb1eaf492d7a13047a642ce16a12a57cf6ef58aa6
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-action/super-hexagon/metadata.xml b/games-action/super-hexagon/metadata.xml
index b878aaa1812d..26079e608bed 100644
--- a/games-action/super-hexagon/metadata.xml
+++ b/games-action/super-hexagon/metadata.xml
@@ -5,9 +5,4 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<use>
-		<flag name="bundled-libs">
-			Use the upstream provided bundled libraries.
-		</flag>
-	</use>
 </pkgmetadata>
diff --git a/games-action/super-hexagon/super-hexagon-20141027.ebuild b/games-action/super-hexagon/super-hexagon-20141027.ebuild
deleted file mode 100644
index 4998bfea0c81..000000000000
--- a/games-action/super-hexagon/super-hexagon-20141027.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# we use bundled glew, cause slotting 1.6 does not give us
-# much benefit for one consumer
-
-EAPI=5
-
-inherit eutils unpacker games
-
-DESCRIPTION="A minimal action game by Terry Cavanagh, with music by Chipzel"
-HOMEPAGE="http://www.superhexagon.com/"
-SRC_URI="superhexagon-${PV:4:4}${PV:0:4}-bin"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="bundled-libs"
-RESTRICT="bindist fetch splitdebug"
-
-MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${MYGAMEDIR#/}/x86/*
-	${MYGAMEDIR#/}/x86_64/*"
-
-DEPEND="app-arch/unzip"
-RDEPEND="
-	virtual/glu
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXxf86vm
-	!bundled-libs? (
-		media-libs/freeglut
-		media-libs/libogg
-		media-libs/libvorbis
-		media-libs/openal
-	)"
-
-S=${WORKDIR}/data
-
-pkg_nofetch() {
-	einfo "Please buy & download ${SRC_URI} from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move it to ${DISTDIR}"
-	einfo
-}
-
-src_unpack() {
-	unpack_zip ${A}
-}
-
-src_prepare() {
-	einfo "removing ${ARCH} unrelated files"
-	rm -r $(usex amd64 "x86" "x86_64") || die
-
-	if ! use bundled-libs ; then
-		einfo "removing bundled-libs..."
-		cd $(usex amd64 "x86_64" "x86") || die
-		rm libglut.so* libogg.so* libopenal.so* libstdc++.so* \
-			libvorbis.so* libvorbisfile.so*
-	fi
-}
-
-src_install() {
-	local myarch=$(usex amd64 "x86_64" "x86")
-
-	insinto "${MYGAMEDIR}"
-	doins -r data ${myarch} SuperHexagon.png
-
-	dodoc Linux.README
-
-	newicon SuperHexagon.png ${PN}.png
-	make_desktop_entry ${PN}
-	games_make_wrapper ${PN} "./${myarch}/superhexagon.${myarch}" "${MYGAMEDIR}" "${MYGAMEDIR}/${myarch}"
-
-	fperms +x "${MYGAMEDIR}/${myarch}/superhexagon.${myarch}"
-	prepgamesdirs
-}
diff --git a/games-action/super-hexagon/super-hexagon-20160217.ebuild b/games-action/super-hexagon/super-hexagon-20160217.ebuild
new file mode 100644
index 000000000000..dbcff6cb6887
--- /dev/null
+++ b/games-action/super-hexagon/super-hexagon-20160217.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop eutils gnome2-utils unpacker
+
+TIMESTAMP="${PV:4:2}${PV:6:2}${PV:0:4}"
+DESCRIPTION="A minimal action game by Terry Cavanagh, with music by Chipzel"
+HOMEPAGE="http://www.superhexagon.com/"
+SRC_URI="superhexagon-${TIMESTAMP}-bin"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist fetch splitdebug"
+
+MYGAMEDIR="/opt/${PN}"
+QA_PREBUILT="${MYGAMEDIR#/}/superhexagon"
+
+DEPEND="app-arch/unzip"
+
+RDEPEND="media-libs/glew:1.6
+	media-libs/libsdl2[opengl,sound,video]
+	media-libs/libvorbis
+	media-libs/openal
+	virtual/glu
+	virtual/opengl"
+
+S="${WORKDIR}/data"
+DOCS=( Linux.README )
+
+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 myarch=$(usex amd64 x86_64 x86)
+
+	exeinto "${MYGAMEDIR}"
+	insinto "${MYGAMEDIR}"
+	newexe ${myarch}/superhexagon.${myarch} superhexagon
+	doins -r data SuperHexagon.png
+
+	make_wrapper ${PN} ./superhexagon "${MYGAMEDIR}"
+	newicon -s 512 SuperHexagon.png ${PN}.png
+	make_desktop_entry ${PN}
+
+	einstalldocs
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-action/swordandsworcery/Manifest b/games-action/swordandsworcery/Manifest
index ad0b87cfb094..eac8dc2513e9 100644
--- a/games-action/swordandsworcery/Manifest
+++ b/games-action/swordandsworcery/Manifest
@@ -1,4 +1,4 @@
 AUX swordandsworcery-wrapper 641 BLAKE2B 3609da1a899e05c3291ff20f30e75a335ac4aee0b53fac8a59786ce9992cf2b6081a8286ff40384f652e1bf35c4768ed7d9b87e6fcca149afd7ac2a6a8344203 SHA512 a29ff0cfadfd537129f5561fe9fa6acd88630340da49cc754f219aa125d01b8f73be7500dcc636140bbf707d73d8376b229e1897017819614fe6f4f28df1a545
-DIST swordandsworcery_1.02.tar.gz 325277619 SHA256 e7be30816059d5fa0bda2378d06f51984de13a17abd835cdc015e591354f59de SHA512 1178492628e8b8196bbb57b3d4d7526d5545bd31d0da34bcbed92150753fbb768c8682f071e2a473b95f1b6ee7c3efb30ccb9fce2e3e319d76673b79617e47c0 WHIRLPOOL 9ec0365372a62b7fadfa6b68e945918a1a2ade3c5e7bae561e16251ed0bf4e76b176bfed31e30b259e9a569858d1ae0b07a83067375ca26fe2da049602a570fd
+DIST swordandsworcery_1.02.tar.gz 325277619 BLAKE2B 7e03350b31d2dc68c5ea3643d7e22ec7da1789729201c2e8aec9e06db8c28c0a38bc826de0769dcec78080f17435d90ae3b0441ee230d7b8a9545a66f6e0ec1f SHA512 1178492628e8b8196bbb57b3d4d7526d5545bd31d0da34bcbed92150753fbb768c8682f071e2a473b95f1b6ee7c3efb30ccb9fce2e3e319d76673b79617e47c0
 EBUILD swordandsworcery-1.02.ebuild 2653 BLAKE2B 9a49ca92edb06d3314ccf21911e3aae1963ca6a5493d8f17ceb163fd4f96f1abb98a79b80c9074708c58fce1afe4c950c9a7ced3392868c28ef585d212194750 SHA512 c4307b85c406b9730d0b10386083b4cd9c752c1c628fc202543168a922b1a9de809c109c858534c92d3bb2994a3459de7357bf67aa92e9425d377a765f21edf8
 MISC metadata.xml 355 BLAKE2B 2ebe0923f754bb09445457bb7f266a9fb673682281d31d70b39a05f1cd0beb682fa26e89861c46e9dab0f77428b916f9f99d8324b3780c795f317b6e06efde84 SHA512 78f8cc8f1f1be915da206e4b8be196a21b58a6f209023594755e481136a1b86ee31c8d0dfedd516d756a47db624e89728875b073b71c3b08ac94a5cde8ff3b83