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/, dev-embedded/scratchbox/, dev-embedded/scratchbox/files/
Date: Fri, 27 Sep 2019 06:08:24
Message-Id: 1569564486.14ea1f1ee576a707a0dc3a9e5615124a305c7762.mgorny@gentoo
1 commit: 14ea1f1ee576a707a0dc3a9e5615124a305c7762
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 27 06:07:24 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 27 06:08:06 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14ea1f1e
7
8 dev-embedded/scratchbox: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/681168
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 dev-embedded/scratchbox/Manifest | 4 -
14 dev-embedded/scratchbox/files/scratchbox.rc | 23 -----
15 dev-embedded/scratchbox/metadata.xml | 8 --
16 dev-embedded/scratchbox/scratchbox-1.0.19.ebuild | 104 -----------------------
17 dev-embedded/scratchbox/scratchbox-1.0.20.ebuild | 104 -----------------------
18 profiles/package.mask | 6 --
19 6 files changed, 249 deletions(-)
20
21 diff --git a/dev-embedded/scratchbox/Manifest b/dev-embedded/scratchbox/Manifest
22 deleted file mode 100644
23 index 8e9c07a9427..00000000000
24 --- a/dev-embedded/scratchbox/Manifest
25 +++ /dev/null
26 @@ -1,4 +0,0 @@
27 -DIST scratchbox-core-1.0.19-i386.tar.gz 51524069 BLAKE2B 0e50c204a104b2f860481170c6236664f8654c45ac256bdfa919fa88d2c49e44e45f3b5835cee6726f4b0192f3a951ea258f8bd90b20bb93a2b7e366f58d88a1 SHA512 870fa53d569fae238e4c9680ce7b61ee3f35a264ba03bb2e57e5501312826883a75c55c989f554afab24c7fa3362139f7ad9ad109019afaaa6968d88e4d4b3c0
28 -DIST scratchbox-core-1.0.20-i386.tar.gz 51829189 BLAKE2B d077c32c2af1f90d4d49205a89ce3eb6d8bb8bb7de55c690c36fefbffd9354296bd47740b4a289212dbe35a9fabe7a1f0f8f8293170a260d2593a319d59d9442 SHA512 a5c99d426458d38458978082db58efd74755e54294ef41dbbd811daf758573e568a84360641d61bd8d30f368e50a088b976369a1c2af543f00026f388366587d
29 -DIST scratchbox-libs-1.0.19-i386.tar.gz 14368380 BLAKE2B cd81dfc13b1f8ad57b8ebcc078a7d8233d593fa1ca35ce6692a01cec10c726131be49ce7bd7bea0fc09d0c4f9f774a5078a4de9e850108ce72dedcecdb3fc146 SHA512 d246c4c2c502c93ad0a73b91b3db177bfb4f6952aa85068bc0561a25567cce0e355539446af51d4aaf27c8cc168050a1ca27e5c937ce9d2e14b9db3fad0977bb
30 -DIST scratchbox-libs-1.0.20-i386.tar.gz 14369499 BLAKE2B 48bb560dc4f0b06c1e51eed2f48a8037213fa3eaae310110821cc03094cda83f7998fde89ee138ccb743218c87ff1bccfa072eecbd4781cf247a9fb14b93e341 SHA512 2be9d23e80827d80bbaaf3da940d50b8f09e24ee9e7e12accd33c8b95aca927e66a6d3bc69e47a7c49efa3f9c7cdfa37aed45303eeee46958f1ae85aed02fc2b
31
32 diff --git a/dev-embedded/scratchbox/files/scratchbox.rc b/dev-embedded/scratchbox/files/scratchbox.rc
33 deleted file mode 100644
34 index 4e69793ccb6..00000000000
35 --- a/dev-embedded/scratchbox/files/scratchbox.rc
36 +++ /dev/null
37 @@ -1,23 +0,0 @@
38 -#!/sbin/openrc-run
39 -
40 -depend() {
41 - need localmount
42 - use logger net
43 -}
44 -
45 -start() {
46 - test -x /opt/scratchbox/sbin/sbox_ctl || \
47 - eend 1 "scratchbox init script not found. Aborting" || return 1
48 -
49 - /opt/scratchbox/sbin/sbox_ctl start
50 - return $?
51 -}
52 -
53 -stop() {
54 - test -x /opt/scratchbox/sbin/sbox_ctl || \
55 - eend 1 "scratchbox init script not found. Aborting" || return 1
56 -
57 - /opt/scratchbox/sbin/sbox_ctl stop
58 - return $?
59 -}
60 -
61
62 diff --git a/dev-embedded/scratchbox/metadata.xml b/dev-embedded/scratchbox/metadata.xml
63 deleted file mode 100644
64 index 71b1461e114..00000000000
65 --- a/dev-embedded/scratchbox/metadata.xml
66 +++ /dev/null
67 @@ -1,8 +0,0 @@
68 -<?xml version="1.0" encoding="UTF-8"?>
69 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
70 -<pkgmetadata>
71 -<maintainer type="project">
72 - <email>embedded@g.o</email>
73 - <name>Embedded Gentoo</name>
74 -</maintainer>
75 -</pkgmetadata>
76
77 diff --git a/dev-embedded/scratchbox/scratchbox-1.0.19.ebuild b/dev-embedded/scratchbox/scratchbox-1.0.19.ebuild
78 deleted file mode 100644
79 index d763fc05189..00000000000
80 --- a/dev-embedded/scratchbox/scratchbox-1.0.19.ebuild
81 +++ /dev/null
82 @@ -1,104 +0,0 @@
83 -# Copyright 1999-2018 Gentoo Foundation
84 -# Distributed under the terms of the GNU General Public License v2
85 -
86 -EAPI=0
87 -
88 -inherit eutils user
89 -
90 -SBOX_GROUP="sbox"
91 -
92 -DESCRIPTION="A cross-compilation toolkit for embedded Linux application development"
93 -HOMEPAGE="http://www.scratchbox.org/"
94 -SRC_URI="http://scratchbox.org/download/files/sbox-releases/hathor/tarball/scratchbox-core-${PV}-i386.tar.gz
95 - http://scratchbox.org/download/files/sbox-releases/hathor/tarball/scratchbox-libs-${PV}-i386.tar.gz"
96 -
97 -LICENSE="GPL-2"
98 -SLOT="0"
99 -KEYWORDS="~amd64 ~x86"
100 -IUSE=""
101 -
102 -# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
103 -RESTRICT="strip"
104 -
105 -DEPEND=""
106 -RDEPEND=""
107 -
108 -TARGET_DIR="/opt/scratchbox"
109 -
110 -S=${WORKDIR}/${PN}
111 -
112 -src_install() {
113 - dodir ${TARGET_DIR}
114 - # doins doesn't work with symlinks, getting "file not found" with doins
115 - cp -pRP ./* "${D}/${TARGET_DIR}"
116 - ln -s opt/scratchbox "${D}/scratchbox"
117 -
118 - # scratchbox service loader
119 - newinitd "${FILESDIR}/scratchbox.rc" scratchbox || die "newinitd failed"
120 -
121 - # group already created
122 - echo ${SBOX_GROUP} > "${D}/${TARGET_DIR}/.run_me_first_done"
123 -}
124 -
125 -pkg_preinst() {
126 - einfo "Creating group sbox"
127 - enewgroup "${SBOX_GROUP}"
128 -}
129 -
130 -pkg_postinst() {
131 - "${TARGET_DIR}/sbin/sbox_configure" "no" ${SBOX_GROUP}
132 -
133 - elog
134 - elog "You can run:"
135 - elog "\"emerge --config =${CATEGORY}/${PF}\""
136 - elog "to setup scratchbox users"
137 - elog
138 - elog "For further documentation about how to setup"
139 - elog "scratchbox for your development needs have a look at"
140 - elog "http://scratchbox.org/documentation/user/scratchbox-1.0/"
141 - elog
142 - elog "Also note that when you reboot you should run:"
143 - elog "/etc/init.d/scratchbox start"
144 - elog "before trying to run scratchbox."
145 - elog "You can also add it to the default runlevel:"
146 - elog "rc-update add scratchbox default"
147 - elog
148 - elog "Type /opt/scratchbox/login to start scratchbox."
149 - elog
150 -}
151 -
152 -pkg_postrm() {
153 - elog
154 - elog "To remove all traces of scratchbox you will need to remove the file"
155 - elog "/etc/init.d/scratchbox. Don't forget to delete the sbox group."
156 - elog
157 -}
158 -
159 -pkg_config() {
160 - if [ `id -u` != "0" ]; then
161 - ewarn "Must be root to run this"
162 - die "not root"
163 - fi
164 -
165 - mkdir -p "${TARGET_DIR}/users"
166 -
167 - while true; do
168 - einfo "Existing users:"
169 - einfo $(ls "${TARGET_DIR}/users")
170 - echo
171 -
172 - einfo "Create new user (leaf empty to skip): "
173 - read newuser
174 - case "$newuser" in
175 - "")
176 - break;
177 - ;;
178 - *)
179 - einfo "Note: users have to be in the '${SBOX_GROUP}' to be able to login into the scratchbox"
180 - "${TARGET_DIR}/sbin/sbox_adduser" ${newuser} || die "sbox_adduser failed"
181 - ;;
182 - esac
183 - done
184 -
185 - einfo "Configuration finished. Make sure you run '/etc/init.d/scratchbox start' before logging in."
186 -}
187
188 diff --git a/dev-embedded/scratchbox/scratchbox-1.0.20.ebuild b/dev-embedded/scratchbox/scratchbox-1.0.20.ebuild
189 deleted file mode 100644
190 index d763fc05189..00000000000
191 --- a/dev-embedded/scratchbox/scratchbox-1.0.20.ebuild
192 +++ /dev/null
193 @@ -1,104 +0,0 @@
194 -# Copyright 1999-2018 Gentoo Foundation
195 -# Distributed under the terms of the GNU General Public License v2
196 -
197 -EAPI=0
198 -
199 -inherit eutils user
200 -
201 -SBOX_GROUP="sbox"
202 -
203 -DESCRIPTION="A cross-compilation toolkit for embedded Linux application development"
204 -HOMEPAGE="http://www.scratchbox.org/"
205 -SRC_URI="http://scratchbox.org/download/files/sbox-releases/hathor/tarball/scratchbox-core-${PV}-i386.tar.gz
206 - http://scratchbox.org/download/files/sbox-releases/hathor/tarball/scratchbox-libs-${PV}-i386.tar.gz"
207 -
208 -LICENSE="GPL-2"
209 -SLOT="0"
210 -KEYWORDS="~amd64 ~x86"
211 -IUSE=""
212 -
213 -# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
214 -RESTRICT="strip"
215 -
216 -DEPEND=""
217 -RDEPEND=""
218 -
219 -TARGET_DIR="/opt/scratchbox"
220 -
221 -S=${WORKDIR}/${PN}
222 -
223 -src_install() {
224 - dodir ${TARGET_DIR}
225 - # doins doesn't work with symlinks, getting "file not found" with doins
226 - cp -pRP ./* "${D}/${TARGET_DIR}"
227 - ln -s opt/scratchbox "${D}/scratchbox"
228 -
229 - # scratchbox service loader
230 - newinitd "${FILESDIR}/scratchbox.rc" scratchbox || die "newinitd failed"
231 -
232 - # group already created
233 - echo ${SBOX_GROUP} > "${D}/${TARGET_DIR}/.run_me_first_done"
234 -}
235 -
236 -pkg_preinst() {
237 - einfo "Creating group sbox"
238 - enewgroup "${SBOX_GROUP}"
239 -}
240 -
241 -pkg_postinst() {
242 - "${TARGET_DIR}/sbin/sbox_configure" "no" ${SBOX_GROUP}
243 -
244 - elog
245 - elog "You can run:"
246 - elog "\"emerge --config =${CATEGORY}/${PF}\""
247 - elog "to setup scratchbox users"
248 - elog
249 - elog "For further documentation about how to setup"
250 - elog "scratchbox for your development needs have a look at"
251 - elog "http://scratchbox.org/documentation/user/scratchbox-1.0/"
252 - elog
253 - elog "Also note that when you reboot you should run:"
254 - elog "/etc/init.d/scratchbox start"
255 - elog "before trying to run scratchbox."
256 - elog "You can also add it to the default runlevel:"
257 - elog "rc-update add scratchbox default"
258 - elog
259 - elog "Type /opt/scratchbox/login to start scratchbox."
260 - elog
261 -}
262 -
263 -pkg_postrm() {
264 - elog
265 - elog "To remove all traces of scratchbox you will need to remove the file"
266 - elog "/etc/init.d/scratchbox. Don't forget to delete the sbox group."
267 - elog
268 -}
269 -
270 -pkg_config() {
271 - if [ `id -u` != "0" ]; then
272 - ewarn "Must be root to run this"
273 - die "not root"
274 - fi
275 -
276 - mkdir -p "${TARGET_DIR}/users"
277 -
278 - while true; do
279 - einfo "Existing users:"
280 - einfo $(ls "${TARGET_DIR}/users")
281 - echo
282 -
283 - einfo "Create new user (leaf empty to skip): "
284 - read newuser
285 - case "$newuser" in
286 - "")
287 - break;
288 - ;;
289 - *)
290 - einfo "Note: users have to be in the '${SBOX_GROUP}' to be able to login into the scratchbox"
291 - "${TARGET_DIR}/sbin/sbox_adduser" ${newuser} || die "sbox_adduser failed"
292 - ;;
293 - esac
294 - done
295 -
296 - einfo "Configuration finished. Make sure you run '/etc/init.d/scratchbox start' before logging in."
297 -}
298
299 diff --git a/profiles/package.mask b/profiles/package.mask
300 index 3d0d8c4a32a..b297417e67d 100644
301 --- a/profiles/package.mask
302 +++ b/profiles/package.mask
303 @@ -1085,12 +1085,6 @@ net-misc/libss7
304 games-rpg/eternal-lands-bloodsucker
305 games-rpg/eternal-lands-data
306
307 -# Michał Górny <mgorny@g.o> (2019-08-28)
308 -# Last touched in 2010. EAPI=0. Last upstream release in 2011 (pending
309 -# bump). No reverse dependencies.
310 -# Removal in 30 days. Bug #681168.
311 -dev-embedded/scratchbox
312 -
313 # Miroslav Šulc <fordfrog@g.o> (2019-08-19)
314 # Depends on >=virtual/{jdk,jre}-11 which is masked
315 =www-servers/tomcat-9.0.24