gentoo resync : 18.05.2019

3 files changed, 38 insertions, 6 deletions

diff --git a/games-action/dxx-rebirth/Manifest b/games-action/dxx-rebirth/Manifest
index f2fde940546b..3a7421ed3755 100644
--- a/games-action/dxx-rebirth/Manifest
+++ b/games-action/dxx-rebirth/Manifest
@@ -1,4 +1,5 @@
 AUX dxx-rebirth-0.59.100-flags.patch 371 BLAKE2B 7902a9375b9f6782eb1cdaba1d0e27ede3476149554a711473631eb652d953828a67836515c097c459b2e3ea31014a71e3ee5d2c46d1ed25dce97ac0cde6f88e SHA512 c8bb575a172845b2643838c95ccbe3fac4509a3b5c24178816ea5a1a46a0fa2721d3fae841641950e97dec0e3a9fb74d8ddac493183df8834caca7d8d9ce11b4
+AUX dxx-rebirth-0.59.100-physfs-3-no-deprecation.patch 1060 BLAKE2B d9b62b11ae0aa871f667bb8e75eca0efffad2ba5d2781410886588b9c1dd6cefe430bb97381bf66ac0a99fd505c08547d45ffb3353e6d0edf14a08973bafdf2f SHA512 3c631874a910192e0f2fd594029b789bc79eb9b70eb3c2c172967ccc0ae1a994f138f7d57e1f99b3067cc1f199594fd590a2d3a73f35fda3520edb98cf0b80c9
 AUX dxx-rebirth-0.59.100-sharepath.patch 553 BLAKE2B 651db97d70b177754d7053c400a99a79c5ff7cd82af7743ef4588f0981ac2e17143fc0b41cbc62670d896e7f51cfc21e96f0b77d0a4994b4e2b56853ee29b28b SHA512 6f57832df96b6c927ea6f1d93f57662df24c0127b8a22ee08c73c3ecd21ab027fa7367070d0bec09250042e716409b258373e54c9189de68d41b799f785498b8
 DIST d1xr-briefings-ger.dxa 16798 BLAKE2B f5e1f4f91cb3464b3d356fab1e3993700cc19f3f2db8682f5194e59aa5d2623efa427db4135c3595534e5dac0f2589b53aac7df3610501b759407e1ead342458 SHA512 956a3ef1fe7379b71d5f651fdcb1f26b786883a35193a0a22009204e885a12fceb3a69c6accbeb2bd20be65afe087d23532d7ef3439edd97cc8904968bf519e3
 DIST d1xr-hires.dxa 1426884 BLAKE2B c4d9b950353fc450c64568779bc3d2e93a46e17980c8df08a2ef06bff5b9709869fdbbaf4fb6698be994b3faae7a75036a53357743d47b728bb3ef9df126afd8 SHA512 3fc84d5610ba40ee383c1720f80513a21b4644ff8b6da4b84ebca13b11c1131deb4897ded6324b54845b6c847dfc0f16700535e16afdd7ebe83bfff042892302
@@ -8,5 +9,5 @@ DIST d2xr-briefings-ger.dxa 11717 BLAKE2B 27af93656ac91bf5490195d2aebc9c9f252cb7
 DIST d2xr-opl3-music.dxa 22710919 BLAKE2B 82bdf29b6afe88305d4c7b69bb8b094efcf33ad23becec223311775cd50600ed399c207ee3a05da3800bcc5e123d00f9f8fa7d2d4f4d4be57bbf71e1c2482a9c SHA512 876321a9a16403f6e9d12e10bb73c9cdc57e1a106fa64833a1be8cc17b74f6f13e57e40f051a1b40e7bc88b95bfe86cff181c93c8619383dfdeb74f36f5cce86
 DIST d2xr-sc55-music.dxa 19579531 BLAKE2B 16091e24477a49319f2685884a7538a3597a9132707ac1d59405fa08ce7492158075df4ee680a5c7ba44aa0bd0b16170057f6a8956eab4b56913d00ee2f1f339 SHA512 290713b05627bf65bdc55fc6631a0c86e50f484a167f3fd20b3fe2bc5b772437939b5bf32eea852874dd983fbd47f160cae2412a2d6c5319f0d1583a33d28da6
 DIST dxx-rebirth_v0.59.100-src.tar.gz 1809614 BLAKE2B 6826380312fa23dbc99459db9272cf7ffb5a00a14cfdd777339633fbd943a288af00f182692ebc3078e4c39bf6b6cc9fb05cc6a533ec126b8c881eb22c465868 SHA512 dc9b7ad263e189e779756b62613d4bc62371cb5fec2176a4013395fc18c9d03ab0c9ddc5ccf2668b87e4a77b25d500bdef373126f176bfce49f73b5a98de23d7
