games-action/trine2: Version bump to 2.01.425, Complete Story edition

This edition includes the Goblin Menace expansion. Sorry if you only
have the original but this was about to be last-rited and I don't have
the original to test against. You cannot buy it any more either.

It's a little buggy regarding displays and sound but once it's
running, you should be okay. Blame the short-lived SDL 1.3. If it
bothers you, poke Frozenbyte about rebuilding it against SDL 2. They
already gave Trine Enchanted Edition the same treatment so it
shouldn't be that hard.

Closes: https://bugs.gentoo.org/485058
Package-Manager: Portage-2.3.40, Repoman-2.3.9

4 files changed, 101 insertions, 136 deletions

diff --git a/games-action/trine2/Manifest b/games-action/trine2/Manifest
index 584187e0bfea..bcbdd62b6f92 100644
--- a/games-action/trine2/Manifest
+++ b/games-action/trine2/Manifest
@@ -1 +1 @@
-DIST trine2_linux_installer.run 1631149097 SHA256 39edf004fb4001360bb4b432cd365ab4b14350612e5632df789d568d682177e7 SHA512 d0c402f4f73f45290784c9414a5b59f89513b14bd09ade815d4456a77ae95909082e0a6a1afad198f6f58707a5d10eedbacd30d6cc5d063eabb702b03a7dc56e WHIRLPOOL 888073296772659c87d9955c14ac116c93bcf5da6ec2715e6a74b10520f2dcd94c5e50a794d0833f3242e3c47689f3f0042883b6673c6f8e0563fea829e06ad0
+DIST trine2_complete_story_v2_01_build_425_humble_linux_full.zip 3243286878 BLAKE2B a9032d6043ac9623a254c1ebe69c30e5f173de91e3cc0552c4ff60275c11601c7708c37d2d7b9eb789290e24569967fc82b56f143110306642b28d5e21cb62ee SHA512 e59aaa6da7d4cae96d361f7f80d857e4102b23fe9584b88af9163407d4f1a34b9e0e79a9337c133e9d60e31ac8ead3a7f9b02b47f9797df05f998666c9219c15
diff --git a/games-action/trine2/metadata.xml b/games-action/trine2/metadata.xml
index cc071fac0574..b26a6baa4124 100644
--- a/games-action/trine2/metadata.xml
+++ b/games-action/trine2/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
-		<flag name="bundled-libs">Use bundled libraries.</flag>
-		<flag name="launcher">Install gtk+ launcher</flag>
+		<flag name="launcher">Install GTK+ launcher</flag>
 	</use>
 </pkgmetadata>
