Gentoo Archives: gentoo-commits

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