Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/
Date: Thu, 27 Feb 2020 03:00:30
Message-Id: 1582772259.f473586634d11e523565e13a7e0759a2b24fb736.gyakovlev@gentoo
1 commit: f473586634d11e523565e13a7e0759a2b24fb736
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 27 02:57:39 2020 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 27 02:57:39 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4735866
7
8 dev-util/schroot: drop old
9
10 Closes: https://bugs.gentoo.org/589466
11 Package-Manager: Portage-2.3.89, Repoman-2.3.20
12 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
13
14 dev-util/schroot/Manifest | 2 -
15 dev-util/schroot/schroot-1.6.10-r4.ebuild | 147 ------------------------------
16 dev-util/schroot/schroot-1.6.10-r5.ebuild | 126 -------------------------
17 3 files changed, 275 deletions(-)
18
19 diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
20 index 721e99dc717..3f59ccd6e4e 100644
21 --- a/dev-util/schroot/Manifest
22 +++ b/dev-util/schroot/Manifest
23 @@ -1,4 +1,2 @@
24 -DIST schroot_1.6.10-2.debian.tar.xz 34296 BLAKE2B 5c712bca72f938d01a9927d846ab48bca83f7f7ed01cee7b7d4caf9c6b5b38ad650152f68dd989fd93032fb669b8208fff09eaf83be7b7e712fcd41caafbc191 SHA512 ea980199b90a2cffc36348e01e2de229c5cb4321f10bcde4b593eeaaa18f34ab9187cc9c717e6043c477819fefbd793cc707e1e77a5bae1c1815a668956cd84c
25 -DIST schroot_1.6.10-6.debian.tar.xz 76576 BLAKE2B 719c994703df8fb391b3a8c8f83a5afea4247b4f817e16317b6ed0ba7ec0f962d669c4d50a120eabdd9054b1a31bb58cc426324108cf77fe5b1aec0024bc03c2 SHA512 44177da262c0a8a511534aba964196cdb5a8a7ec094727122954638c29cdc9b80ef0a1ffb709c4841918effb44fe2c0f8912ae87cfa9e4696dbbe9f55adb1211
26 DIST schroot_1.6.10-7.debian.tar.xz 82524 BLAKE2B 664ee356f8de1215c761a771cc0700d25ff6c0513124f4d84d5b33a046cac6ff194b62dded1e8f966a922a013644edd3d9424b0d577a8bb2b371e23e8dd88ed5 SHA512 ee362cce46ec804cd0ad6bfe3c7dec37fdeffe56941d51aec9e9622057a4d2a94e47f7530d28862c948233c6623cfa4b4721c27f293e31a28ec0320ffe02a47a
27 DIST schroot_1.6.10.orig.tar.xz 797328 BLAKE2B 1f91531f22c5b0a75e5bb74effc660efe4819acc59b007355c12a01c0a1de12674881dd0fbbcab00575a02629662fca799d48f5b967eb527812ed8c08ff9ad28 SHA512 25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe
28
29 diff --git a/dev-util/schroot/schroot-1.6.10-r4.ebuild b/dev-util/schroot/schroot-1.6.10-r4.ebuild
30 deleted file mode 100644
31 index 3f08febeed9..00000000000
32 --- a/dev-util/schroot/schroot-1.6.10-r4.ebuild
33 +++ /dev/null
34 @@ -1,147 +0,0 @@
35 -# Copyright 1999-2019 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=6
39 -
40 -inherit cmake-utils eutils pam versionator bash-completion-r1
41 -
42 -MY_P=${PN}_${PV}
43 -DEB_REL=2
44 -
45 -DESCRIPTION="Utility to execute commands in a chroot environment"
46 -HOMEPAGE="https://packages.debian.org/source/sid/schroot"
47 -SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.xz
48 - mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}-${DEB_REL}.debian.tar.xz"
49 -
50 -LICENSE="GPL-3"
51 -SLOT="0"
52 -KEYWORDS="amd64 ~arm x86"
53 -IUSE="btrfs +dchroot debug doc lvm nls pam test"
54 -RESTRICT="!test? ( test )"
55 -
56 -COMMON_DEPEND="
57 - >=dev-libs/boost-1.42.0
58 - >=sys-apps/util-linux-2.16
59 - btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 )
60 - lvm? ( sys-fs/lvm2 )
61 - pam? ( sys-libs/pam )
62 -"
63 -
64 -DEPEND="${COMMON_DEPEND}
65 - app-arch/xz-utils
66 - sys-apps/groff
67 - doc? (
68 - app-doc/doxygen
69 - media-gfx/graphviz
70 - )
71 - nls? (
72 - >=app-text/po4a-0.40
73 - sys-devel/gettext
74 - )
75 - test? ( >=dev-util/cppunit-1.10.0 )
76 -"
77 -RDEPEND="${COMMON_DEPEND}
78 - sys-apps/debianutils
79 - dchroot? ( !sys-apps/dchroot )
80 - nls? ( virtual/libintl )
81 -"
82 -
83 -PATCHES=(
84 - "${S}/debian/patches/Add-support-for-more-compression-formats.patch"
85 - "${S}/debian/patches/Add-SESSION_SOURCE-and-CHROOT_SESSION_SOURCE.patch"
86 - "${S}/debian/patches/10mount-Move-mount-directory-to-var-run.patch"
87 - "${S}/debian/patches/Support-union-mounts-with-overlay-as-in-Linux-4.0.patch"
88 - "${S}/debian/patches/GCC5-fixes-on-regexes.patch"
89 -)
90 -
91 -src_unpack() {
92 - unpack ${MY_P}.orig.tar.xz
93 - cd "${S}"
94 - unpack ${MY_P}-${DEB_REL}.debian.tar.xz
95 -}
96 -
97 -src_prepare() {
98 - sed -i -e 's/warn(/message(WARNING /' man/CMakeLists.txt || die
99 - sed -i -e '/^have schroot/d' etc/bash_completion/schroot || die
100 -
101 - cmake-utils_src_prepare
102 -}
103 -
104 -src_configure() {
105 - local mycmakeargs=(
106 - -Dbtrfs-snapshot=$(usex btrfs)
107 - -Ddchroot=$(usex dchroot)
108 - -Ddchroot-dsa=$(usex dchroot)
109 - -Ddebug=$(usex debug)
110 - -Ddoxygen=$(usex doc)
111 - -Dlvm-snapshot=$(usex lvm)
112 - -Dnls=$(usex nls)
113 - -Dpam=$(usex pam)
114 - -Dtest=$(usex test)
115 - -Dbash_completion_dir="$(get_bashcompdir)"
116 - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
117 - -DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
118 - )
119 - if ! use nls; then
120 - mycmakeargs+=(-DPO4A_EXECUTABLE=NOTFOUND)
121 - fi
122 -
123 - cmake-utils_src_configure
124 -}
125 -
126 -src_compile() {
127 - cmake-utils_src_compile all $(usev doc)
128 -}
129 -
130 -src_test() {
131 - if [[ $EUID -ne 0 ]]; then
132 - ewarn "Disabling tests because you are not root"
133 - return 0
134 - fi
135 -
136 - cmake-utils_src_test
137 -}
138 -
139 -src_install() {
140 - cmake-utils_src_install
141 -
142 - insinto /usr/share/doc/${PF}/contrib/setup.d
143 - doins contrib/setup.d/05customdir contrib/setup.d/09fsck contrib/setup.d/10mount-ssh
144 -
145 - newdoc debian/schroot.NEWS NEWS.debian
146 -
147 - newinitd "${FILESDIR}"/schroot.initd schroot
148 - newconfd "${FILESDIR}"/schroot.confd schroot
149 -
150 - if use doc; then
151 - docinto html/sbuild
152 - dohtml "${BUILD_DIR}"/doc/sbuild/html/*
153 - docinto html/schroot
154 - dohtml "${BUILD_DIR}"/doc/schroot/html/*
155 - fi
156 -
157 - if use pam; then
158 - rm -f "${ED}"etc/pam.d/schroot
159 - pamd_mimic_system schroot auth account session
160 - fi
161 -}
162 -
163 -pkg_postinst() {
164 - if [[ ${REPLACING_VERSIONS} == 1.[24]* ]]; then
165 - elog "Please read /usr/share/doc/${PF}/NEWS.debian* for important"
166 - elog "upgrade information."
167 - fi
168 - # If installing to a running system, upgrading from <=1.6.10-r3, then
169 - # make sure that the runtime dirs are still visible to the new install
170 - if [[ ${ROOT} == / && ${REPLACING_VERSIONS} ]] && ! version_is_at_least 1.6.10-r4 ${REPLACING_VERSIONS}; then
171 - ln -s "${EPREFIX}"/var/lib/schroot "${EPREFIX}"/var/run/schroot
172 - fi
173 -}
174 -
175 -pkg_postrm() {
176 - if [[ -z ${REPLACED_BY_VERSION} ]]; then
177 - for dir in $(find "${EROOT}"/var/lib/schroot/mount -maxdepth 1 -type d | tac); do
178 - rmdir "$dir" || elog "Failed to remove session mount directory $dir: Please check for any stray mounts or data under this directory and remove by hand."
179 - done
180 - fi
181 -}
182
183 diff --git a/dev-util/schroot/schroot-1.6.10-r5.ebuild b/dev-util/schroot/schroot-1.6.10-r5.ebuild
184 deleted file mode 100644
185 index 9752f106449..00000000000
186 --- a/dev-util/schroot/schroot-1.6.10-r5.ebuild
187 +++ /dev/null
188 @@ -1,126 +0,0 @@
189 -# Copyright 1999-2020 Gentoo Authors
190 -# Distributed under the terms of the GNU General Public License v2
191 -
192 -EAPI=7
193 -
194 -inherit bash-completion-r1 cmake pam tmpfiles
195 -
196 -MY_P=${PN}_${PV}
197 -DEB_REL=6
198 -
199 -DESCRIPTION="Utility to execute commands in a chroot environment"
200 -HOMEPAGE="https://packages.debian.org/source/sid/schroot"
201 -SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.xz
202 - mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}-${DEB_REL}.debian.tar.xz"
203 -
204 -LICENSE="GPL-3"
205 -SLOT="0"
206 -KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
207 -IUSE="btrfs +dchroot debug doc lvm nls pam test"
208 -RESTRICT="!test? ( test )"
209 -
210 -COMMON_DEPEND="
211 - >=dev-libs/boost-1.42.0:=
212 - >=sys-apps/util-linux-2.16
213 - btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 )
214 - lvm? ( sys-fs/lvm2 )
215 - pam? ( sys-libs/pam )
216 -"
217 -
218 -DEPEND="${COMMON_DEPEND}
219 - app-arch/xz-utils
220 - sys-apps/groff
221 - doc? (
222 - app-doc/doxygen
223 - media-gfx/graphviz
224 - )
225 - nls? (
226 - >=app-text/po4a-0.40
227 - sys-devel/gettext
228 - )
229 - test? ( >=dev-util/cppunit-1.10.0 )
230 -"
231 -RDEPEND="${COMMON_DEPEND}
232 - sys-apps/debianutils
233 - dchroot? ( !sys-apps/dchroot )
234 - nls? ( virtual/libintl )
235 -"
236 -
237 -src_unpack() {
238 - unpack ${MY_P}.orig.tar.xz
239 - cd "${S}"
240 - unpack ${MY_P}-${DEB_REL}.debian.tar.xz
241 -}
242 -
243 -src_prepare() {
244 - sed -i -e 's/warn(/message(WARNING /' man/CMakeLists.txt || die
245 - eapply "${S}"/debian/patches/*.patch
246 - cmake_src_prepare
247 -}
248 -
249 -src_configure() {
250 - local mycmakeargs=(
251 - -Dbtrfs-snapshot=$(usex btrfs)
252 - -Ddchroot=$(usex dchroot)
253 - -Ddchroot-dsa=$(usex dchroot)
254 - -Ddebug=$(usex debug)
255 - -Ddoxygen=$(usex doc)
256 - -Dlvm-snapshot=$(usex lvm)
257 - -Dnls=$(usex nls)
258 - -Dpam=$(usex pam)
259 - -Dtest=$(usex test)
260 - -Dbash_completion_dir="$(get_bashcompdir)"
261 - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
262 - -DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
263 - -DSCHROOT_MOUNT_DIR="${EPREFIX}/run/${PN}/mount"
264 - )
265 - if ! use nls; then
266 - mycmakeargs+=(-DPO4A_EXECUTABLE=NOTFOUND)
267 - fi
268 -
269 - cmake_src_configure
270 -}
271 -
272 -src_compile() {
273 - cmake_src_compile all $(usev doc)
274 -}
275 -
276 -src_test() {
277 - if [[ $EUID -ne 0 ]]; then
278 - ewarn "Disabling tests because you are not root"
279 - return 0
280 - fi
281 -
282 - cmake_src_test
283 -}
284 -
285 -src_install() {
286 - cmake_src_install
287 -
288 - keepdir /var/lib/schroot/{session,unpack,union/{overlay,underlay}}
289 -
290 - docinto /usr/share/doc/${PF}/contrib/setup.d
291 - dodoc contrib/setup.d/05customdir contrib/setup.d/09fsck contrib/setup.d/10mount-ssh
292 -
293 - newdoc debian/schroot.NEWS NEWS.debian
294 -
295 - newinitd "${FILESDIR}"/schroot.initd schroot
296 - newconfd "${FILESDIR}"/schroot.confd schroot
297 - newtmpfiles "${FILESDIR}"/schroot.tmpfilesd schroot.conf
298 -
299 - if use doc; then
300 - docinto html/sbuild
301 - dodoc "${BUILD_DIR}"/doc/sbuild/html/*
302 - docinto html/schroot
303 - dodoc "${BUILD_DIR}"/doc/schroot/html/*
304 - fi
305 -
306 - if use pam; then
307 - rm -f "${ED}"/etc/pam.d/schroot
308 - pamd_mimic_system schroot auth account session
309 - fi
310 -}
311 -
312 -pkg_postinst() {
313 - tmpfiles_process ${PN}.conf
314 -}