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/, profiles/arch/hppa/
Date: Sun, 26 Feb 2017 11:58:43
Message-Id: 1488110316.99d36d2e957164374ebcc9fa990509dc2f81833f.jer@gentoo
1 commit: 99d36d2e957164374ebcc9fa990509dc2f81833f
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 26 11:58:13 2017 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 26 11:58:36 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99d36d2e
7
8 profiles/arch/hppa: Mask USE=libsecret for dev-vcs/git.
9
10 net-misc/apt-cacher-ng/Manifest | 1 -
11 net-misc/apt-cacher-ng/apt-cacher-ng-1.ebuild | 118 --------------------------
12 profiles/arch/hppa/package.use.mask | 4 +
13 3 files changed, 4 insertions(+), 119 deletions(-)
14
15 diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
16 index a4655819a3..dbea216f78 100644
17 --- a/net-misc/apt-cacher-ng/Manifest
18 +++ b/net-misc/apt-cacher-ng/Manifest
19 @@ -1,2 +1 @@
20 -DIST apt-cacher-ng_1.orig.tar.xz 312120 SHA256 f8e6fee778b2e2fa37c99b1a398d1d7fe352a719e30f4c4a21323ce0558fa9d9 SHA512 56de49df851acde32624a3a7ade9adc9d0a7a7ed4995f50992fcedddf2e6a04bc6503869f104986aeb8dadc851cc0dd7c3c57d04e29c2300fc44b0bf111f4a58 WHIRLPOOL 3a82eac4bbda2cbc205ee7b7558c1c196fbbde9d4c156fed62fe3335654cc140c7c294b642c22470b9e19e118efd1e4a7d9038d9f42e760a1f96c4974d7371a3
21 DIST apt-cacher-ng_2.orig.tar.xz 313360 SHA256 eeab24d96ceb544b4c57dd1ac749af9e2ad92dbf864056688bd9c62d02186c2e SHA512 ad409b4ffc39af4037be003c8f73048e191bfed36e3d63dcb061fdc456b3d18c3e0ec82d8af5f9272c3e33564ec3060a567733e123c892841cbb8bc7d557fd1b WHIRLPOOL 44940dd3b494d395dae18c93d4553775d9df487c7c5b4c2f8a643df91a4e30fe5d1724f9d54b3ff74f189ea877d35a7974076fd0260ce0f5ebe6291572e93805
22
23 diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-1.ebuild
24 deleted file mode 100644
25 index 369eb9b069..0000000000
26 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-1.ebuild
27 +++ /dev/null
28 @@ -1,118 +0,0 @@
29 -# Copyright 1999-2016 Gentoo Foundation
30 -# Distributed under the terms of the GNU General Public License v2
31 -# $Id$
32 -
33 -EAPI=5
34 -inherit cmake-utils eutils toolchain-funcs user
35 -
36 -DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
37 -HOMEPAGE="
38 - http://www.unix-ag.uni-kl.de/~bloch/acng/
39 - http://packages.qa.debian.org/a/apt-cacher-ng.html
40 -"
41 -LICENSE="BSD-4 ZLIB public-domain"
42 -SLOT="0"
43 -SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.xz"
44 -
45 -KEYWORDS="~amd64 ~x86"
46 -IUSE="doc fuse systemd tcpd"
47 -
48 -COMMON_DEPEND="
49 - app-arch/bzip2
50 - app-arch/xz-utils
51 - dev-libs/openssl:*
52 - sys-libs/zlib
53 - systemd? (
54 - sys-apps/systemd
55 - )
56 -"
57 -DEPEND="
58 - ${COMMON_DEPEND}
59 - dev-util/cmake
60 - >sys-devel/gcc-4.8
61 - virtual/pkgconfig
62 -"
63 -RDEPEND="
64 - ${COMMON_DEPEND}
65 - dev-lang/perl
66 - fuse? ( sys-fs/fuse )
67 - tcpd? ( sys-apps/tcp-wrappers )
68 -"
69 -
70 -S=${WORKDIR}/${P/_}
71 -
72 -pkg_pretend() {
73 - if [[ $(gcc-major-version) -lt 4 ]]; then
74 - die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
75 - elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then
76 - die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
77 - fi
78 -}
79 -
80 -pkg_setup() {
81 - # add new user & group for daemon
82 - enewgroup ${PN}
83 - enewuser ${PN} -1 -1 -1 ${PN}
84 -}
85 -
86 -src_configure(){
87 - mycmakeargs=( "-DCMAKE_INSTALL_PREFIX=/usr" )
88 - if use fuse; then
89 - mycmakeargs+=( "-DHAVE_FUSE_25=yes" )
90 - else
91 - mycmakeargs+=( "-DHAVE_FUSE_25=no" )
92 - fi
93 - if use tcpd; then
94 - mycmakeargs=( "-DHAVE_LIBWRAP=yes" )
95 - else
96 - mycmakeargs=( "-DHAVE_LIBWRAP=no" )
97 - fi
98 -
99 - cmake-utils_src_configure
100 -}
101 -
102 -src_install() {
103 - pushd ${CMAKE_BUILD_DIR}
104 - dosbin ${PN}
105 - if use fuse; then
106 - dobin acngfs
107 - fi
108 - popd
109 -
110 - newinitd "${FILESDIR}"/initd-r1 ${PN}
111 - newconfd "${FILESDIR}"/confd ${PN}
112 -
113 - insinto /etc/logrotate.d
114 - newins "${FILESDIR}"/logrotate ${PN}
115 -
116 - doman doc/man/${PN}*
117 - if use fuse; then
118 - doman doc/man/acngfs*
119 - fi
120 -
121 - # Documentation
122 - dodoc doc/README TODO VERSION INSTALL ChangeLog
123 - if use doc; then
124 - dodoc doc/*.pdf
125 - dohtml doc/html/*
126 - docinto examples/conf
127 - dodoc conf/*
128 - fi
129 -
130 - # perl daily cron script
131 - dosbin scripts/expire-caller.pl
132 - exeinto /etc/cron.daily
133 - newexe "${FILESDIR}"/cron.daily ${PN}
134 -
135 - # default configuration
136 - insinto /etc/${PN}
137 - newins "${CMAKE_BUILD_DIR}"/conf/acng.conf ${PN}.conf
138 - doins $( echo conf/* | sed 's|conf/acng.conf.in||g' )
139 -
140 - keepdir /var/log/${PN}
141 - # Some directories must exists
142 - keepdir /var/log/${PN}
143 - fowners -R ${PN}:${PN} \
144 - /etc/${PN} \
145 - /var/log/${PN}
146 -}
147
148 diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
149 index 558f9658d1..6cd620ffd4 100644
150 --- a/profiles/arch/hppa/package.use.mask
151 +++ b/profiles/arch/hppa/package.use.mask
152 @@ -4,6 +4,10 @@
153
154 # DON'T TOUCH THIS FILE. Instead, file a keyword request bug and CC <hppa@g.o>.
155
156 +# Jeroen Roovers <jer@g.o> (26 Feb 2017)
157 +# app-crypt/libsecret is not keyworded for HPPA
158 +dev-vcs/git libsecret
159 +
160 # Jeroen Roovers <jer@g.o> (4 Feb 2017)
161 # media-libs/libilbc has not been ported to HPPA
162 # media-libs/zimg triggers a toolchain issue (bug #597152)