gentoo resync : 13.05.2018

5 files changed, 42 insertions, 12 deletions

diff --git a/games-action/bzflag/Manifest b/games-action/bzflag/Manifest
index 6f155d14394f..4cf755eef06d 100644
--- a/games-action/bzflag/Manifest
+++ b/games-action/bzflag/Manifest
@@ -1,7 +1,8 @@
-AUX bzflag-2.4.12-configure.patch 1278 BLAKE2B 1db48df25ce19df2d3fb81fc60ffc7b51ef6621e8e85237f620447e64ed4139453b3b720d0d28f78ec6cd616f3b40c3f4732cb98e8b464f20ab3e7e5814b2e73 SHA512 177d73ee047984e18dff2f2f15e8e679485a166a51303f61e1a7411e6c330c04d813a824e3d727aa95b251cd9a27a00dc41c229af56f927a9a4adabc96e4813e
+AUX bzflag-2.4.12-configure.patch 1113 BLAKE2B 922feac9bb501d21a0b5decbc3ae8aff96f8f5d6747868bc46e25145d8908a238dbfa406238f5d023e6c72bf4daf3bc5ff8d1dbeb384aef65d9cf034ea5ab26e SHA512 f3b6cc3422c3d4f0c4b39fa58e440f4a4cc1b2e0a56a4cad41eae3cbaf1d23e153b711246420143bb3132fa5e87538d814653131e0adf5cfe752b68ff4d82f05
+AUX bzflag-2.4.12-sdl2-cppflags.patch 437 BLAKE2B e7abcaf318a67f9252e32be1215b1e80edfbe0926bdf5533849f39b5366a3acaf19bec88428bb700a7be2fe2a63053006c69d1284e4050adbf71e0f34d853394 SHA512 eb59f965b716869168cc5dc40f8b4e55d27abe997e83f2434de5e54802b6b29410e43b3fb00e5ede7da56e631bb4e0daaabd3072b4577e14127e54aa2fab9428
 AUX bzflag-2.4.12-tinfo.patch 683 BLAKE2B 720a6b5aa97a474c2e37bb2927cd9680a55249e732f6f07cc894e114c745b15886325a2d56a7731d397580a1dedba6be1acb71086e146bb8af2f983c908b3bb0 SHA512 f670e7362fc81055d3996a16c213746fa55338aed0756c36565c856eae4e7f9ed8bed3b2b2955b659f83bf03d4b4249b53a7ea02e614409fe38dbcd215c805da
 DIST bzflag-2.4.12.tar.bz2 14042357 BLAKE2B eb18072f459549b18bf99fbe0b635aea24568ad39494082f443e8eb7a604db0341aa18f1d458a950b5344f34278599215b351bcad35bd88f33f01449b89489b8 SHA512 9b5fa6b7ab7eb13043242defcc86cbed083e98306b2f611932b48d6d833a37bbe2ab05a0a3d1a2c9b861bfbd834fc6e86783ba82d8a841527d0eedb06f3bde9f
 DIST bzflag-2.4.14.tar.bz2 14066129 BLAKE2B 7ec44bc9b7ccb644b98dac0b99770471b488b9e34b12a34e4fa76cdc22a4e7b14324915b83db76a69bb4b8ebd928018e69145aa6b87e48a379d37c23ce84c575 SHA512 c092a869813bd300e5eff5bf17ea46708b566a9e4f56cb6c4ccd92346ab1e87c8837efb8295d3b4485cd8d4de5b0d92b079c70390d06a481cfee693d393aca21
-EBUILD bzflag-2.4.12.ebuild 1188 BLAKE2B d8fe7e188582f9f65da7bc72632e514e2b37b2c088ad751c4d417ff588c32a49fabe1587da1d36f60e1eff5d7888628fcc2b69ca7750e5bb9bffa7f199f23145 SHA512 a219fa56a5fe4d0c1b2b15330c140d52bdb8b08474b6bdc6cc26fd590c2c11ba9654a2d76d7b0889e3ad100622ed544306436b8445f8b00c235cd3f75e6b7343
-EBUILD bzflag-2.4.14.ebuild 1204 BLAKE2B d6d98b5cbf51e11c324db9a404f3795ce7a8a36d0eb71c0e26ece880cff4da30222b60e794b0405a074e2b959a13b06f78d9b74a610011546af8ca2d3f5a2f5b SHA512 282999e7a9c381364d97a2d7c7477e9af2fac7d961a9825be69c0f31881978b4e44e70dc40d6d7cf06fe3c423e1f9e7146d1d78f1e666a3a52e3b841cb1af27f
+EBUILD bzflag-2.4.12.ebuild 1214 BLAKE2B 479c7b6f185e2ef76eb1a609e7a95920e1a2a026892af6f1800a9a68bdfbf065488a1a54d0a3fe84afc2bc05131a9396906386c0d57d8c5cd6f9644bbff8456c SHA512 2d4737201bad699ebde6b2e9175d10672016e3c895bb3e9d9c4a125752935796ae25a11011e1aae1af1aca9ff3b229a319d0847cb4d1bd6735dd56b4acfd3b18
+EBUILD bzflag-2.4.14.ebuild 1308 BLAKE2B 68caf2a41a1bea25cda2c948552feb3df58d3391e9128099472ea16f9e46409ce73cd0806fe4800dc5d33b9e4814a78da4bd8cee3a8ceb4785f8afaaade6e489 SHA512 717f80fa81fceb78950841ade6bff71fb4b52fa7e0b36c7f8b5c077ac5c078f38e26405572100b869a24439b84f4031ed45a3966eb35467d35514568ad6c68ee
 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 7479f96e32a8..0f6e8a8722e5 100644
