gentoo resync : 15.01.2020

8 files changed, 38 insertions, 281 deletions

diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index b589fd9dff01..6d440b6d2c14 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -1,18 +1,14 @@
-AUX apt-cacher-ng-3.2-flags.patch 4172 BLAKE2B 9068ada51f5c12a662f521eee7a834c6eb07299a41671a6d8b47474bdbe15f1c25f531a9f2d058af97ee77d6ddb05fdfa64f018f3bb2ceaad51ac6b7a5f66903 SHA512 b57dc514d976b6f808c332c36c5014a407ec1e7184fb8653404dcf745872b03611ccc9f33bc42846429dc389b4b91831f308874deca4682e6dc636ea4c707713
 AUX apt-cacher-ng-3.3-flags.patch 2661 BLAKE2B 7a1d477819aae614b7598cec314de9627d9f56f974d4d5970be5b624b7cb6d6896f591a2d3eeea0e5af4f8cf264340cceb5a51961fae96343348180f0f66266e SHA512 e03aecb4332d34c1ed9dfe92e9c2fdd1a7f2e7a353039f9b86d14f7717fad2519c32f75a53614653323cf28f65705139244b5851fa6645f7461ecf3fce40394c
-AUX confd 90 BLAKE2B 5a0ba4fe7d07c4d74559f194cc497b0de5ea86db746fa8425267b9e1fe0d88afc3bae69129a60f4553729d24dfd09f910c037742181915d03f4c18b764f235cd SHA512 14412f717ad334e6ce5cf65b9b0968fc3ab27e93f3d3ce52d39e0b646694e8e7d7905ede25feeabad6ef3301b5644677f30e27b867ff32f665ab6c4e2cd0a662
+AUX apt-cacher-ng-9999999-flags.patch 660 BLAKE2B 64c1e8ef41841daf8e13b1cc9a0a2fe8839200eb37663069c52e1a2e2ae1f454ed98d802b7dfa6df95c9f3f113badfbf6bc07f3e9aa9b8925e88c87c8a3af9ee SHA512 fb3332380708ec37179de9493193e8c674e38fbd38af00098572fbe1b66184e5c3358640a8f56d8e336582b496e3d0d924761a3dffdc397e98903beb90efa8de
 AUX confd-r1 100 BLAKE2B e5f0e9ca77d9d3b30a0a59a755e286a914d1ed81a2afd47ed0fd2563eca81ec9db8e50aa9d34c9e31b1014ecf2db7e85cb055d7a67af494bf88c2ec9b9c13465 SHA512 c58ecc104ab7fa90cbccc1d9f9725c9ddad84bb7225ea3eea56d7874b060ce453e4576ca055e014b9621b9514d95a189915fead2057557fb785d9520d7121831
 AUX cron.daily 459 BLAKE2B 8798bcc7f57cfe0798fc6594dccf89165df88361510ceb962ff8cd70bd10c15f2cc8acff11ad0e2051d6a6bfe65e53e438d5fee9a60ac293334561f603adbedf SHA512 3e42afb0be6235594e2ccf68d0fd4c7be4954d6583562e1692e98ab55e8fdc74026690b01417e4b6fc9fe288df40e66e5e63e5a1fd98d5484c6eb366aa1b4d4a
-AUX initd-r1 906 BLAKE2B 828ac672348454842e3daeb62e39436dce86f3ff9ba2319755f2bc64a20d3dc9e73689c27f79e7f521b6d6553c5d6922eb1b8d72a52a97c7f92b2847b6322b9d SHA512 c4aa04ea30734f00c617684ea014c632bf0d43580ae7b7c6e9ae58e2c947d15177f93e7b92fd9f7b79d1898d0c6a386de1da7fa038dace6381cd72907845e57c
 AUX initd-r2 1003 BLAKE2B f8e87da524cb10358420de9bc7e76d5b954cdfa70ba54637ca0b4653c1f718eebe77bbc3220003691d7163374f3af0aa4ca8568b76218d7214e2e498c2998f79 SHA512 f57c58074bbe1c35b748f94bf2a8a4aa10f8264e662b61c1178582f16f5e53c38941e9b2c2c0a46718ab8615ff426a887f64fe170da42b7aaaa9bb3c23a0fc00
 AUX logrotate 377 BLAKE2B deaa8badb74a660419df29efc02d0f00d3100c4357f43e02c7c9eba305902a204d3b61073a3e483b0f7d614ddf4053bdc731737c5199b792380a922e25e2a49f SHA512 c2f4be7294953a63a89e5beee40029e03faa1db49986a6f8d974def67b064d391be13ecddec0d6b4d7ec369db6dcd0bafc328e90b54ccec911df739c719fd885
