gentoo resync : 20.11.2017

3 files changed, 12 insertions, 72 deletions

diff --git a/games-action/0verkill/0verkill-0.16-r3.ebuild b/games-action/0verkill/0verkill-0.16-r3.ebuild
deleted file mode 100644
index 3c347dd0a14d..000000000000
--- a/games-action/0verkill/0verkill-0.16-r3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils games
-
-DESCRIPTION="a bloody 2D action deathmatch-like game in ASCII-ART"
-HOMEPAGE="http://artax.karlin.mff.cuni.cz/~brain/0verkill/"
-SRC_URI="http://artax.karlin.mff.cuni.cz/~brain/0verkill/release/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-DEPEND="X? ( x11-libs/libXpm )"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-docs.patch \
-		"${FILESDIR}"/${P}-home-overflow.patch \
-		"${FILESDIR}"/${P}-segv.patch \
-		"${FILESDIR}"/${P}-gentoo-paths.patch \
-		"${FILESDIR}"/${P}-ovflfix.patch \
-		"${FILESDIR}"/${P}-CC.patch \
-		"${FILESDIR}"/${P}-underflow-check.patch #136222 \
-	sed -i \
-		-e "s:data/:${GAMES_DATADIR}/${PN}/data/:" cfg.h || die
-	sed -i \
-		-e "s:@CFLAGS@ -O3 :@CFLAGS@ :" Makefile.in || die
-	sed -i \
-		-e "/gettimeofday/s/getopt/getopt calloc/" configure.in || die
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf $(use_with X x)
-}
-
-src_install() {
-	local x
-	dogamesbin 0verkill
-	for x in avi bot editor server test_server ; do
-		newgamesbin ${x} 0verkill-${x}
-	done
-	if use X ; then
-		dogamesbin x0verkill
-		for x in avi editor ; do
-			newgamesbin ${x} 0verkill-${x}
-		done
-	fi
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r data grx
-
-	dohtml doc/*.html
-	rm doc/*.html doc/README.OS2 doc/Readme\ Win32.txt doc/COPYING
-	dodoc doc/*
-
-	prepgamesdirs
-}
diff --git a/games-action/0verkill/0verkill-0.16-r4.ebuild b/games-action/0verkill/0verkill-0.16-r4.ebuild
index b512d03cdb80..478fcc1bbda7 100644
--- a/games-action/0verkill/0verkill-0.16-r4.ebuild
+++ b/games-action/0verkill/0verkill-0.16-r4.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils
 
-DESCRIPTION="a bloody 2D action deathmatch-like game in ASCII-ART"
-HOMEPAGE="http://artax.karlin.mff.cuni.cz/~brain/0verkill/"
+inherit autotools
+
+DESCRIPTION="A bloody 2D action deathmatch-like game in ASCII-ART"
+HOMEPAGE="http://freecode.com/projects/0verkill"
 SRC_URI="http://artax.karlin.mff.cuni.cz/~brain/0verkill/release/${P}.tgz"
 
 LICENSE="GPL-2"
@@ -34,6 +35,8 @@ src_prepare() {
 		-e "s:@CFLAGS@ -O3 :@CFLAGS@ :" Makefile.in || die
 	sed -i \
 		-e "/gettimeofday/s/getopt/getopt calloc/" configure.in || die
+
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
@@ -42,8 +45,8 @@ src_configure() {
 }
 
 src_install() {
-	local x
 	dobin 0verkill
+	local x
 	for x in avi bot editor server test_server ; do
 		newbin ${x} 0verkill-${x}
 	done
@@ -54,9 +57,9 @@ src_install() {
 		done
 	fi
 
-	insinto "/usr/share/${PN}"
+	insinto /usr/share/${PN}
 	doins -r data grx
 
-	rm doc/README.OS2 doc/Readme\ Win32.txt doc/COPYING
-	dodoc -r doc/
+	rm doc/{README.OS2,"Readme Win32.txt",COPYING} || die
+	dodoc -r doc/.
 }
diff --git a/games-action/0verkill/Manifest b/games-action/0verkill/Manifest
index 0789f6bf5e72..81ee388ed2d8 100644
--- a/games-action/0verkill/Manifest
+++ b/games-action/0verkill/Manifest
@@ -6,8 +6,7 @@ AUX 0verkill-0.16-ovflfix.patch 805 SHA256 437c92bdd39d44842fad0ee8386e4dae2093c
 AUX 0verkill-0.16-segv.patch 1560 SHA256 b49cb1a14667cc4033e6094f99a9ddc1ef242381acac83a3abdeebf208724291 SHA512 05ce966d80cf199a9602cb7143a2d7e8479ccb4b03da2275dc8a93a9065d387fe15426c48559279acb73eb3c371306a02706de899d5c6a97c123319426b3f6bc WHIRLPOOL 9578ee8bd00cdb6860a348a6aa37c1ac3efc9ccead20152d3317377e2afec99798b523d8e0d458699d6ecd10d86e35b25416c8e11b5bc555d1b72b34b0502e8a
 AUX 0verkill-0.16-underflow-check.patch 675 SHA256 e918e3b2b632632cca8c337caf019b0c2565ded120b8055a4d31677d446ef8e5 SHA512 3b5bff2c18c1862fadbb3d932be23f35559ed9eb3ffb979cf11c50bbac9fff8928b5ead8349ddfc78c84d07a5d1afe4431af56263568b3b82fd7cb015f442e42 WHIRLPOOL 1ba725a9232cd2374d4273a770c1223ebae68d81486e4443c5d9a6ebd7fe12d8a20815b07d2afe6e8d40948aa81c9e19ec440bbd313b9876b7baec73453caf42
 DIST 0verkill-0.16.tgz 276579 SHA256 8091261c3fef3535edb97ab46cb48c067befb329e951bfa3f1b54ae6b7e1dadf SHA512 6ab273085f2be3a6d0a2b785a51a9bfd52add0212b3c8522b22255c4e3e48a9470f20d9d678158233da9c9465563279079c29ca5526d322247f2ef1d74107144 WHIRLPOOL 7a1dff93014ea67f6d16efea408ed77219a391b015a0d533a53d52eb735d8b84c8cc0f4e1cb6997aca2b3d238b57f7cff780f11fe838ded362769529cf437665
-EBUILD 0verkill-0.16-r3.ebuild 1446 SHA256 458f863b23773203c010f3f44cb7cc32b5746f44b123badf04ac94a04392bf09 SHA512 a2715e30dc6be6be08cb8fa5b96c4944e2a7ffa4f3f9e63022ccdd5a6ea65884398840df8178190a351752ba235413295013ce9b3443a3789125d53ce8d47a62 WHIRLPOOL 91dbba4069faf765d5e405202da7329c47feb847f94e88a044229ff8b1d74849860e295db78aa3fc57db642149f2ca412b277773b3c496582bbef3cd72759f0f
-EBUILD 0verkill-0.16-r4.ebuild 1357 SHA256 7c3d1955848c9bea9b1f6ba10245c3d63575431c2244e1f1b6f2ec24b77d8932 SHA512 886bbb6cf2c2ee91e04ca4c2305a81980fe135b0c2945ebb6911e0abe6d7c304a6e8df8f311d79e11c5637af8c8b4595dbd22db4622aad28bee94c9edf0b1e06 WHIRLPOOL 2979c1ae3ccb644acfae1c9fdaffb880519cd6ceb0696d6597be70a6e3b0231d8c193bc5ea921a5744c0ddf246cd091c7db4e4bdf8b6639fb5567a4a5db8ec4e
+EBUILD 0verkill-0.16-r4.ebuild 1371 SHA256 4ac203872fb9c8240cb28c23e2172f126909e5b5f2e6765c718f595ac390064d SHA512 35c019c33ffbc2b9429770b697b58b15368fbc251a13e16a345409224e9fd1a1dac8a6c1b9ac5cee609cbb8d2ef1a7342596f2bc9c8b9ad5ee900a6634008795 WHIRLPOOL bd8145879af86cf657996d9864fe765fad2c536aa8da089950fb8c876cb20bd40165c2f2b412d28e63407875be0864e8a2c3f452db34034b2fbc13619f6b388d
 MISC ChangeLog 3253 SHA256 a43fba250411ce853c279fc0accdc0cea8b5328f8a42ee28d2cb34f909380bf7 SHA512 2cac7a43f6a2a7ddcc67618750b53b3c73b83112a042589d1d198b9954bd2211bcfa28da3d7ff9c545beed3dea1bcf59527928851aefdc3ecf2813de895ba2dd WHIRLPOOL f3bbf18bd555a429721a3131b582864f3fc4b81f5a73c09f24214a79c8c9aaf6d8253c0427b4a502d6e322140163c2ff4909ba56881ddf73893a6aba08f6e8b8
 MISC ChangeLog-2015 2606 SHA256 1974704c5722bdd51f6d91e620c791f110bb94838d35ceeb943873d0a3260d1e SHA512 51aa9146da9c9b4f1a2eb5167fe7000093a7db8e2e8cc12cff0a736e70e869671408d1b4fd9ae577ad1e3d654a82de0a96fff31337dc86f08e6b82c5c8f15829 WHIRLPOOL 9ecb5ee655fe2e6a96c7d123bb0f3252a330a7ee2bb4de63769f62797c795b8c6fb214d0544021b9dc3c3e3532fdc73e88f71842d82324039cc1a67e14ae5b47
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088