gentoo resync : 16.06.2018

11 files changed, 286 insertions, 142 deletions

diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index e334818245ea..45e0b6a73faf 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index 92674943e651..d02b46036b76 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -1,5 +1,7 @@
 AUX minetestserver.confd 313 BLAKE2B 67e0b20c320d93323affd63b58085c7e0371f2ac68a541cd59a5327811bb420a42951b12396fe9c73e83be38c1a9affa25f5257e9e8488cdf9074498c1664d60 SHA512 96fe764d78b383f294bce81e8631861057f309fd9d13f9397ca0c715396f3793f201f313a3507c0b190f41891441eb4fe418b5888cb73ffdea0d27969d0172c3
 AUX minetestserver.initd 558 BLAKE2B 70557c32b4aaff21ea8e8101b90bb2f1278dfbaa684152024130603a1c69ac93790983777eed666069bfe8898a4b3d20fca4f8dba6a93018e238bc6274ca1c41 SHA512 0be59fb3b42632d3a6badd01362bf62519da9cf4a1a726f304167c7ecd52c7643c04cc410bbfd3096ebd6413242cb28e3d149b06858b25344fd5a2412b6f0907
 DIST minetest-0.4.16.tar.gz 7753044 BLAKE2B a35a0bcab00393fc72e5d932a86ebacdd1b3aa5a850e36f7b788599086c65f549341fa05fcbc0c6a09540df79d840611ec352d79e673ba63575a9f51fd5e22af SHA512 c124a997d9eb242885551e5c68948158cbd172ccd44fb1feb4d7aea487f876a2421bc990528dbfb6baf2033bfd4759d17138ed95b077e0ba80785a6e7ff521a2
+DIST minetest-0.4.17.tar.gz 7757149 BLAKE2B 9ee908990224da800e7f0f4fc5e28d5bde03f4486d43ad58225d8ec056f8209fde94597798c977e1d3f3f8cbeadeb0bcdae6eb2aac2b8572fcbcfa28bbd62eba SHA512 3015f5a03be37c5395b55b6dc9f883f9270b19f709a47250f36bc7b1ce6d04a0e89e4366d86da33bbebbfb64f04ff008aec66c96930d7314991a21160265bafe
 EBUILD minetest-0.4.16-r1.ebuild 3226 BLAKE2B 917e9af650a0e760804a2247b516565864390686141c67293aa38fd3ef52a0f6a68dd8713f9b6d48fb38b006c3dbcc4c2251373daf9e92bc53758a3a4dcc769d SHA512 0e5bbfc042b0951b7bd1fa589b91a280372bceaec7703046a0e124eb0c81d4572b821a72733c2ad30eed56dc7d2ff42f6d41d8e4670f1fa8551391acec3ce414
-MISC metadata.xml 1941 BLAKE2B c713f7ece80fac930df86c9eb4e0b33c6a2d037d89c19f87fce8d3d7f8015c7fae65b07b6d8d442c10fe8aef5ee60529bb84c869fa1a24e69bbaf4d833e057af SHA512 e88db6d9e7a3f77a85519265f2d055deaf7a96db1c8b43de9a757e59914a16ad56db202720f31abf002470cbdc4ad444d8a1a0cac1f9e6ccf02a81bfd3a47f59
+EBUILD minetest-0.4.17.ebuild 3294 BLAKE2B 2cff7f6d5c0ff8edecc563ebe6249f86b51742689d409094de3d3683b1a3fe28ca90f57852ac7b6bd714c2bb3ba896713fb05e5acf50392bcb4832cf6cd5d783 SHA512 58c1beb6dd3cb3258a1cad11d71efdedb3b1957fab223ce73f603c807ef777326326f53a577fe8c17fe63d1f09d74c7f36a69ad1800e1fcf224e5a48e6d918db
+MISC metadata.xml 2216 BLAKE2B 3872d007ded87d46e806b334e3808096f7a07c64e6ae1a99a5b79db81d7396131df7ea42d7d74753efd42844e7fe01de5e02be37c8f78198de953d9e8381602d SHA512 4c2a2a007239ca5a313e31caa19483fc877e241e5ede1ea509b12931d0feef1aa72cb086266d61f3d38c11fc303f646f328b17c5f184d8bb45d0019e6a31c9a7
diff --git a/games-action/minetest/metadata.xml b/games-action/minetest/metadata.xml
index a392aaeb34c5..c302c3ff8ee8 100644
--- a/games-action/minetest/metadata.xml
+++ b/games-action/minetest/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Minetest is an infinite-world block sandbox game and a game
 		engine, inspired by InfiniMiner, Minecraft and the like. It has