-DIST apt-cacher-ng_3.2-2.debian.tar.xz 48740 BLAKE2B ab2f6349aa66f39b778f346827767514761eeb8977d69a55940d7dd4c738b54ba20a9725387f769edf2cce454588746bc10361d4a174ed380a431a6ecf6b096d SHA512 e5299432b91cdf6cb51934fcc440e62d24c1b4849ad3a0c3a5e47a256c874ebb85c7ba56b97da27c2e03e0621b4ae42b69592440d521e718f4f8725a6ff379d4
-DIST apt-cacher-ng_3.2.orig.tar.xz 319036 BLAKE2B 576fc7a409556d34ee702edd57527c9c35eb033d0e8c8ea4f7b8a8a2dae86f75cd1ca3a7fb0e02845e70d6f8715692b638ff9d574ce1664b67fec9247b60fbc0 SHA512 7dfee4a8f38e7c5251c761a5faae063926c5001fe0b97136d938cdbff907e97fb0a20b89dcf685645a518e92be04fe5660d840e738960b4465408f04fe532cae
-DIST apt-cacher-ng_3.3-1.debian.tar.xz 48472 BLAKE2B 9d7f531d84f470ada8236a5603d06e45d9b7acb7bdeb8bd639c250724013a0552819cabe67f1cee0a1f337d7725429932bdf179afae307242e4d45081854614e SHA512 44a241791b92d6b9231caff8296ed1d9536ffcdc18263451d662da01f1b257b8ea4741e5cfb09c5cd90986c46fe1e91b3110379442d9ed20434e696c6cf645aa
 DIST apt-cacher-ng_3.3-2.debian.tar.xz 48496 BLAKE2B 327d57cdf74798b99067cdd7153aaba4d3fb03c047203fb1d59fce730c68a28b6db2853f5f944843b96d8613f213c0399ba78aed1b3a186968f8767d03c0fd0c SHA512 aa446b8147a42fa44fcd29754dabe388eedc9829cd908314ba97e0cacbd17d6a0222789015827196ab6fe3efd51ab08a2673ae7c04f5c0781705310e28ca44e7
+DIST apt-cacher-ng_3.3.1-1.debian.tar.xz 50912 BLAKE2B a873c4e718765a7161d9f87b68fc891202c6406e91252eb4b1aee6ca87f3497e6f4a1ca9353d3a86f3a8a24059339f2c370a707427f5baecb1e8b6d3977b445a SHA512 b643d9b38891ffd6603239ddb8635dd3dcd7c31d7a32fa128e9b4d632fa08c95ca652e1bdbd2bb046895341bc4611c436e6ff4d997ae2050cdb84e56fb311078
+DIST apt-cacher-ng_3.3.1.orig.tar.xz 321996 BLAKE2B b630a31414ee86256f2e2ebe950b56d182d61dffd1603ce8387b5cd677d18fcda3ed17864bb99c253b11e2d29163b172c2d0bc91a3f5b14fb9f0ef321d656b40 SHA512 0d412e4a488fa4c55f1292c1fc7346bdf88228528455ce1d2ad20137ddb84df211a3bc5911c12662428335d8f624979d166b0ed31f74e466228df3ab108e67f3
 DIST apt-cacher-ng_3.3.orig.tar.xz 320884 BLAKE2B c4bda8de90f76e7cb8335fdb758571db030c1298881afceb865f84e506aeb82e4db69c5c091debfdcf6c85bc8d4e703b75725ae6b06f2e412ba4b4362d568a05 SHA512 01a09bc13d2a9d24ee3012a21ae954362715bc0b69ef021a3446ad7d78157209aaaf941fbb02b0e5323bfb0337a1e3d6450c07b680d42f7bf93855d7ac65c60f
