commit: 48c72dfeb8f5b9e501a4ffe5c9eaab0e13a18517 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Thu Mar 15 23:43:07 2018 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Thu Mar 15 23:43:07 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48c72dfe
games-action/super-hexagon: Bump to 20160217, EAPI 6, no bundling This previously bundled SDL 2, probably because it wasn't packaged when this was first added. With that unbundled, there are far fewer dependencies and this makes unbundling everything less likely to break. SDL is particularly stable in this regard. Because of this and in the interests of security, I have dropped the bundled-libs flag. Anyone experiencing issues can obviously file a bug report. Closes: https://bugs.gentoo.org/611282 Package-Manager: Portage-2.3.24, Repoman-2.3.6 games-action/super-hexagon/Manifest | 2 +- games-action/super-hexagon/metadata.xml | 5 -- .../super-hexagon/super-hexagon-20141027.ebuild | 84 ---------------------- .../super-hexagon/super-hexagon-20160217.ebuild | 60 ++++++++++++++++ 4 files changed, 61 insertions(+), 90 deletions(-) diff --git a/games-action/super-hexagon/Manifest b/games-action/super-hexagon/Manifest index c829ee21d52..50c5b023ce6 100644 --- a/games-action/super-hexagon/Manifest +++ b/games-action/super-hexagon/Manifest @@ -1 +1 @@ -DIST superhexagon-10272014-bin 29469168 SHA256 f079cd5f644ba69a1123491a3d2bd19069670e6a9884ad756d927be331f3d9c8 SHA512 ec07576e897cddcbb1ef1da104750001b7610ca31d40f41044dc412d8a149fa07b71e9fbc5df8b1d3ad6f110b28e5891dde618e39f4b2565d73fcfae28d3a85a WHIRLPOOL 4c73f6cddce5d4fb6aace87c2b7c660f7e2be9cfcdc37355ba953e83bb06aa3cba554d15e3051ffcbbcc15b0e6473079b811fbf261771a302dfd496e9505057f +DIST superhexagon-02172016-bin 27481878 BLAKE2B bae4d841cd3a03923b92c511a963ea836bf67b79b23dd800fb2731f33344981ad0f8392025173e2840ad3291646427ce42ba6ebd4b4920a29edb68cf9579103b SHA512 ffb54a9c3fd2e78efcdbf491e995f242ea10da40f32d36c17a0e29f6ac5d684426b542abc1dcdc8c281fa62b6a267642f834b8007686c35f54a445568808eb1e diff --git a/games-action/super-hexagon/metadata.xml b/games-action/super-hexagon/metadata.xml index b878aaa1812..26079e608be 100644 --- a/games-action/super-hexagon/metadata.xml +++ b/games-action/super-hexagon/metadata.xml @@ -5,9 +5,4 @@ <email>[email protected]</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 4998bfea0c8..00000000000 --- 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 00000000000..dbcff6cb688 --- /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; }
