gentoo resync : 25.03.2018

10 files changed, 210 insertions, 88 deletions

diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 8c5d68041739..600f3f45b45f 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/trine-bin/Manifest b/games-action/trine-bin/Manifest
deleted file mode 100644
index 9e3b6e2c288c..000000000000
--- a/games-action/trine-bin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST TrineUpdate4.64.run 647258173 BLAKE2B b520d1f312b9bd9ef94f32cd5fbe7ceaea0cb1bd839d8a898ac02cac0eb3464d83588f1163949ca2f53d7badb2eca456b8e1438d6f5e96e3c6baa10ca6cb865a SHA512 1255edc90cfd47c4f5a3cf7fa07cebac047f46f9b5f9f6621baff01d9c4295c95204a695127ce4947038c50c80253e7a004ec1c3accff6ac8697605fd25885f9
-EBUILD trine-bin-1.08-r2.ebuild 1600 BLAKE2B ca1e3ddfeaf2d584a158ba319c0808046cf679a50b30a9332a567befca5766136ce4d82c5a9f25f45eaa42ea2d1953da221ca2f90f15f85f30e34e67f4528d4e SHA512 aae2c12a3f387d7f7f918f46e246e9756abe75ec4e98c24ef120f57104edf79c110c04bb79a80fb6a486891d7a66d40ad4ed770c8b3dd367ef46ce82586ef081
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/trine-bin/metadata.xml b/games-action/trine-bin/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-action/trine-bin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-action/trine-bin/trine-bin-1.08-r2.ebuild b/games-action/trine-bin/trine-bin-1.08-r2.ebuild
deleted file mode 100644
index 99503c9efac8..000000000000
--- a/games-action/trine-bin/trine-bin-1.08-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop eutils unpacker
-
-DESCRIPTION="A physics-based action game with character-dependent solutions to challenges"
-HOMEPAGE="http://trine-thegame.com/"
-SRC_URI="TrineUpdate4.64.run"
-
-LICENSE="frozenbyte-eula"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="fetch strip"
-
-DEPEND="
-	app-admin/chrpath
-	app-arch/unzip
-"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/libx86
-	gnome-base/libglade:2.0
-	media-libs/libogg
-	media-libs/libpng:1.2
-	>=media-libs/libsdl-1.2[opengl,sound,video]
-	>=media-libs/libvorbis-1.3
-	>=media-libs/openal-1.15
-	>=media-libs/tiff-3.9:3
-	>=sys-devel/gcc-4.3.0
-	>=sys-libs/glibc-2.4
-	virtual/jpeg:62
-	x11-libs/gtk+:2
-"
-
-S="${WORKDIR}"
-d="/opt/${PN}"
-QA_PREBUILT="*"
-
-pkg_nofetch() {
-	einfo "Fetch ${SRC_URI} and put it into ${DISTDIR}"
-	einfo "See http://www.humblebundle.com/ for more info."
-}
-
-src_unpack() {
-	unpack_zip ${A}
-}
-
-src_prepare() {
-	default
-	rm -v lib*/lib{gcc_s,jpeg,m,ogg,openal,png*,rt,SDL*,selinux,stdc++,tiff,vorbis*}.* || die
-	chrpath --replace "${EPREFIX}${d}"/lib trine-{bin,launcher}$(usex x86 32 64) || die
-}
-
-src_install() {
-	local b bb
-	local sfx=$(usex x86 32 64)
-
-	doicon Trine.xpm
-	for b in bin launcher ; do
-		bb="trine-${b}"
-		exeinto ${d}
-		newexe ${bb}${sfx} ${bb}
-		make_wrapper ${bb} "./${bb}" "${d}"
-		make_desktop_entry ${bb} "Trine ${b}" Trine
-	done
-
-	exeinto ${d}/lib
-	doexe lib${sfx}/*
-
-	insinto ${d}
-	doins -r binds config data dev profiles *.fbz *.glade trine-logo.png
-
-	dodoc Trine_Manual_linux.pdf Trine_updates.txt
-}
diff --git a/games-action/trine-enchanted-edition/Manifest b/games-action/trine-enchanted-edition/Manifest
new file mode 100644
index 000000000000..7bed2544ddbc
--- /dev/null
+++ b/games-action/trine-enchanted-edition/Manifest
@@ -0,0 +1,3 @@
+DIST trine_enchanted_edition_v2_12_build_508_humble_linux_full.zip 1226749814 BLAKE2B 9803f78279bcf83a2a54f25e2498664b73ba1c0ae5c540bb4479345ae05495cc11527937876fb7c9dbb34d05dbbdb4575cc6c1899923c782ff67ea23bd2cfac9 SHA512 e883763efe89f09a84c2896bfd0a9a13319dd14bb840e67f1812a0bab45bcab7a144f4c9399194e5aabad0435e350c6a903a542c9101a37c602855ebd0884d9d
+EBUILD trine-enchanted-edition-2.12.508.ebuild 2281 BLAKE2B 414c0a17d01db6edc9fbb41e80a9e604e73aedec3df46f82f4833034d61ff820a9c49c6ef30fcb88df21b3cdf8f9a7f5828a00a12e271aa659ec8e39d45577a8 SHA512 feb074255ad518616b4dd116e05b3e2cbddbc5cc5e49962cf4011e7bb8226b304557b1bac993316c696b073f02119cea7ed5078eb8aa38d3ce858a009d46317d
+MISC metadata.xml 321 BLAKE2B 5aca052a154cd0d9a43b96774253a2999ad36aa01c956961ad0021fa7cc6cbc8b89b7f93c6318308f6310a877ac9cb2b70bf622f25b882cf0c13261a7fae9b9c SHA512 ab5d27c4f1f5760f902abe8829db8732a19206739001dd349ac170bc64e5edb9b10ec4d16ec3d8f52569a05bc90ac08af6724f11206fce2b3506d99555712747
diff --git a/games-action/trine-enchanted-edition/metadata.xml b/games-action/trine-enchanted-edition/metadata.xml
new file mode 100644
index 000000000000..b26a6baa4124
--- /dev/null
+++ b/games-action/trine-enchanted-edition/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="launcher">Install GTK+ launcher</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508.ebuild b/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508.ebuild
new file mode 100644
index 000000000000..87871dfbf505
--- /dev/null
+++ b/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508.ebuild
@@ -0,0 +1,85 @@
+# 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//-/_}_v${MY_P%_*}_build_${MY_P##*_}"
+MY_PN="Trine Enchanted Edition"
+
+DESCRIPTION="The original sidescrolling action platformer under the Trine 2 engine"
+HOMEPAGE="https://www.frozenbyte.com/games/trine-enchanted-edition"
+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}*"
+
+DEPEND="app-arch/unzip"
+
+# SDL 1.3 is bundled but the game appears to be statically linked
+# against SDL 2.0.3. This is unfortunate as there are bugs. For example,
+# it doesn't respect the DISPLAY variable under Zaphod mode.
+
+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-libs/zlib[abi_x86_32]
+	virtual/glu[abi_x86_32]
+	virtual/opengl[abi_x86_32]
+	launcher? (
+		dev-libs/glib:2[abi_x86_32]
+		media-libs/libpng:1.2[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}/linux/_enchanted_edition_"
+
+pkg_nofetch() {
+	einfo "Please buy and download ${SRC_URI} from:"
+	einfo "  https://www.humblebundle.com/store/${PN}"
+	einfo "and move it to your distfiles directory."
+}
+
+src_install() {
+	local dir=/opt/${PN}
+
+	insinto "${dir}"
+	doins -r *.fbq data
+
+	exeinto "${dir}"
+	newexe bin/trine1_linux_32bit ${PN}
+
+	make_wrapper ${PN} ./${PN} "${dir}"
+	make_desktop_entry ${PN} "${MY_PN}"
+
+	if use launcher ; then
+		exeinto "${dir}"
+		newexe bin/trine1_linux_launcher_32bit ${PN}-launcher
+
+		make_wrapper ${PN}-launcher ./${PN}-launcher "${dir}"
+		make_desktop_entry ${PN}-launcher "${MY_PN} (launcher)"
+
+		# Launcher binary has hardcoded the game path.
+		dosym ../${PN} "${dir}"/bin/trine1_bin_starter.sh
+	fi
+
+	newicon -s 64 trine1.png ${PN}.png
+	dodoc readme_changelog.txt
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-action/trine/Manifest b/games-action/trine/Manifest
new file mode 100644
index 000000000000..7db21e5d4541
--- /dev/null
+++ b/games-action/trine/Manifest
@@ -0,0 +1,3 @@
+DIST TrineUpdate4.64.run 647258173 BLAKE2B b520d1f312b9bd9ef94f32cd5fbe7ceaea0cb1bd839d8a898ac02cac0eb3464d83588f1163949ca2f53d7badb2eca456b8e1438d6f5e96e3c6baa10ca6cb865a SHA512 1255edc90cfd47c4f5a3cf7fa07cebac047f46f9b5f9f6621baff01d9c4295c95204a695127ce4947038c50c80253e7a004ec1c3accff6ac8697605fd25885f9
+EBUILD trine-1.08-r3.ebuild 2401 BLAKE2B c81708cf345a2a67e7ef0e0edc570bcb95946145dc78408aa2d03d5f365efc269df9c8a69c40d97037853f6efa860ba9a6bf0cd2cffe2adb65a592cf6459e715 SHA512 cebbd8d3a103cf6fa5e363b2f504a45b20f2dd3dbf071071fd3b003a45aba2f2f955f16e32d679a8406504eb46f37fbcd85cf06c99bad9d9a2de0eda82f89525
+MISC metadata.xml 321 BLAKE2B 5aca052a154cd0d9a43b96774253a2999ad36aa01c956961ad0021fa7cc6cbc8b89b7f93c6318308f6310a877ac9cb2b70bf622f25b882cf0c13261a7fae9b9c SHA512 ab5d27c4f1f5760f902abe8829db8732a19206739001dd349ac170bc64e5edb9b10ec4d16ec3d8f52569a05bc90ac08af6724f11206fce2b3506d99555712747
diff --git a/games-action/trine/metadata.xml b/games-action/trine/metadata.xml
new file mode 100644
index 000000000000..b26a6baa4124
--- /dev/null
+++ b/games-action/trine/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="launcher">Install GTK+ launcher</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-action/trine/trine-1.08-r3.ebuild b/games-action/trine/trine-1.08-r3.ebuild
new file mode 100644
index 000000000000..f9b9673cdd45
--- /dev/null
+++ b/games-action/trine/trine-1.08-r3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop eutils gnome2-utils unpacker
+
+DESCRIPTION="A physics-based action game with character-dependent solutions to challenges"
+HOMEPAGE="https://www.frozenbyte.com/games/trine-enchanted-edition"
+SRC_URI="TrineUpdate4.64.run"
+LICENSE="frozenbyte-eula"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+launcher"
+RESTRICT="bindist fetch strip"
+
+QA_PREBUILT="opt/${PN}/${PN}*
+	opt/${PN}/lib/*"
+
+DEPEND="
+	app-admin/chrpath
+	app-arch/unzip
+"
+
+RDEPEND="
+	media-gfx/nvidia-cg-toolkit
+	>=media-libs/libsdl-1.2[opengl,video]
+	>=media-libs/sdl-image-1.2
+	>=media-libs/sdl-ttf-2.0
+	>=media-libs/libvorbis-1.3
+	>=media-libs/openal-1.15
+	>=sys-devel/gcc-4.3.0
+	>=sys-libs/glibc-2.4
+	sys-libs/zlib
+	x11-libs/gtk+:2
+	launcher? (
+		dev-libs/glib:2
+		gnome-base/libglade:2.0
+	)"
+
+S="${WORKDIR}"
+dir="/opt/${PN}"
+
+pkg_nofetch() {
+	einfo "Fetch ${SRC_URI} and put it into your distfiles directory."
+	einfo "It is no longer available to purchase but you can still download it"
+	einfo "from https://www.humblebundle.com if you bought it previously."
+	einfo "Otherwise install ${CATEGORY}/trine-enchanted-edition instead."
+}
+
+src_unpack() {
+	unpack_zip ${A}
+}
+
+src_prepare() {
+	default
+	use launcher || rm -v lib*/lib{boost*,icu*}.* || die
+	rm -v lib*/lib{Cg*,direct*,fusion*,gcc_s,jpeg,m,ogg,openal,png*,rt,SDL*,selinux,stdc++,tiff,vga,vorbis*}.* || die
+	chrpath --replace "${EPREFIX}${dir}"/lib trine-{bin,launcher}$(usex x86 32 64) || die
+}
+
+src_install() {
+	local sfx=$(usex x86 32 64)
+
+	insinto "${dir}"
+	doins -r binds config data dev profiles *.fbz *.glade trine-logo.png
+
+	exeinto "${dir}/lib"
+	doexe lib${sfx}/*
+
+	exeinto "${dir}"
+	newexe trine-bin${sfx} ${PN}
+
+	make_wrapper ${PN} ./${PN} "${dir}"
+	make_desktop_entry ${PN} "Trine"
+
+	# Compatibility with trine-bin.
+	dosym ${PN} /usr/bin/${PN}-bin
+
+	if use launcher ; then
+		exeinto "${dir}"
+		newexe trine-launcher${sfx} ${PN}-launcher
+
+		dosym {"../..${dir}",/usr/bin}/${PN}-launcher
+		make_desktop_entry ${PN}-launcher "Trine (launcher)"
+
+		# Launcher binary has hardcoded the game path.
+		dosym ${PN} "${dir}"/${PN}-bin
+	fi
+
+	newicon -s 512 Trine.xpm ${PN}.xpm
+	dodoc Trine_Manual_linux.pdf Trine_updates.txt
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }