gentoo resync : 02.03.2018

6 files changed, 52 insertions, 25 deletions

diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index cc6f7814cfd4..367ba5dbd989 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/bzflag/Manifest b/games-action/bzflag/Manifest
index 6cb13b59895d..e3f16fe89ecf 100644
--- a/games-action/bzflag/Manifest
+++ b/games-action/bzflag/Manifest
@@ -1,4 +1,5 @@
 AUX bzflag-2.4.12-configure.patch 1278 BLAKE2B 1db48df25ce19df2d3fb81fc60ffc7b51ef6621e8e85237f620447e64ed4139453b3b720d0d28f78ec6cd616f3b40c3f4732cb98e8b464f20ab3e7e5814b2e73 SHA512 177d73ee047984e18dff2f2f15e8e679485a166a51303f61e1a7411e6c330c04d813a824e3d727aa95b251cd9a27a00dc41c229af56f927a9a4adabc96e4813e
+AUX bzflag-2.4.12-tinfo.patch 683 BLAKE2B 720a6b5aa97a474c2e37bb2927cd9680a55249e732f6f07cc894e114c745b15886325a2d56a7731d397580a1dedba6be1acb71086e146bb8af2f983c908b3bb0 SHA512 f670e7362fc81055d3996a16c213746fa55338aed0756c36565c856eae4e7f9ed8bed3b2b2955b659f83bf03d4b4249b53a7ea02e614409fe38dbcd215c805da
 DIST bzflag-2.4.12.tar.bz2 14042357 BLAKE2B eb18072f459549b18bf99fbe0b635aea24568ad39494082f443e8eb7a604db0341aa18f1d458a950b5344f34278599215b351bcad35bd88f33f01449b89489b8 SHA512 9b5fa6b7ab7eb13043242defcc86cbed083e98306b2f611932b48d6d833a37bbe2ab05a0a3d1a2c9b861bfbd834fc6e86783ba82d8a841527d0eedb06f3bde9f
-EBUILD bzflag-2.4.12.ebuild 1156 BLAKE2B c7681ab6f6443d514f7a580a527a9631169f5631ac2a652c32ac125c61ff2baa728d1232d7c07b12641337694b0290e68d72c3bb45b717735e81bc6f54bef7e5 SHA512 7cfbde67369821f4af8afc45ceb420725ba2f9ad24e2470db631c7127dd4a61fc23344c590c2f0ed25fdec33891ca50f30dcc1891008305265d5d109859dafe3
+EBUILD bzflag-2.4.12.ebuild 1187 BLAKE2B 7332f360aa5198bbc1e735fded940b99711e6bf630d079b70fcc7fff94dbbbfb5cc57a4d329341597570db318e549170e6cde86ac398d072e3750f68235480af SHA512 69ea008df306bcd54dd66db7760434af0bbcd4bd93cada77fdd2d5cfc8b4dce8e99835be0367fcf996954143ce12195908431f818d94f4635d40031779bbf395
 MISC metadata.xml 329 BLAKE2B 045c2426f059b10e768ba5764ec7c26ad95f98ca1754358df18faa4ec58d3b26c02d905222c877c6d508eeb47f3ae3f22dd319b1d719f169e91ab31d824ab30d SHA512 4f9e157aef5067fb6a97fd7d7e68f758a280a37b8093c7291b45ada10169ca8c79ee0e7770fdbcc4d2de517b7bf05f1e3585585c72c1fdf7692d4e568f5d8301
diff --git a/games-action/bzflag/bzflag-2.4.12.ebuild b/games-action/bzflag/bzflag-2.4.12.ebuild
index 909cc8440797..26da58b19793 100644
--- a/games-action/bzflag/bzflag-2.4.12.ebuild
+++ b/games-action/bzflag/bzflag-2.4.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,9 +24,9 @@ DEPEND="
 		virtual/opengl )
 	upnp? ( net-libs/miniupnpc )"
 RDEPEND=${DEPEND}
-
 PATCHES=(
 	"${FILESDIR}"/${P}-configure.patch
+	"${FILESDIR}"/${P}-tinfo.patch
 )
 
 src_prepare() {
diff --git a/games-action/bzflag/files/bzflag-2.4.12-tinfo.patch b/games-action/bzflag/files/bzflag-2.4.12-tinfo.patch
new file mode 100644
index 000000000000..aa43980b9b67
--- /dev/null
+++ b/games-action/bzflag/files/bzflag-2.4.12-tinfo.patch
@@ -0,0 +1,15 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -125,7 +125,11 @@
+ BZ_CONFIGURE_STAGE([arguments], [1 of 9])
+ 
+ # provide a with-curses option, test for curses
+-MP_WITH_CURSES
++PKG_CHECK_MODULES(ncurses, ncurses,
++	[CURSES_LIB="$ncurses_LIBS"]
++	AC_DEFINE(HAVE_NCURSES_H, , [Use the header file ncurses.h]),
++	AC_MSG_ERROR([Could not find ncurses]))
++AC_SUBST(CURSES_LIB)
+ 
+ # check for SDL option (enabled by default now)
+ AC_ARG_WITH(SDL, AS_HELP_STRING([--without-SDL | --with-SDL={1,2}],[Do not use Simple DirectMedia Layer or force using a specific version (by default tries 2, then 1, then resorts to native platform code if available]), sdl_version="$withval", sdl_version="detect")
diff --git a/games-action/trine-bin/Manifest b/games-action/trine-bin/Manifest
index c94e5079070a..9e3b6e2c288c 100644
--- a/games-action/trine-bin/Manifest
+++ b/games-action/trine-bin/Manifest
@@ -1,3 +1,3 @@
-DIST Trine.64.run 648471997 SHA256 1c9067cb19e3c954b460b4df27e6ca5d80b31c7ead49bd5779dcbce5528177db SHA512 400200a3ebc6003545df460f9a8af7fe4f6f370655432c66ca8a5ceb10e40bf205e81f70cfbe3fe7386de9ec0aeb5e23f02590776c2b0f35a32f9fbc1012ea3a WHIRLPOOL b6610f53e8e4079383de9a664b8cb019fbe9daa7cdbb204116c3e34b27327325dfdc39649185076524429f8ba2fc1a0889f9006e6873db65c3f73784f440e1e9
-EBUILD trine-bin-1.08-r1.ebuild 1625 BLAKE2B 4a666d9cb47809ac783efffbb7ccd6b41151b441cfa95d29ff25f293e6a1579c8afb8cf68d59404cd6983142077723227eb2424f09fad976fc6ca5a6ece6b158 SHA512 a5af36f86b67b8f70fc0e68e2bdfc2ba046b55b76787e67ab31074d2bd3f6213d543e21db027cf738793d351270a8dc8c2f31420c7f1ce444a65302bef30fe9b
+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/trine-bin-1.08-r1.ebuild b/games-action/trine-bin/trine-bin-1.08-r2.ebuild
index dd00324d01d0..99503c9efac8 100644
--- a/games-action/trine-bin/trine-bin-1.08-r1.ebuild
+++ b/games-action/trine-bin/trine-bin-1.08-r2.ebuild
@@ -1,36 +1,43 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# these are ELFs that include a ZIP (504b0304) appended to it
-#   dd if=Trine.64.run of=Trine.64.zip ibs=$((0x342a8)) skip=1
-#   dd if=Trine.32.run of=Trine.32.zip ibs=$((0x31c24)) skip=1
-# but `unzip` will skip the ELF at the start.  both ELFs contain
-# the same zip appended, so only need to hash one of them.
-
 EAPI=6
-inherit unpacker eutils
+
+inherit desktop eutils unpacker
 
 DESCRIPTION="A physics-based action game with character-dependent solutions to challenges"
 HOMEPAGE="http://trine-thegame.com/"
-SRC_URI="Trine.64.run"
+SRC_URI="TrineUpdate4.64.run"
 
 LICENSE="frozenbyte-eula"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
 RESTRICT="fetch strip"
 
-DEPEND="app-arch/unzip"
+DEPEND="
+	app-admin/chrpath
+	app-arch/unzip
+"
+
 RDEPEND="
+	dev-libs/glib:2
 	dev-libs/libx86
-	gnome-base/libglade
+	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"
+	>=sys-libs/glibc-2.4
+	virtual/jpeg:62
+	x11-libs/gtk+:2
+"
 
-S=${WORKDIR}
-
-d=/opt/${PN}
-QA_PREBUILT="${d#/}/trine-launcher ${d#/}/trine-bin ${d#/}/lib*/lib*.so*"
+S="${WORKDIR}"
+d="/opt/${PN}"
+QA_PREBUILT="*"
 
 pkg_nofetch() {
 	einfo "Fetch ${SRC_URI} and put it into ${DISTDIR}"
@@ -38,9 +45,13 @@ pkg_nofetch() {
 }
 
 src_unpack() {
-	# manually run unzip as the initial seek causes it to exit(1)
 	unpack_zip ${A}
-	rm lib*/lib{gcc_s,m,rt,selinux}.so.? || die
+}
+
+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() {
@@ -56,7 +67,7 @@ src_install() {
 		make_desktop_entry ${bb} "Trine ${b}" Trine
 	done
 
-	exeinto ${d}/lib${sfx}
+	exeinto ${d}/lib
 	doexe lib${sfx}/*
 
 	insinto ${d}