Gentoo Archives: gentoo-commits

From: Yixun Lan <dlan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/xen-pvgrub/
Date: Wed, 28 Dec 2016 09:06:28
Message-Id: 1482915942.ce893e355a725639e9297556b64a6baef3400019.dlan@gentoo
1 commit: ce893e355a725639e9297556b64a6baef3400019
2 Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 28 09:05:42 2016 +0000
4 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 28 09:05:42 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce893e35
7
8 app-emulation/xen-pvgrub: drop old
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 app-emulation/xen-pvgrub/Manifest | 1 -
13 app-emulation/xen-pvgrub/xen-pvgrub-4.6.4.ebuild | 146 --------------------
14 app-emulation/xen-pvgrub/xen-pvgrub-4.7.1.ebuild | 161 -----------------------
15 3 files changed, 308 deletions(-)
16
17 diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
18 index f29f79a..e636ec8 100644
19 --- a/app-emulation/xen-pvgrub/Manifest
20 +++ b/app-emulation/xen-pvgrub/Manifest
21 @@ -3,7 +3,6 @@ DIST lwip-1.3.0.tar.gz 398933 SHA256 772e4d550e07826665ed0528c071dd5404ef7dbe182
22 DIST newlib-1.16.0.tar.gz 12024353 SHA256 db426394965c48c1d29023e1cc6d965ea6b9a9035d8a849be2750ca4659a3d07 SHA512 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3 WHIRLPOOL 47f7afd525f482d79d9e964f0e75ee8a77e59551bd19cd94f9b95ac3af9406afa381c9d8d224f76eb568441ab613b2b194f8e5be50aa222f9ed2d9b9761829db
23 DIST pciutils-2.2.9.tar.bz2 212265 SHA256 f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5 WHIRLPOOL ce801947fcf7ba0b56710029f25e746d3e03a80699af9d3570efcd417b12b546264f286b2e78b1402cca766c08e35bdd0ff0a692ab4ad419295f00bcfe91130e
24 DIST polarssl-1.1.4-gpl.tgz 611340 SHA256 2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad WHIRLPOOL 39448c00dda142a836a78381b446c7b586272a44d8afc867a7ea702228f105bb2adffe757bd6c23af090cff64ef32e7af0c373dccc5145ff4c11552cf3f28383
25 -DIST xen-4.6.4.tar.gz 19709274 SHA256 b795d5631a85fb68295361067195ecd00003656dacede4ec57533fce33ab5109 SHA512 e6278061a16829628030579e115a500970ff575eb6796189bfa1e2d7a8cbbf8aec2c2bd04c77cdc87226d6cc5eaee59d6c62cacb4e74b06e1f1379734b872938 WHIRLPOOL a982f7bbf2ba16781ac0f310ef27a32e9115596e91117609d22827bc1999facb12df4f33d1ba0b7015cbfae90a24302243d508e8c38ba45ea998341b76ba0567
26 DIST xen-4.7.1.tar.gz 20706864 SHA256 e87f4b0575e78657ee23d31470a15ecf1ce8c3a92a771cda46bbcd4d0d671ffe SHA512 eb03244f5fa7b54402fcc1d38f1e69c0ea4536d5ab2f9859b41b5e94920ad9db20fb146e3c3d3635e9ca1d12e93ce0429e57f24bf53d4a2c4b69babc76ec724e WHIRLPOOL 5d7ba29ea58bdedb6a237f7cb1c0aacf361dc35ebb07ec8e55773e07b1f38c1b151615b526e14daeca7c2db235114bde0b6d124219e8818c6e529873b5151fec
27 DIST xen-4.8.0.tar.gz 22499917 SHA256 1e15c713ab7ba3bfda8b4a285ed973529364fd1100e6dd5a61f29583dc667b04 SHA512 70b95553f9813573b12e52999a4df8701dec430f23c36a8dc70d25a46bb4bc9234e5b7feb74a04062af4c8d6b6bcfe947d90b2b172416206812e54bac9797454 WHIRLPOOL 1296c25a05e3ab81730a2587ea1c07c7c022f05cfefc580224185c8d5fc9853531031c1292f69eff944ae2752492c4b95f13e160be3c449a7626aeadf1a21102
28 DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276
29
30 diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.6.4.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.6.4.ebuild
31 deleted file mode 100644
32 index ca7ab74..00000000
33 --- a/app-emulation/xen-pvgrub/xen-pvgrub-4.6.4.ebuild
34 +++ /dev/null
35 @@ -1,146 +0,0 @@
36 -# Copyright 1999-2016 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -# $Id$
39 -
40 -EAPI=5
41 -
42 -PYTHON_COMPAT=( python2_7 )
43 -PYTHON_REQ_USE='xml,threads'
44 -
45 -inherit flag-o-matic eutils multilib python-single-r1 toolchain-funcs
46 -
47 -XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
48 -LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
49 -GRUB_URL=mirror://gnu-alpha/grub
50 -SRC_URI="
51 - http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
52 - $GRUB_URL/grub-0.97.tar.gz
53 - $XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
54 - $LIBPCI_URL/pciutils-2.2.9.tar.bz2
55 - $XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
56 - $XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
57 - $XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz"
58 -
59 -S="${WORKDIR}/xen-${PV}"
60 -
61 -DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
62 -HOMEPAGE="http://xen.org/"
63 -LICENSE="GPL-2"
64 -SLOT="0"
65 -KEYWORDS="amd64 x86"
66 -IUSE="custom-cflags"
67 -
68 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
69 -
70 -DEPEND="sys-devel/gettext
71 - sys-devel/bin86
72 - sys-apps/texinfo
73 - x11-libs/pixman"
74 -
75 -RDEPEND=">=app-emulation/xen-tools-${PV}"
76 -
77 -pkg_setup() {
78 - python-single-r1_pkg_setup
79 -}
80 -
81 -retar-externals() {
82 - # Purely to unclutter src_prepare
83 - local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
84 -
85 - # epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
86 - sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
87 - -i "${WORKDIR}"/zlib-1.2.3/configure
88 - sed -e 's:^AR=ar rc:AR=ar:' \
89 - -e s':$(AR) $@:$(AR) rc $@:' \
90 - -i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
91 - einfo "zlib Makefile edited"
92 -
93 - cd "${WORKDIR}"
94 - tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
95 - tar czp grub-0.97 -f grub-0.97.tar.gz
96 - tar czp lwip -f lwip-1.3.0.tar.gz
97 - tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
98 - tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz
99 - mv $set "${S}"/stubdom/
100 - einfo "tarballs moved to source"
101 -}
102 -
103 -src_prepare() {
104 - # if the user *really* wants to use their own custom-cflags, let them
105 - if use custom-cflags; then
106 - einfo "User wants their own CFLAGS - removing defaults"
107 - # try and remove all the default custom-cflags
108 - find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
109 - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
110 - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
111 - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
112 - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
113 - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
114 - -i {} \;
115 - fi
116 -
117 - # Patch the unmergeable newlib, fix most of the leftover gcc QA issues
118 - cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
119 -
120 - # Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
121 - epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch
122 -
123 - # fix jobserver in Makefile
124 - epatch "${FILESDIR}"/${PN}-4.2-jserver.patch
125 -
126 - #Substitute for internal downloading. pciutils copied only due to the only .bz2
127 - cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
128 - retar-externals || die "re-tar procedure failed"
129 -
130 - epatch_user
131 -}
132 -
133 -src_configure() {
134 - local myconf="--prefix=${PREFIX}/usr \
135 - --libdir=${PREFIX}/usr/$(get_libdir) \
136 - --libexecdir=${PREFIX}/usr/libexec \
137 - --disable-werror \
138 - --disable-xen"
139 -
140 - econf ${myconf}
141 -}
142 -
143 -src_compile() {
144 - use custom-cflags || unset CFLAGS
145 - if test-flag-CC -fno-strict-overflow; then
146 - append-flags -fno-strict-overflow
147 - fi
148 -
149 - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
150 -
151 - if use x86; then
152 - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
153 - XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
154 - elif use amd64; then
155 - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
156 - XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
157 - if has_multilib_profile; then
158 - multilib_toolchain_setup x86
159 - emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
160 - XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
161 - fi
162 - fi
163 -}
164 -
165 -src_install() {
166 - if use x86; then
167 - emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
168 - fi
169 - if use amd64; then
170 - emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
171 - if has_multilib_profile; then
172 - emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
173 - fi
174 - fi
175 -}
176 -
177 -pkg_postinst() {
178 - elog "Official Xen Guide and the offical wiki page:"
179 - elog "https://wiki.gentoo.org/wiki/Xen"
180 - elog "http://wiki.xen.org/wiki/Main_Page"
181 -}
182
183 diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.7.1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.7.1.ebuild
184 deleted file mode 100644
185 index 67b78b1..00000000
186 --- a/app-emulation/xen-pvgrub/xen-pvgrub-4.7.1.ebuild
187 +++ /dev/null
188 @@ -1,161 +0,0 @@
189 -# Copyright 1999-2016 Gentoo Foundation
190 -# Distributed under the terms of the GNU General Public License v2
191 -# $Id$
192 -
193 -EAPI=5
194 -
195 -PYTHON_COMPAT=( python2_7 )
196 -PYTHON_REQ_USE='xml,threads'
197 -
198 -inherit flag-o-matic eutils multilib python-single-r1 toolchain-funcs
199 -
200 -XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
201 -LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
202 -GRUB_URL=mirror://gnu-alpha/grub
203 -
204 -UPSTREAM_VER=
205 -[[ -n ${UPSTREAM_VER} ]] && \
206 - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
207 -
208 -SRC_URI="
209 - http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
210 - $GRUB_URL/grub-0.97.tar.gz
211 - $XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
212 - $LIBPCI_URL/pciutils-2.2.9.tar.bz2
213 - $XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
214 - $XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
215 - $XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz
216 - ${UPSTREAM_PATCHSET_URI}"
217 -
218 -S="${WORKDIR}/xen-${PV}"
219 -
220 -DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
221 -HOMEPAGE="http://xen.org/"
222 -LICENSE="GPL-2"
223 -SLOT="0"
224 -KEYWORDS="~amd64 ~x86"
225 -IUSE="custom-cflags"
226 -
227 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
228 -
229 -DEPEND="sys-devel/gettext
230 - sys-devel/bin86
231 - sys-apps/texinfo
232 - x11-libs/pixman"
233 -
234 -RDEPEND=">=app-emulation/xen-tools-${PV}"
235 -
236 -pkg_setup() {
237 - python-single-r1_pkg_setup
238 -}
239 -
240 -retar-externals() {
241 - # Purely to unclutter src_prepare
242 - local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
243 -
244 - # epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
245 - sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
246 - -i "${WORKDIR}"/zlib-1.2.3/configure
247 - sed -e 's:^AR=ar rc:AR=ar:' \
248 - -e s':$(AR) $@:$(AR) rc $@:' \
249 - -i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
250 - einfo "zlib Makefile edited"
251 -
252 - cd "${WORKDIR}"
253 - tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
254 - tar czp grub-0.97 -f grub-0.97.tar.gz
255 - tar czp lwip -f lwip-1.3.0.tar.gz
256 - tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
257 - tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz
258 - mv $set "${S}"/stubdom/
259 - einfo "tarballs moved to source"
260 -}
261 -
262 -src_prepare() {
263 - # Upstream's patchset
264 - if [[ -n ${UPSTREAM_VER} ]]; then
265 - einfo "Try to apply Xen Upstream patch set"
266 - EPATCH_SUFFIX="patch" \
267 - EPATCH_FORCE="yes" \
268 - EPATCH_OPTS="-p1" \
269 - epatch "${WORKDIR}"/patches-upstream
270 - fi
271 -
272 - # if the user *really* wants to use their own custom-cflags, let them
273 - if use custom-cflags; then
274 - einfo "User wants their own CFLAGS - removing defaults"
275 - # try and remove all the default custom-cflags
276 - find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
277 - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
278 - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
279 - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
280 - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
281 - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
282 - -i {} \;
283 - fi
284 -
285 - # Patch the unmergeable newlib, fix most of the leftover gcc QA issues
286 - cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
287 -
288 - # Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
289 - epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch
290 -
291 - # fix jobserver in Makefile
292 - epatch "${FILESDIR}"/${PN}-4.2-jserver.patch
293 -
294 - #Substitute for internal downloading. pciutils copied only due to the only .bz2
295 - cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
296 - retar-externals || die "re-tar procedure failed"
297 -
298 - epatch_user
299 -}
300 -
301 -src_configure() {
302 - local myconf="--prefix=${PREFIX}/usr \
303 - --libdir=${PREFIX}/usr/$(get_libdir) \
304 - --libexecdir=${PREFIX}/usr/libexec \
305 - --disable-werror \
306 - --disable-xen"
307 -
308 - econf ${myconf}
309 -}
310 -
311 -src_compile() {
312 - use custom-cflags || unset CFLAGS
313 - if test-flag-CC -fno-strict-overflow; then
314 - append-flags -fno-strict-overflow
315 - fi
316 -
317 - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
318 -
319 - if use x86; then
320 - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
321 - XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
322 - elif use amd64; then
323 - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
324 - XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
325 - if has_multilib_profile; then
326 - multilib_toolchain_setup x86
327 - emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
328 - XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
329 - fi
330 - fi
331 -}
332 -
333 -src_install() {
334 - if use x86; then
335 - emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
336 - fi
337 - if use amd64; then
338 - emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
339 - if has_multilib_profile; then
340 - emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
341 - fi
342 - fi
343 -}
344 -
345 -pkg_postinst() {
346 - elog "Official Xen Guide and the offical wiki page:"
347 - elog "https://wiki.gentoo.org/wiki/Xen"
348 - elog "http://wiki.xen.org/wiki/Main_Page"
349 -}