From aea898f9fb3e0bfa1f6fc10c505e39a1a6ec393f Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Mon, 13 Feb 2023 15:08:30 -0500 Subject: net-misc/apt-cacher-ng: adjust libevent dependency Bug: https://bugs.gentoo.org/869722 Signed-off-by: Mike Gilbert --- .../apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r1.ebuild | 105 --------------------- .../apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild | 105 +++++++++++++++++++++ net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild | 4 +- 3 files changed, 107 insertions(+), 107 deletions(-) delete mode 100644 net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r1.ebuild create mode 100644 net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild (limited to 'net-misc/apt-cacher-ng') diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r1.ebuild deleted file mode 100644 index 290c31128e2b..000000000000 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake tmpfiles - -MY_PV="${PV/_p/-}" -MY_P="${PN}-debian-${MY_PV}" - -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="https://salsa.debian.org/blade/${PN}/-/archive/debian/${MY_PV}/${MY_P}.tar.gz" - -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:=[threads] - dev-libs/openssl:0= - net-dns/c-ares:= - 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}/${MY_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/" src/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 -} - -pkg_postinst() { - tmpfiles_process "${PN}.conf" -} diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild new file mode 100644 index 000000000000..93003c161282 --- /dev/null +++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake tmpfiles + +MY_PV="${PV/_p/-}" +MY_P="${PN}-debian-${MY_PV}" + +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="https://salsa.debian.org/blade/${PN}/-/archive/debian/${MY_PV}/${MY_P}.tar.gz" + +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:=[threads(+)] + dev-libs/openssl:0= + net-dns/c-ares:= + 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}/${MY_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/" src/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 +} + +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 317ac95f9c39..c68f0b584466 100644 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild +++ b/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,7 @@ IUSE="doc fuse systemd tcpd" DEPEND="acct-user/apt-cacher-ng acct-group/apt-cacher-ng app-arch/bzip2 - dev-libs/libevent:=[threads] + dev-libs/libevent:=[threads(+)] dev-libs/openssl:0= sys-libs/zlib fuse? ( sys-fs/fuse:0 ) -- cgit v1.2.3-65-gdbad