-EBUILD apt-cacher-ng-3.2_p2-r2.ebuild 2715 BLAKE2B cf204efafbd483b174bd2f0627dd81c0d04bf9c232a4c7e694c43e0ad5dca58eb69180bb27e5f80f1981643d0696689c724a8417e56c4a1c7be032ac476760cf SHA512 bc9486e131b1d6fd294d50a62d9e20ac3e25d4fd24de9f28e334f6504140bd0a7217b1af0832ad70df5a08cbadced4229a51a7bb6df7e5a5b861bd6b3f24d98c
-EBUILD apt-cacher-ng-3.3_p1-r1.ebuild 2807 BLAKE2B 7d8fdc71ae134fe136b05ea1482640727960e134dff98cd200328c9e87ce378a88f6dda930da58123db17c157255c0f8e4e5282424beb3d41a42ba11f60e5bd0 SHA512 6c9428d87835712ee4676f24653adaec346a441e18de1f4bc4cc70e3b803546d84d5956994216fa474d2973a62c1e841b7ffd07ab9ba15d55d817e413355aa04
-EBUILD apt-cacher-ng-3.3_p1.ebuild 2713 BLAKE2B 51d2c1171543ff2aab95cbe97e5b3cb8d92e66ca7e8764227e71bce6dd8c1a0048e791d2fabe833bcd81104852b360f33ba06acc0dd1339476635e5445cc1026 SHA512 56ebef8ba58686261ebd7e4472e0c63f7494fe844c87d9eb531b4ad3e8ef02816cb5f31b34933649e1c542b2f60641d303550d75e84e5cd08d49af2e01f7ad0b
+EBUILD apt-cacher-ng-3.3.1_p1.ebuild 2907 BLAKE2B 47adba5835b919179c63558378b1c06918a64af4255890c5c48a4c91713ebfe26807c5924df6048eb0b2268a1dbf7dd0528ba7473b4c43964618a163002c3559 SHA512 8a1cb4173e52229794d5e4b87cf9f11842d5529b87abf9ec34d56d9e3a83fb51f99b402e832dd0445d537d8dc66c4ee3da0c70c3f4751ef71aee6972f9808ee7
 EBUILD apt-cacher-ng-3.3_p2.ebuild 2863 BLAKE2B 20318be65af24050ec49f9b429e5119d0a0a2a7b426b66bbed13e861459e601e873d6abd6aceb540f11d75b316341a70d650160cf194b9dd60967fe7dff00c70 SHA512 bd2bd0728bc5049dc54eedcd38a09c5c33615cf09054e0e9bbd141dce845e0dae57d5d793c99406060871e7f375b962bd335fe9363f3e627095bc85acbd76682
