gentoo resync : 28.04.2021

3 files changed, 63 insertions, 64 deletions

diff --git a/games-mud/circlemud/Manifest b/games-mud/circlemud/Manifest
index add3ae2e0c3a..a23b14ed032c 100644
--- a/games-mud/circlemud/Manifest
+++ b/games-mud/circlemud/Manifest
@@ -1,4 +1,4 @@
 AUX circlemud-3.1-ldflags.patch 2808 BLAKE2B 89eb13ad95e943c2d46802ff86ca921759f39c47812df41ba91ca640ac559f0eb1d5685bab0727b0b7e1085f5b87e9fd7dc1288e88447a404f07005d4e1472ac SHA512 e60d6732cd488257f770e561852394ce6f5437b1c9b96233e9a650c02f4e66d3a31e37438655a7a25cd5af050d3da67c19154500cc3679ca0b4cb3d2aff92ba8
 DIST circle-3.1.tar.bz2 1176136 BLAKE2B f48a8feeb2cca17f23142f3456e09bc319aa26e2e295badc0e80b9d5f87f09f30f697ffba87c2edefdd6f77c8c56af68e395532c4a2232687c02ad869c19fb3f SHA512 161a0fd74aa248f6b357447be1de2d7c55e1fd281e9621d1cf7eb02d802ae06f362a318eeb3eb2425aad96620f71775245775a3aa42250e4374e8c82947df194
-EBUILD circlemud-3.1.ebuild 1476 BLAKE2B 0f56a4f02849b5fea5a4f34386d00c020d7f384e5179541791d0423e473dfcb59818fbe2fa386deb5eaf497f40577e9113e6b325429bcc9be88117cba6377667 SHA512 b408ba65f1fcb0533c743071ad8fd6c06b668ca08f204e1d30a37e274e892031460f70356f90893e8a80d3df466ca9dcce2edc5a355e6e5e86aa212c0fe5b1b9
+EBUILD circlemud-3.1-r1.ebuild 1162 BLAKE2B fe357b65b547a243a3225a41543039d7a82026a64c8568ca82747192725111ce0a9f59874d50097f8e67146c6ef7fbe4b4d034f613cedb1776981474b2bbb723 SHA512 ca184edb334414c5bd86bed09e32104ac001452698bd564befb19394ec46f98995664463c97fd60e1b9f6b7706b2bfe08ce7dbb0fa3f6b77de30a929db26e97f
 MISC metadata.xml 711 BLAKE2B 1ca940940c272abadf5883a5458c414fdff03775c999d6156c1552bfd8abfd2199d0bc273498248e091f9c04ea3f43bbf4cc10cef06daab6014d867281e07a40 SHA512 4e0b5aa6ad14a7a0ae17be00023586becd1c370f01eca9730632a52ea56b3b6a91cb0180ead036937df09c4adaf6a9950cd872de42bd8c81ca69112a63dd37f6
diff --git a/games-mud/circlemud/circlemud-3.1-r1.ebuild b/games-mud/circlemud/circlemud-3.1-r1.ebuild
new file mode 100644
index 000000000000..ff9a32c5494f
--- /dev/null
+++ b/games-mud/circlemud/circlemud-3.1-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A multi-user dungeon game system server"
+HOMEPAGE="https://www.circlemud.org/"
+SRC_URI="https://www.circlemud.org/pub/CircleMUD/3.x/circle-${PV}.tar.bz2"
+S="${WORKDIR}"/circle-${PV}
+
+LICENSE="circlemud"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/openssl:0="
+RDEPEND="
+	${DEPEND}
+	acct-group/gamestat
+"
+
+src_prepare() {
+	default
+
+	cd src || die
+
+	touch .accepted || die
+
+	sed -i \
+		-e 's:^read.*::' licheck || die
+
+	# Now let's rename binaries (too many are very generic)
+	sed -i \
+		-e "s:\.\./bin/autowiz:${PN}-autowiz:" limits.c || die
+
+	tc-export CC
+	eapply "${FILESDIR}"/${P}-ldflags.patch
+}
+
+src_compile() {
+	emake -C src
+}
+
+src_install() {
+	local bin
+
+	for bin in autowiz delobjs listrent mudpasswd play2to3 purgeplay \
+	           shopconv showplay sign split wld2html ; do
+		newbin bin/${bin} ${PN}-${bin}
+	done
+
+	dobin bin/circle
+
+	insinto /var/lib/${PN}
+	doins -r lib/*
+
+	insinto /etc/${PN}
+	doins lib/etc/*
+
+	dodoc doc/{README.UNIX,*.pdf,*.txt} ChangeLog FAQ README release_notes.${PV}.txt
+}
diff --git a/games-mud/circlemud/circlemud-3.1.ebuild b/games-mud/circlemud/circlemud-3.1.ebuild
deleted file mode 100644
index 0e4c0eb1a255..000000000000
--- a/games-mud/circlemud/circlemud-3.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="a multi-user dungeon game system server"
-HOMEPAGE="https://www.circlemud.org/"
-SRC_URI="https://www.circlemud.org/pub/CircleMUD/3.x/circle-${PV}.tar.bz2"
-
-LICENSE="circlemud"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/openssl:0="
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/circle-${PV}
-
-src_prepare() {
-	cd src
-	touch .accepted
-	sed -i \
-		-e 's:^read.*::' licheck || die
-
-	# make circlemud fit into Gentoo nicely
-	sed -i \
-		-e "s:\"lib\":\"${GAMES_DATADIR}/${PN}\":g" \
-		-e "s:\(LOGNAME = \)NULL:\1\"${GAMES_LOGDIR}/${PN}.log\":g" \
-		config.c || die
-	sed -i \
-		-e "s:etc/:${GAMES_SYSCONFDIR}/${PN}/:g" db.h || die
-
-	# now lets rename binaries (too many are very generic)
-	sed -i \
-		-e "s:\.\./bin/autowiz:${PN}-autowiz:" limits.c || die
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-}
-
-src_compile() {
-	emake -C src
-}
-
-src_install() {
-	local bin
-
-	for bin in autowiz delobjs listrent mudpasswd play2to3 purgeplay \
-	           shopconv showplay sign split wld2html ; do
-		newgamesbin bin/${bin} ${PN}-${bin}
-	done
-	dogamesbin bin/circle
-
-	dodir "${GAMES_DATADIR}/${PN}"
-	cp -r lib/*  "${D}/${GAMES_DATADIR}/${PN}" || die
-
-	insinto "${GAMES_SYSCONFDIR}/${PN}"
-	doins lib/etc/*
-
-	dodoc doc/{README.UNIX,*.pdf,*.txt} ChangeLog FAQ README release_notes.${PV}.txt
-	prepgamesdirs
-	fperms 770 "${GAMES_SYSCONFDIR}/${PN}/players"
-}