gentoo resync : 12.07.2021

5 files changed, 110 insertions, 116 deletions

diff --git a/net-p2p/fms/Manifest b/net-p2p/fms/Manifest
index 84727fe492c9..053970dbf329 100644
--- a/net-p2p/fms/Manifest
+++ b/net-p2p/fms/Manifest
@@ -1,5 +1,5 @@
-AUX fms 861 BLAKE2B f4ee5f508327c55bf2b5446d85ab51fe3f968c6592be0045a26f4a1a8f4df3e86505a5f9f5f57c62dafb4d11e75229ddd76b8839f6183ddfcf5adcd53016e15e SHA512 82a8202dd7191b8b0dbca7028cdadeb4d62faae3d60d77bc5e799bd0c83d6ad3e6a7bb0317531b746f7f5f4851df4439edb90b155587ad6631c1b1b91ac18a80
 AUX fms-use-system-libs4.patch 1343 BLAKE2B b45a272f24e0b738328e7d901699f4a5a9e4d9f8f2d564d28d85e817ed4fc8165cebdaa150ecece8c88197d2b5bb7d31a690f84198bad89e9cb7df63a5d57f65 SHA512 36aa556661db38813021e6e4ef2ebc6f3b4e06aa400f774281766579fa21da9583d87a27aef3c7b68c840bec7c69b99aebd237ba25c42fc5732a66b10d4ed20d
+AUX fms.initd 294 BLAKE2B 2ca5dd139ca0380cec252d99f0573d613568bf35556439a8efb770d63af4f88b8867215118504926c7b326136a391c4effc8c9614b57c3679b66d05925e5a75f SHA512 55a918ad3462d932ba6b785ee9cf2c6ef999b770a51bf6260976c89f87cf2e5f2c38dd82e7d687325e0b21b9813f5aa9222cc895c06bb0ac6fb355b6070ee196
 DIST fms-src-0.3.82.zip 4786920 BLAKE2B c18630b8b1b8871290f1d66c4638b99c110e0f49bef11517aa83760274707fd5d0b53c053ea3b38a0c35018de4a4b6f3dd426499228997bac377bb1f04f784fb SHA512 2a72cbc7e23eb16cc12bd373944d1da090030602a09d0c1cf2fd8688a7b1a98ff649f1d0aa8b525b65987394d81acbb9b7558fcb21cea90a7646067a16600673
-EBUILD fms-0.3.82.ebuild 2106 BLAKE2B 64dd710e3678c235f6f644314e677ae0e237eb0357bae2fb30e2fef4ffa6d2c46c0f0c8a717d702cae4f76e051deb700adb1e6160b21f450aad077da90d45537 SHA512 25e7c78c594b046e0a8c504c227c168888a368ae2664c0dde854fac84f66ffec19508750a45c26eca40ae7316930600e38f3f0b3e069d3ec85d85ab17d2a0185
+EBUILD fms-0.3.82-r1.ebuild 2139 BLAKE2B 7474b82db550d2788712d7db3d5dd233636d1fdf6b0d4208d6ff236d49950c4df6ad860d7ee6c1fbeb4b56ccb3b7952da278d7babdabbb7b9fa2dd5cea4255dd SHA512 8282dbfb932c3080be34eff46e22931e8316fb9085c3c529b39cbcf472ebc92acf3b7cc4f9518277d3174bbe52bd8446a0cd521c62543d82b996ceb3b1e39248
 MISC metadata.xml 394 BLAKE2B 0d5eaf902ec54a167ff7fe8c977bfa85faa3549c7ebb885883dc2d5891f1cd54e178bbdb90e5e9dba215e50933e495b71945c11923d7762bf3addfcb9ffc51ca SHA512 6e4e6974d4526ac0bb4ad81f873b829e0d7b15ffceaf6d43752f56576c839f507261af75c7430c61710c8df6a4d659bdb152d01b9cc33caee580e823343dd639
