Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/keyutils/
Date: Wed, 24 May 2017 16:30:23
Message-Id: 1495643414.ce3843183473f710d4a19d790b57f74598196f55.polynomial-c@gentoo
1 commit: ce3843183473f710d4a19d790b57f74598196f55
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 24 16:29:57 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed May 24 16:30:14 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce384318
7
8 sys-apps/keyutils: Removed old.
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 sys-apps/keyutils/keyutils-1.5.9-r2.ebuild | 92 -----------------------------
13 sys-apps/keyutils/keyutils-1.5.9-r3.ebuild | 93 ------------------------------
14 2 files changed, 185 deletions(-)
15
16 diff --git a/sys-apps/keyutils/keyutils-1.5.9-r2.ebuild b/sys-apps/keyutils/keyutils-1.5.9-r2.ebuild
17 deleted file mode 100644
18 index 9f0a92e3693..00000000000
19 --- a/sys-apps/keyutils/keyutils-1.5.9-r2.ebuild
20 +++ /dev/null
21 @@ -1,92 +0,0 @@
22 -# Copyright 1999-2017 Gentoo Foundation
23 -# Distributed under the terms of the GNU General Public License v2
24 -
25 -EAPI="5"
26 -
27 -inherit multilib eutils toolchain-funcs linux-info multilib-minimal
28 -
29 -DESCRIPTION="Linux Key Management Utilities"
30 -HOMEPAGE="https://people.redhat.com/dhowells/keyutils/"
31 -SRC_URI="https://people.redhat.com/dhowells/${PN}/${P}.tar.bz2"
32 -
33 -LICENSE="GPL-2 LGPL-2.1"
34 -SLOT="0"
35 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
36 -IUSE="static static-libs test"
37 -
38 -RDEPEND=""
39 -DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
40 -
41 -pkg_setup() {
42 - CONFIG_CHECK="~KEYS"
43 - use test && CONFIG_CHECK="${CONFIG_CHECK} ~KEYS_DEBUG_PROC_KEYS"
44 - ERROR_KEYS="You must have CONFIG_KEYS to use this package!"
45 - ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
46 - linux-info_pkg_setup
47 -}
48 -
49 -src_prepare() {
50 - epatch "${FILESDIR}"/${PN}-1.5.5-makefile-fixup.patch
51 - epatch "${FILESDIR}"/${PN}-1.5.9-endian-check-{1,2}.patch #426424
52 - epatch "${FILESDIR}"/${PN}-1.5.9-disable-tests.patch #519062 #522050
53 -
54 - # The lsb check is useless, so avoid spurious command not found messages.
55 - sed -i -e 's,lsb_release,:,' tests/prepare.inc.sh || die
56 - # All the test files are bash, but try to execute via `sh`.
57 - sed -i -r \
58 - -e 's:([[:space:]])sh([[:space:]]):\1bash\2:' \
59 - tests/{Makefile*,*.sh} || die
60 - find tests/ -name '*.sh' -exec sed -i '1s:/sh$:/bash:' {} +
61 - # Some tests call the kernel which calls userspace, but that will
62 - # run the install keyutils rather than the locally compiled one,
63 - # so disable round trip tests.
64 - rm -rf tests/keyctl/requesting/{bad-args,piped,valid}
65 -
66 - multilib_copy_sources
67 -}
68 -
69 -multilib_src_compile() {
70 - tc-export AR CC
71 - sed -i \
72 - -e "1iRPATH = $(usex static -static '')" \
73 - -e '/^C.*FLAGS/s|:=|+=|' \
74 - -e 's:-Werror::' \
75 - -e '/^BUILDFOR/s:=.*:=:' \
76 - -e "/^LIBDIR/s:=.*:= /usr/$(get_libdir):" \
77 - -e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \
78 - -e "s: /: ${EPREFIX}/:g" \
79 - -e '/^NO_ARLIB/d' \
80 - Makefile || die
81 -
82 - # We need the static lib in order to statically link programs.
83 - if use static ; then
84 - export NO_ARLIB=0
85 - # Hack the progs to depend on the static lib instead.
86 - sed -i \
87 - -e '/^.*:.*[$](DEVELLIB)$/s:$(DEVELLIB):$(ARLIB):' \
88 - Makefile || die
89 - else
90 - export NO_ARLIB=$(usex static-libs 0 1)
91 - fi
92 - emake
93 -}
94 -
95 -multilib_src_test() {
96 - # Execute the locally compiled code rather than the
97 - # older versions already installed in the system.
98 - LD_LIBRARY_PATH=${BUILD_DIR} \
99 - PATH="${BUILD_DIR}:${PATH}" \
100 - emake test
101 -}
102 -
103 -multilib_src_install() {
104 - # Possibly undo the setting for USE=static (see src_compile).
105 - export NO_ARLIB=$(usex static-libs 0 1)
106 -
107 - default
108 - use static || gen_usr_ldscript -a keyutils
109 -}
110 -
111 -multilib_src_install_all() {
112 - dodoc README
113 -}
114
115 diff --git a/sys-apps/keyutils/keyutils-1.5.9-r3.ebuild b/sys-apps/keyutils/keyutils-1.5.9-r3.ebuild
116 deleted file mode 100644
117 index 0fef96cfb73..00000000000
118 --- a/sys-apps/keyutils/keyutils-1.5.9-r3.ebuild
119 +++ /dev/null
120 @@ -1,93 +0,0 @@
121 -# Copyright 1999-2017 Gentoo Foundation
122 -# Distributed under the terms of the GNU General Public License v2
123 -
124 -EAPI="5"
125 -
126 -inherit multilib eutils toolchain-funcs linux-info multilib-minimal
127 -
128 -DESCRIPTION="Linux Key Management Utilities"
129 -HOMEPAGE="https://people.redhat.com/dhowells/keyutils/"
130 -SRC_URI="https://people.redhat.com/dhowells/${PN}/${P}.tar.bz2"
131 -
132 -LICENSE="GPL-2 LGPL-2.1"
133 -SLOT="0"
134 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
135 -IUSE="static static-libs test"
136 -
137 -RDEPEND=""
138 -DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
139 -
140 -pkg_setup() {
141 - CONFIG_CHECK="~KEYS"
142 - use test && CONFIG_CHECK="${CONFIG_CHECK} ~KEYS_DEBUG_PROC_KEYS"
143 - ERROR_KEYS="You must have CONFIG_KEYS to use this package!"
144 - ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
145 - linux-info_pkg_setup
146 -}
147 -
148 -src_prepare() {
149 - epatch "${FILESDIR}"/${PN}-1.5.5-makefile-fixup.patch
150 - epatch "${FILESDIR}"/${PN}-1.5.9-endian-check-{1,2}.patch #426424
151 - epatch "${FILESDIR}"/${PN}-1.5.9-disable-tests.patch #519062 #522050
152 - epatch "${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch
153 -
154 - # The lsb check is useless, so avoid spurious command not found messages.
155 - sed -i -e 's,lsb_release,:,' tests/prepare.inc.sh || die
156 - # All the test files are bash, but try to execute via `sh`.
157 - sed -i -r \
158 - -e 's:([[:space:]])sh([[:space:]]):\1bash\2:' \
159 - tests/{Makefile*,*.sh} || die
160 - find tests/ -name '*.sh' -exec sed -i '1s:/sh$:/bash:' {} +
161 - # Some tests call the kernel which calls userspace, but that will
162 - # run the install keyutils rather than the locally compiled one,
163 - # so disable round trip tests.
164 - rm -rf tests/keyctl/requesting/{bad-args,piped,valid}
165 -
166 - multilib_copy_sources
167 -}
168 -
169 -multilib_src_compile() {
170 - tc-export AR CC
171 - sed -i \
172 - -e "1iRPATH = $(usex static -static '')" \
173 - -e '/^C.*FLAGS/s|:=|+=|' \
174 - -e 's:-Werror::' \
175 - -e '/^BUILDFOR/s:=.*:=:' \
176 - -e "/^LIBDIR/s:=.*:= /usr/$(get_libdir):" \
177 - -e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \
178 - -e "s: /: ${EPREFIX}/:g" \
179 - -e '/^NO_ARLIB/d' \
180 - Makefile || die
181 -
182 - # We need the static lib in order to statically link programs.
183 - if use static ; then
184 - export NO_ARLIB=0
185 - # Hack the progs to depend on the static lib instead.
186 - sed -i \
187 - -e '/^.*:.*[$](DEVELLIB)$/s:$(DEVELLIB):$(ARLIB):' \
188 - Makefile || die
189 - else
190 - export NO_ARLIB=$(usex static-libs 0 1)
191 - fi
192 - emake
193 -}
194 -
195 -multilib_src_test() {
196 - # Execute the locally compiled code rather than the
197 - # older versions already installed in the system.
198 - LD_LIBRARY_PATH=${BUILD_DIR} \
199 - PATH="${BUILD_DIR}:${PATH}" \
200 - emake test
201 -}
202 -
203 -multilib_src_install() {
204 - # Possibly undo the setting for USE=static (see src_compile).
205 - export NO_ARLIB=$(usex static-libs 0 1)
206 -
207 - default
208 - use static || gen_usr_ldscript -a keyutils
209 -}
210 -
211 -multilib_src_install_all() {
212 - dodoc README
213 -}