diff --git a/games-action/trine2/trine2-1.16-r1.ebuild b/games-action/trine2/trine2-1.16-r1.ebuild
deleted file mode 100644
index 83ead951316e..000000000000
--- a/games-action/trine2/trine2-1.16-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker gnome2-utils games
-
-MY_PN="Trine 2"
-DESCRIPTION="A sidescrolling game of action, puzzles and platforming"
-HOMEPAGE="http://www.trine2.com/"
-SRC_URI="${PN}_linux_installer.run"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="bundled-libs +launcher"
-RESTRICT="fetch bindist splitdebug"
-
-QA_PREBUILT="${GAMES_PREFIX_OPT}/${PN}/${PN}*
-	${GAMES_PREFIX_OPT}/${PN}/lib/*"
-
-# TODO: bundled-libs: no libsdl-1.3, no physx
-RDEPEND="
-	amd64? (
-		>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
-		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-		>=virtual/glu-9.0-r1[abi_x86_32(-)]
-		>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-		>=media-libs/openal-1.15.1[abi_x86_32(-)]
-		>=media-libs/libogg-1.3.0[abi_x86_32(-)]
-		>=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)]
-		>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-		launcher? (
-			>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			>=media-libs/libpng-1.5.18:1.5[abi_x86_32(-)]
-			>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
-			>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
-			>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-			>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-		)
-		!bundled-libs? (
-			>=media-gfx/nvidia-cg-toolkit-3.1.0013-r3[abi_x86_32(-)]
-		)
-	)
-	x86? (
-		dev-libs/glib:2
-		media-libs/freetype
-		media-libs/libogg
-		media-libs/libvorbis
-		media-libs/openal
-		sys-libs/zlib
-		virtual/glu
-		virtual/opengl
-		launcher? (
-			media-libs/fontconfig
-			media-libs/libpng:1.5
-			x11-libs/gtk+:2
-			x11-libs/libSM
-			x11-libs/libX11
-			x11-libs/libXinerama
-			x11-libs/libXxf86vm
-		)
-		!bundled-libs? ( media-gfx/nvidia-cg-toolkit )
-	)"
-
-S=${WORKDIR}
-
-pkg_nofetch() {
-	einfo
-	einfo "Please buy & download \"${SRC_URI}\" from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move/link it to \"${DISTDIR}\""
-	einfo
-}
-
-src_unpack() {
-	local offset="$(( $(grep -a -h -n -m 1 -F -e THIS_IS_THE_LAST_SCRIPT_LINE_ARCHIVE_DATA_FOLLOWS "${DISTDIR}"/${A} | cut -d':' -f1) + 1 ))"
-	unpack_makeself ${A} "${offset}" "tail"
-}
-
-src_install() {
-	local dir=${GAMES_PREFIX_OPT}/${PN}
-
-	insinto "${dir}"
-	doins -r data*
-
-	exeinto "${dir}"
-	newexe "bin/trine2_linux_32bit" ${PN}
-
-	exeinto "${dir}/lib"
-	use bundled-libs || { find lib/lib32 -type f -name "libCg*.so*" -delete || die ;}
-	doexe lib/lib32/*
-
-	games_make_wrapper ${PN} "./${PN}" "${dir}" "${dir}/lib"
-	doicon -s 64 ${PN}.png
-	make_desktop_entry ${PN} "${MY_PN}"
-
-	if use launcher ; then
-		exeinto "${dir}"
-		newexe bin/trine2_linux_launcher_32bit ${PN}-launcher
-
-		games_make_wrapper ${PN}-launcher "./${PN}-launcher" "${dir}" "${dir}/lib"
-		make_desktop_entry ${PN}-launcher "${MY_PN} (launcher)"
-
-		# launcher binary has hardcoded the script path
-		dodir "${dir}"/bin
-		dosym "${GAMES_BINDIR}"/trine2 "${dir}"/bin/trine2_bin_starter.sh
-	fi
-
-	dodoc KNOWN_LINUX_ISSUES README
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	einfo
-	elog "${MY_PN} savegames and configurations are stored in:"
-	elog "   \${HOME}/.frozenbyte/${MY_PN//\ /}"
-	einfo
-
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-action/trine2/trine2-2.01.425.ebuild b/games-action/trine2/trine2-2.01.425.ebuild
new file mode 100644
index 000000000000..1b49131fab0c
--- /dev/null
+++ b/games-action/trine2/trine2-2.01.425.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop eutils gnome2-utils
+
+MY_P="${PV//./_}"
+MY_P="${PN}_complete_story_v${MY_P%_*}_build_${MY_P##*_}"
+MY_PN="Trine 2"
+
+DESCRIPTION="Sidescrolling game of action, puzzles and platforming, Complete Story edition"
+HOMEPAGE="http://www.trine2.com/"
+SRC_URI="${MY_P}_humble_linux_full.zip"
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+launcher"
+RESTRICT="bindist fetch splitdebug"
+
+QA_PREBUILT="opt/${PN}/${PN}*
+	opt/${PN}/lib/*"
+
+DEPEND="app-arch/unzip"
+
+RDEPEND="
+	media-gfx/nvidia-cg-toolkit[abi_x86_32]
+	media-libs/alsa-lib[abi_x86_32]
+	media-libs/freetype:2[abi_x86_32]
+	media-libs/libogg[abi_x86_32]
+	>=media-libs/libvorbis-1.3[abi_x86_32]
+	>=media-libs/openal-1.15[abi_x86_32]
+	>=sys-devel/gcc-4.6[cxx]
+	>=sys-libs/glibc-2.15
+	sys-libs/zlib[abi_x86_32]
+	virtual/glu[abi_x86_32]
+	virtual/opengl[abi_x86_32]
+	launcher? (
+		dev-libs/expat[abi_x86_32]
+		dev-libs/glib:2[abi_x86_32]
+		media-libs/libpng:1.2[abi_x86_32]
+		sys-apps/dbus[abi_x86_32]
+		sys-apps/util-linux[abi_x86_32]
+		x11-libs/gdk-pixbuf:2[abi_x86_32,X]
+		x11-libs/gtk+:2[abi_x86_32]
+		x11-libs/libX11[abi_x86_32]
+		x11-libs/pango[abi_x86_32,X]
+	)"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	einfo "Please buy and download ${SRC_URI} from:"
+	einfo "  https://www.humblebundle.com/store/trine-2-complete-story"
+	einfo "and move it to your distfiles directory."
+}
+
+src_prepare() {
+	default
+
+	# SDL 1.3 is very special and crashes when fullscreen if
+	# /usr/bin/gnome-screensaver-command is missing. XD
+	sed -i 's:/usr/bin/gnome-screensaver-command:/bin/true\x0                        :g' \
+		lib/lib32/libSDL-1.3.so.0 || die
+}
+
+src_install() {
+	local dir=/opt/${PN}
+
+	insinto "${dir}"
+	doins -r *.fbq data
+
+	exeinto "${dir}"
+	newexe bin/${PN}_linux_32bit ${PN}
+
+	exeinto "${dir}"/lib
+	doexe lib/lib32/lib{{SDL-1.3,PhysXLoader}.so.*,PhysX{Cooking,Core}.so} # Avoid duplicates.
+
+	make_wrapper ${PN} ./${PN} "${dir}" "${dir}"/lib
+	make_desktop_entry ${PN} "${MY_PN}"
+
+	if use launcher ; then
+		exeinto "${dir}"
+		newexe bin/${PN}_linux_launcher_32bit ${PN}-launcher
+
+		make_wrapper ${PN}-launcher ./${PN}-launcher "${dir}" "${dir}"/lib
+		make_desktop_entry ${PN}-launcher "${MY_PN} (launcher)"
+
+		# Launcher binary has hardcoded the game path.
+		dosym ../${PN} "${dir}"/bin/${PN}_bin_starter.sh
+	fi
+
+	doicon -s 64 ${PN}.png
+	dodoc readme_changelog.txt readme/{KNOWN_LINUX_ISSUES,README}
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }