gentoo resync : 04.05.2018

6 files changed, 65 insertions, 71 deletions

diff --git a/games-util/uglygs/Manifest b/games-util/uglygs/Manifest
index df06733bb10b..2b29c17cd775 100644
--- a/games-util/uglygs/Manifest
+++ b/games-util/uglygs/Manifest
@@ -1,5 +1,6 @@
-AUX 0_rc11-uglygs.conf.patch 2213 BLAKE2B cde96bd6a986e671e1a2c84c91b49993fedc95d55f52d5a16c72da126fbcdd9b6cc1bfb555e9af405d37d61855b1cd5e69fb4e4b5cc9b0e6bcc06eaa71ab002c SHA512 e19ea449992afdf6f5a46352244c97a183a4869e2b018b458e01f02499d48ca95341e94b9704583c8c34a6cda02703de376cf83eb12a406cf145eb98ce7ac88f
-AUX 0_rc11-uglygs.pl.patch 7040 BLAKE2B f415682ade193e0facbfb5966eceac6b6ad6a8a5dec26d824a55c54c1bf93d89772d0ee4d7ec50e4444f02d73e681bd0c5cf73d1a465a5fc9e7aa60453630c86 SHA512 afaee5a46fe17bddc497e4cbdafda3b461e0f1710368dce8057d276c523eae674c3069ec2a86d4386da7d9412a551debebea9c9fe32eae7eb58cebdc06c73db9
+AUX 0_rc11-uglygs.conf.patch 2217 BLAKE2B 545fde785e66039180b3deed5fd79e8d4b87c82231da03d6fb047fc72b4f2be3e7534855c77888e8c57a15ee71e35d289fe369e55ea28ed01ac87398d3aef42e SHA512 f7a465d28c042637af1ea45d6f04d809384c0d06d582270cc914cea1bcfed476798c65abf1e18ad5743cff33914bd4f8755cddbb727da6346cb0942d43401756
+AUX 0_rc11-uglygs.pl.patch 7048 BLAKE2B ddff45fb72140f68fd5096dfce9930b6fa4a11fa13584841d84bf9600858e60cbf2e56d910fdeb1605ace6afdd290eb7d1dd135f6541cb501ba496259a240da2 SHA512 98fc61108bc660be487419485a0bcd01b6d9cc8ab8986807a349d6da3cbcf97707b6c9561c88ab268e53ad503ae0fae50e36021943737298a628c88b74d5c36c
+DATA servers.cfg 0 BLAKE2B 786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e
 DIST uglygs-rc11.tar.gz 9066873 BLAKE2B 91cc02ecfd6ccb98ac765e5702e13fffc231cce9938fc01950eb7691bc3bef03dee51489cacf3526939ebccfafe06a7cbbb97c653a27a0d9dff19e67b73ab4e0 SHA512 2a57eb7a4562525c00c69a7874d32fa52d5f12cb2926dffcf4bc8ad74e5847a962c464426b476412bff369963ee40120c3dfc9c0b506606f8a4668bca88d1970
-EBUILD uglygs-0_rc11.ebuild 1453 BLAKE2B 8dab957d393d952795c7c0ba2b4b1522b89a4b4c2c0a47e19b0432d80c60c135df27473ff8eac2ed249f2258e8f7936d0adc449aa3d0d1df1fdd11e03dad7459 SHA512 685de258dd6bd1a9fe6405196e9fd63f126181ed5787aae3a4404c817971d3891c4ddb8ceeb641f0aa3e645f27f31bc9c466d40a54edb4ba5b47614293b53bba
+EBUILD uglygs-0_rc11-r1.ebuild 1252 BLAKE2B a1074d3984b3c086215d8f6384e9138115b5ba33fc0e8efa9170c91658af607543fc57bb32ddc228d1c3c150e56f4acc9619b6b785fdf90c98b679cb69ec212a SHA512 9d91148ecc0e5bed6474db3c9d6a25c982b41c5eb4e07249d4359db5acc1e7f80c716c5734d7fbf9f264960aaaff7231414bd2cb84afa73ef976de6562d4dd37
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/uglygs/files/0_rc11-uglygs.conf.patch b/games-util/uglygs/files/0_rc11-uglygs.conf.patch
index 6ee918c70088..f85c6a3c3198 100644
--- a/games-util/uglygs/files/0_rc11-uglygs.conf.patch
+++ b/games-util/uglygs/files/0_rc11-uglygs.conf.patch
@@ -1,5 +1,5 @@
---- uglygs.conf.orig	2003-06-30 11:16:57.000000000 -0400
-+++ uglygs.conf	2003-06-30 11:22:50.000000000 -0400
+--- a/uglygs.conf.orig	2003-06-30 11:16:57.000000000 -0400
++++ b/uglygs.conf	2003-06-30 11:22:50.000000000 -0400
 @@ -12,22 +12,23 @@
  $runmode = "loop";                                              # Run mode, Run as a loop or as a cron Executable
  
