gentoo resync : 28.04.2021

7 files changed, 9 insertions, 293 deletions

diff --git a/games-action/bzflag/Manifest b/games-action/bzflag/Manifest
index d61a7be2e2ec..5d6178c1f0f0 100644
--- a/games-action/bzflag/Manifest
+++ b/games-action/bzflag/Manifest
@@ -1,16 +1,8 @@
 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
-DIST bzflag-2.4.16.tar.bz2 14010330 BLAKE2B fc19e068c43c18bd38445b48ca0ca38669f956da1540e3255420cb7f36a42349aa3aa881dfeed2b2a1a7e163ee832a510fde658edd38b6ac038b62229baf8306 SHA512 809adc39088f3fc8ca0d2ead9c7172cfbe582789bc80b3ac55fabe078a0868f0cf7cfa8027ac696718e9983a19386933fd370684a0bd33e63c3106f2ce8a9d63
-DIST bzflag-2.4.18.tar.bz2 14011236 BLAKE2B 103495622afb45b2bf87576d92c5cdd37a04386fa82583929ab64087a875acd3be49045cf81d0099fccd0ebc5e7471883756edb85894f9f519d7b6fea8ac3534 SHA512 8e3183f2d78b686c92f3b9911b3cad2fa0df5693401537dc674c75e192fd59451167b7ddc546aa8a090b38d7864b8f22459ba9a4702451987f9c1dfa87fdb246
 DIST bzflag-2.4.20.tar.bz2 14032356 BLAKE2B 278b0f0d970f103a7b00953e60bda6962706dea27a8695bae8e902bdbb1364158ace03dafc778871e89444fe44f16e7d2fceec36b67982ad7f18fc916484260d SHA512 6140123d37065bead3021ef9c36db1210ad2c71a4a7deb6894bb3f856a571197a7eac37d16b8e3b587549dc201c4ac8d7bbe03d1a05d067dc452861924005169
 DIST bzflag-2.4.22.tar.bz2 14169079 BLAKE2B e3020d161326215b721e142198295314fce60212322d787389ee47519a8f20a64065ec2744799b8dc282fb343af1b2c5ae54bdab93827a5716ad5ac2363f8978 SHA512 c78ad0e9e861d0c922ef73dd1e040d998836efaab3a48d5a3cd8392835ce37392b1b9438aed7483ea48c6bce672bb937aeba40553553dce0c0fd3cce38bf10cf
-EBUILD bzflag-2.4.12.ebuild 1230 BLAKE2B 7d423cbadd4cd97d1cf8802d3cb27e92b96adaeedfddbab68b04b0fa184dd601facfde0359817826fff49ab5bb8f881c02474c1740e334cb684c56072b308530 SHA512 6d4701f797524170ba701d576d3e754374d9b161d56715f9ad677b65153e11030ff56186259d93424c62a5f96eda2329585c895ae179cfd28eeec33b940b7bfd
-EBUILD bzflag-2.4.14.ebuild 1374 BLAKE2B 2d3489f7d979a9450361c2f326866b5991078441accd95a43b35193a117231bd6939071369415360fedc559fb202d7d97676015a77a9622137dc31b44e02c478 SHA512 77b2b00b66c71cb779c059a8adf81e74454c87d0d51f48831dc51c9ee2ec715e89f378a782c242dd8cac237210ad6aa0fbfac4edbfd216e058ac22f05d44550e
-EBUILD bzflag-2.4.16.ebuild 1389 BLAKE2B e5f2aaaa41c6b7e95333c1e62fda97fd689a79a158eadb896a0db02470ce23600be8b99c48dab389b2b8a06f3c8fd102d8daa82db14ee68979ccc1b9aec146b0 SHA512 a69233216af2ac803dbdf03d981ffc82473e970aa8492e3e58550631a1bd849df8e5c2257811a284eb70df44f322c9201bed2c7974bf859dd60582b49e3c536e
-EBUILD bzflag-2.4.18.ebuild 1386 BLAKE2B 18aef6ee817ed31e0c6b7c7285e4d984c17580f604533c4d41a1155d86a13ec5bc41d16f61f5d28a9e901e12876761b797a8c9a687e367f82d45a1dcb5cbabad SHA512 d2150674093674e79942db3f72d21ede06b94ad55893e840c179deae170021596bacc1f27632c92dcd10efee893b2c9e09aa89e5a09bdc8c489606c2ce191286
-EBUILD bzflag-2.4.20.ebuild 1386 BLAKE2B c15fb4988a79136d39500cc583319eb4796c21b349d5c81a0956aa949b1e550b569aff90b673b07a0347490dc5fcf72954d98625c8ee499c299c5da1079b31bb SHA512 e787f961330320853f2eb09fc7a6310906d0de9b5571910942c32e933421c9ff94eeec384956ef90c64028aa1d095c4ba70f1013a9306d025d0ebbb9bbfce279
-EBUILD bzflag-2.4.22.ebuild 1386 BLAKE2B 96e6ea1a257a17a73778dad362e34672d6b165c2d94d80e828790f7a00b20e1b186f6daa41c02279a9270474ff417d8bd87743e89d8977cc9c9823bf2b6f5530 SHA512 fe9449b241fb127cbbccd9e5f89c3ccdf7728f0493d97e871a7c5a7abab7e02c97114cc2c02d530d4c11ddb8fa7230003a08365d6b95b0fd1dc50c3d4266e818
+EBUILD bzflag-2.4.20.ebuild 1382 BLAKE2B 744e0ab3ae142a54c5d8b3dfa8b317c03a3fb850a19d922940651dced3e96a1b5d3d2dd39051c521c5d6c2bd8c46612b6ccd37e93a3827932751bbfb8c7a8d3e SHA512 7cea7820a768a48e0cb21c71ff02c2078b1cf1b5e0dd21808fcb706f2d450bc8e83551317c792e6799057693140e221c9c5c42834fb27cf284d4eefd82eb64ca
+EBUILD bzflag-2.4.22.ebuild 1382 BLAKE2B 744e0ab3ae142a54c5d8b3dfa8b317c03a3fb850a19d922940651dced3e96a1b5d3d2dd39051c521c5d6c2bd8c46612b6ccd37e93a3827932751bbfb8c7a8d3e SHA512 7cea7820a768a48e0cb21c71ff02c2078b1cf1b5e0dd21808fcb706f2d450bc8e83551317c792e6799057693140e221c9c5c42834fb27cf284d4eefd82eb64ca
 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
deleted file mode 100644
index 7fdb07496ab3..000000000000
--- a/games-action/bzflag/bzflag-2.4.12.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop flag-o-matic ltprune
-
-DESCRIPTION="3D tank combat simulator game"
-HOMEPAGE="https://www.bzflag.org/"
-SRC_URI="https://download.bzflag.org/bzflag/source/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated upnp"
-
-RDEPEND="
-	net-dns/c-ares
-	>=net-misc/curl-7.15.0
-	sys-libs/ncurses:0
-	sys-libs/zlib
-	!dedicated? (
-		media-libs/libsdl2[joystick,sound,video]
-		virtual/glu
-		virtual/opengl )
-	upnp? ( net-libs/miniupnpc )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${P}-configure.patch
-	"${FILESDIR}"/${P}-tinfo.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable upnp UPnP)
-	)
-
-	if use dedicated ; then
-		ewarn
-		ewarn "You are building a server-only copy of BZFlag"
-		ewarn
-		myconf+=( --disable-client --without-SDL )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog DEVINFO PORTING README README.Linux" \
-		default
-
-	if ! use dedicated ; then
-		newicon data/bzflag-48x48.png ${PN}.png
-		make_desktop_entry ${PN} "BZFlag"
-	fi
-
-	prune_libtool_files --modules
-}
diff --git a/games-action/bzflag/bzflag-2.4.14.ebuild b/games-action/bzflag/bzflag-2.4.14.ebuild
deleted file mode 100644
index 68787097d150..000000000000
--- a/games-action/bzflag/bzflag-2.4.14.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop flag-o-matic ltprune
-
-DESCRIPTION="3D tank combat simulator game"
-HOMEPAGE="https://www.bzflag.org/"
-SRC_URI="https://download.bzflag.org/bzflag/source/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated upnp"
-
-RDEPEND="
-	net-dns/c-ares
-	>=net-misc/curl-7.15.0
-	sys-libs/ncurses:0
-	sys-libs/zlib
-	!dedicated? (
-		media-libs/libsdl2[joystick,sound,video]
-		virtual/glu
-		virtual/opengl )
-	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() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable upnp UPnP)
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN}
-	)
-
-	if use dedicated ; then
-		ewarn
-		ewarn "You are building a server-only copy of BZFlag"
-		ewarn
-		myconf+=( --disable-client --without-SDL )
-	else
-		myconf=( --with-SDL=2 )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog DEVINFO PORTING README README.Linux" \
-		default
-
-	if ! use dedicated ; then
-		newicon data/bzflag-48x48.png ${PN}.png
-		make_desktop_entry ${PN} "BZFlag"
-	fi
-
-	prune_libtool_files --modules
-}
diff --git a/games-action/bzflag/bzflag-2.4.16.ebuild b/games-action/bzflag/bzflag-2.4.16.ebuild
deleted file mode 100644
index 84a0bef4a27a..000000000000
--- a/games-action/bzflag/bzflag-2.4.16.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop flag-o-matic
-
-DESCRIPTION="3D tank combat simulator game"
-HOMEPAGE="https://www.bzflag.org/"
-SRC_URI="https://download.bzflag.org/bzflag/source/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated upnp"
-
-RDEPEND="
-	net-dns/c-ares
-	>=net-misc/curl-7.15.0
-	sys-libs/ncurses:0
-	sys-libs/zlib
-	!dedicated? (
-		media-libs/libsdl2[joystick,sound,video]
-		media-libs/glew:=
-		virtual/glu
-		virtual/opengl )
-	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() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable upnp UPnP)
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN}
-	)
-
-	if use dedicated ; then
-		ewarn
-		ewarn "You are building a server-only copy of BZFlag"
-		ewarn
-		myconf+=( --disable-client --without-SDL )
-	else
-		myconf=( --with-SDL=2 )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog DEVINFO PORTING README README.Linux" \
-		default
-
-	if ! use dedicated ; then
-		newicon data/bzflag-48x48.png ${PN}.png
-		make_desktop_entry ${PN} "BZFlag"
-	fi
-
-	find "${D}"/ -name \*.la -delete
-}
diff --git a/games-action/bzflag/bzflag-2.4.18.ebuild b/games-action/bzflag/bzflag-2.4.18.ebuild
deleted file mode 100644
index 2186c9bc37aa..000000000000
--- a/games-action/bzflag/bzflag-2.4.18.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop flag-o-matic
-
-DESCRIPTION="3D tank combat simulator game"
-HOMEPAGE="https://www.bzflag.org/"
-SRC_URI="https://download.bzflag.org/bzflag/source/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated upnp"
-
-RDEPEND="
-	net-dns/c-ares
-	>=net-misc/curl-7.15.0
-	sys-libs/ncurses:0
-	sys-libs/zlib
-	!dedicated? (
-		media-libs/libsdl2[joystick,sound,video]
-		media-libs/glew:=
-		virtual/glu
-		virtual/opengl )
-	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() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable upnp UPnP)
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN}
-	)
-
-	if use dedicated ; then
-		ewarn
-		ewarn "You are building a server-only copy of BZFlag"
-		ewarn
-		myconf+=( --disable-client --without-SDL )
-	else
-		myconf=( --with-SDL=2 )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog DEVINFO PORTING README README.Linux" \
-		default
-
-	if ! use dedicated ; then
-		newicon data/bzflag-48x48.png ${PN}.png
-		make_desktop_entry ${PN} "BZFlag"
-	fi
-
-	find "${D}"/ -name \*.la -delete
-}
diff --git a/games-action/bzflag/bzflag-2.4.20.ebuild b/games-action/bzflag/bzflag-2.4.20.ebuild
index c9e550882ec9..f33c9b955d35 100644
--- a/games-action/bzflag/bzflag-2.4.20.ebuild
+++ b/games-action/bzflag/bzflag-2.4.20.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools desktop flag-o-matic
+
+inherit autotools desktop
 
 DESCRIPTION="3D tank combat simulator game"
 HOMEPAGE="https://www.bzflag.org/"
@@ -67,5 +68,5 @@ src_install() {
 		make_desktop_entry ${PN} "BZFlag"
 	fi
 
-	find "${D}"/ -name \*.la -delete
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/games-action/bzflag/bzflag-2.4.22.ebuild b/games-action/bzflag/bzflag-2.4.22.ebuild
index fd77e44f349c..f33c9b955d35 100644
--- a/games-action/bzflag/bzflag-2.4.22.ebuild
+++ b/games-action/bzflag/bzflag-2.4.22.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools desktop flag-o-matic
+
+inherit autotools desktop
 
 DESCRIPTION="3D tank combat simulator game"
 HOMEPAGE="https://www.bzflag.org/"
@@ -67,5 +68,5 @@ src_install() {
 		make_desktop_entry ${PN} "BZFlag"
 	fi
 
-	find "${D}"/ -name \*.la -delete
+	find "${ED}" -name '*.la' -delete || die
 }