gentoo resync : 30.09.2020

5 files changed, 6 insertions, 308 deletions

diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index c4a09a5d78c1..6634b152654e 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -5,14 +5,8 @@ AUX confd-r1 100 BLAKE2B e5f0e9ca77d9d3b30a0a59a755e286a914d1ed81a2afd47ed0fd256
 AUX cron.daily 459 BLAKE2B 8798bcc7f57cfe0798fc6594dccf89165df88361510ceb962ff8cd70bd10c15f2cc8acff11ad0e2051d6a6bfe65e53e438d5fee9a60ac293334561f603adbedf SHA512 3e42afb0be6235594e2ccf68d0fd4c7be4954d6583562e1692e98ab55e8fdc74026690b01417e4b6fc9fe288df40e66e5e63e5a1fd98d5484c6eb366aa1b4d4a
 AUX initd-r2 1003 BLAKE2B f8e87da524cb10358420de9bc7e76d5b954cdfa70ba54637ca0b4653c1f718eebe77bbc3220003691d7163374f3af0aa4ca8568b76218d7214e2e498c2998f79 SHA512 f57c58074bbe1c35b748f94bf2a8a4aa10f8264e662b61c1178582f16f5e53c38941e9b2c2c0a46718ab8615ff426a887f64fe170da42b7aaaa9bb3c23a0fc00
 AUX logrotate 377 BLAKE2B deaa8badb74a660419df29efc02d0f00d3100c4357f43e02c7c9eba305902a204d3b61073a3e483b0f7d614ddf4053bdc731737c5199b792380a922e25e2a49f SHA512 c2f4be7294953a63a89e5beee40029e03faa1db49986a6f8d974def67b064d391be13ecddec0d6b4d7ec369db6dcd0bafc328e90b54ccec911df739c719fd885
-DIST apt-cacher-ng_3.3.1-2.debian.tar.xz 49772 BLAKE2B b864859e7f0ad5eba24b2f1ced74dbdb7a1878fbc2190863929f45534163c18ed2a67c4c75b5fe8011d93312ab9a67d899b09669e7aacb1ad3ae15a2bc1fba12 SHA512 653ca59c1d9c89a9586ccf963da480524ff8195222435e4a89f0c08ca64586e1993a92d00a05dbf738b0814869a5e6b539a05d1d59cb956e66b2dbe5ad95eeb8
-DIST apt-cacher-ng_3.3.1.orig.tar.xz 321996 BLAKE2B b630a31414ee86256f2e2ebe950b56d182d61dffd1603ce8387b5cd677d18fcda3ed17864bb99c253b11e2d29163b172c2d0bc91a3f5b14fb9f0ef321d656b40 SHA512 0d412e4a488fa4c55f1292c1fc7346bdf88228528455ce1d2ad20137ddb84df211a3bc5911c12662428335d8f624979d166b0ed31f74e466228df3ab108e67f3
-DIST apt-cacher-ng_3.4-1.debian.tar.xz 49880 BLAKE2B a49dc9ca415cd00f275f8aab61836ef002b9463a8ce22b2fbf1379ce908737d0df813e9d112e64667790e0c9c29ae44ca12291ff531fa565a30b0345c3970824 SHA512 49879c8786ba5aa6398ce43d733a71529a5c2a93a0e8e3e856bb7bf6d6dd0d8dcf9f6a96b291a3e77e0a71a9a990b5d0ade9134e5ec670a33592c9a1ab61a48e
-DIST apt-cacher-ng_3.4.orig.tar.xz 324040 BLAKE2B 0164ac35815fb42a2197830134172c4b93677f6ee6add71d115e975a3b8538db18e635fae2fe9556346229dc076c732b3b3f6fb9958e347fee8876f0f2363c9e SHA512 956366431f4671afd46f3bc0cdb9acaf02378606a7e210a190902e519ed25d2d102a336032c31fcc8b71c879bd219f249f411af732bfb6f9213e485ba6981c5d
 DIST apt-cacher-ng_3.5-1.debian.tar.xz 49916 BLAKE2B c01c96e5cf46fa3b8c46145b34976f3c4a3b545819719a8de517fe53a91d6f65c460bee59d98de750912d7bb9e3416804a088bdf274d74352c35f757cdeb16ea SHA512 8a543f94ef5e206be40070eb757c950ad6915cfbd6cacfadb5bd91070d14b4bb1c3c550823cd088c15335963587cc34d414518ae0013f6561996f855ccf97359
 DIST apt-cacher-ng_3.5.orig.tar.xz 325260 BLAKE2B 1cf19bd575d4e3d320f73771b31e98977417713d57ceaaccb8b6c0eff7bd5e02c99a0c197ddbc09d14d8f6a70799525dedfe1fbacb00357f65f0c8c4d540bcab SHA512 0bbc78c128d353ec2504f4d898d0ffb339778e98ab9899d48c61c094b15cafd92e430f864c82b66049578f5dd3c9e74fc5c09883231faeddce453be64e6f8954
