gentoo (valentine's day) resync : 14.02.2021

10 files changed, 238 insertions, 297 deletions

diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 6bbaabb72816..a25486a436ef 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -1,12 +1,12 @@
 AUX apt-cacher-ng-3.3.1-flags.patch 340 BLAKE2B e9de81bc2a73a24c99fc7f3509d5e94e148e5ec1c4c672c28428aec398344a37b180084f26f7050fc39a92942ffb2a743b87e13dda7b21d9085516c7847e29f7 SHA512 f57cf0f6d74f1326feb2796a92ed22c6e19dcfed923f6c3a130ca82e0a0abd3c7e629ca29eb1512aefd2500e2da75cdffbd32d53c727a1be52ea3d4664f4cceb
 AUX apt-cacher-ng-3.5-perl-syntax.patch 365 BLAKE2B db71cf58c61ef6192f0d2955f64dbbe89ea580c4dbdd6cabc150f5cdebbf383f916dcfc1379e0caa1792be7dbda18898e71fc7a4f1829ae77160dc4a9ca83a74 SHA512 fe933eac743b13974cd7451f9a8fcbd32d6f779b992aaa07526eb291eeb64dbd48050ec08ae141fee55df2f1c415799073a78236c6fa10d5eb12733e2919ca16
 AUX apt-cacher-ng-9999999-flags.patch 660 BLAKE2B 64c1e8ef41841daf8e13b1cc9a0a2fe8839200eb37663069c52e1a2e2ae1f454ed98d802b7dfa6df95c9f3f113badfbf6bc07f3e9aa9b8925e88c87c8a3af9ee SHA512 fb3332380708ec37179de9493193e8c674e38fbd38af00098572fbe1b66184e5c3358640a8f56d8e336582b496e3d0d924761a3dffdc397e98903beb90efa8de
-AUX confd-r1 100 BLAKE2B e5f0e9ca77d9d3b30a0a59a755e286a914d1ed81a2afd47ed0fd2563eca81ec9db8e50aa9d34c9e31b1014ecf2db7e85cb055d7a67af494bf88c2ec9b9c13465 SHA512 c58ecc104ab7fa90cbccc1d9f9725c9ddad84bb7225ea3eea56d7874b060ce453e4576ca055e014b9621b9514d95a189915fead2057557fb785d9520d7121831
+AUX confd-r2 452 BLAKE2B 36175fbb8305e43139e0a30aca1840c184972e0c1fe61189634ff38184b905d6ecd372bfa8e13b52babba18da0c8f364a6ba66890d6de96ce6970c7c8ff3b2d2 SHA512 4a7cd8ee8125def9290d2e7a369f76308bcf8faf22eb908c974cedb7206d1d02417636cc14ccec9047bd25d7f4fd0d245189353cb2b0266f8c8122e019460666
 AUX cron.daily 459 BLAKE2B 8798bcc7f57cfe0798fc6594dccf89165df88361510ceb962ff8cd70bd10c15f2cc8acff11ad0e2051d6a6bfe65e53e438d5fee9a60ac293334561f603adbedf SHA512 3e42afb0be6235594e2ccf68d0fd4c7be4954d6583562e1692e98ab55e8fdc74026690b01417e4b6fc9fe288df40e66e5e63e5a1fd98d5484c6eb366aa1b4d4a
-AUX initd-r2 1003 BLAKE2B f8e87da524cb10358420de9bc7e76d5b954cdfa70ba54637ca0b4653c1f718eebe77bbc3220003691d7163374f3af0aa4ca8568b76218d7214e2e498c2998f79 SHA512 f57c58074bbe1c35b748f94bf2a8a4aa10f8264e662b61c1178582f16f5e53c38941e9b2c2c0a46718ab8615ff426a887f64fe170da42b7aaaa9bb3c23a0fc00
+AUX initd-r3 599 BLAKE2B aee4ad69c9aa213ce00062b073c3c02a1f29b96aaa0b2b4573f009846be1f5b0f1bb53089f14c399b6accb73937545820eef5b84a765ed8fff26e79ac543bcfd SHA512 37ea0bc22347afad9e64e038c14552a4609fa95f3c4a4dd0a3938cada1545940f1c76114cf1a46cea41ce4cf524f9e6a2499d7a7770507c20bcb726b8ee9515f
 AUX logrotate 377 BLAKE2B deaa8badb74a660419df29efc02d0f00d3100c4357f43e02c7c9eba305902a204d3b61073a3e483b0f7d614ddf4053bdc731737c5199b792380a922e25e2a49f SHA512 c2f4be7294953a63a89e5beee40029e03faa1db49986a6f8d974def67b064d391be13ecddec0d6b4d7ec369db6dcd0bafc328e90b54ccec911df739c719fd885
-DIST apt-cacher-ng_3.5-1.debian.tar.xz 49916 BLAKE2B c01c96e5cf46fa3b8c46145b34976f3c4a3b545819719a8de517fe53a91d6f65c460bee59d98de750912d7bb9e3416804a088bdf274d74352c35f757cdeb16ea SHA512 8a543f94ef5e206be40070eb757c950ad6915cfbd6cacfadb5bd91070d14b4bb1c3c550823cd088c15335963587cc34d414518ae0013f6561996f855ccf97359
+DIST apt-cacher-ng_3.5-3.debian.tar.xz 49708 BLAKE2B 85092374207a252dcb4ef7b95dc434f81f9b67791e20099dc058022a9a575130070c12827f3fd04640fcec3b44a444fb85d8cea6439d5eaeeb359f263fb05682 SHA512 f690ae69d38b8e9c73ef095e9779364c7c5ccd246b19e8f5ce2edde47861e44c0aedabc75bcf11f5b408e034e52190dc8ed1789b503284f8f68dc1f5e84e1712
 DIST apt-cacher-ng_3.5.orig.tar.xz 325260 BLAKE2B 1cf19bd575d4e3d320f73771b31e98977417713d57ceaaccb8b6c0eff7bd5e02c99a0c197ddbc09d14d8f6a70799525dedfe1fbacb00357f65f0c8c4d540bcab SHA512 0bbc78c128d353ec2504f4d898d0ffb339778e98ab9899d48c61c094b15cafd92e430f864c82b66049578f5dd3c9e74fc5c09883231faeddce453be64e6f8954
-EBUILD apt-cacher-ng-3.5_p1-r1.ebuild 2654 BLAKE2B 12fc9530aeced18d71bc4b4a23fd4b5315170d2b499e4354db49ec0e818694245eeed7db8fd36327093d0114dcba175793aebcaf8cb543526df22079166316db SHA512 2cb8a2292d56d00385c6e1566a511574316339e57c94d95aba3140fbf657b3c96275bea75b0c895a06438b9d6f34c75ebb79e6ff65b0b0ad115366aa89b71cb8
-EBUILD apt-cacher-ng-9999999.ebuild 2433 BLAKE2B c0c38e832d015dbefb62d4d661269567dc69e00247913e54155442b28b992d6b49d03489f97454390eecc11ee695eabf1817573c5f13e968a3c845707f729e38 SHA512 d58313380be4cdb7931b9ea5426996ce9b0380c13f474eaacde7aaa8ae448b7690bd41fc79feaf572f1902a69983d7c4fc000956fe05aaa7df8e291635724d36
-MISC metadata.xml 302 BLAKE2B 45d53591d095c3b57ddf3111fb9d214495a84d905b0428c7a9f45108354a82d0c7c84cd86e6e3b9afe5ab183ba49252da7ca6a6edde61558a73d5bb992b60eaf SHA512 f78c942870ae5a99f63f31535853047cc9c1fb5a2d84a8341558fa22c37e2cb07bb604b63a1952750dd0b895458b6b7b514974b0128cb27a33f4c3f69ba0e4fe
+EBUILD apt-cacher-ng-3.5_p3.ebuild 2449 BLAKE2B 71da549cdea5abb9a301aeeee78b8c9507d833fbdd545b747f75fab9684f02f8934be2ddbf6de1d66ba82de5ec180fd82a630280b4e452ca674ab02bba7cc814 SHA512 e04544ab9969f7384893efdc68220c0293ebaf38eb7da085b55bbbc154fad4a4d3710f7a283c0ca2021daf70058fe342943d2fd29c1a38a7dc820f715006fbd1
+EBUILD apt-cacher-ng-9999.ebuild 2400 BLAKE2B 79834b1870b720d0bf4d45ebd8914e8a7bd85b0fecb5c3c6a471e1bbcca6bcbcca40000a19850eb7d7aff58b9d294fba196dd64760e06978452b5c8d37a0028b SHA512 135c66bd0e00f46a2f6ba12acde0551a26168219b1843d0e256bc9673bb7fefdcffb824ebcf6fcef348139aa31b13e1f498d572aa166ee848f4102c5d193dca4
+MISC metadata.xml 514 BLAKE2B fc89f43d55b9d0d2250522ffa3704a51e336a9c7ec13b928ec483be4da6cf01edd7ab11bdd6e2ede0b1203eef2682270479e1703822849f50c2ccbc32cc0502f SHA512 fe3e1774feb81e61d22f56d6095d7d6caaaecadccda26812c4677c02470e0a6528c474a53ec73615abd5ecd22d4410991d0ce01b7f1177b92fccfd8cca3cf0a7
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild
deleted file mode 100644
index 362e497b3c1b..000000000000
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake user
-
-DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
-HOMEPAGE="
-	https://www.unix-ag.uni-kl.de/~bloch/acng/
-	https://packages.qa.debian.org/a/apt-cacher-ng.html
-"
-LICENSE="BSD-4 ZLIB public-domain"
-SLOT="0"
-SRC_URI="
-	mirror://debian/pool/main/a/${PN}/${PN}_${PV/_*}.orig.tar.xz
-	mirror://debian/pool/main/a/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
-"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fuse systemd tcpd"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	dev-libs/libevent:=
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	systemd? (
-		sys-apps/systemd
-	)
-"
-BDEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-lang/perl
-	fuse? ( sys-fs/fuse )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3.1-flags.patch
-	"${FILESDIR}"/${PN}-3.5-perl-syntax.patch
-	"${WORKDIR}"/debian/patches/debian-changes
-)
-S=${WORKDIR}/${P/_*}
-
-pkg_setup() {
-	# add new user & group for daemon
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_configure() {
-	local mycmakeargs=()
-	if use fuse; then
-		mycmakeargs+=( "-DHAVE_FUSE_25=yes" )
-	else
-		mycmakeargs+=( "-DHAVE_FUSE_25=no" )
-	fi
-	if use tcpd; then
-		mycmakeargs+=( "-DHAVE_LIBWRAP=yes" )
-	else
-		mycmakeargs+=( "-DHAVE_LIBWRAP=no" )
-	fi
-	if tc-ld-is-gold; then
-		mycmakeargs+=( "-DUSE_GOLD=yes" )
-	else
-		mycmakeargs+=( "-DUSE_GOLD=no" )
-	fi
-
-	cmake_src_configure
-
-	sed -i -e '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
-}
-
-src_install() {
-	pushd "${BUILD_DIR}" || die
-	dosbin ${PN} acngtool
-	dolib.so libsupacng.so
-	if use fuse; then
-		dobin acngfs
-	fi
-	popd || die
-
-	newinitd "${FILESDIR}"/initd-r2 ${PN}
-	newconfd "${FILESDIR}"/confd-r1 ${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/logrotate ${PN}
-
-	doman doc/man/${PN}*
-	if use fuse; then
-		doman doc/man/acngfs*
-	fi
-
-	# Documentation
-	dodoc doc/README TODO VERSION INSTALL ChangeLog
-	if use doc; then
-		dodoc doc/*.pdf
-
-		docinto html
-		dodoc doc/html/*
-
-		find conf -name '*.gz' -exec gzip -d {} \; || die
-		docinto examples/conf
-		dodoc conf/*
-	fi
-
-	newdoc "${WORKDIR}"/debian/changelog debian.changelog
-
-	# perl daily cron script
-	dosbin scripts/expire-caller.pl
-	insinto /etc/cron.daily
-	newins "${FILESDIR}"/cron.daily ${PN}
-
-	# default configuration
-	insinto /etc/${PN}
-	newins "${BUILD_DIR}"/conf/acng.conf ${PN}.conf
-	doins $( echo conf/* | sed 's|conf/acng.conf.in||g' )
-
-	keepdir /var/log/${PN}
-	# Some directories must exists
-	keepdir /var/log/${PN}
-	fowners -R ${PN}:${PN} \
-		/etc/${PN} \
-		/var/log/${PN}
-}
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p3.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p3.ebuild
new file mode 100644
index 000000000000..56294639238b
--- /dev/null
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
+HOMEPAGE="https://www.unix-ag.uni-kl.de/~bloch/acng/
+	https://packages.qa.debian.org/a/apt-cacher-ng.html"
+SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV/_*}.orig.tar.xz
+	mirror://debian/pool/main/a/${PN}/${PN}_${PV/_p/-}.debian.tar.xz"
+
+LICENSE="BSD-4 ZLIB public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fuse tcpd"
+
+DEPEND="acct-user/apt-cacher-ng
+	acct-group/apt-cacher-ng
+	app-arch/bzip2
+	dev-libs/libevent:=
+	dev-libs/openssl:0=
+	sys-libs/zlib
+	fuse? ( sys-fs/fuse:0 )
+	tcpd? ( sys-apps/tcp-wrappers )"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}
+	dev-lang/perl"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.3.1-flags.patch"
+	"${FILESDIR}/${PN}-3.5-perl-syntax.patch"
+	"${WORKDIR}/debian/patches/debian-changes"
+)
+
+S="${WORKDIR}/${P/_*}"
+
+src_prepare() {
+	# Fixup systemd/CMakeLists.txt cmake version requirement
+	sed -ie "s/2.6/3.1/" systemd/CMakeLists.txt || die
+
+	# Make sure we install everything the same way it used to be after
+	# switching from mostly custom src_install to relying on build system
+	# installation
+	sed -e "/install/s/LIBDIR/CFGDIR/" \
+		-e "/install.*acng\.conf/s/)$/ RENAME ${PN}.conf)/" \
+		-e "/file/s/)$/ \"*hooks\" \"backends_debian\")/" -i conf/CMakeLists.txt || die
+	sed -ie "/INSTALL.*acngtool/s/LIBDIR/CMAKE_INSTALL_SBINDIR/" source/CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DHAVE_FUSE_25=$(usex fuse)"
+		"-DHAVE_LIBWRAP=$(usex tcpd)"
+		# Unconditionally install systemd service file
+		"-DSDINSTALL=1"
+	)
+
+	if tc-ld-is-gold; then
+		mycmakeargs+=( "-DUSE_GOLD=yes" )
+	else
+		mycmakeargs+=( "-DUSE_GOLD=no" )
+	fi
+
+	cmake_src_configure
+
+	sed -ie '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}/initd-r3" "${PN}"
+	newconfd "${FILESDIR}/confd-r2" "${PN}"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate" "${PN}"
+
+	insinto /etc/cron.daily
+	newins "${FILESDIR}/cron.daily" "${PN}"
+
+	# USE=fuse installs acngfs, don't install manpage without the bin
+	if use !fuse; then
+		rm doc/man/acngfs.8 || die
+	fi
+
+	if use !doc; then
+		rm -r doc/html || die
+	fi
+
+	dosbin scripts/expire-caller.pl
+
+	keepdir "/var/log/${PN}"
+	fowners -R ${PN}:${PN} "/var/log/${PN}"
+
+	cmake_src_install
+}
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild
new file mode 100644
index 000000000000..eeecc4fa1d9c
--- /dev/null
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake git-r3
+
+DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
+HOMEPAGE="https://www.unix-ag.uni-kl.de/~bloch/acng/
+	https://packages.qa.debian.org/a/apt-cacher-ng.html"
+EGIT_REPO_URI="https://salsa.debian.org/blade/apt-cacher-ng.git"
+EGIT_BRANCH="upstream/sid"
+
+LICENSE="BSD-4 ZLIB public-domain"
+SLOT="0"
+IUSE="doc fuse tcpd"
+
+DEPEND="acct-user/apt-cacher-ng
+	acct-group/apt-cacher-ng
+	app-arch/bzip2
+	dev-libs/libevent:=
+	dev-libs/openssl:0=
+	sys-libs/zlib
+	fuse? ( sys-fs/fuse:0 )
+	tcpd? ( sys-apps/tcp-wrappers )"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}
+	dev-lang/perl"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.3.1-flags.patch"
+	"${FILESDIR}/${PN}-3.5-perl-syntax.patch"
+)
+
+S="${WORKDIR}/${P/_*}"
+
+src_prepare() {
+	# Fixup systemd/CMakeLists.txt cmake version requirement
+	sed -ie "s/2.6/3.1/" systemd/CMakeLists.txt || die
+
+	# Make sure we install everything the same way it used to be after
+	# switching from mostly custom src_install to relying on build system
+	# installation
+	sed -ie "/install/s/LIBDIR/CFGDIR/" conf/CMakeLists.txt || die
+	sed -ie '/install.*acng\.conf/s/)$/ RENAME '"${PN}"'.conf)/' conf/CMakeLists.txt || die
+	sed -ie '/file/s/)$/ "*hooks" "backends_debian")/' conf/CMakeLists.txt || die
+	sed -ie "/INSTALL.*acngtool/s/LIBDIR/CMAKE_INSTALL_SBINDIR/" source/CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DHAVE_FUSE_25=$(usex fuse)"
+		"-DHAVE_LIBWRAP=$(usex tcpd)"
+		# Unconditionally install systemd service file
+		"-DSDINSTALL=1"
+	)
+
+	if tc-ld-is-gold; then
+		mycmakeargs+=( "-DUSE_GOLD=yes" )
+	else
+		mycmakeargs+=( "-DUSE_GOLD=no" )
+	fi
+
+	cmake_src_configure
+
+	sed -ie '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}/initd-r3" "${PN}"
+	newconfd "${FILESDIR}/confd-r2" "${PN}"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate" "${PN}"
+
+	insinto /etc/cron.daily
+	newins "${FILESDIR}/cron.daily" "${PN}"
+
+	# USE=fuse installs acngfs, don't install manpage without the bin
+	if use !fuse; then
+		rm doc/man/acngfs.8 || die
+	fi
+
+	if use !doc; then
+		rm -r doc/html || die
+	fi
+
+	dosbin scripts/expire-caller.pl
+
+	keepdir "/var/log/${PN}"
+	fowners -R ${PN}:${PN} "/var/log/${PN}"
+
+	cmake_src_install
+}
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
deleted file mode 100644
index 8ecaae37d3c5..000000000000
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake git-r3 user
-
-DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
-HOMEPAGE="
-	https://www.unix-ag.uni-kl.de/~bloch/acng/
-	https://packages.qa.debian.org/a/apt-cacher-ng.html
-"
-LICENSE="BSD-4 ZLIB public-domain"
-SLOT="0"
-EGIT_REPO_URI="https://salsa.debian.org/blade/apt-cacher-ng.git"
-EGIT_BRANCH="upstream/sid"
-
-KEYWORDS=""
-IUSE="doc fuse systemd tcpd"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	dev-libs/libevent:=
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	systemd? (
-		sys-apps/systemd
-	)
-"
-BDEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-lang/perl
-	fuse? ( sys-fs/fuse )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-perl-syntax.patch
-	"${FILESDIR}"/${PN}-9999999-flags.patch
-)
-S=${WORKDIR}/${P/_*}
-
-pkg_setup() {
-	# add new user & group for daemon
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DCMAKE_SKIP_BUILD_RPATH=on"
-	)
-	if use fuse; then
-		mycmakeargs+=( "-DHAVE_FUSE_25=yes" )
-	else
-		mycmakeargs+=( "-DHAVE_FUSE_25=no" )
-	fi
-	if use tcpd; then
-		mycmakeargs+=( "-DHAVE_LIBWRAP=yes" )
-	else
-		mycmakeargs+=( "-DHAVE_LIBWRAP=no" )
-	fi
-
-	cmake_src_configure
-
-	sed -i -e '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
-}
-
-src_install() {
-	pushd "${BUILD_DIR}" || die
-	dosbin ${PN} acngtool
-	dolib.so libsupacng.so
-	if use fuse; then
-		dobin acngfs
-	fi
-	popd || die
-
-	newinitd "${FILESDIR}"/initd-r2 ${PN}
-	newconfd "${FILESDIR}"/confd-r1 ${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/logrotate ${PN}
-
-	doman doc/man/${PN}*
-	if use fuse; then
-		doman doc/man/acngfs*
-	fi
-
-	# Documentation
-	dodoc doc/README TODO VERSION INSTALL ChangeLog
-	if use doc; then
-		dodoc doc/*.pdf
-
-		docinto html
-		dodoc doc/html/*
-
-		find conf -name '*.gz' -exec gzip -d {} \; || die
-		docinto examples/conf
-		dodoc conf/*
-	fi
-
-	# perl daily cron script
-	dosbin scripts/expire-caller.pl
-	insinto /etc/cron.daily
-	newins "${FILESDIR}"/cron.daily ${PN}
-
-	# default configuration
-	insinto /etc/${PN}
-	newins "${BUILD_DIR}"/conf/acng.conf ${PN}.conf
-	doins $( echo conf/* | sed 's|conf/acng.conf.in||g' )
-
-	keepdir /var/log/${PN}
-	# Some directories must exists
-	keepdir /var/log/${PN}
-	fowners -R ${PN}:${PN} \
-		/etc/${PN} \
-		/var/log/${PN}
-}
diff --git a/net-misc/apt-cacher-ng/files/confd-r1 b/net-misc/apt-cacher-ng/files/confd-r1
deleted file mode 100644
index 84b659bc488b..000000000000
--- a/net-misc/apt-cacher-ng/files/confd-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-# Additional options that are passed to the Daemon.
-DAEMON_OPTS=" -c /etc/apt-cacher-ng "
-LOGDIR=""
diff --git a/net-misc/apt-cacher-ng/files/confd-r2 b/net-misc/apt-cacher-ng/files/confd-r2
new file mode 100644
index 000000000000..2e2f5c99dd4a
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/confd-r2
@@ -0,0 +1,9 @@
+# Additional options that are passed to the Daemon.
+APT_CACHER_NG_ARGS="-c /etc/apt-cacher-ng"
+
+# Specify the network services that correspond to the "BindAddress"
+# setting in your apt-cacher-ng.conf. For example, if you bind to
+# 127.0.0.1, then this should be set to "net.lo" which provides the
+# loopback interface. The default BindAddress listens on all available
+# interfaces, for which it suffices to have only one (net.lo) up.
+rc_need="net.lo"
diff --git a/net-misc/apt-cacher-ng/files/initd-r2 b/net-misc/apt-cacher-ng/files/initd-r2
deleted file mode 100644
index ae9ab7258cc4..000000000000
--- a/net-misc/apt-cacher-ng/files/initd-r2
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-CACHEDIR="var/cache/${RC_SVCNAME}"
-DAEMON="/usr/sbin/${RC_SVCNAME}"
-RUNDIR="/var/run/${RC_SVCNAME}"
-PIDFILE="${RUNDIR}/${RC_SVCNAME}.pid"
-SOCKETFILE="${RUNDIR}/${RC_SVCNAME}.socket"
-DAEMON_OPTS="${DAEMON_OPTS} pidfile=${PIDFILE} SocketPath=${SOCKETFILE} foreground=0"
-
-depend() {
-	use net
-}
-
-start() {
-	ebegin "Starting ${RC_SVCNAME}"
-	checkpath -d -m 0755 -o ${RC_SVCNAME}:${RC_SVCNAME} "${RUNDIR}"
-	checkpath -d -m 0755 -o ${RC_SVCNAME}:${RC_SVCNAME} "${CACHEDIR}"
-	[ -z "${LOGDIR}" ] && checkpath -d -m 0755 -o ${RC_SVCNAME}:${RC_SVCNAME} "/var/log/${RC_SVCNAME}"
-	start-stop-daemon --start --exec ${DAEMON} \
-	    --user ${RC_SVCNAME} --group ${RC_SVCNAME} \
-	    --pidfile ${PIDFILE} \
-	    -- ${DAEMON_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${RC_SVCNAME}"
-	start-stop-daemon --stop --retry 15 --exec ${DAEMON} \
-	    --pidfile ${PIDFILE}
-	rm -f ${PIDFILE}
-	eend $?
-}
diff --git a/net-misc/apt-cacher-ng/files/initd-r3 b/net-misc/apt-cacher-ng/files/initd-r3
new file mode 100644
index 000000000000..665b0e46bcab
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/initd-r3
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+CACHEDIR="/var/cache/${RC_SVCNAME}"
+SOCKETDIR="/run/apt-cacher-ng"
+SOCKETFILE="${SOCKETDIR}/${RC_SVCNAME}.socket"
+
+command="/usr/sbin/apt-cacher-ng"
+command_args="SocketPath=${SOCKETFILE} foreground=1 ${APT_CACHER_NG_ARGS}"
+command_background="true"
+command_user="apt-cacher-ng:apt-cacher-ng"
+pidfile="/run/${RC_SVCNAME}.pid"
+retry="15"
+
+start_pre() {
+	for d in "${SOCKETDIR}" "${CACHEDIR}"; do
+		checkpath --directory --mode 0755 --owner "${command_user}" "${d}"
+	done
+}
diff --git a/net-misc/apt-cacher-ng/metadata.xml b/net-misc/apt-cacher-ng/metadata.xml
index 569b73d1178f..453387392cc2 100644
--- a/net-misc/apt-cacher-ng/metadata.xml
+++ b/net-misc/apt-cacher-ng/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-<flag name="fuse">Install the <pkg>sys-fs/fuse</pkg> based acngfs, to use a userspace filesystem for the apt cache.</flag>
-</use>
+	<maintainer type="person">
+			<email>jchelmert3@posteo.net</email>
+			<name>John Helmert III</name>
+	</maintainer>
+	<maintainer type="project">
+			<email>proxy-maint@gentoo.org</email>
+			<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="fuse">Install the <pkg>sys-fs/fuse</pkg> based acngfs, to use a userspace filesystem for the apt cache.</flag>
+	</use>
 </pkgmetadata>