diff --git a/games-util/uglygs/files/0_rc11-uglygs.pl.patch b/games-util/uglygs/files/0_rc11-uglygs.pl.patch
index 8c7f7943c978..61758e621a9a 100644
--- a/games-util/uglygs/files/0_rc11-uglygs.pl.patch
+++ b/games-util/uglygs/files/0_rc11-uglygs.pl.patch
@@ -1,5 +1,5 @@
---- uglygs.pl.orig	2003-06-30 11:37:59.000000000 -0400
-+++ uglygs.pl	2003-06-30 11:38:30.000000000 -0400
+--- a/uglygs.pl.orig	2003-06-30 11:37:59.000000000 -0400
++++ b/uglygs.pl	2003-06-30 11:38:30.000000000 -0400
 @@ -8,7 +8,8 @@
  ##########                                      Contact uglygs@uglypunk.com                                    ##########
  #########################################################################################################################
@@ -127,5 +127,5 @@
       while($serverline = <QSTAT>){
       my @data = split(/ /,$serverline);
       if ($data[0] eq "<!--" and $data[1] eq "gamedetails"){
---- uglygs.pl.orig	2003-06-30 13:56:01.000000000 -0400
-+++ uglygs.pl	2003-06-30 13:59:17.000000000 -0400
+--- a/uglygs.pl.orig	2003-06-30 13:56:01.000000000 -0400
++++ b/uglygs.pl	2003-06-30 13:59:17.000000000 -0400
diff --git a/games-util/uglygs/servers.cfg b/games-util/uglygs/servers.cfg
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/games-util/uglygs/servers.cfg
diff --git a/games-util/uglygs/uglygs-0_rc11-r1.ebuild b/games-util/uglygs/uglygs-0_rc11-r1.ebuild
new file mode 100644
index 000000000000..a431e691ff30
--- /dev/null
+++ b/games-util/uglygs/uglygs-0_rc11-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${P/0_/}"
+DESCRIPTION="Quickly searches the network for game servers"
+HOMEPAGE="http://uglygs.uglypunk.com/"
+SRC_URI="ftp://ftp.uglypunk.com/uglygs/current/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~alpha ~hppa ~x86"
+IUSE=""
+
+DEPEND="net-analyzer/rrdtool[graph]
+	dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}"/${PV}-uglygs.conf.patch
+	sed -i \
+		-e "s:GENTOO_DIR:/usr/$(get_libdir)/${PN}:" uglygs.conf || die
+	eapply "${FILESDIR}"/${PV}-uglygs.pl.patch
+	sed -i \
+		-e "s:GENTOO_DIR:/etc:" uglygs.pl || die
+	sed -i \
+		-e "s/strndup/${PN}_strndup/" qstat/qstat.c || die
+}
+
+src_compile() {
+	emake -C qstat CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	insinto /etc
+	doins uglygs.conf qstat/qstat.cfg
+
+	dobin uglygs.pl
+
+	insinto /usr/"$(get_libdir)"/${PN}
+	doins -r data templates tmp
+	insinto /usr/"$(get_libdir)"/${PN}/images
+	doins -r images/{avp2,bds,default.gif,hls,j2s,mhs,q3s,rws,sf2s,uns,vcs}
+	dosym bds /usr/"$(get_libdir)"/${PN}/images/bdl
+	keepdir /usr/"$(get_libdir)"/${PN}/tmp
+
+	exeinto /usr/"$(get_libdir)"/${PN}
+	doexe qstat/qstat
+
+	einstalldocs
+}
diff --git a/games-util/uglygs/uglygs-0_rc11.ebuild b/games-util/uglygs/uglygs-0_rc11.ebuild
deleted file mode 100644
index 8ce6738b693e..000000000000
--- a/games-util/uglygs/uglygs-0_rc11.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-MY_P=${P/0_/}
-DESCRIPTION="quickly searches the network for game servers"
-HOMEPAGE="http://uglygs.uglypunk.com/"
-SRC_URI="ftp://ftp.uglypunk.com/uglygs/current/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~hppa ~x86"
-IUSE=""
-
-DEPEND="net-analyzer/rrdtool[graph]
-	dev-lang/perl"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-uglygs.conf.patch
-	sed -i \
-		-e "s:GENTOO_DIR:$(games_get_libdir)/${PN}:" uglygs.conf || die
-	epatch "${FILESDIR}"/${PV}-uglygs.pl.patch
-	sed -i \
-		-e "s:GENTOO_DIR:${GAMES_SYSCONFDIR}:" uglygs.pl || die
-	sed -i \
-		-e "s/strndup/${PN}_strndup/" qstat/qstat.c || die
-}
-
-src_compile() {
-	emake -C qstat CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	insinto "${GAMES_SYSCONFDIR}"
-	doins uglygs.conf qstat/qstat.cfg
-
-	dogamesbin uglygs.pl
-
-	insinto "$(games_get_libdir)"/${PN}
-	doins -r data templates tmp
-	insinto "$(games_get_libdir)"/${PN}/images
-	doins -r images/{avp2,bds,default.gif,hls,j2s,mhs,q3s,rws,sf2s,uns,vcs}
-	dosym bds "$(games_get_libdir)"/${PN}/images/bdl
-	keepdir "$(games_get_libdir)"/${PN}/tmp
-
-	exeinto "$(games_get_libdir)"/${PN}
-	doexe qstat/qstat
-
-	dodoc CHANGES README
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "Dont forget to setup ${GAMES_SYSCONFDIR}/uglygs.conf and ${GAMES_SYSCONFDIR}/qstat.cfg"
-}