gentoo resync : 12.03.2021

2 files changed, 99 insertions, 0 deletions

diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index e86f44326ff9..5a991ae178bd 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -5,7 +5,9 @@ AUX confd-r2 452 BLAKE2B 36175fbb8305e43139e0a30aca1840c184972e0c1fe61189634ff38
 AUX cron.daily 459 BLAKE2B 8798bcc7f57cfe0798fc6594dccf89165df88361510ceb962ff8cd70bd10c15f2cc8acff11ad0e2051d6a6bfe65e53e438d5fee9a60ac293334561f603adbedf SHA512 3e42afb0be6235594e2ccf68d0fd4c7be4954d6583562e1692e98ab55e8fdc74026690b01417e4b6fc9fe288df40e66e5e63e5a1fd98d5484c6eb366aa1b4d4a
 AUX initd-r3 599 BLAKE2B aee4ad69c9aa213ce00062b073c3c02a1f29b96aaa0b2b4573f009846be1f5b0f1bb53089f14c399b6accb73937545820eef5b84a765ed8fff26e79ac543bcfd SHA512 37ea0bc22347afad9e64e038c14552a4609fa95f3c4a4dd0a3938cada1545940f1c76114cf1a46cea41ce4cf524f9e6a2499d7a7770507c20bcb726b8ee9515f
 AUX logrotate 377 BLAKE2B deaa8badb74a660419df29efc02d0f00d3100c4357f43e02c7c9eba305902a204d3b61073a3e483b0f7d614ddf4053bdc731737c5199b792380a922e25e2a49f SHA512 c2f4be7294953a63a89e5beee40029e03faa1db49986a6f8d974def67b064d391be13ecddec0d6b4d7ec369db6dcd0bafc328e90b54ccec911df739c719fd885
+DIST apt-cacher-ng_3.6.2.orig.tar.xz 334412 BLAKE2B 4a104337efc8a901d137bafefb6e4bdd90972c8584cef6cce470386c0f26638c5d80a99c12789e47eeae572d95483620435c4adbedefc64af98f906681e255a7 SHA512 8ad40e22ef5b2d952f1968431e8e2a64bf83223424866426ce04d67647b6a7e44e63dfcbe8269606b9ef135097e6d88a16e2b825c1be5c074dba706d47df5f61
 DIST apt-cacher-ng_3.6.orig.tar.xz 331300 BLAKE2B 6c3e118e2b2d79492d6b33f1a40fd9e4aa963e90141706b84603e69551e37f99a813d59c564d442b38eea2ba3b115913d767c9a97da0b08b5efe8bfe2b657acf SHA512 6f58afe10d9e5adb036ca2de67cf017415623dc0552ed60a64967ac248a1cc44be87fd9ddf8905a16d347bd1367425a46316ae6cd4fdc2f1e94f668b59dae63e
+EBUILD apt-cacher-ng-3.6.2_p1.ebuild 2545 BLAKE2B f954883b51527cc8b7838824e54afe851008acd51cdc2aab0b85f01f07c5add2e57cb3592dcc22d33866dcf05b37f5e1db6d8b67e3a894822bb736554c55873d SHA512 68c9b4d7c17b193cc5f1bc11f2b3ffe9b4015c69712dd774b99b3b2e508a65f7b7227e5c92d2958c53ef7304692fe2de54578091d0c4016b1624e76464e80c85
 EBUILD apt-cacher-ng-3.6_p1.ebuild 2545 BLAKE2B f954883b51527cc8b7838824e54afe851008acd51cdc2aab0b85f01f07c5add2e57cb3592dcc22d33866dcf05b37f5e1db6d8b67e3a894822bb736554c55873d SHA512 68c9b4d7c17b193cc5f1bc11f2b3ffe9b4015c69712dd774b99b3b2e508a65f7b7227e5c92d2958c53ef7304692fe2de54578091d0c4016b1624e76464e80c85
 EBUILD apt-cacher-ng-9999.ebuild 2400 BLAKE2B 79834b1870b720d0bf4d45ebd8914e8a7bd85b0fecb5c3c6a471e1bbcca6bcbcca40000a19850eb7d7aff58b9d294fba196dd64760e06978452b5c8d37a0028b SHA512 135c66bd0e00f46a2f6ba12acde0551a26168219b1843d0e256bc9673bb7fefdcffb824ebcf6fcef348139aa31b13e1f498d572aa166ee848f4102c5d193dca4
 MISC metadata.xml 387 BLAKE2B 8c38c862cf70d31fe8ffe60d978aa80a688e45296f11d257ab7abf56edefbed921660c4fd090daf63c60077d8232e5e2b7e65fd881cb2d623c4804192825b68c SHA512 0bc4487ec77c3511deb9df220cf31bc7dc8cf56bc46da5e23c10aa2234d5119b2283f0294651b18e3a4bec4aa0dcef79e3e777efea9d84e6955abee593f49aab
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.2_p1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.2_p1.ebuild
new file mode 100644
index 000000000000..ce6af89f9fa7
--- /dev/null
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.2_p1.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"
+
+LICENSE="BSD-4 ZLIB public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fuse systemd 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 )
+	systemd? ( sys-apps/systemd )
+	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"
+	"${FILESDIR}/${PN}-3.6-optional-systemd.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 -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)"
+		"-DSDINSTALL=$(usex systemd)"
+	)
+
+	cmake_src_configure
+
+	sed -ie '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
+}
+
+src_install() {
+	# README is a symlink to doc/README and README automatically gets
+	# installed, leading to a broken symlink installed. Fix this by removing
+	# the symlink then installing the actual README. https://bugs.gentoo.org/770046
+	rm README || die
+	dodoc doc/README
+
+	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
+}