-EBUILD dxx-rebirth-0.59.100.ebuild 3276 BLAKE2B 2fb4ede8bc77e37d698f776cdf2aceb7a969ee821d61f7a9ac06e512b8c504fcb911928588686580bad91b15cebee9d6f4a87a17f777e4e5dd82d93caf6cc596 SHA512 ce48361403cc3696ee8d19b33f9546b41867e2eef330bef6dc821a1995bdb6b2ec10328fc15997942ffa1e0908abf810a0bb479192495a4b84fcc891363895a6
+EBUILD dxx-rebirth-0.59.100.ebuild 3355 BLAKE2B 11173d9573253619102874c4f5fd49088e57f977c97f015b56ca4184e36b8e7b2d8ba11474c83c26c9e4a24978f2dee79064f181e27743315a1850b0583224b3 SHA512 4cdba9cfe109516d574824e360772b2c042b5aab5753b02107c2fccc47a7f71f0048ea177cd04c6a3202727787b075ba7e1d8deca6da3a6f74ab25f7eee52c4d
 MISC metadata.xml 1974 BLAKE2B 654588e63aa9b45daa812b1a79cedc5992ec6a083d37f7abc13643ea49c5e2679ff967af6f5d3f309f832a0d0a8c8877a6b0b3984f2515aeea95a0750fab6b3a SHA512 4c6bcb9366d27b943b5b0e0e77ce4fc3a9424cf7bee7f76a33b33da803fa86440a2ddf2359996871953ebb3e1c51451032f920b73e3d9fe918415a2fca3f5c09
diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild b/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild
index 048eb3cb263c..df2171429517 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -51,9 +51,11 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-# Remove hardcoded optimisation flags.
-# Change share path to use old d1x/d2x locations.
-PATCHES=( "${FILESDIR}"/${P}-{flags,sharepath}.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-flags.patch # Remove hardcoded optimisation flags.
+	"${FILESDIR}"/${P}-sharepath.patch # Change share path to use old d1x/d2x locations.
+	"${FILESDIR}"/${P}-physfs-3-no-deprecation.patch # bug #653014
+)
 
 src_compile() {
 	tc-export CXX
@@ -102,6 +104,5 @@ pkg_postinst() {
 		elog "To play the game enable USE=\"data\" or manually "
 		elog "copy the files to ${EPREFIX}/usr/share/games/{d1x,d2x}."
 		elog "See each game's INSTALL.txt for details."
-		echo
 	fi
 }
diff --git a/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-physfs-3-no-deprecation.patch b/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-physfs-3-no-deprecation.patch
new file mode 100644
index 000000000000..86e94d43389e
--- /dev/null
+++ b/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-physfs-3-no-deprecation.patch
@@ -0,0 +1,30 @@
+From 8838b46e65c830e8d9ebaeaf568f186eff57d5c7 Mon Sep 17 00:00:00 2001
+From: Kp <kp@valhallalegends.com>
+Date: Sun, 22 Oct 2017 04:20:35 +0000
+Subject: [PATCH] Suppress PhysFS deprecation errors
+
+PhysFS 2.0 only offers PHYSFS_read/PHYSFS_write for I/O.  PhysFS 3.0
+deprecates PHYSFS_read / PHYSFS_write and offers PHYSFS_readBytes /
+PHYSFS_writeBytes.  Converting Rebirth to use the new API is somewhat
+invasive, and would require dropping support for PhysFS 2.0.
+
+For now, for compatibility with PhysFS 2.0, disable the deprecation
+errors and continue to use the older functions.
+
+Reported-by: gabeotisbenson <https://github.com/dxx-rebirth/dxx-rebirth/issues/352>
+---
+ SConstruct | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/SConstruct b/SConstruct
+index 560a6ef1a..78491cb1a 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -3177,6 +3177,7 @@
+ 		def adjust_environment(self,program,env):
+ 			env.Append(
+ 				CXXFLAGS = ['-pthread'],
++				CPPDEFINES = [('PHYSFS_DEPRECATED', '')],
+ 			)
+ 
+ 	def __init__(self,__program_instance=itertools.count(1)):