gentoo resync : 28.04.2021

6 files changed, 69 insertions, 13 deletions

diff --git a/net-misc/gofish/Manifest b/net-misc/gofish/Manifest
index 414b55d492ae..61f19c0531e8 100644
--- a/net-misc/gofish/Manifest
+++ b/net-misc/gofish/Manifest
@@ -1,5 +1,8 @@
+AUX gofish-1.2-r1.confd 21 BLAKE2B 3a7fb9d9e622954e7bf2cabc4c3dcfa3b948303810e091f4f8d1a8fc73ba1d7bbe778714b4fb5cb3138c7913b5e74dc45cd964794b602d94149480d70fd8cfed SHA512 869e3a142459145c162cbcb9ae147169bff1158db0027c79c1374bf2f5160827e249ee7a59f3b0721d6392b585ce5a6ca65bdc0950092d8663d3dc9ffb65a2d7
+AUX gofish-1.2-r1.rc 276 BLAKE2B 0a0441c2357a0089aced9143de03c628d0b7b2e8fb1544ac7a3a7b7f0364745866977519654d9ebdc9037307424c981f6bb1627605f581a17cc58bd402d2c835 SHA512 0d8ccd935ce7a4d25be0f67d6095fdbcbd5e11b49aabdbd64cfba5f297cdcbc3db70b3759da4158cca00bf50faa6874c6cc3b2cc51dfebfa3c0b1c65c252db3f
 AUX gofish.confd 429 BLAKE2B 508d6970cf449da1b1b9cf3940d3df024f66ace3ec1f64415eccfab8d3a8c27be54c3b00fbbbc058fc17d583dd863323aad0a88291ffaee2015a6352202a004d SHA512 3a3fc8a701149195d6a18aa38cf22030415fcaf1e72bb9603175345d639a055e7b13130d4a2ef3308eaf946ed4d0c8d21378f8793e344d2baf6dc4c9ad0b7db6
 AUX gofish.rc 607 BLAKE2B 85733d62a2b59a0feb900169cac3ce58f49a40664c7a536b23e4efde8db0888957773ace3cd0f317b821be4532cfd8b9ff7f6641f66cfcac15af6e62bee959fb SHA512 dbae20d8b5bd17e05612bf85acea2a6d0433a7c59670e6d7c2807274da8d8a81a82cdb15eac7dda572be062ef2aa87b62dabc0dfc208013eaeb682f7bc49f9e1
 DIST gofish-1.2.tar.gz 212596 BLAKE2B ca202a55463fbc0b09ed902556d038101b4963ef24920ccd527c2b0c99a2905431c3bdffb2777605010b62db48dd80362ecc68e6ddcfecc7f5f4245bece4d749 SHA512 f7999a5e2b4f80d6402f26d9434f844b26b47b43a6b00055e72ba399426672ed299ca759252d8eb732b23a4c2c369a92c11c0d496f16f4bf3a999398cf6c5bee
