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/
Date: Sat, 26 Sep 2020 07:46:47
Message-Id: 1601106401.4e89038e505071a9148986112ab3b6a20bdb7717.jer@gentoo
1 commit: 4e89038e505071a9148986112ab3b6a20bdb7717
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 26 07:41:34 2020 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 26 07:46:41 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e89038e
7
8 net-misc/apt-cacher-ng: Old
9
10 Package-Manager: Portage-3.0.8, Repoman-3.0.1
11 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
12
13 net-misc/apt-cacher-ng/Manifest | 4 -
14 .../apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild | 138 ---------------------
15 net-misc/apt-cacher-ng/apt-cacher-ng-3.4_p1.ebuild | 138 ---------------------
16 3 files changed, 280 deletions(-)
17
18 diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
19 index 57eaa1e124f..5715fe065c4 100644
20 --- a/net-misc/apt-cacher-ng/Manifest
21 +++ b/net-misc/apt-cacher-ng/Manifest
22 @@ -1,6 +1,2 @@
23 -DIST apt-cacher-ng_3.3.1-2.debian.tar.xz 49772 BLAKE2B b864859e7f0ad5eba24b2f1ced74dbdb7a1878fbc2190863929f45534163c18ed2a67c4c75b5fe8011d93312ab9a67d899b09669e7aacb1ad3ae15a2bc1fba12 SHA512 653ca59c1d9c89a9586ccf963da480524ff8195222435e4a89f0c08ca64586e1993a92d00a05dbf738b0814869a5e6b539a05d1d59cb956e66b2dbe5ad95eeb8
24 -DIST apt-cacher-ng_3.3.1.orig.tar.xz 321996 BLAKE2B b630a31414ee86256f2e2ebe950b56d182d61dffd1603ce8387b5cd677d18fcda3ed17864bb99c253b11e2d29163b172c2d0bc91a3f5b14fb9f0ef321d656b40 SHA512 0d412e4a488fa4c55f1292c1fc7346bdf88228528455ce1d2ad20137ddb84df211a3bc5911c12662428335d8f624979d166b0ed31f74e466228df3ab108e67f3
25 -DIST apt-cacher-ng_3.4-1.debian.tar.xz 49880 BLAKE2B a49dc9ca415cd00f275f8aab61836ef002b9463a8ce22b2fbf1379ce908737d0df813e9d112e64667790e0c9c29ae44ca12291ff531fa565a30b0345c3970824 SHA512 49879c8786ba5aa6398ce43d733a71529a5c2a93a0e8e3e856bb7bf6d6dd0d8dcf9f6a96b291a3e77e0a71a9a990b5d0ade9134e5ec670a33592c9a1ab61a48e
26 -DIST apt-cacher-ng_3.4.orig.tar.xz 324040 BLAKE2B 0164ac35815fb42a2197830134172c4b93677f6ee6add71d115e975a3b8538db18e635fae2fe9556346229dc076c732b3b3f6fb9958e347fee8876f0f2363c9e SHA512 956366431f4671afd46f3bc0cdb9acaf02378606a7e210a190902e519ed25d2d102a336032c31fcc8b71c879bd219f249f411af732bfb6f9213e485ba6981c5d
27 DIST apt-cacher-ng_3.5-1.debian.tar.xz 49916 BLAKE2B c01c96e5cf46fa3b8c46145b34976f3c4a3b545819719a8de517fe53a91d6f65c460bee59d98de750912d7bb9e3416804a088bdf274d74352c35f757cdeb16ea SHA512 8a543f94ef5e206be40070eb757c950ad6915cfbd6cacfadb5bd91070d14b4bb1c3c550823cd088c15335963587cc34d414518ae0013f6561996f855ccf97359
28 DIST apt-cacher-ng_3.5.orig.tar.xz 325260 BLAKE2B 1cf19bd575d4e3d320f73771b31e98977417713d57ceaaccb8b6c0eff7bd5e02c99a0c197ddbc09d14d8f6a70799525dedfe1fbacb00357f65f0c8c4d540bcab SHA512 0bbc78c128d353ec2504f4d898d0ffb339778e98ab9899d48c61c094b15cafd92e430f864c82b66049578f5dd3c9e74fc5c09883231faeddce453be64e6f8954
29
30 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
31 deleted file mode 100644
32 index 4061fff1f9c..00000000000
33 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild
34 +++ /dev/null
35 @@ -1,138 +0,0 @@
36 -# Copyright 1999-2020 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=7
40 -inherit cmake-utils toolchain-funcs user
41 -
42 -DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
43 -HOMEPAGE="
44 - https://www.unix-ag.uni-kl.de/~bloch/acng/
45 - https://packages.qa.debian.org/a/apt-cacher-ng.html
46 -"
47 -LICENSE="BSD-4 ZLIB public-domain"
48 -SLOT="0"
49 -SRC_URI="
50 - mirror://debian/pool/main/a/${PN}/${PN}_${PV/_*}.orig.tar.xz
51 - mirror://debian/pool/main/a/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
52 -"
53 -
54 -KEYWORDS="~amd64 ~x86"
55 -IUSE="doc fuse systemd tcpd"
56 -
57 -COMMON_DEPEND="
58 - app-arch/bzip2
59 - app-arch/xz-utils
60 - dev-libs/libevent:=
61 - dev-libs/openssl:0=
62 - sys-libs/zlib
63 - systemd? (
64 - sys-apps/systemd
65 - )
66 -"
67 -BDEPEND="
68 - ${COMMON_DEPEND}
69 - dev-util/cmake
70 - >sys-devel/gcc-4.8
71 - virtual/pkgconfig
72 -"
73 -RDEPEND="
74 - ${COMMON_DEPEND}
75 - dev-lang/perl
76 - fuse? ( sys-fs/fuse )
77 - tcpd? ( sys-apps/tcp-wrappers )
78 -"
79 -PATCHES=(
80 - "${FILESDIR}"/${PN}-3.3.1-flags.patch
81 - "${WORKDIR}"/debian/patches/debian-changes
82 -)
83 -S=${WORKDIR}/${P/_*}
84 -
85 -pkg_pretend() {
86 - if [[ $(gcc-major-version) -lt 4 ]]; then
87 - die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
88 - elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then
89 - die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
90 - fi
91 -}
92 -
93 -pkg_setup() {
94 - # add new user & group for daemon
95 - enewgroup ${PN}
96 - enewuser ${PN} -1 -1 -1 ${PN}
97 -}
98 -
99 -src_configure() {
100 - local mycmakeargs=()
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/apt-cacher-ng-3.4_p1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.4_p1.ebuild
176 deleted file mode 100644
177 index 4061fff1f9c..00000000000
178 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.4_p1.ebuild
179 +++ /dev/null
180 @@ -1,138 +0,0 @@
181 -# Copyright 1999-2020 Gentoo Authors
182 -# Distributed under the terms of the GNU General Public License v2
183 -
184 -EAPI=7
185 -inherit cmake-utils toolchain-funcs user
186 -
187 -DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
188 -HOMEPAGE="
189 - https://www.unix-ag.uni-kl.de/~bloch/acng/
190 - https://packages.qa.debian.org/a/apt-cacher-ng.html
191 -"
192 -LICENSE="BSD-4 ZLIB public-domain"
193 -SLOT="0"
194 -SRC_URI="
195 - mirror://debian/pool/main/a/${PN}/${PN}_${PV/_*}.orig.tar.xz
196 - mirror://debian/pool/main/a/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
197 -"
198 -
199 -KEYWORDS="~amd64 ~x86"
200 -IUSE="doc fuse systemd tcpd"
201 -
202 -COMMON_DEPEND="
203 - app-arch/bzip2
204 - app-arch/xz-utils
205 - dev-libs/libevent:=
206 - dev-libs/openssl:0=
207 - sys-libs/zlib
208 - systemd? (
209 - sys-apps/systemd
210 - )
211 -"
212 -BDEPEND="
213 - ${COMMON_DEPEND}
214 - dev-util/cmake
215 - >sys-devel/gcc-4.8
216 - virtual/pkgconfig
217 -"
218 -RDEPEND="
219 - ${COMMON_DEPEND}
220 - dev-lang/perl
221 - fuse? ( sys-fs/fuse )
222 - tcpd? ( sys-apps/tcp-wrappers )
223 -"
224 -PATCHES=(
225 - "${FILESDIR}"/${PN}-3.3.1-flags.patch
226 - "${WORKDIR}"/debian/patches/debian-changes
227 -)
228 -S=${WORKDIR}/${P/_*}
229 -
230 -pkg_pretend() {
231 - if [[ $(gcc-major-version) -lt 4 ]]; then
232 - die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
233 - elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then
234 - die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
235 - fi
236 -}
237 -
238 -pkg_setup() {
239 - # add new user & group for daemon
240 - enewgroup ${PN}
241 - enewuser ${PN} -1 -1 -1 ${PN}
242 -}
243 -
244 -src_configure() {
245 - local mycmakeargs=()
246 - if use fuse; then
247 - mycmakeargs+=( "-DHAVE_FUSE_25=yes" )
248 - else
249 - mycmakeargs+=( "-DHAVE_FUSE_25=no" )
250 - fi
251 - if use tcpd; then
252 - mycmakeargs+=( "-DHAVE_LIBWRAP=yes" )
253 - else
254 - mycmakeargs+=( "-DHAVE_LIBWRAP=no" )
255 - fi
256 - if tc-ld-is-gold; then
257 - mycmakeargs+=( "-DUSE_GOLD=yes" )
258 - else
259 - mycmakeargs+=( "-DUSE_GOLD=no" )
260 - fi
261 -
262 - cmake-utils_src_configure
263 -
264 - sed -i -e '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
265 -}
266 -
267 -src_install() {
268 - pushd "${BUILD_DIR}" || die
269 - dosbin ${PN} acngtool
270 - dolib.so libsupacng.so
271 - if use fuse; then
272 - dobin acngfs
273 - fi
274 - popd || die
275 -
276 - newinitd "${FILESDIR}"/initd-r2 ${PN}
277 - newconfd "${FILESDIR}"/confd-r1 ${PN}
278 -
279 - insinto /etc/logrotate.d
280 - newins "${FILESDIR}"/logrotate ${PN}
281 -
282 - doman doc/man/${PN}*
283 - if use fuse; then
284 - doman doc/man/acngfs*
285 - fi
286 -
287 - # Documentation
288 - dodoc doc/README TODO VERSION INSTALL ChangeLog
289 - if use doc; then
290 - dodoc doc/*.pdf
291 -
292 - docinto html
293 - dodoc doc/html/*
294 -
295 - find conf -name '*.gz' -exec gzip -d {} \; || die
296 - docinto examples/conf
297 - dodoc conf/*
298 - fi
299 -
300 - newdoc "${WORKDIR}"/debian/changelog debian.changelog
301 -
302 - # perl daily cron script
303 - dosbin scripts/expire-caller.pl
304 - exeinto /etc/cron.daily
305 - newexe "${FILESDIR}"/cron.daily ${PN}
306 -
307 - # default configuration
308 - insinto /etc/${PN}
309 - newins "${BUILD_DIR}"/conf/acng.conf ${PN}.conf
310 - doins $( echo conf/* | sed 's|conf/acng.conf.in||g' )
311 -
312 - keepdir /var/log/${PN}
313 - # Some directories must exists
314 - keepdir /var/log/${PN}
315 - fowners -R ${PN}:${PN} \
316 - /etc/${PN} \
317 - /var/log/${PN}
318 -}