gentoo resync : 07.07.2018

8 files changed, 8 insertions, 176 deletions

diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 8bcd8ca24e78..38b6bb941dd3 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index f6a6d0209e04..9714646e8be0 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -9,5 +9,5 @@ DIST duke3d_psx-1.11.zip 7636016 BLAKE2B 63094c0eb2343e443f98844675ddc23a138d87c
 DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf
 DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833
 DIST eduke32_src_20180508-6885.tar.xz 14703224 BLAKE2B 8b90bf5771c2c27701316df8b9e738082d03552dddbd4d8be7e25195fd2da746afb2857e166ac6e6c0c78ad43e3c21f809538f0c54936ce82b5f2a3f93f80f94 SHA512 2b1be82a1bfbb0cf2a9b7bb0b73e69232bc2ce7adf343e25319b16c4240a6b3acf0fb8708e6ab8c7daa18f5a3039772472fd6542f6ea6dbe0530c8c3361c791c
-EBUILD eduke32-20180508.6885.ebuild 5647 BLAKE2B c67e49b7f24535fca3f84423848bc75de9c4f1180eab87303e13064225d47ce4a635589eec6a639f22353bc6806321e07f3330b7babe96a2385aa7364bc3ebad SHA512 733e6e58058275a988a2b162b487e93f442c1164b46ff6b9272b9d09fd1789f112ff81759da6e19b05a5e44d971dd0f4da0f78eb1f2a348c96f6662bd80b48d5
+EBUILD eduke32-20180508.6885.ebuild 5653 BLAKE2B be4dd6f9b63aac67499b35a36b0a72324ea60eda8b1b7b1f3bed681b9d5738209b097c162bed8301d2dcb98b12447f90be4a49164f55a29a7a9cc05ab437b180 SHA512 70e3a215dc32bcbd3227c07e58cfd66469c7630c3bd813ed6db5798b242aba156aeec6ebfa2000ed7faac42125e2b97cbb3b94dc9ecd2166b59751628961226d
 MISC metadata.xml 1659 BLAKE2B 2114f1b5ec7101a54c8506bb2d3877453f58057de782f399cd8126f82d8e390d9816a2d0f706d2f98ef13e54169d22eaa8de3cf8509884a145c9b602e37a2c36 SHA512 6ba7e12733147190ed307b02c80ba7224be49b30a795d04e5b4c466e929665b75690be81c8aea80cfc754981edbc9bfdabd93c1c6424ecc92a8d645c5b13484d