-EBUILD apt-cacher-ng-3.3.1_p2.ebuild 3008 BLAKE2B 8c3d1f980c2feb4f9e66987bf31a2b3160b2e6cc01c1a679192575b1c4d2cc8e4b4fc3cb07dc4535a5fbb3252ac6311720b6197b8df4aee0e1b4416f697a691f SHA512 de16ae9ad3f8bcd68e672d8bec28e7cc57df6920e12aa1e21ebbe4ec85d8afbf4dd964e3d0c6e740df1b8dec5cf9e93d7a84f073ecc60108b034d81af9b8aedc
-EBUILD apt-cacher-ng-3.4_p1.ebuild 3008 BLAKE2B 8c3d1f980c2feb4f9e66987bf31a2b3160b2e6cc01c1a679192575b1c4d2cc8e4b4fc3cb07dc4535a5fbb3252ac6311720b6197b8df4aee0e1b4416f697a691f SHA512 de16ae9ad3f8bcd68e672d8bec28e7cc57df6920e12aa1e21ebbe4ec85d8afbf4dd964e3d0c6e740df1b8dec5cf9e93d7a84f073ecc60108b034d81af9b8aedc
-EBUILD apt-cacher-ng-3.5_p1-r1.ebuild 3051 BLAKE2B b491d278e3b6353d07e3f626a43f54f030921ee2782680e74b3c375a7fb55a96c16ae6b40678d3571a4c01baee5d7a00ad3ae4697c466848310d5b70a1b8e088 SHA512 04f2f4c75b0a8977f171dc3b27e974678d9218c7423b2cfa51139576a0a8a6c9713aeeaa62aa94daac320a615e9ef9d9f8d10086d30cd1fe498841c45d0568e8
-EBUILD apt-cacher-ng-9999999.ebuild 2830 BLAKE2B b8f25d69a78c7c2833ab73fb0cc18a13336af60747e276c2c0348659bb918f594726979184797312343fa3e4feb3582e23699198712b1ed76648b8f3a83ada79 SHA512 dece416e0eff684007f95d758377f9310ec03962111544c003375d552aa0cfde0fcfccebd208a763820a668c6e09fc844e39df67106260fdf7642b1831e06724
+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 493 BLAKE2B 6c2fb1f7abaee7df8db9ccdd7b71774230ddf2dc860d59f65a1cb77560532eb363e550bef6df18a63a78858a0a2469b0eb011d8bf0d41bf36a4c1b11223f0b2d SHA512 58f1345b841c7d5105432d0dab345033b9cefcfd4dedfe05f52d25135716be336a2f4a5fee3288236239bae9bbb1381deff0917fff8c80d81caaf64e8706b5a6
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild
deleted file mode 100644
index 4061fff1f9ca..000000000000
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake-utils toolchain-funcs 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}
-	dev-util/cmake
-	>sys-devel/gcc-4.8
-	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
-	"${WORKDIR}"/debian/patches/debian-changes
-)
-S=${WORKDIR}/${P/_*}
-
-pkg_pretend() {
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
-	elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then
-		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
-	fi
-}
-
-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-utils_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
-	exeinto /etc/cron.daily
-	newexe "${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.4_p1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.4_p1.ebuild
deleted file mode 100644
index 4061fff1f9ca..000000000000
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.4_p1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake-utils toolchain-funcs 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}
-	dev-util/cmake
-	>sys-devel/gcc-4.8
-	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
-	"${WORKDIR}"/debian/patches/debian-changes
-)
-S=${WORKDIR}/${P/_*}
-
-pkg_pretend() {
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
-	elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then
-		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
-	fi
-}
-
-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-utils_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
-	exeinto /etc/cron.daily
-	newexe "${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_p1-r1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild
index f118d28f0119..362e497b3c1b 100644
--- 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
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils toolchain-funcs user
+inherit cmake user
 
 DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
 HOMEPAGE="
@@ -31,8 +31,6 @@ COMMON_DEPEND="
 "
 BDEPEND="
 	${COMMON_DEPEND}
-	dev-util/cmake
-	>sys-devel/gcc-4.8
 	virtual/pkgconfig
 "
 RDEPEND="
@@ -48,14 +46,6 @@ PATCHES=(
 )
 S=${WORKDIR}/${P/_*}
 
-pkg_pretend() {
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
-	elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then
-		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
-	fi
-}
-
 pkg_setup() {
 	# add new user & group for daemon
 	enewgroup ${PN}
@@ -80,7 +70,7 @@ src_configure() {
 		mycmakeargs+=( "-DUSE_GOLD=no" )
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	sed -i -e '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
 }
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
index 6ae025935bf9..8ecaae37d3c5 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils git-r3 toolchain-funcs user
+inherit cmake git-r3 user
 
 DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
 HOMEPAGE="
@@ -29,8 +29,6 @@ COMMON_DEPEND="
 "
 BDEPEND="
 	${COMMON_DEPEND}
-	dev-util/cmake
-	>sys-devel/gcc-4.8
 	virtual/pkgconfig
 "
 RDEPEND="
@@ -45,14 +43,6 @@ PATCHES=(
 )
 S=${WORKDIR}/${P/_*}
 
-pkg_pretend() {
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
-	elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then
-		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
-	fi
-}
-
 pkg_setup() {
 	# add new user & group for daemon
 	enewgroup ${PN}
@@ -74,7 +64,7 @@ src_configure() {
 		mycmakeargs+=( "-DHAVE_LIBWRAP=no" )
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	sed -i -e '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
 }