@@ -30,7 +29,16 @@
 		* Runs natively on Windows, Linux, OS X and FreeBSD.
 		* Supports multiple languages, translated by the community.
 	</longdescription>
+	<maintainer type="person">
+		<email>vilhelm.gray@gmail.com</email>
+		<name>William Breathitt Gray</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
+		<flag name="jsoncpp">Enable using a system-wide JSONCPP</flag>
 		<flag name="leveldb">Enable LevelDB backend</flag>
 		<flag name="postgres">Optionally use PostgreSQL as map backend</flag>
 		<flag name="redis">Enable redis backend via
diff --git a/games-action/minetest/minetest-0.4.17.ebuild b/games-action/minetest/minetest-0.4.17.ebuild
new file mode 100644
index 000000000000..4bc4a915ac54
--- /dev/null
+++ b/games-action/minetest/minetest-0.4.17.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils gnome2-utils user
+
+DESCRIPTION="An InfiniMiner/Minecraft inspired game"
+HOMEPAGE="https://www.minetest.net"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+curl dedicated doc jsoncpp +leveldb luajit ncurses nls postgres redis +server +sound spatial +truetype"
+
+RDEPEND="dev-db/sqlite:3
+	sys-libs/zlib
+	curl? ( net-misc/curl )
+	!dedicated? (
+		app-arch/bzip2
+		>=dev-games/irrlicht-1.8-r2
+		dev-libs/gmp:0=
+		media-libs/libpng:0=
+		virtual/jpeg:0
+		virtual/opengl
+		x11-libs/libX11
+		x11-libs/libXxf86vm
+		sound? (
+			media-libs/libogg:=
+			media-libs/libvorbis:=
+			media-libs/openal:=
+		)
+		truetype? ( media-libs/freetype:2 )
+	)
+	jsoncpp? ( dev-libs/jsoncpp )
+	leveldb? ( dev-libs/leveldb )
+	luajit? ( dev-lang/luajit:2 )
+	ncurses? ( sys-libs/ncurses:0= )
+	nls? ( virtual/libintl )
+	postgres? ( >=dev-db/postgresql-9.5:= )
+	redis? ( dev-libs/hiredis )
+	spatial? ( sci-libs/libspatialindex )"
+DEPEND="${RDEPEND}
+	>=dev-games/irrlicht-1.8-r2
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	if use server || use dedicated ; then
+		enewgroup ${PN}
+		enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	# set paths
+	sed \
+		-e "s#@BINDIR@#${EPREFIX}/usr/bin#g" \
+		-e "s#@GROUP@#${PN}#g" \
+		"${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CLIENT=$(usex !dedicated)
+		-DCUSTOM_BINDIR="${EPREFIX}/usr/bin"
+		-DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DCUSTOM_EXAMPLE_CONF_DIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DCUSTOM_LOCALEDIR="${EPREFIX}/usr/share/${PN}/locale"
+		-DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}"
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_CURSES=$(usex ncurses)
+		-DENABLE_FREETYPE=$(usex truetype)
+		-DENABLE_GETTEXT=$(usex nls)
+		-DENABLE_GLES=0
+		-DENABLE_LEVELDB=$(usex leveldb)
+		-DENABLE_LUAJIT=$(usex luajit)
+		-DENABLE_POSTGRESQL=$(usex postgres)
+		-DENABLE_REDIS=$(usex redis)
+		-DENABLE_SPATIAL=$(usex spatial)
+		-DENABLE_SOUND=$(usex sound)
+		-DENABLE_SYSTEM_JSONCPP=$(usex jsoncpp)
+		-DRUN_IN_PLACE=0
+	)
+
+	use dedicated && mycmakeargs+=(
+		-DIRRLICHT_INCLUDE_DIR="${EPREFIX}/usr/include/irrlicht"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc ; then
+		cmake-utils_src_compile doc
+		HTML_DOCS=( "${CMAKE_BUILD_DIR}"/doc/html/. )
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use server || use dedicated ; then
+		newinitd "${FILESDIR}"/minetestserver.initd minetest-server
+		newconfd "${T}"/minetestserver.confd minetest-server
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	if ! use dedicated ; then
+		elog
+		elog "optional dependencies:"
+		elog "	games-action/minetest_game (official mod)"
+		elog
+	fi
+
+	if use server || use dedicated ; then
+		elog
+		elog "Configure your server via /etc/conf.d/minetest-server"
+		elog "The user \"minetest\" is created with /var/lib/${PN} homedir."
+		elog "Default logfile is ~/minetest-server.log"
+		elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-action/minetest_game/Manifest b/games-action/minetest_game/Manifest
index fc3ee61ab3ef..1fc591a3faf6 100644
--- a/games-action/minetest_game/Manifest
+++ b/games-action/minetest_game/Manifest
@@ -1,3 +1,5 @@
 DIST minetest_game-0.4.16.tar.gz 1356062 BLAKE2B 5a5481a56484b486848c762f53000fad3359076938767726d1c629ae3ce5c273306adda38672333137df314f83eb67c58633a58a82ba9c556c8d0f8df03b0f8a SHA512 5823be50b385327948be1d609ffd66c9c24c6eb466eba4366c67dc3287c26066c74d25f17c4a6cb27fba34a82c093b8da44b3cb3fc62c45ad9d996bde15112d1
+DIST minetest_game-0.4.17.tar.gz 1356784 BLAKE2B 4cbae279edc24c7ebe8460fd3d805d3ab0f6deaf5ab303818b025b454fee8e67097a980e22f1eff39306b1ef545eae3becbbc6cfcbcad34af96b01d46e865df0 SHA512 3ed6c8419a11fe38e311b319c2af8b1f2793e40cf4bcd96b3d61748ec56a930278bace992b4142a394279c0c0308d5783a0121a9224126da9df7bdb7536b9294
 EBUILD minetest_game-0.4.16.ebuild 574 BLAKE2B 3a89ea8208081cac45263ea9a09e6eb8057d9b669b247a7c598d47093b3e349c61ad6bf10048b4016793283b78a7387d312ad96e25eca1f800ec15e80f6b553f SHA512 3278722d306214315ea07a848b6cd5e066fb01e4d2cd7f54966acb504753ef08abdf6f0dbd58d6fde73f31abb379d2c8e8cb33fdcaa3fdf7c5bf31d9226b77d3
-MISC metadata.xml 324 BLAKE2B be5f1cd4f5720edd19aa4d28797e2196b5a837f2d121566eb18b7e2b2f7910c06b3bde88cfaaeeaad1dc4d1d920bcf831fc7f293c0466cdc7511da90cd0254f8 SHA512 7e380d55164ee9e5e535adeccc2d0373618bce9a854f47002535ede7d5ff462ec148c79b6e2676f2426b6b916ecf606bef366070b57ead232f7b19518a6c6686
+EBUILD minetest_game-0.4.17.ebuild 581 BLAKE2B aa999ccf92a0e5fe692d82e259af16446b8304ec2ca8676b9bad263acc7f70de6d8330a22b86e0f5128d0b75ffb599263827f2c8bdd448633b09b73bc47936e4 SHA512 828eddf0477cb8e5fd823cf9139160be76f21d772262ccdfa9b548d7eef74b4c6811b21e71f2fea64ca94e987cb047c6981f4702294997392179fdc47d7b532d
+MISC metadata.xml 534 BLAKE2B ce785d62b15d550a92f226db94770a6e4d96ad434ab5136f6dcc1b2c6f6d28a7a84562c48ab029c25bac434c56b723c2e600adcca7355252e38af10f811b3611 SHA512 f244d4aa62a012e586988dd4839b4f809dfc82e348e04f79f84d8a6faa78bbaaa02364ba8152380a6a92e0d60402a70ea8b5ec4c896795ba8affd6297d8cb833
diff --git a/games-action/minetest_game/metadata.xml b/games-action/minetest_game/metadata.xml
index 5fb34f81c2fc..15dfa15e0050 100644
--- a/games-action/minetest_game/metadata.xml
+++ b/games-action/minetest_game/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>vilhelm.gray@gmail.com</email>
+		<name>William Breathitt Gray</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/minetest/minetest_game/issues</bugs-to>
 		<remote-id type="github">minetest/minetest_game</remote-id>
diff --git a/games-action/minetest_game/minetest_game-0.4.17.ebuild b/games-action/minetest_game/minetest_game-0.4.17.ebuild
new file mode 100644
index 000000000000..cba98c5a4067
--- /dev/null
+++ b/games-action/minetest_game/minetest_game-0.4.17.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vcs-snapshot
+
+DESCRIPTION="The main game for the Minetest game engine"
+HOMEPAGE="https://github.com/minetest/minetest_game"
+SRC_URI="https://github.com/minetest/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=games-action/minetest-${PV}"
+
+src_install() {
+	insinto /usr/share/minetest/games/${PN}
+	doins -r mods menu
+	doins game.conf minetest.conf
+
+	dodoc README.txt game_api.txt
+}
diff --git a/games-action/trine2/Manifest b/games-action/trine2/Manifest
index 8ee0f5a3af73..85d97d8698d8 100644
--- a/games-action/trine2/Manifest
+++ b/games-action/trine2/Manifest
@@ -1,3 +1,3 @@
-DIST trine2_linux_installer.run 1631149097 SHA256 39edf004fb4001360bb4b432cd365ab4b14350612e5632df789d568d682177e7 SHA512 d0c402f4f73f45290784c9414a5b59f89513b14bd09ade815d4456a77ae95909082e0a6a1afad198f6f58707a5d10eedbacd30d6cc5d063eabb702b03a7dc56e WHIRLPOOL 888073296772659c87d9955c14ac116c93bcf5da6ec2715e6a74b10520f2dcd94c5e50a794d0833f3242e3c47689f3f0042883b6673c6f8e0563fea829e06ad0
-EBUILD trine2-1.16-r1.ebuild 3230 BLAKE2B 1f7497ee876b75f1bdcb9b4642e3ac29600c786d078c4d610e9bce23c9576109e451ba4d6cbe1133e8c0abec63548708339e3bcc8ccc02fcc56929690a3497a3 SHA512 755c54368c84715eb324889b2f3c0e1eebc1f5d39390f7b0c421e723ff7453ae0ff598605e5c05fffc3cb61a0c7d94658c92ab046804c9a84d9366d069533407
-MISC metadata.xml 379 BLAKE2B c2145cb60f868b888d88f831ab58d5fac46fd31f5757253242fc2d78c725d28a41d31a7ec8e4bc0a34d06a8214a696b9e308161276dafc2768b39e0730c913e3 SHA512 666d5ad642fce9cd2e64e1ba63c89dd85fb1a0c9969916bf93a1421f3c9691a5b90b36d2778c41177c1fab5a1f8957adb757ab2d0fe034b7d9244d22f05f161a
+DIST trine2_complete_story_v2_01_build_425_humble_linux_full.zip 3243286878 BLAKE2B a9032d6043ac9623a254c1ebe69c30e5f173de91e3cc0552c4ff60275c11601c7708c37d2d7b9eb789290e24569967fc82b56f143110306642b28d5e21cb62ee SHA512 e59aaa6da7d4cae96d361f7f80d857e4102b23fe9584b88af9163407d4f1a34b9e0e79a9337c133e9d60e31ac8ead3a7f9b02b47f9797df05f998666c9219c15
+EBUILD trine2-2.01.425.ebuild 2620 BLAKE2B c0b4a6279a97ee29b926275439accad1ceb63adf32ea7f45842df1e7d2d2b8c9719012db9e1fa58ea948917a4826f15bb737d46286552f720ff8342b931bc357 SHA512 4e6382935cf268e89a85c7ca9fc4340d498cf83407bfdec2ba1fcd4d7b9da3905d440f7dbb172cea3a79cf15ebd55bc16dc895814d34a3a13f10ae8da3aedd14
+MISC metadata.xml 321 BLAKE2B 5aca052a154cd0d9a43b96774253a2999ad36aa01c956961ad0021fa7cc6cbc8b89b7f93c6318308f6310a877ac9cb2b70bf622f25b882cf0c13261a7fae9b9c SHA512 ab5d27c4f1f5760f902abe8829db8732a19206739001dd349ac170bc64e5edb9b10ec4d16ec3d8f52569a05bc90ac08af6724f11206fce2b3506d99555712747
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; }