+EBUILD apt-cacher-ng-9999999.ebuild 2791 BLAKE2B bdb7e182590dbe4cb0220216ea31ce4cd08238c47fa0e0f3cbb210e63c7ada4562c2b91a9aa45460b1b280465273849e8e517c3fab1129dfd2136c93257457a3 SHA512 01bd9b8a96655f882b53e602371a7cdb805056cee58b63b009c87308749bc7cbdfd1031c251f04746dafe4902d248a3234ecc0db81960b0044570d8dd45a8052
 MISC metadata.xml 493 BLAKE2B 6c2fb1f7abaee7df8db9ccdd7b71774230ddf2dc860d59f65a1cb77560532eb363e550bef6df18a63a78858a0a2469b0eb011d8bf0d41bf36a4c1b11223f0b2d SHA512 58f1345b841c7d5105432d0dab345033b9cefcfd4dedfe05f52d25135716be336a2f4a5fee3288236239bae9bbb1381deff0917fff8c80d81caaf64e8706b5a6
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.2_p2-r2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.2_p2-r2.ebuild
deleted file mode 100644
index 4e825f700ed0..000000000000
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.2_p2-r2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2019 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/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=(
-	"${WORKDIR}"/debian/patches/debian-changes
-	"${FILESDIR}"/${PN}-3.2-flags.patch
-)
-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(){
-	mycmakeargs=(
-		"-DCMAKE_INSTALL_PREFIX=/usr"
-	)
-	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-utils_src_configure
-}
-
-src_install() {
-	pushd "${BUILD_DIR}" || die
-	dosbin ${PN}
-	if use fuse; then
-		dobin acngfs
-	fi
-	popd
-
-	newinitd "${FILESDIR}"/initd-r1 ${PN}
-	newconfd "${FILESDIR}"/confd ${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
-	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.3_p1-r1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild
index 682a66fd9f07..6fcc74573fc8 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p1-r1.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,6 +42,7 @@ RDEPEND="
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.3-flags.patch
+	"${WORKDIR}"/debian/patches/debian-changes
 )
 S=${WORKDIR}/${P/_*}
 
@@ -112,6 +113,8 @@ src_install() {
 		dodoc conf/*
 	fi
 
+	newdoc "${WORKDIR}"/debian/changelog debian.changelog
+
 	# perl daily cron script
 	dosbin scripts/expire-caller.pl
 	exeinto /etc/cron.daily
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
index a2ab7261f60d..8bde423cde01 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p1.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils toolchain-funcs user
+inherit cmake-utils git-r3 toolchain-funcs user
 
 DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
 HOMEPAGE="
@@ -11,12 +11,10 @@ HOMEPAGE="
 "
 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
-"
+EGIT_REPO_URI="https://salsa.debian.org/blade/apt-cacher-ng.git"
+EGIT_BRANCH="upstream/sid"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="doc fuse systemd tcpd"
 
 COMMON_DEPEND="
@@ -41,7 +39,7 @@ RDEPEND="
 	tcpd? ( sys-apps/tcp-wrappers )
 "
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.3-flags.patch
+	"${FILESDIR}"/${PN}-9999999-flags.patch
 )
 S=${WORKDIR}/${P/_*}
 
@@ -62,6 +60,7 @@ pkg_setup() {
 src_configure(){
 	mycmakeargs=(
 		"-DCMAKE_INSTALL_PREFIX=/usr"
+		"-DCMAKE_SKIP_BUILD_RPATH=on"
 	)
 	if use fuse; then
 		mycmakeargs+=( "-DHAVE_FUSE_25=yes" )
@@ -75,6 +74,8 @@ src_configure(){
 	fi
 
 	cmake-utils_src_configure
+
+	sed -i -e '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
 }
 
 src_install() {
@@ -86,8 +87,8 @@ src_install() {
 	fi
 	popd || die
 
-	newinitd "${FILESDIR}"/initd-r1 ${PN}
-	newconfd "${FILESDIR}"/confd ${PN}
+	newinitd "${FILESDIR}"/initd-r2 ${PN}
+	newconfd "${FILESDIR}"/confd-r1 ${PN}
 
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/logrotate ${PN}
diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.2-flags.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.2-flags.patch
deleted file mode 100644
index bc78fcaea142..000000000000
--- a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.2-flags.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-- Rip out additional CFLAGS/LDFLAGS
-- Drop osslcompat (bug #686608)
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -106,16 +106,6 @@
-         _append(ACNG_CXXFLAGS -fvisibility-inlines-hidden)
- endif()
- 
--foreach(linkarg -Wl,--as-needed -Wl,-O1 -Wl,--discard-all -Wl,--no-undefined -Wl,--build-id=sha1 -Wl,-fuse-ld=gold -Wl,--threads)
--	STRING(REGEX REPLACE "=|-|," "" optname "${linkarg}")
--	set(CMAKE_REQUIRED_FLAGS "${linkarg}")
--	CHECK_CXX_COMPILER_FLAG("" "LD_${optname}")
--	if(LD_${optname})
--          _append(CMAKE_EXE_LINKER_FLAGS ${linkarg})
--	endif()
--	set(CMAKE_REQUIRED_FLAGS "")
--endforeach(linkarg)
--
- option(USE_SSL "Use OpenSSL library for TLS and other crypto functionality" on)
- 
- IF(CMAKE_SYSTEM MATCHES "Darwin")
-@@ -134,14 +124,6 @@
- if(CMAKE_BUILD_TYPE MATCHES Debug)
-    set(USE_LTO_DEFAULT off)
-    _append(ACNG_COMPFLAGS -DDEBUG)
--else()
--   set(CMAKE_REQUIRED_FLAGS "-Wl,--gc-sections")
--   CHECK_CXX_COMPILER_FLAG("-Os -fdata-sections -ffunction-sections -Wl,--gc-sections" GC_SECTIONS)
--   if(GC_SECTIONS)
--           _append(ACNG_COMPFLAGS -fdata-sections -ffunction-sections)
--           _append(CMAKE_EXE_LINKER_FLAGS -Wl,--gc-sections)
--   endif()
--   set(CMAKE_REQUIRED_FLAGS "")
- endif()
- 
- # XXX: could use the modern macros instead but they were not available in CMake 2.x
-@@ -167,23 +149,6 @@
-    endif()
- endif()
- 
--option(USE_LTO "Enable Link Time Optimization (requires modern compilers)" ${USE_LTO_DEFAULT})
--
--if(USE_LTO)
--        SET(LDFLAGS_BACKUP "${CMAKE_EXE_LINKER_FLAGS}")
--        SET(CMAKE_REQUIRED_FLAGS "${ACNG_COMPFLAGS} -flto")
--        _append(CMAKE_EXE_LINKER_FLAGS -flto)
--        CHECK_CXX_SOURCE_COMPILES("${CXX11_TESTSRC}" HAS_LTO)
--        if(HAS_LTO)
--                SET(ACNG_COMPFLAGS ${CMAKE_REQUIRED_FLAGS})
--        else()
--                SET(CMAKE_REQUIRED_FLAGS "${ACNG_COMPFLAGS}")
--                SET(CMAKE_EXE_LINKER_FLAGS "${LDFLAGS_BACKUP}")
--                message(WARNING "Link Time Optimization support broken, disabling it.")
--        endif()
--endif()
--message("-- LTO use: ${USE_LTO}")
--
- FIND_LIBRARY(HAVE_SOCKETLIB socket) # separate socket lib looks like Solaris-like environment
- if(HAVE_SOCKETLIB)
-    LIST(APPEND BaseNetworkLibs socket nsl)
-@@ -378,7 +343,6 @@
- 
- CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/include/acsyscap.h.in" "${CMAKE_BINARY_DIR}/acsyscap.h")
- 
--add_subdirectory(oldssl-workaround)
- add_subdirectory(client)
- add_subdirectory(fs)
- add_subdirectory(source)
---- a/fs/CMakeLists.txt
-+++ b/fs/CMakeLists.txt
-@@ -20,7 +20,7 @@
-                 list(APPEND fsSRCS ../source/aclogger.cc)
-         endif()
- 
--        ADD_EXECUTABLE(acngfs ${fsSRCS} $<TARGET_OBJECTS:osslcompat>)
-+        ADD_EXECUTABLE(acngfs ${fsSRCS})
-         SET_TARGET_PROPERTIES(acngfs PROPERTIES COMPILE_FLAGS "${ACNG_COMPFLAGS} ${ACNG_CXXFLAGS} ${acngfs_cflags}")
-         INSTALL(TARGETS acngfs DESTINATION ${LIBDIR})
-         if(HAVE_DLOPEN)
---- a/source/CMakeLists.txt
-+++ b/source/CMakeLists.txt
-@@ -4,12 +4,12 @@
- ADD_LIBRARY(acngstuff OBJECT ${SHAREDSRCS})
- SET_TARGET_PROPERTIES(acngstuff PROPERTIES COMPILE_FLAGS "${ACNG_COMPFLAGS} ${ACNG_CXXFLAGS} ${CFLAGS_DAEMON} ${CFLAGS_PTHREAD}")
- 
--ADD_EXECUTABLE(apt-cacher-ng $<TARGET_OBJECTS:acngstuff> ${ACNG_SRCS} apt-cacher.cc $<TARGET_OBJECTS:osslcompat>)
-+ADD_EXECUTABLE(apt-cacher-ng $<TARGET_OBJECTS:acngstuff> ${ACNG_SRCS} apt-cacher.cc)
- TARGET_LINK_LIBRARIES(apt-cacher-ng ${BaseNetworkLibs} ${ServerLibs} ${CompLibs} ${SSL_LIB_LIST} ${LDFLAGS_DAEMON} ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_LIBS_ACNG})
- SET_TARGET_PROPERTIES(apt-cacher-ng PROPERTIES COMPILE_FLAGS "${ACNG_COMPFLAGS} ${ACNG_CXXFLAGS} ${CFLAGS_DAEMON} ${CFLAGS_PTHREAD}")
- INSTALL(TARGETS apt-cacher-ng DESTINATION ${SBINDIR})
- 
--ADD_EXECUTABLE(acngtool acngtool.cc $<TARGET_OBJECTS:acngstuff> $<TARGET_OBJECTS:osslcompat>)
-+ADD_EXECUTABLE(acngtool acngtool.cc $<TARGET_OBJECTS:acngstuff>)
- SET_TARGET_PROPERTIES(acngtool PROPERTIES COMPILE_FLAGS "${ACNG_COMPFLAGS} ${ACNG_CXXFLAGS} ${CFLAGS_PTHREAD}")
- TARGET_LINK_LIBRARIES(acngtool ${BaseNetworkLibs} ${CompLibs} ${SSL_LIB_LIST} ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_LIBS_ACNGTOOL})
- INSTALL(TARGETS acngtool DESTINATION ${LIBDIR})
diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-9999999-flags.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-9999999-flags.patch
new file mode 100644
index 000000000000..8fe769ada328
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-9999999-flags.patch
@@ -0,0 +1,18 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -114,15 +114,6 @@
+ 
+ if(CMAKE_BUILD_TYPE MATCHES Debug)
+    set(USE_LTO_DEFAULT off)
+-else()
+-   set(CMAKE_REQUIRED_FLAGS "-Wl,--gc-sections")
+-   CHECK_CXX_COMPILER_FLAG("-Os -fdata-sections -ffunction-sections -Wl,--gc-sections" GC_SECTIONS)
+-   if(GC_SECTIONS)
+-           _append(ACNG_COMPFLAGS -fdata-sections -ffunction-sections)
+-           _append(CMAKE_EXE_LINKER_FLAGS -Wl,--gc-sections)
+-           _append(CMAKE_SHARED_LINKER_FLAGS -Wl,--gc-sections)
+-   endif()
+-   set(CMAKE_REQUIRED_FLAGS "")
+ endif()
+ 
+ option(USE_LTO "Enable Link Time Optimization (requires modern compilers)" ${USE_LTO_DEFAULT})
diff --git a/net-misc/apt-cacher-ng/files/confd b/net-misc/apt-cacher-ng/files/confd
deleted file mode 100644
index 72e76de133d1..000000000000
--- a/net-misc/apt-cacher-ng/files/confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# Additional options that are passed to the Daemon.
-DAEMON_OPTS=" -c /etc/apt-cacher-ng "
diff --git a/net-misc/apt-cacher-ng/files/initd-r1 b/net-misc/apt-cacher-ng/files/initd-r1
deleted file mode 100644
index 2e401dcd25a0..000000000000
--- a/net-misc/apt-cacher-ng/files/initd-r1
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON="/usr/sbin/${RC_SVCNAME}"
-RUNDIR="/var/run/${RC_SVCNAME}"
-CACHEDIR="var/cache/${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}"
-	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 $?
-}