1 |
commit: 5befcd1c1ce45aae17c9afa036030e9a6165e41e |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 26 05:15:17 2015 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 26 05:15:55 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5befcd1c |
7 |
|
8 |
net-misc/apt-cacher-ng: Version bump. |
9 |
|
10 |
Package-Manager: portage-2.2.20.1 |
11 |
|
12 |
net-misc/apt-cacher-ng/Manifest | 3 +- |
13 |
net-misc/apt-cacher-ng/apt-cacher-ng-0.8.4.ebuild | 119 --------------------- |
14 |
...-ng-0.8.3.ebuild => apt-cacher-ng-0.8.6.ebuild} | 4 +- |
15 |
3 files changed, 3 insertions(+), 123 deletions(-) |
16 |
|
17 |
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest |
18 |
index 0fda26e..e71af6c 100644 |
19 |
--- a/net-misc/apt-cacher-ng/Manifest |
20 |
+++ b/net-misc/apt-cacher-ng/Manifest |
21 |
@@ -1,3 +1,2 @@ |
22 |
-DIST apt-cacher-ng_0.8.3.orig.tar.xz 294116 SHA256 d86a6616b56094b6888a10ff40ae374beac2bc3525ab7b9e7159c4f4dfd00c49 SHA512 dbccec0ba44af34870bdf5650ae594552a7816d1203210f9a09826c0dec6d74f24c07bd0d18ab3df6f9068f15c601e54aa0892e68f6bfca4b59ae300c4313210 WHIRLPOOL 0fee51e0834f1e18ff020c933a52c7745fd23ccb3cde50ea71a10662643ccf55710f77314c344e18b07b534c9346bb010b14229fd9cf9afc0202a53baad2e84f |
23 |
-DIST apt-cacher-ng_0.8.4.orig.tar.xz 297168 SHA256 efa8c0e9300f7dda5e1a52d30aaad8c3b2c3ef9e45b0e8592797b40f2e433214 SHA512 b564cc81bfc45e35d77d32216212608ee5adc3bcd49a61212c825b381507cda1912e15d9f5e177042d6c5e87991288ad4ad10972f1e400d4d85c5c6cc8a8d07c WHIRLPOOL cdccf30a574d3a400ea1b40e8ef2fc6d0ac5e214981951746fd684dd8abcf4a1a11047f8396977bc126dd7096c319e50304eec19ddf90d82dfe9ac7ab9c9482b |
24 |
DIST apt-cacher-ng_0.8.5.orig.tar.xz 303260 SHA256 f4e80adb02ad68a5f79a23335f1cc1e6b8a610b2c70749d9a1ce44171766775c SHA512 6c39ff8a37f074c1e2befc4acfa9685b2349cd364bdf808862bb77bbefa4bcf5bebf3dca3924cd55132d7c29aa0a55c553f483c763ccd46c3dbad8f1da3ab58e WHIRLPOOL 3530e6ffe6553753603751b8e5994b030dc2faa24cdb3ff98f21328e25070ba8750e17e040e4bcc0a40a589037441f645d9553837d1ed4de41c8e3e58c460e18 |
25 |
+DIST apt-cacher-ng_0.8.6.orig.tar.xz 295760 SHA256 255b742d3551fcbfa71b6df4d8892038934812425222a15d085436a4a76b8400 SHA512 e9b8c8cd1c1c1eee3a090599cc3735317c9062d9c8032ac1ab9657793921ab250b3200ec2e1a265a26097655ae88b5cff0e62f7d36483eaa19a1246aac58837d WHIRLPOOL efbeab3503dd3eefb9b6bdd1a54151ea8811f2bc9ed70b498dbe1169a45b7e17dbdafaa73da8b3b7d3448f47f5ace78443ecc3b253a4f68eaea1ffc0c84d3328 |
26 |
|
27 |
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.4.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.4.ebuild |
28 |
deleted file mode 100644 |
29 |
index 0d43788..0000000 |
30 |
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.4.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,119 +0,0 @@ |
33 |
-# Copyright 1999-2015 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
-# $Id$ |
36 |
- |
37 |
-EAPI=5 |
38 |
-inherit cmake-utils eutils toolchain-funcs user |
39 |
- |
40 |
-DESCRIPTION="Yet another implementation of an HTTP proxy for Debian/Ubuntu software packages written in C++" |
41 |
-HOMEPAGE=" |
42 |
- http://www.unix-ag.uni-kl.de/~bloch/acng/ |
43 |
- http://packages.qa.debian.org/a/apt-cacher-ng.html |
44 |
-" |
45 |
-LICENSE="BSD-4 ZLIB public-domain" |
46 |
-SLOT="0" |
47 |
-SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.xz" |
48 |
- |
49 |
-KEYWORDS="~amd64 ~x86" |
50 |
-IUSE="doc fuse systemd tcpd" |
51 |
- |
52 |
-COMMON_DEPEND=" |
53 |
- app-arch/bzip2 |
54 |
- app-arch/xz-utils |
55 |
- sys-libs/zlib |
56 |
- systemd? ( |
57 |
- sys-apps/systemd |
58 |
- ) |
59 |
-" |
60 |
-DEPEND=" |
61 |
- ${COMMON_DEPEND} |
62 |
- dev-util/cmake |
63 |
- >sys-devel/gcc-4.8 |
64 |
- virtual/pkgconfig |
65 |
-" |
66 |
-RDEPEND=" |
67 |
- ${COMMON_DEPEND} |
68 |
- dev-lang/perl |
69 |
- fuse? ( sys-fs/fuse ) |
70 |
- tcpd? ( sys-apps/tcp-wrappers ) |
71 |
-" |
72 |
- |
73 |
-S=${WORKDIR}/${P/_} |
74 |
- |
75 |
-pkg_pretend() { |
76 |
- if [[ $(gcc-major-version) = 4 ]]; then |
77 |
- if [[ $(gcc-minor-version) -lt 8 ]]; then |
78 |
- die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)" |
79 |
- fi |
80 |
- else |
81 |
- die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)" |
82 |
- fi |
83 |
-} |
84 |
- |
85 |
-pkg_setup() { |
86 |
- # add new user & group for daemon |
87 |
- enewgroup ${PN} |
88 |
- enewuser ${PN} -1 -1 -1 ${PN} |
89 |
-} |
90 |
- |
91 |
-src_configure(){ |
92 |
- mycmakeargs="-DCMAKE_INSTALL_PREFIX=/usr" |
93 |
- if use fuse; then |
94 |
- mycmakeargs="-DHAVE_FUSE_25=yes ${mycmakeargs}" |
95 |
- else |
96 |
- mycmakeargs="-DHAVE_FUSE_25=no ${mycmakeargs}" |
97 |
- fi |
98 |
- if use tcpd; then |
99 |
- mycmakeargs="-DHAVE_LIBWRAP=yes ${mycmakeargs}" |
100 |
- else |
101 |
- mycmakeargs="-DHAVE_LIBWRAP=no ${mycmakeargs}" |
102 |
- fi |
103 |
- |
104 |
- cmake-utils_src_configure |
105 |
-} |
106 |
- |
107 |
-src_install() { |
108 |
- pushd ${CMAKE_BUILD_DIR} |
109 |
- dosbin ${PN} |
110 |
- if use fuse; then |
111 |
- dobin acngfs |
112 |
- fi |
113 |
- popd |
114 |
- |
115 |
- newinitd "${FILESDIR}"/initd-r1 ${PN} |
116 |
- newconfd "${FILESDIR}"/confd ${PN} |
117 |
- |
118 |
- insinto /etc/logrotate.d |
119 |
- newins "${FILESDIR}"/logrotate ${PN} |
120 |
- |
121 |
- doman doc/man/${PN}* |
122 |
- if use fuse; then |
123 |
- doman doc/man/acngfs* |
124 |
- fi |
125 |
- |
126 |
- # Documentation |
127 |
- dodoc README TODO VERSION INSTALL ChangeLog |
128 |
- if use doc; then |
129 |
- dodoc doc/*.pdf |
130 |
- dohtml doc/html/* |
131 |
- docinto examples/conf |
132 |
- dodoc conf/* |
133 |
- fi |
134 |
- |
135 |
- # perl daily cron script |
136 |
- dosbin scripts/expire-caller.pl |
137 |
- exeinto /etc/cron.daily |
138 |
- newexe "${FILESDIR}"/cron.daily ${PN} |
139 |
- |
140 |
- # default configuration |
141 |
- insinto /etc/${PN} |
142 |
- newins conf/acng.conf ${PN}.conf |
143 |
- doins $( echo conf/* | sed 's|conf/acng.conf||g' ) |
144 |
- |
145 |
- keepdir /var/log/${PN} |
146 |
- # Some directories must exists |
147 |
- keepdir /var/log/${PN} |
148 |
- fowners -R ${PN}:${PN} \ |
149 |
- /etc/${PN} \ |
150 |
- /var/log/${PN} |
151 |
-} |
152 |
|
153 |
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.3.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.6.ebuild |
154 |
similarity index 95% |
155 |
rename from net-misc/apt-cacher-ng/apt-cacher-ng-0.8.3.ebuild |
156 |
rename to net-misc/apt-cacher-ng/apt-cacher-ng-0.8.6.ebuild |
157 |
index 0d43788..885013a 100644 |
158 |
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.3.ebuild |
159 |
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.6.ebuild |
160 |
@@ -107,8 +107,8 @@ src_install() { |
161 |
|
162 |
# default configuration |
163 |
insinto /etc/${PN} |
164 |
- newins conf/acng.conf ${PN}.conf |
165 |
- doins $( echo conf/* | sed 's|conf/acng.conf||g' ) |
166 |
+ newins "${CMAKE_BUILD_DIR}"/conf/acng.conf ${PN}.conf |
167 |
+ doins $( echo conf/* | sed 's|conf/acng.conf.in||g' ) |
168 |
|
169 |
keepdir /var/log/${PN} |
170 |
# Some directories must exists |