diff --git a/net-p2p/fms/files/fms b/net-p2p/fms/files/fms
deleted file mode 100644
index d7f0453f1606..000000000000
--- a/net-p2p/fms/files/fms
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Check for OpenRC/Baselayout 2 - see bug #270646
-is_openrc() {
-    [ -f /lib/librc.so -o -f /etc/init.d/sysfs -o -f /lib/rc/version ]
-}
-
-start() {
-	ebegin "Starting FMS"
-	if is_openrc; then
-		start-stop-daemon -S -u freenet:freenet -d /var/freenet/fms -b -x /usr/bin/fms
-		eend $?
-	else
-		cd /var/freenet/fms
-		su -s /bin/sh -c "fms --daemon" freenet
-		eend $?
-	fi
-}
-
-stop() {
-	ebegin "Stopping FMS"
-	if is_openrc; then
-		start-stop-daemon -K -u freenet:freenet -d /var/freenet/fms /usr/bin/fms
-		eend $?
-	else
-		pkill -u freenet -f "fms --daemon"
-		eend 0
-	fi
-	if [[ $RC_CMD == "restart" ]]; then
-		ebegin "Waiting a few seconds to be sure FMS is ready for restart"
-		sleep 10
-		#give fms time to stop and release the nntp port
-	fi
-}
-
diff --git a/net-p2p/fms/files/fms.initd b/net-p2p/fms/files/fms.initd
new file mode 100644
index 000000000000..fb76b701c515
--- /dev/null
+++ b/net-p2p/fms/files/fms.initd
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/run/fms.pid"
+start_stop_daemon_args="--chdir /var/freenet/fms"
+
+command="/usr/bin/fms"
+command_background="true"
+command_group="freenet"
+command_user="freenet"
diff --git a/net-p2p/fms/fms-0.3.82-r1.ebuild b/net-p2p/fms/fms-0.3.82-r1.ebuild
new file mode 100644
index 000000000000..ca07782f8477
--- /dev/null
+++ b/net-p2p/fms/fms-0.3.82-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit edos2unix cmake
+
+DESCRIPTION="A spam-resistant message board application for Freenet"
+# FMS only has a homepage within freenet, so the closest is a wiki linking to it
+HOMEPAGE="https://github.com/freenet/wiki/wiki/FMS"
+SRC_URI="https://dev.gentoo.org/~tommy/distfiles/${PN}-src-${PV}.zip"
+S="${WORKDIR}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="frost ssl"
+
+CDEPEND="
+	acct-group/freenet
+	acct-user/freenet
+"
+
+RDEPEND="
+	${CDEPEND}
+	dev-db/sqlite:3=
+	dev-libs/poco
+	frost? ( net-libs/mbedtls:0= )
+	ssl? ( net-libs/mbedtls:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	virtual/libiconv
+"
+
+PATCHES=( "${FILESDIR}/${PN}-use-system-libs4.patch" )
+
+DOCS=( "readme.txt" )
+
+src_prepare() {
+	# Convert encoding due applied patch
+	edos2unix src/http/pages/showfilepage.cpp
+	edos2unix CMakeLists.txt
+
+	# Remove bundled libs
+	rm -fr libs || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDO_CHARSET_CONVERSION="ON"
+		-DFCP_SSL_SUPPORT="$(usex ssl 'ON' 'OFF')"
+		-DFROST_SUPPORT="$(usex frost 'ON' 'OFF')"
+		-DI_HAVE_READ_THE_README="ON"
+		-DUSE_BUNDLED_SQLITE="OFF"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/fms
+
+	insinto /var/freenet/fms
+	doins *.htm
+	doins -r fonts images styles translations
+
+	fperms -R o-rwx /var/freenet/fms
+	fowners -R freenet:freenet /var/freenet/fms
+
+	newinitd "${FILESDIR}/fms.initd" fms
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	if ! has_version 'net-p2p/freenet' ; then
+		ewarn "FMS needs a freenet node to upload and download messages."
+		ewarn "Please make sure to have a node you can connect to"
+		ewarn "or install net-p2p/freenet to get FMS working."
+	fi
+
+	einfo "By default, the FMS NNTP server will listen on port 1119,"
+	einfo "and the web configuration interface will be running at"
+	einfo "http://localhost:8080."
+	einfo "For more information, read the installed readme.txt."
+
+	if use frost; then
+		einfo
+		einfo "You need to enable frost on the configuration page"
+		einfo "and restart FMS for frost support."
+	fi
+}
diff --git a/net-p2p/fms/fms-0.3.82.ebuild b/net-p2p/fms/fms-0.3.82.ebuild
deleted file mode 100644
index 76a9a63fb5c9..000000000000
--- a/net-p2p/fms/fms-0.3.82.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit edos2unix cmake-utils user
-
-DESCRIPTION="A spam-resistant message board application for Freenet"
-#FMS oly has a homepage within freenet, so the closest is a wiki linking to it
-HOMEPAGE="https://github.com/freenet/wiki/wiki/FMS"
-SRC_URI="https://dev.gentoo.org/~tommy/distfiles/${PN}-src-${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="frost ssl"
-
-RDEPEND="virtual/libiconv
-	frost? ( net-libs/mbedtls )
-	ssl? ( net-libs/mbedtls )
-	>=dev-libs/poco-1.4.3_p1
-	>=dev-db/sqlite-3.6.15"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-PATCHES=( "${FILESDIR}"/${PN}-use-system-libs4.patch )
-
-pkg_setup() {
-	enewgroup freenet
-	enewuser freenet -1 -1 /var/freenet freenet
-}
-
-src_prepare() {
-	rm -rv  libs
-	edos2unix src/http/pages/showfilepage.cpp
-	edos2unix CMakeLists.txt
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=( -DI_HAVE_READ_THE_README=ON \
-		-DUSE_BUNDLED_SQLITE=OFF \
-		-DDO_CHARSET_CONVERSION=ON \
-		-DFROST_SUPPORT=$(use frost && echo ON || echo OFF) \
-		-DFCP_SSL_SUPPORT=$(use ssl && echo ON || echo OFF) )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	insinto /var/freenet/fms
-	dobin "${CMAKE_BUILD_DIR}"/fms
-	doins *.htm
-	doins -r fonts images styles translations
-	fperms -R o-rwx /var/freenet/fms/ /usr/bin/fms
-	fowners -R freenet:freenet /var/freenet/fms/ /usr/bin/fms
-	doinitd "${FILESDIR}/fms"
-	dodoc readme.txt
-}
-
-pkg_postinst() {
-	if ! has_version 'net-p2p/freenet' ; then
-		ewarn "FMS needs a freenet node to up-/download messages."
-		ewarn "Please make sure to have a node you can connect to"
-		ewarn "or install net-p2p/freenet to get FMS working."
-	fi
-	elog "By default, the FMS NNTP server will listen on port 1119,"
-	elog "and the web configuration interface will be running at"
-	elog "http://localhost:8080. For more information, read"
-	elog "${ROOT}usr/share/doc/${PF}/readme.txt.bz2"
-	if use frost; then
-		elog " "
-		elog "You need to enable frost on the config page"
-		elog "and restart fms for frost support."
-	fi
-}