Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/base/, net-nds/nsscache/
Date: Sun, 26 Aug 2018 17:40:38
Message-Id: 1535304778.fc3eb85aa0d5088e2075ba0f1b0e2ce898a2b0b5.mgorny@gentoo
1 commit: fc3eb85aa0d5088e2075ba0f1b0e2ce898a2b0b5
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 26 17:32:58 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 26 17:32:58 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc3eb85a
7
8 net-nds/nsscache: Remove support for non-existent deps
9
10 net-nds/nsscache/metadata.xml | 1 -
11 net-nds/nsscache/nsscache-0.30-r2.ebuild | 5 ++---
12 net-nds/nsscache/nsscache-0.30.ebuild | 8 +++-----
13 net-nds/nsscache/nsscache-0.31.ebuild | 5 ++---
14 net-nds/nsscache/nsscache-0.32.ebuild | 5 ++---
15 profiles/base/package.use.mask | 1 -
16 6 files changed, 9 insertions(+), 16 deletions(-)
17
18 diff --git a/net-nds/nsscache/metadata.xml b/net-nds/nsscache/metadata.xml
19 index 90ba820d293..2391c0ec85c 100644
20 --- a/net-nds/nsscache/metadata.xml
21 +++ b/net-nds/nsscache/metadata.xml
22 @@ -5,7 +5,6 @@
23 <email>robbat2@g.o</email>
24 </maintainer>
25 <use>
26 - <flag name="nssdb">Depend on sys-libs/libnss_db to handle dbm files.</flag>
27 <flag name="nsscache">Depend on sys-auth/libnss-cache to handle flat files</flag>
28 </use>
29 <upstream>
30
31 diff --git a/net-nds/nsscache/nsscache-0.30-r2.ebuild b/net-nds/nsscache/nsscache-0.30-r2.ebuild
32 index cdcb4c2d78e..522bf545439 100644
33 --- a/net-nds/nsscache/nsscache-0.30-r2.ebuild
34 +++ b/net-nds/nsscache/nsscache-0.30-r2.ebuild
35 @@ -1,4 +1,4 @@
36 -# Copyright 1999-2016 Gentoo Foundation
37 +# Copyright 1999-2018 Gentoo Foundation
38 # Distributed under the terms of the GNU General Public License v2
39
40 EAPI=5
41 @@ -16,14 +16,13 @@ LICENSE="GPL-2"
42 SLOT="0"
43 KEYWORDS="~amd64 ~x86"
44 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
45 -IUSE="nssdb nsscache"
46 +IUSE="nsscache"
47
48 DEPEND="${PYTHON_DEPS}
49 dev-python/python-ldap[${PYTHON_USEDEP}]
50 dev-python/pycurl[${PYTHON_USEDEP}]
51 dev-python/bsddb3[${PYTHON_USEDEP}]"
52 RDEPEND="${DEPEND}
53 - nssdb? ( sys-libs/nss-db )
54 nsscache? ( >=sys-auth/libnss-cache-0.10 )"
55 RESTRICT="test"
56 S="${WORKDIR}/${PN}-version-${PV}"
57
58 diff --git a/net-nds/nsscache/nsscache-0.30.ebuild b/net-nds/nsscache/nsscache-0.30.ebuild
59 index f8d2a3f20cc..822766f671c 100644
60 --- a/net-nds/nsscache/nsscache-0.30.ebuild
61 +++ b/net-nds/nsscache/nsscache-0.30.ebuild
62 @@ -1,4 +1,4 @@
63 -# Copyright 1999-2015 Gentoo Foundation
64 +# Copyright 1999-2018 Gentoo Foundation
65 # Distributed under the terms of the GNU General Public License v2
66
67 EAPI=5
68 @@ -14,14 +14,12 @@ LICENSE="GPL-2"
69 SLOT="0"
70 KEYWORDS="~amd64 ~x86"
71 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
72 -IUSE="nssdb nsscache"
73 +IUSE="nsscache"
74
75 DEPEND="${PYTHON_DEPS}
76 dev-python/python-ldap[${PYTHON_USEDEP}]
77 - dev-python/pycurl[${PYTHON_USEDEP}]
78 - nssdb? ( dev-python/bsddb3[${PYTHON_USEDEP}] )"
79 + dev-python/pycurl[${PYTHON_USEDEP}]"
80 RDEPEND="${DEPEND}
81 - nssdb? ( sys-libs/nss-db )
82 nsscache? ( >=sys-auth/libnss-cache-0.10 )"
83 RESTRICT="test"
84 S="${WORKDIR}/${PN}-version-${PV}"
85
86 diff --git a/net-nds/nsscache/nsscache-0.31.ebuild b/net-nds/nsscache/nsscache-0.31.ebuild
87 index b16d07c4ca6..a62723e48c6 100644
88 --- a/net-nds/nsscache/nsscache-0.31.ebuild
89 +++ b/net-nds/nsscache/nsscache-0.31.ebuild
90 @@ -1,4 +1,4 @@
91 -# Copyright 1999-2016 Gentoo Foundation
92 +# Copyright 1999-2018 Gentoo Foundation
93 # Distributed under the terms of the GNU General Public License v2
94
95 EAPI=5
96 @@ -17,14 +17,13 @@ LICENSE="GPL-2"
97 SLOT="0"
98 KEYWORDS="~amd64 ~x86"
99 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
100 -IUSE="nssdb nsscache"
101 +IUSE="nsscache"
102
103 DEPEND="${PYTHON_DEPS}
104 dev-python/python-ldap[${PYTHON_USEDEP}]
105 dev-python/pycurl[${PYTHON_USEDEP}]
106 dev-python/bsddb3[${PYTHON_USEDEP}]"
107 RDEPEND="${DEPEND}
108 - nssdb? ( sys-libs/nss-db )
109 nsscache? ( >=sys-auth/libnss-cache-0.10 )"
110 RESTRICT="test"
111 S="${WORKDIR}/${PN}-version-${PV}"
112
113 diff --git a/net-nds/nsscache/nsscache-0.32.ebuild b/net-nds/nsscache/nsscache-0.32.ebuild
114 index b16d07c4ca6..a62723e48c6 100644
115 --- a/net-nds/nsscache/nsscache-0.32.ebuild
116 +++ b/net-nds/nsscache/nsscache-0.32.ebuild
117 @@ -1,4 +1,4 @@
118 -# Copyright 1999-2016 Gentoo Foundation
119 +# Copyright 1999-2018 Gentoo Foundation
120 # Distributed under the terms of the GNU General Public License v2
121
122 EAPI=5
123 @@ -17,14 +17,13 @@ LICENSE="GPL-2"
124 SLOT="0"
125 KEYWORDS="~amd64 ~x86"
126 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
127 -IUSE="nssdb nsscache"
128 +IUSE="nsscache"
129
130 DEPEND="${PYTHON_DEPS}
131 dev-python/python-ldap[${PYTHON_USEDEP}]
132 dev-python/pycurl[${PYTHON_USEDEP}]
133 dev-python/bsddb3[${PYTHON_USEDEP}]"
134 RDEPEND="${DEPEND}
135 - nssdb? ( sys-libs/nss-db )
136 nsscache? ( >=sys-auth/libnss-cache-0.10 )"
137 RESTRICT="test"
138 S="${WORKDIR}/${PN}-version-${PV}"
139
140 diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
141 index bdf5c8d7d5c..853c669be52 100644
142 --- a/profiles/base/package.use.mask
143 +++ b/profiles/base/package.use.mask
144 @@ -406,7 +406,6 @@ dev-java/gcj-jdk awt
145 # Mike Gilbert <floppym@g.o> (16 May 2015)
146 # dev-lang/python[berkdb] fails with recent multilib sys-libs/db (bug 519584).
147 dev-lang/python berkdb
148 -net-nds/nsscache nssdb
149
150 # Jason Zaman <perfinion@g.o> (08 May 2015)
151 # java wrappers fail to build (bug #548858)