--- a/games-action/bzflag/bzflag-2.4.12.ebuild
+++ b/games-action/bzflag/bzflag-2.4.12.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="dedicated upnp"
 
-DEPEND="
+RDEPEND="
 	net-dns/c-ares
 	>=net-misc/curl-7.15.0
 	sys-libs/ncurses:0
@@ -22,8 +22,12 @@ DEPEND="
 		media-libs/libsdl2[joystick,sound,video]
 		virtual/glu
 		virtual/opengl )
-	upnp? ( net-libs/miniupnpc )"
-RDEPEND=${DEPEND}
+	upnp? ( net-libs/miniupnpc )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
 PATCHES=(
 	"${FILESDIR}"/${P}-configure.patch
 	"${FILESDIR}"/${P}-tinfo.patch
diff --git a/games-action/bzflag/bzflag-2.4.14.ebuild b/games-action/bzflag/bzflag-2.4.14.ebuild
index cf647d42a263..59edcad41888 100644
--- a/games-action/bzflag/bzflag-2.4.14.ebuild
+++ b/games-action/bzflag/bzflag-2.4.14.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="dedicated upnp"
 
-DEPEND="
+RDEPEND="
 	net-dns/c-ares
 	>=net-misc/curl-7.15.0
 	sys-libs/ncurses:0
@@ -22,11 +22,16 @@ DEPEND="
 		media-libs/libsdl2[joystick,sound,video]
 		virtual/glu
 		virtual/opengl )
-	upnp? ( net-libs/miniupnpc )"
-RDEPEND=${DEPEND}
+	upnp? ( net-libs/miniupnpc )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.12-configure.patch
 	"${FILESDIR}"/${PN}-2.4.12-tinfo.patch
+	"${FILESDIR}"/${PN}-2.4.12-sdl2-cppflags.patch
 )
 
 src_prepare() {
@@ -42,6 +47,8 @@ src_configure() {
 		ewarn "You are building a server-only copy of BZFlag"
 		ewarn
 		myconf="--disable-client --without-SDL"
+	else
+		myconf="--with-sdl=2"
 	fi
 
 	econf \
diff --git a/games-action/bzflag/files/bzflag-2.4.12-configure.patch b/games-action/bzflag/files/bzflag-2.4.12-configure.patch
index b280621f6ec2..e1c546f37a34 100644
--- a/games-action/bzflag/files/bzflag-2.4.12-configure.patch
+++ b/games-action/bzflag/files/bzflag-2.4.12-configure.patch
@@ -1,6 +1,5 @@
-diff -ru bzflag-2.4.4.orig/configure.ac bzflag-2.4.4/configure.ac
---- bzflag-2.4.4.orig/configure.ac	2016-02-14 19:09:51.000000000 -0500
-+++ bzflag-2.4.4/configure.ac	2016-05-05 16:35:35.475935345 -0400
+--- a/configure.ac
++++ b/configure.ac
 @@ -215,7 +215,7 @@
  AC_SUBST(AR)
  AC_SUBST(AR_FLAGS)
diff --git a/games-action/bzflag/files/bzflag-2.4.12-sdl2-cppflags.patch b/games-action/bzflag/files/bzflag-2.4.12-sdl2-cppflags.patch
new file mode 100644
index 000000000000..f7f6dfd7f14c
--- /dev/null
+++ b/games-action/bzflag/files/bzflag-2.4.12-sdl2-cppflags.patch
@@ -0,0 +1,19 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -236,6 +236,7 @@
+ AC_PROG_CC
+ AC_PROG_LN_S
+ AC_CHECK_PROG(AR, ar, ar)
++PKG_PROG_PKG_CONFIG
+ AC_SUBST(AR)
+ AC_SUBST(AR_FLAGS)
+ 
+@@ -716,6 +717,8 @@
+ fi
+ if test "x$with_SDL" = "x2"; then
+     AC_DEFINE(HAVE_SDL2, 1, [Using SDL2])
++    PKG_CHECK_MODULES(sdl2, sdl2,
++        [CONF_CPPFLAGS="$CONF_CPPFLAGS $sdl2_CFLAGS"],[])
+ fi
+ 
+ AM_CONDITIONAL(HAVE_SDL, test x$with_SDL = x1 -o x$with_SDL = x2)