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: Fri, 25 Sep 2020 22:24:33
Message-Id: 1601072665.1ea3a0c8927324b92203e3306fe3e033f4b6124b.jer@gentoo
1 commit: 1ea3a0c8927324b92203e3306fe3e033f4b6124b
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 25 22:23:40 2020 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 25 22:24:25 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ea3a0c8
7
8 net-misc/apt-cacher-ng: Drop GCC >=4.8 check
9
10 Package-Manager: Portage-3.0.8, Repoman-3.0.1
11 Closes: https://bugs.gentoo.org/731278
12 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
13
14 net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild | 11 +----------
15 net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild | 11 +----------
16 2 files changed, 2 insertions(+), 20 deletions(-)
17
18 diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild
19 index f118d28f011..4fc61df2c95 100644
20 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild
21 +++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild
22 @@ -2,7 +2,7 @@
23 # Distributed under the terms of the GNU General Public License v2
24
25 EAPI=7
26 -inherit cmake-utils toolchain-funcs user
27 +inherit cmake-utils user
28
29 DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
30 HOMEPAGE="
31 @@ -32,7 +32,6 @@ COMMON_DEPEND="
32 BDEPEND="
33 ${COMMON_DEPEND}
34 dev-util/cmake
35 - >sys-devel/gcc-4.8
36 virtual/pkgconfig
37 "
38 RDEPEND="
39 @@ -48,14 +47,6 @@ PATCHES=(
40 )
41 S=${WORKDIR}/${P/_*}
42
43 -pkg_pretend() {
44 - if [[ $(gcc-major-version) -lt 4 ]]; then
45 - die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
46 - elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then
47 - die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
48 - fi
49 -}
50 -
51 pkg_setup() {
52 # add new user & group for daemon
53 enewgroup ${PN}
54
55 diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
56 index 6ae025935bf..6b25935a9cb 100644
57 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
58 +++ b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
59 @@ -2,7 +2,7 @@
60 # Distributed under the terms of the GNU General Public License v2
61
62 EAPI=7
63 -inherit cmake-utils git-r3 toolchain-funcs user
64 +inherit cmake-utils git-r3 user
65
66 DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
67 HOMEPAGE="
68 @@ -30,7 +30,6 @@ COMMON_DEPEND="
69 BDEPEND="
70 ${COMMON_DEPEND}
71 dev-util/cmake
72 - >sys-devel/gcc-4.8
73 virtual/pkgconfig
74 "
75 RDEPEND="
76 @@ -45,14 +44,6 @@ PATCHES=(
77 )
78 S=${WORKDIR}/${P/_*}
79
80 -pkg_pretend() {
81 - if [[ $(gcc-major-version) -lt 4 ]]; then
82 - die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
83 - elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then
84 - die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
85 - fi
86 -}
87 -
88 pkg_setup() {
89 # add new user & group for daemon
90 enewgroup ${PN}