gentoo resync : 25.04.2020

5 files changed, 147 insertions, 3 deletions

diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 4ec3f5bedd87..fa3d6ba6f9b6 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -8,7 +8,10 @@ DIST apt-cacher-ng_3.3.1-2.debian.tar.xz 49772 BLAKE2B b864859e7f0ad5eba24b2f1ce
 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
-EBUILD apt-cacher-ng-3.3.1_p2.ebuild 2987 BLAKE2B b3a076b3b4e58020e8795279da7c28cfa9f496f285814f34e5bcfc37976de7496e1e89df002f31e89bff8311db3ac261c1609041fc115cf85216b7214e9e90a4 SHA512 847e7cd3b1eab44f0d883da8bc6642b191b96302a9082e3f4a1ea80c65b4e5fc8382274ffdfc0dd19f93c7d4fac4db6bd003bd02a0bce14ac9971dc018cb35c1
-EBUILD apt-cacher-ng-3.4_p1.ebuild 2987 BLAKE2B b3a076b3b4e58020e8795279da7c28cfa9f496f285814f34e5bcfc37976de7496e1e89df002f31e89bff8311db3ac261c1609041fc115cf85216b7214e9e90a4 SHA512 847e7cd3b1eab44f0d883da8bc6642b191b96302a9082e3f4a1ea80c65b4e5fc8382274ffdfc0dd19f93c7d4fac4db6bd003bd02a0bce14ac9971dc018cb35c1
-EBUILD apt-cacher-ng-9999999.ebuild 2766 BLAKE2B 4f701f236badb3a89b585690aab07e0004a5ac09daa6afb8dab499e3ae083ff6cf70ebba41c72ed6eb185c0c668d499c94d1f458da2c1117c9140a1a7b998dc2 SHA512 664184bd5ebc58302e952848ab301b241173e2ddec5896a9f99c35f96622d915e47d9243d590473d65d488fd66c869accb31c0cc7bd22c97245a0784b369186e
+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.ebuild 3008 BLAKE2B 8c3d1f980c2feb4f9e66987bf31a2b3160b2e6cc01c1a679192575b1c4d2cc8e4b4fc3cb07dc4535a5fbb3252ac6311720b6197b8df4aee0e1b4416f697a691f SHA512 de16ae9ad3f8bcd68e672d8bec28e7cc57df6920e12aa1e21ebbe4ec85d8afbf4dd964e3d0c6e740df1b8dec5cf9e93d7a84f073ecc60108b034d81af9b8aedc
+EBUILD apt-cacher-ng-9999999.ebuild 2787 BLAKE2B 47f4c6f7657f1651fe41be6787320ddb746ba7427644c7fa5f3f363dc69dee49f610290ad4d5b472e79a3e4a79c682f0c7cb7c2f1dae56421abcf9d6ab4918d1 SHA512 b0c096658bedcb31ad27d5719c6bf4ab2e8196647b124d9fa746670255c1f4fc7d569905d334be2b395b2d03c3f1e96a3187daaf0c3e411d4b4570a579946a21
 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
index 0b5dc00272ba..4061fff1f9ca 100644
--- 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
@@ -22,6 +22,7 @@ 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? (
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
index 0b5dc00272ba..4061fff1f9ca 100644
--- 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
@@ -22,6 +22,7 @@ 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? (
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1.ebuild
new file mode 100644
index 000000000000..4061fff1f9ca
--- /dev/null
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1.ebuild
@@ -0,0 +1,138 @@
+# 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-9999999.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
index 25cdda30a1e1..402b95991acf 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
@@ -20,6 +20,7 @@ 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? (