diff options
Diffstat (limited to 'net-misc/apt-cacher-ng')
| -rw-r--r-- | net-misc/apt-cacher-ng/Manifest | 4 | ||||
| -rw-r--r-- | net-misc/apt-cacher-ng/apt-cacher-ng-3.6.3_p1-r2.ebuild (renamed from net-misc/apt-cacher-ng/apt-cacher-ng-3.6.3_p1-r1.ebuild) | 6 | ||||
| -rw-r--r-- | net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild | 31 |
3 files changed, 25 insertions, 16 deletions
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest index edc4e96378b2..f04f31dc02ee 100644 --- a/net-misc/apt-cacher-ng/Manifest +++ b/net-misc/apt-cacher-ng/Manifest @@ -6,6 +6,6 @@ AUX cron.daily 459 BLAKE2B 8798bcc7f57cfe0798fc6594dccf89165df88361510ceb962ff8c AUX initd-r3 599 BLAKE2B aee4ad69c9aa213ce00062b073c3c02a1f29b96aaa0b2b4573f009846be1f5b0f1bb53089f14c399b6accb73937545820eef5b84a765ed8fff26e79ac543bcfd SHA512 37ea0bc22347afad9e64e038c14552a4609fa95f3c4a4dd0a3938cada1545940f1c76114cf1a46cea41ce4cf524f9e6a2499d7a7770507c20bcb726b8ee9515f AUX logrotate 377 BLAKE2B deaa8badb74a660419df29efc02d0f00d3100c4357f43e02c7c9eba305902a204d3b61073a3e483b0f7d614ddf4053bdc731737c5199b792380a922e25e2a49f SHA512 c2f4be7294953a63a89e5beee40029e03faa1db49986a6f8d974def67b064d391be13ecddec0d6b4d7ec369db6dcd0bafc328e90b54ccec911df739c719fd885 DIST apt-cacher-ng_3.6.3.orig.tar.xz 334620 BLAKE2B 7e77edb966f0732f392a3fb243cda547dca7d4f878e44c6c000491ccb0a3115ad58a553706ef02834d25366b09d24ee6af2dafad76f97cd1978dc5a4d35f3380 SHA512 57d991c71f6d0bb9d43b4645ee7be2fb38ccbf73581206e01b6ca389bd8591d5e9f425350e3aff053527125c95caefe9ab1217dedff812162cf6bd4cdfdef792 -EBUILD apt-cacher-ng-3.6.3_p1-r1.ebuild 2554 BLAKE2B a4fb769215e9a2a371caf53184b5d2d6b9fc37cb2152b44a6a603dcf55125ca8787076d21d49721017061d3b5c1bb87a9c7b24a69aa109cfe3326bb0a8015dce SHA512 a6f4b5678a672885fa4f57bc77ab52113f1228149e747387799ff368472c19140992ef9d008206be8f38587ebd1d62110615d5256b397d03918b56f9b6469f7b -EBUILD apt-cacher-ng-9999.ebuild 2409 BLAKE2B 5f3308a0080fb19fc89f442cce5eb2b5ab21c26c644cca30ab7641a04be8fc2fdd42f1739c02db3cee81a9bb8a0e9834b678c5f03cdfa004d8134a1519b97279 SHA512 160950f774cbb650511f989908c4cf66e2f711138a64046a5f42bc6c965a60611c0b2653184f50506f76fe00521c105086dbe5b4db20479ab9f4c97a724a6c3f +EBUILD apt-cacher-ng-3.6.3_p1-r2.ebuild 2614 BLAKE2B 1f02755ebf1c2c270ef3bc9c1c8f6f0aa0630d4045ddfed294493ece4a9c4f9926d3655a1fe6703eca2d7c80fea710a2cad5e1a28ef7e8cd2557b0f36dabd63d SHA512 b51821cdc6a2eb0eaa0c1b91a68dd48d2afae89bce14d50bfe3c74617a9039a5891897b5d32d5348b769f00882e36a25ef426ce2f03db8791ad4889738fbc087 +EBUILD apt-cacher-ng-9999.ebuild 2571 BLAKE2B a10affa9280d6289bc7e6b64b4eb487be57de5e4339383c5d4620057c87192d156b7c29b2be0118124f0da408c9038a7ad9f2ea4c2d67d3ba4cdcc9902e86fad SHA512 6a68080dd1aae9ae441344bb1057aba4ff02839e058e8219d6551dc5c0f6cd90e1d9c79592424acdd85b2aa175a89ee0160f35d12f36a3740befbdca9149e37d MISC metadata.xml 387 BLAKE2B 8c38c862cf70d31fe8ffe60d978aa80a688e45296f11d257ab7abf56edefbed921660c4fd090daf63c60077d8232e5e2b7e65fd881cb2d623c4804192825b68c SHA512 0bc4487ec77c3511deb9df220cf31bc7dc8cf56bc46da5e23c10aa2234d5119b2283f0294651b18e3a4bec4aa0dcef79e3e777efea9d84e6955abee593f49aab diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.3_p1-r1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.3_p1-r2.ebuild index 4dd1587fad73..f5616939a35b 100644 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.3_p1-r1.ebuild +++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.3_p1-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake +inherit cmake tmpfiles DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages" HOMEPAGE="https://www.unix-ag.uni-kl.de/~bloch/acng/ @@ -95,3 +95,7 @@ src_install() { cmake_src_install } + +pkg_postinst() { + tmpfiles_process "${PN}.conf" +} 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 c69b956cb3c7..317ac95f9c39 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" +} |