-EBUILD gofish-1.2.ebuild 639 BLAKE2B 84057e4158b72cf573c684aa61eea6c60961922ac457ce1a261340b333dad8624330e8334caca52865c2ca543beba75f12bf591a521a58d273466dd94e3fee9a SHA512 4788c07ebd7a8b82a04cea280b80e149ba559d3703b376428478bc3cebc0101ad4627cc829678eb30b087c2ae64b4e9f9b7300582f0787b8b760489f6471ecf9
-MISC metadata.xml 243 BLAKE2B abe6d8663d75c0714d442564a532697432403497680faea1e7aaac85ead3e43040f41b87aeff96392efe92cbeb4e8795d5fa89975098673d89b6b116e24e8b98 SHA512 20e0e5969c25ae20a3e0fd1a48aab24ea25d41f80ea16d1b5075a097ce1de9f1652c571a9b2673d6ff009e03eeb9bf5a11f61ed305486784df5ae0924ef9ef24
+EBUILD gofish-1.2-r1.ebuild 638 BLAKE2B 6eea9492afa5815f033e3a15331980c733c4725faeb907261c22caaef6936ac3269e4d970c6e3e45a37140b2ff65855c8a9cb5af0cfe26f03e09e8ecd9851f71 SHA512 3022adbcf217df44bad004f97a97ea3c965e61babdf47d3fc4715f4d9f9ae7da3325458a234f0bab6a19f5eb77112e6660e3854945eff386164f2c5419473424
+EBUILD gofish-1.2.ebuild 652 BLAKE2B c75e3dd069dc503b10b0eac2a817607a272587062562a0b0cf5cfe3abd2fc2f770bfb1968c341d5da1f54322959f4e02c4087f76a7ccb80fda78eab6d81efdc3 SHA512 0e85d33f0c2fb1aafb733d8f4aaac19329865f0c66e4224c686caea4aa27e790e3a1e7420f1912315323ed8664354d93da2b2bc044347a7ab6a73bb42dc72d37
+MISC metadata.xml 466 BLAKE2B 5cfa732e72370b818e728f16af957fcd57c4a10d03dca70bd83014074d659e2a695752a4f3bb536b30eca784b812004638fae7d7fb25cb1381b18c7881220aaf SHA512 957563aed285486e3453274fcb2a50f3492aee99f537f6028f8cedc95a88d033e7c0639dca64e34048fd6889c3148483a886e8f0e10063e85445febdea41ddc0
diff --git a/net-misc/gofish/files/gofish-1.2-r1.confd b/net-misc/gofish/files/gofish-1.2-r1.confd
new file mode 100644
index 000000000000..5ecb2816c2aa
--- /dev/null
+++ b/net-misc/gofish/files/gofish-1.2-r1.confd
@@ -0,0 +1 @@
+GOFISH_START_OPTS=""
diff --git a/net-misc/gofish/files/gofish-1.2-r1.rc b/net-misc/gofish/files/gofish-1.2-r1.rc
new file mode 100644
index 000000000000..2566bbca99c3
--- /dev/null
+++ b/net-misc/gofish/files/gofish-1.2-r1.rc
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/gofish"
+command_args="${GOFISH_START_OPTS}"
+command_args_background="-d"
+pidfile="/var/run/gofish.pid"
+
+depend() {
+       need net
+}
diff --git a/net-misc/gofish/gofish-1.2-r1.ebuild b/net-misc/gofish/gofish-1.2-r1.ebuild
new file mode 100644
index 000000000000..fa82bccbe174
--- /dev/null
+++ b/net-misc/gofish/gofish-1.2-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Gofish gopher server"
+HOMEPAGE="http://gofish.sourceforge.net"
+SRC_URI="mirror://sourceforge/gofish/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	acct-group/gopher
+	acct-user/gopher
+"
+
+DOCS=( Configure_GoFish )
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir=/var
+		--disable-mmap-cache
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}"/gofish-1.2-r1.rc gofish
+	newconfd "${FILESDIR}"/gofish-1.2-r1.confd gofish
+}
diff --git a/net-misc/gofish/gofish-1.2.ebuild b/net-misc/gofish/gofish-1.2.ebuild
index 6f64429d30ae..6ab8823d84a2 100644
--- a/net-misc/gofish/gofish-1.2.ebuild
+++ b/net-misc/gofish/gofish-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,16 +8,11 @@ inherit user
 DESCRIPTION="Gofish gopher server"
 HOMEPAGE="http://gofish.sourceforge.net"
 SRC_URI="mirror://sourceforge/gofish/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}/${PN}
 
 pkg_setup() {
 	enewgroup gopher
@@ -25,9 +20,12 @@ pkg_setup() {
 }
 
 src_configure() {
-	econf \
-		--localstatedir=/var \
+	local myeconfargs=(
+		--localstatedir=/var
 		--disable-mmap-cache
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/net-misc/gofish/metadata.xml b/net-misc/gofish/metadata.xml
index b939f35668cd..ab50e898b2e8 100644
--- a/net-misc/gofish/metadata.xml
+++ b/net-misc/gofish/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>matt@offtopica.uk</email>
+		<name>Matt Smith</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gofish</remote-id>
 	</upstream>