gentoo resync : 18.03.2018

4 files changed, 63 insertions, 92 deletions

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; }