diff --git a/games-fps/eduke32/eduke32-20180508.6885.ebuild b/games-fps/eduke32/eduke32-20180508.6885.ebuild
index c7c7bba616d1..d0de4c73bf6f 100644
--- a/games-fps/eduke32/eduke32-20180508.6885.ebuild
+++ b/games-fps/eduke32/eduke32-20180508.6885.ebuild
@@ -30,7 +30,7 @@ SRC_URI="http://dukeworld.com/eduke32/synthesis/${MY_DATE}-${MY_BUILD}/${PN}_src
 	psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> ${MY_PN_PSX}-${MY_PV_PSX}.zip )
 	sc-55? ( http://www.duke4.org/files/nightfright/music/${MY_PN_SC55}.zip -> ${MY_PN_SC55}-${MY_PV_SC55}.zip )"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 LICENSE="BUILDLIC GPL-2 HRP"
 SLOT="0"
 IUSE="cdinstall demo flac fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools vorbis vpx xmp"
diff --git a/games-fps/urbanterror-data/Manifest b/games-fps/urbanterror-data/Manifest
index 1da7731311d0..908b7f561cfa 100644
--- a/games-fps/urbanterror-data/Manifest
+++ b/games-fps/urbanterror-data/Manifest
@@ -2,5 +2,6 @@ DIST urbanterror-data-4.3.0-to-4.3.1.zip 7495315 BLAKE2B a4562c81169274e6f7685c9
 DIST urbanterror-data-4.3.0.zip 1490106979 BLAKE2B 2bee5e869b3929564cdba268765f6fda67ec1e4fb55209cac3f7b51b418bba287ba22112e5cd4db8ff2aae81ac836a31640760b1e4b24440054f2b2ee4d7e3c3 SHA512 2f54b59355f790a65b3dbd205e9e8b30d41856f5010a55e9e1436a6ec78e986ceecf78c8d84fac1060702c38a7df849f78a2832bdccb91ea46444877635b32ea
 DIST urbanterror-data-4.3.1-to-4.3.2.zip 15305498 BLAKE2B d3b21c893dc6f5ce2323ca383ff52c1f6711ba57ab752c30d8fbb76b5d72125427a14fc30127589c5612df34cfda869a0727a838006fd6fc566005a54b7e741d SHA512 cb24939fffef9310c6ca8496d0d4f3be8656685e749ff1d6589fd193990be67ac70494b61ef6a12dd1f6995a78d451b9f09098e03970e82e1e3153ec3f89792c
 DIST urbanterror-data-4.3.2-to-4.3.3.zip 10409736 BLAKE2B edc33e959cd16528ef732ae31335412c7c7741ccc5f106d2c0c6236f180cf9fd9b14a23b5e4a60d91aa9b8c4126fae5f110034216d5d2ae63ab784fc16532730 SHA512 f2100bf11b5dc0dac265f43fe6c8aa0a1e604728ce02b5b6ca770c9145d11bf02a7e2118ff818d1fdb2b9693ddb85eb012814f346337ef14c58c3a4f3e3abb90
-EBUILD urbanterror-data-4.3.3.ebuild 1653 BLAKE2B d20d9cc4c54cdf472141a3921a8c36cca785ff6634dcde49e6edbff5cb437a7122b19db6b46561f0df8c1bfc07a58fd12d6bf8fa5e2abf19638574e27ebdf6fb SHA512 e1583cdc80d7fb824234b85b0a12661cc5fe256c59547b89fb35e8742bc35dc6915457cd3b89df84ddbf375172994200aceffc4e4f8bc561baf8c448f2257a5b
+DIST urbanterror-data-4.3.3-to-4.3.4.zip 10421275 BLAKE2B 95ad6f395fef538fcb5e0413070fda7752759244d968649b0f59d2d9060cd79645a5485c554f2afc74028b7664dc907183ab99274db96826c00169ef5235c577 SHA512 05e14a1411a606fc7aeec3fa6393227af87afcf1ddd5ed5210c6612a9a1c15e0c4f9e14c40d43c078ac3fdbf519e9e8cb7d7a7983b7fceb39d11222d14ed39d6
+EBUILD urbanterror-data-4.3.4.ebuild 1653 BLAKE2B d20d9cc4c54cdf472141a3921a8c36cca785ff6634dcde49e6edbff5cb437a7122b19db6b46561f0df8c1bfc07a58fd12d6bf8fa5e2abf19638574e27ebdf6fb SHA512 e1583cdc80d7fb824234b85b0a12661cc5fe256c59547b89fb35e8742bc35dc6915457cd3b89df84ddbf375172994200aceffc4e4f8bc561baf8c448f2257a5b
 MISC metadata.xml 480 BLAKE2B 8a3fd7bc4b93959b7d499e9454896285f8bfa4e1abeccf08b3d419f278d51a1e708fbc261d69fd42964e2ac04b5c008a1b22d2f6ad3e275e762c9ace799bc8b7 SHA512 94c46a1dffab072012fbdda9831db4ed465561866d5f3c7ba01045ef6424780f690bfdf381dd32664f1237b65828fefa1199cae98c5fd23757ceda76142ef5a9
diff --git a/games-fps/urbanterror-data/urbanterror-data-4.3.3.ebuild b/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
index 0fbf35551184..0fbf35551184 100644
--- a/games-fps/urbanterror-data/urbanterror-data-4.3.3.ebuild
+++ b/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index dd303f11c959..d2cc4f1ff165 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,7 +1,5 @@
 AUX urbanterror-4.3-fix-build_system.patch 2774 BLAKE2B d750fab8dcf67e6ac37d6b9e44abf3c7961320bbd51093b198d31e470396dc415219b09ac910a7938a557b6af4d9df39bb7f35cf5e90bb56f97cd334b584db4c SHA512 90d06ee5bb77e13e34923f446c0e8e90fdef5628c6199a4f9508336aa0bb30c0ab273ac794a8eb483c2534e64bf81f76ef449ed90000314f227d39de572809f2
 AUX urbanterror-4.3.3_p20180218-fix-loop.patch 1442 BLAKE2B 045a018bb3476f94b471f62ccf3bacce2b68523de235698b47f2e98979f3a1284b826e9dc74f4fd225ba930057df6d9bed599872568330952fa4ffe0389e2563 SHA512 7a31cded5b99fda6f4c92f5d1ce9ef7606dc87f08a70efc3aea970e6a870e22aeb0a772f63a11d151cd227f68803e028b2f5adee381d8f65c523c585a474b53c
-DIST urbanterror-4.3.3_p20180218.tar.gz 10069644 BLAKE2B ef711eee61f18cf2bc15974806d1b0b74c2a2094fbca5a07d70307289ae9eca53d2704b1cabc754c70984133761ff6daa55e00613668c0f0cc2b9a3ad5dac624 SHA512 e7f433b9971f5992efedee96123fe7c7665b6c7fa4a516df281e1f3635a9d56a653310e38f326a8e53640ed0a7d8e3bf6b44c08d70b8378d1ccdd75c05b31dc8
-DIST urbanterror-4.3.3_p20180410.tar.gz 10070300 BLAKE2B c81b93137b7c528354b3d894d45636195947ab4f7e3e8af031e8c164114fa3db16d500046187ce5ad688a6d6c65844b1b1b1282773c2171b38f59c7093d251dd SHA512 ea9021543c91ef7619f1f15febecd36c1e38a382c4959d5916022c108458a17f3649ac74784da0c06ef2ed738390bd247888ca4ba8d033b8c1121ab9540dcb31
-EBUILD urbanterror-4.3.3_p20180218.ebuild 4533 BLAKE2B c54b46f90dbb630a5cfe81580d2f48715ced43be8d4ed202a83617f7b33e0d0252d8aeed1e88fcaa0046e81ed33828fd69816a995185cab0eaf14ac527188b5c SHA512 3b4e1fc69e35c3db3c0b189618ecd79da61f9f9a5a1b63b8a4041fa91e5baecbaaa18758344b7f6f3ac1952a645ceb1d81b33966bbe079c81e9d1571b57f63cc
-EBUILD urbanterror-4.3.3_p20180410.ebuild 4525 BLAKE2B d78cc0eeba336a087817cbce73a85f2d907a9db0fee377ee2391306943420708796dee2300aa5d482f595fed06c474c582dde94f14f7ad4bc599030392ffe8c8 SHA512 ab20a9be4d1295f4c8592da8be629032ab1ecc23b64c76a9d9b91aad033114abbcddc90594e6123c452a1695ebed51a3a7be34d45acd11b385071d69454fcdc2
+DIST urbanterror-4.3.4_p20180627.tar.gz 10069715 BLAKE2B 179a952d51448af39636560e71c33dba8491fa195dd29d149f3d87d11ca2efff9a50041cdb585df9944361cfef8ac2b9efd2967cb6ffeeceb553fbc6aa17b218 SHA512 8eb314143fb336ff32d5b4a97075e54d5577570f1193c2220648ba7866373c8aa158015efebcb8325ade7964f4622baff8a30d89e889f64141d748bba28712ef
+EBUILD urbanterror-4.3.4_p20180627.ebuild 4525 BLAKE2B 66031a89f019f983363ad4d19f2cdaa6a28040234785ff2c873384bfa64070c51c037764f6158dd95d5c046e0b7c820afdf412119c99666bfc5ff64b348189cf SHA512 f67174fe11786d9dca773548c39fed04aa7ec2744d9f9887261253e52fdfa1ac2b03cb1dcc863db59819b87a2a3f055d2b0dd50bdccfc0dbe668df130ec3c52b
 MISC metadata.xml 1109 BLAKE2B 9e9f6a21667badafad0c007a2694a50ceaa467ce28fdc9b3f8838d58dd201f56b0b08c78d3285dfd53dd14db6c5ab26461cb400308abc920ce234048fdc48f8b SHA512 cb55a92c3c03065a17f71e5cfc8151a8c12acbc341389a14f96119960eb23c11613adaa8e9b552946d2db728121118a5130447c892d61a1a909b4dd8b94a5dcc
diff --git a/games-fps/urbanterror/urbanterror-4.3.3_p20180218.ebuild b/games-fps/urbanterror/urbanterror-4.3.3_p20180218.ebuild
deleted file mode 100644
index e211e749ba5a..000000000000
--- a/games-fps/urbanterror/urbanterror-4.3.3_p20180218.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eapi7-ver flag-o-matic toolchain-funcs xdg-utils
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
-	EGIT_BRANCH="urt"
-else
-	COMMIT_ID="d93f05de38a6cae60fbf0f073aace64b3adc7aaf"
-	SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ioq3-${COMMIT_ID}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod voip vorbis"
-REQUIRED_USE="|| ( client server )
-		voip? ( opus )"
-
-DOCS=( ChangeLog README.md README.ioq3.md md4-readme.txt )
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3-fix-build_system.patch
-	"${FILESDIR}"/${PN}-4.3.3_p20180218-fix-loop.patch
-)
-
-RDEPEND="
-	client? (
-		media-libs/libsdl2:=[X,sound,joystick,opengl,video]
-		mumble? ( media-sound/mumble:= )
-		openal? ( media-libs/openal:= )
-		opus? ( media-libs/opusfile:= )
-		vorbis? ( media-libs/libvorbis:= )
-	)
-	curl? ( net-misc/curl )
-	~games-fps/urbanterror-data-4.3.3
-	sys-libs/zlib:=[minizip]
-	virtual/jpeg:0
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-	if use client; then
-		if ! use openal && ! use opus && ! use vorbis; then
-			ewarn
-			ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
-		fi
-	fi
-}
-
-src_configure() {
-	default
-
-	tc-export CC
-}
-
-src_compile() {
-	# Workaround for used zlib macro, which got renamed in Gentoo
-	# wrt bug #449510
-	append-cppflags "-DOF=_Z_OF"
-
-	local my_arch=$(usex amd64 "x86_64" "i386")
-
-	emake \
-		ARCH=${my_arch} \
-		DEFAULT_BASEDIR="/usr/share/urbanterror" \
-		BUILD_CLIENT=$(usex "client" 1 0) \
-		BUILD_SERVER=$(usex "server" 1 0) \
-		BUILD_BASEGAME=1 \
-		BUILD_MISSIONPACK=0 \
-		BUILD_GAME_SO=0 \
-		BUILD_GAME_QVM=0 \
-		BUILD_STANDALONE=1 \
-		SERVERBIN="Quake3-UrT-Ded" \
-		CLIENTBIN="Quake3-UrT" \
-		USE_RENDERER_DLOPEN=0 \
-		USE_YACC=0 \
-		BASEGAME="q3ut4"\
-		BASEGAME_CFLAGS="${CFLAGS}" \
-		USE_OPENAL=$(usex "openal" 1 0) \
-		USE_OPENAL_DLOPEN=$(usex "openal" 1 0) \
-		USE_CURL=$(usex "curl" 1 0) \
-		USE_CURL_DLOPEN=$(usex "curl" 1 0) \
-		USE_CODEC_VORBIS=$(usex "vorbis" 1 0) \
-		USE_CODEC_OPUS=$(usex "opus" 1 0) \
-		USE_MUMBLE=$(usex "mumble" 1 0) \
-		USE_SKEETMOD=$(usex "skeetshootmod" 1 0) \
-		USE_VOIP=$(usex "mumble" 1 0) \
-		USE_INTERNAL_LIBS=0 \
-		USE_LOCAL_HEADERS=0 \
-		USE_ALTGAMMA=$(usex "altgamma" 1 0) \
-		$(usex "debug" "debug" "release")
-}
-
-src_install() {
-	local my_arch=$(usex amd64 "x86_64" "i386")
-
-	if use client; then
-		newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT.${my_arch} ${PN}
-		# Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
-		make_desktop_entry ${PN} "UrbanTerror" ${PN}
-	fi
-
-	if use server && ! use client; then
-		# dedicated server only
-		newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-ded
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use client && xdg_desktop_database_update
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# ^this is a new installation, so:
-		if use openal; then
-			elog ""
-			elog "You might need to set:"
-			elog "  seta s_useopenal \"1\""
-			elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
-		fi
-
-		if use altgamma; then
-			elog ""
-			elog "You might need to set:"
-			elog "  seta r_altgamma \"1\""
-			elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
-			elog "Be aware that altgamme works on a global scale, so external"
-			elog "applications like redshift can cause trouble. Disabling"
-			elog "these while playing is a usable workaround."
-		fi
-
-		if ! use altgamma; then
-			elog ""
-			elog "If you are using a modesetting graphics driver you might"
-			elog "consider setting USE=\"altgamma\"."
-			elog "For details take a look at:"
-			elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
-		fi
-
-		if ! use client; then
-			elog ""
-			elog "You disabled client support. You won't be able to connect"
-			elog "to any servers and play. If you want to do so, enable"
-			elog "USE=\"client\"."
-		fi
-
-		if use skeetshootmod; then
-			elog ""
-			elog "You might need to set:"
-			elog "  seta sv_skeetshoot \"1\""
-			elog "in your ~/.q3a/q3ut4/q3config.cfg to use the skeetshoot mod."
-		fi
-	fi
-}
-
-pkg_postrm() {
-	use client && xdg_desktop_database_update
-}
diff --git a/games-fps/urbanterror/urbanterror-4.3.3_p20180410.ebuild b/games-fps/urbanterror/urbanterror-4.3.4_p20180627.ebuild
index ebea9db38f90..04d4459533ea 100644
--- a/games-fps/urbanterror/urbanterror-4.3.3_p20180410.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.3.4_p20180627.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
 	EGIT_BRANCH="urt"
 else
-	COMMIT_ID="d6db4589efd1ff2b7a4fa2983e58993d06098327"
+	COMMIT_ID="e8c941ec8b753b9ecb4f8c4fcec07e4fe3babc64"
 	SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/ioq3-${COMMIT_ID}"
 	KEYWORDS="~amd64 ~x86"
@@ -41,7 +41,7 @@ RDEPEND="
 		vorbis? ( media-libs/libvorbis:= )
 	)
 	curl? ( net-misc/curl )
-	~games-fps/urbanterror-data-4.3.3
+	~games-fps/urbanterror-data-4.3.4
 	sys-libs/zlib:=[minizip]
 	virtual/jpeg:0
 "