Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/apt-cacher-ng/, net-misc/apt-cacher-ng/files/
Date: Mon, 20 Jan 2020 15:26:24
Message-Id: 1579533977.a3abfe512fddebcd61e3c15bbfe149163cefa707.jer@gentoo
1 commit: a3abfe512fddebcd61e3c15bbfe149163cefa707
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 20 15:25:53 2020 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 20 15:26:17 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3abfe51
7
8 net-misc/apt-cacher-ng: Version 3.3.1_p2
9
10 Package-Manager: Portage-2.3.84, Repoman-2.3.20
11 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
12
13 net-misc/apt-cacher-ng/Manifest | 1 +
14 .../apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild | 139 +++++++++++++++++++++
15 .../files/apt-cacher-ng-3.3.1-flags.patch | 11 ++
16 3 files changed, 151 insertions(+)
17
18 diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
19 index 015b3ca868e..c04034341df 100644
20 --- a/net-misc/apt-cacher-ng/Manifest
21 +++ b/net-misc/apt-cacher-ng/Manifest
22 @@ -1,4 +1,5 @@
23 DIST apt-cacher-ng_3.3-2.debian.tar.xz 48496 BLAKE2B 327d57cdf74798b99067cdd7153aaba4d3fb03c047203fb1d59fce730c68a28b6db2853f5f944843b96d8613f213c0399ba78aed1b3a186968f8767d03c0fd0c SHA512 aa446b8147a42fa44fcd29754dabe388eedc9829cd908314ba97e0cacbd17d6a0222789015827196ab6fe3efd51ab08a2673ae7c04f5c0781705310e28ca44e7
24 DIST apt-cacher-ng_3.3.1-1.debian.tar.xz 50912 BLAKE2B a873c4e718765a7161d9f87b68fc891202c6406e91252eb4b1aee6ca87f3497e6f4a1ca9353d3a86f3a8a24059339f2c370a707427f5baecb1e8b6d3977b445a SHA512 b643d9b38891ffd6603239ddb8635dd3dcd7c31d7a32fa128e9b4d632fa08c95ca652e1bdbd2bb046895341bc4611c436e6ff4d997ae2050cdb84e56fb311078
25 +DIST apt-cacher-ng_3.3.1-2.debian.tar.xz 49772 BLAKE2B b864859e7f0ad5eba24b2f1ced74dbdb7a1878fbc2190863929f45534163c18ed2a67c4c75b5fe8011d93312ab9a67d899b09669e7aacb1ad3ae15a2bc1fba12 SHA512 653ca59c1d9c89a9586ccf963da480524ff8195222435e4a89f0c08ca64586e1993a92d00a05dbf738b0814869a5e6b539a05d1d59cb956e66b2dbe5ad95eeb8
26 DIST apt-cacher-ng_3.3.1.orig.tar.xz 321996 BLAKE2B b630a31414ee86256f2e2ebe950b56d182d61dffd1603ce8387b5cd677d18fcda3ed17864bb99c253b11e2d29163b172c2d0bc91a3f5b14fb9f0ef321d656b40 SHA512 0d412e4a488fa4c55f1292c1fc7346bdf88228528455ce1d2ad20137ddb84df211a3bc5911c12662428335d8f624979d166b0ed31f74e466228df3ab108e67f3
27 DIST apt-cacher-ng_3.3.orig.tar.xz 320884 BLAKE2B c4bda8de90f76e7cb8335fdb758571db030c1298881afceb865f84e506aeb82e4db69c5c091debfdcf6c85bc8d4e703b75725ae6b06f2e412ba4b4362d568a05 SHA512 01a09bc13d2a9d24ee3012a21ae954362715bc0b69ef021a3446ad7d78157209aaaf941fbb02b0e5323bfb0337a1e3d6450c07b680d42f7bf93855d7ac65c60f
28
29 diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild
30 new file mode 100644
31 index 00000000000..21f1ce96df0
32 --- /dev/null
33 +++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild
34 @@ -0,0 +1,139 @@
35 +# Copyright 1999-2020 Gentoo Authors
36 +# Distributed under the terms of the GNU General Public License v2
37 +
38 +EAPI=7
39 +inherit cmake-utils toolchain-funcs user
40 +
41 +DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
42 +HOMEPAGE="
43 + https://www.unix-ag.uni-kl.de/~bloch/acng/
44 + https://packages.qa.debian.org/a/apt-cacher-ng.html
45 +"
46 +LICENSE="BSD-4 ZLIB public-domain"
47 +SLOT="0"
48 +SRC_URI="
49 + mirror://debian/pool/main/a/${PN}/${PN}_${PV/_*}.orig.tar.xz
50 + mirror://debian/pool/main/a/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
51 +"
52 +
53 +KEYWORDS="~amd64 ~x86"
54 +IUSE="doc fuse systemd tcpd"
55 +
56 +COMMON_DEPEND="
57 + app-arch/bzip2
58 + app-arch/xz-utils
59 + dev-libs/openssl:0=
60 + sys-libs/zlib
61 + systemd? (
62 + sys-apps/systemd
63 + )
64 +"
65 +BDEPEND="
66 + ${COMMON_DEPEND}
67 + dev-util/cmake
68 + >sys-devel/gcc-4.8
69 + virtual/pkgconfig
70 +"
71 +RDEPEND="
72 + ${COMMON_DEPEND}
73 + dev-lang/perl
74 + fuse? ( sys-fs/fuse )
75 + tcpd? ( sys-apps/tcp-wrappers )
76 +"
77 +PATCHES=(
78 + "${FILESDIR}"/${PN}-3.3.1-flags.patch
79 + "${WORKDIR}"/debian/patches/debian-changes
80 +)
81 +S=${WORKDIR}/${P/_*}
82 +
83 +pkg_pretend() {
84 + if [[ $(gcc-major-version) -lt 4 ]]; then
85 + die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
86 + elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then
87 + die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
88 + fi
89 +}
90 +
91 +pkg_setup() {
92 + # add new user & group for daemon
93 + enewgroup ${PN}
94 + enewuser ${PN} -1 -1 -1 ${PN}
95 +}
96 +
97 +src_configure(){
98 + mycmakeargs=(
99 + "-DCMAKE_INSTALL_PREFIX=/usr"
100 + )
101 + if use fuse; then
102 + mycmakeargs+=( "-DHAVE_FUSE_25=yes" )
103 + else
104 + mycmakeargs+=( "-DHAVE_FUSE_25=no" )
105 + fi
106 + if use tcpd; then
107 + mycmakeargs+=( "-DHAVE_LIBWRAP=yes" )
108 + else
109 + mycmakeargs+=( "-DHAVE_LIBWRAP=no" )
110 + fi
111 + if tc-ld-is-gold; then
112 + mycmakeargs+=( "-DUSE_GOLD=yes" )
113 + else
114 + mycmakeargs+=( "-DUSE_GOLD=no" )
115 + fi
116 +
117 + cmake-utils_src_configure
118 +
119 + sed -i -e '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
120 +}
121 +
122 +src_install() {
123 + pushd "${BUILD_DIR}" || die
124 + dosbin ${PN} acngtool
125 + dolib.so libsupacng.so
126 + if use fuse; then
127 + dobin acngfs
128 + fi
129 + popd || die
130 +
131 + newinitd "${FILESDIR}"/initd-r2 ${PN}
132 + newconfd "${FILESDIR}"/confd-r1 ${PN}
133 +
134 + insinto /etc/logrotate.d
135 + newins "${FILESDIR}"/logrotate ${PN}
136 +
137 + doman doc/man/${PN}*
138 + if use fuse; then
139 + doman doc/man/acngfs*
140 + fi
141 +
142 + # Documentation
143 + dodoc doc/README TODO VERSION INSTALL ChangeLog
144 + if use doc; then
145 + dodoc doc/*.pdf
146 +
147 + docinto html
148 + dodoc doc/html/*
149 +
150 + find conf -name '*.gz' -exec gzip -d {} \; || die
151 + docinto examples/conf
152 + dodoc conf/*
153 + fi
154 +
155 + newdoc "${WORKDIR}"/debian/changelog debian.changelog
156 +
157 + # perl daily cron script
158 + dosbin scripts/expire-caller.pl
159 + exeinto /etc/cron.daily
160 + newexe "${FILESDIR}"/cron.daily ${PN}
161 +
162 + # default configuration
163 + insinto /etc/${PN}
164 + newins "${BUILD_DIR}"/conf/acng.conf ${PN}.conf
165 + doins $( echo conf/* | sed 's|conf/acng.conf.in||g' )
166 +
167 + keepdir /var/log/${PN}
168 + # Some directories must exists
169 + keepdir /var/log/${PN}
170 + fowners -R ${PN}:${PN} \
171 + /etc/${PN} \
172 + /var/log/${PN}
173 +}
174
175 diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.3.1-flags.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.3.1-flags.patch
176 new file mode 100644
177 index 00000000000..c721fac7a57
178 --- /dev/null
179 +++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.3.1-flags.patch
180 @@ -0,0 +1,11 @@
181 +--- a/CMakeLists.txt
182 ++++ b/CMakeLists.txt
183 +@@ -14,7 +14,7 @@
184 +
185 + set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
186 + set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR})
187 +-#set(CMAKE_SKIP_BUILD_RPATH on) # no -rdynamic needed ever
188 ++set(CMAKE_SKIP_BUILD_RPATH on) # no -rdynamic needed ever
189 +
190 + INCLUDE(CheckIncludeFiles)
191 + INCLUDE(CheckCXXSourceCompiles)