From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AF2231580BA for ; Sat, 21 Aug 2021 23:25:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5AE85E091C; Sat, 21 Aug 2021 23:25:05 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4E6B8E0918 for ; Sat, 21 Aug 2021 23:25:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F3BEF33E830 for ; Sat, 21 Aug 2021 23:25:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 497517B2 for ; Sat, 21 Aug 2021 23:25:01 +0000 (UTC) From: "John Helmert III" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "John Helmert III" Message-ID: <1629588051.a786bf0592e537ff939e17466940a06c79f84320.ajak@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/apt-cacher-ng/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild X-VCS-Directories: net-misc/apt-cacher-ng/ X-VCS-Committer: ajak X-VCS-Committer-Name: John Helmert III X-VCS-Revision: a786bf0592e537ff939e17466940a06c79f84320 X-VCS-Branch: master Date: Sat, 21 Aug 2021 23:25:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ab8e44e9-b396-49f9-a5f5-a38c9bc3ea29 X-Archives-Hash: 8b479f1d4c0329999f450d57b7db04ca commit: a786bf0592e537ff939e17466940a06c79f84320 Author: John Helmert III gentoo org> AuthorDate: Sat Aug 21 23:19:40 2021 +0000 Commit: John Helmert III gentoo org> CommitDate: Sat Aug 21 23:20:51 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a786bf05 net-misc/apt-cacher-ng: propagate some fixes to live ebuild Signed-off-by: John Helmert III gentoo.org> net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild | 31 ++++++++++++++---------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild index c69b956cb3c..317ac95f9c3 100644 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild +++ b/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake git-r3 +inherit cmake git-r3 tmpfiles DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages" HOMEPAGE="https://www.unix-ag.uni-kl.de/~bloch/acng/ @@ -13,7 +13,7 @@ EGIT_BRANCH="upstream/sid" LICENSE="BSD-4 ZLIB public-domain" SLOT="0" -IUSE="doc fuse tcpd" +IUSE="doc fuse systemd tcpd" DEPEND="acct-user/apt-cacher-ng acct-group/apt-cacher-ng @@ -22,6 +22,7 @@ DEPEND="acct-user/apt-cacher-ng 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} @@ -41,10 +42,11 @@ src_prepare() { # 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 -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 } @@ -52,22 +54,21 @@ src_configure() { local mycmakeargs=( "-DHAVE_FUSE_25=$(usex fuse)" "-DHAVE_LIBWRAP=$(usex tcpd)" - # Unconditionally install systemd service file - "-DSDINSTALL=1" + "-DSDINSTALL=$(usex systemd)" ) - 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() { + # 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}" @@ -93,3 +94,7 @@ src_install() { cmake_src_install } + +pkg_postinst() { + tmpfiles_process "${PN}.conf" +}