Gentoo Archives: gentoo-commits

From: "Lars Wendler (polynomial-c)" <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/virtualbox: ChangeLog virtualbox-4.1.12.ebuild virtualbox-4.1.10.ebuild virtualbox-4.1.6-r1.ebuild
Date: Thu, 05 Apr 2012 07:44:56
Message-Id: 20120405074441.61F4A2004B@flycatcher.gentoo.org
1 polynomial-c 12/04/05 07:44:41
2
3 Modified: ChangeLog virtualbox-4.1.10.ebuild
4 Added: virtualbox-4.1.12.ebuild
5 Removed: virtualbox-4.1.6-r1.ebuild
6 Log:
7 Version bump (bug #410811). Removed old
8
9 (Portage version: 2.2.0_alpha99/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.104 app-emulation/virtualbox/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/ChangeLog?rev=1.104&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/ChangeLog?rev=1.104&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/ChangeLog?r1=1.103&r2=1.104
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v
21 retrieving revision 1.103
22 retrieving revision 1.104
23 diff -u -r1.103 -r1.104
24 --- ChangeLog 23 Mar 2012 20:18:07 -0000 1.103
25 +++ ChangeLog 5 Apr 2012 07:44:41 -0000 1.104
26 @@ -1,6 +1,12 @@
27 # ChangeLog for app-emulation/virtualbox
28 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.103 2012/03/23 20:18:07 hwoarang Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.104 2012/04/05 07:44:41 polynomial-c Exp $
31 +
32 +*virtualbox-4.1.12 (05 Apr 2012)
33 +
34 + 05 Apr 2012; Lars Wendler <polynomial-c@g.o>
35 + -virtualbox-4.1.6-r1.ebuild, +virtualbox-4.1.12.ebuild:
36 + Version bump (bug #410811). Removed old.
37
38 23 Mar 2012; Markos Chandras <hwoarang@g.o>
39 +files/virtualbox-4.1.10-libgsoapssl.patch, virtualbox-4.1.10.ebuild:
40
41
42
43 1.3 app-emulation/virtualbox/virtualbox-4.1.10.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.10.ebuild?rev=1.3&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.10.ebuild?rev=1.3&content-type=text/plain
47 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.10.ebuild?r1=1.2&r2=1.3
48
49 Index: virtualbox-4.1.10.ebuild
50 ===================================================================
51 RCS file: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.10.ebuild,v
52 retrieving revision 1.2
53 retrieving revision 1.3
54 diff -u -r1.2 -r1.3
55 --- virtualbox-4.1.10.ebuild 23 Mar 2012 20:18:07 -0000 1.2
56 +++ virtualbox-4.1.10.ebuild 5 Apr 2012 07:44:41 -0000 1.3
57 @@ -1,6 +1,6 @@
58 # Copyright 1999-2012 Gentoo Foundation
59 # Distributed under the terms of the GNU General Public License v2
60 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.10.ebuild,v 1.2 2012/03/23 20:18:07 hwoarang Exp $
61 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.10.ebuild,v 1.3 2012/04/05 07:44:41 polynomial-c Exp $
62
63 EAPI=4
64
65 @@ -182,7 +182,7 @@
66 # Link to correct gsoap library. Bug #408569
67 # This has been fixed upstream and should be removed when virtualbox is
68 # bumped
69 - epatch ${FILESDIR}/${P}-libgsoapssl.patch
70 + epatch "${FILESDIR}"/${P}-libgsoapssl.patch
71 }
72
73 src_configure() {
74
75
76
77 1.1 app-emulation/virtualbox/virtualbox-4.1.12.ebuild
78
79 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.12.ebuild?rev=1.1&view=markup
80 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.12.ebuild?rev=1.1&content-type=text/plain
81
82 Index: virtualbox-4.1.12.ebuild
83 ===================================================================
84 # Copyright 1999-2012 Gentoo Foundation
85 # Distributed under the terms of the GNU General Public License v2
86 # $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.12.ebuild,v 1.1 2012/04/05 07:44:41 polynomial-c Exp $
87
88 EAPI=4
89
90 inherit eutils fdo-mime flag-o-matic linux-info pax-utils python qt4-r2 toolchain-funcs java-pkg-opt-2
91
92 if [[ ${PV} == "9999" ]] ; then
93 # XXX: should finish merging the -9999 ebuild into this one ...
94 ESVN_REPO_URI="http://www.virtualbox.org/svn/vbox/trunk"
95 inherit linux-mod subversion
96 else
97 MY_P=VirtualBox-${PV}
98 SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
99 S="${WORKDIR}/${MY_P}"
100 fi
101
102 DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
103 HOMEPAGE="http://www.virtualbox.org/"
104
105 LICENSE="GPL-2"
106 SLOT="0"
107 KEYWORDS="~amd64 ~x86"
108 IUSE="+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
109
110 RDEPEND="!app-emulation/virtualbox-bin
111 ~app-emulation/virtualbox-modules-${PV}
112 dev-libs/libIDL
113 >=dev-libs/libxslt-1.1.19
114 net-misc/curl
115 dev-libs/openssl
116 dev-libs/libxml2
117 sys-libs/zlib
118 !headless? (
119 qt4? (
120 x11-libs/qt-gui:4
121 x11-libs/qt-core:4
122 opengl? ( x11-libs/qt-opengl:4 )
123 x11-libs/libXinerama
124 )
125 opengl? ( virtual/opengl media-libs/freeglut )
126 x11-libs/libX11
127 x11-libs/libXcursor
128 x11-libs/libXext
129 x11-libs/libXmu
130 x11-libs/libXt
131 media-libs/libsdl[X,video]
132 )
133 vnc? ( >=net-libs/libvncserver-0.9.7 )
134 java? ( virtual/jre:1.6 )"
135 DEPEND="${RDEPEND}
136 >=dev-util/kbuild-0.1.999
137 >=dev-lang/yasm-0.6.2
138 sys-devel/bin86
139 sys-devel/dev86
140 sys-power/iasl
141 media-libs/libpng
142 pam? ( sys-libs/pam )
143 sys-libs/libcap
144 doc? (
145 dev-texlive/texlive-basic
146 dev-texlive/texlive-latex
147 dev-texlive/texlive-latexrecommended
148 dev-texlive/texlive-latexextra
149 dev-texlive/texlive-fontsrecommended
150 dev-texlive/texlive-fontsextra
151 )
152 java? ( virtual/jdk:1.6 )
153 dev-util/pkgconfig
154 alsa? ( >=media-libs/alsa-lib-1.0.13 )
155 !headless? ( x11-libs/libXinerama )
156 pulseaudio? ( media-sound/pulseaudio )
157 vboxwebsrv? ( >=net-libs/gsoap-2.7.13 )"
158 PDEPEND="additions? ( ~app-emulation/virtualbox-additions-${PV} )
159 extensions? ( ~app-emulation/virtualbox-extpack-oracle-${PV} )"
160
161 QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
162 usr/lib/virtualbox/VBoxSDL.so
163 usr/lib/virtualbox/VBoxSharedFolders.so
164 usr/lib/virtualbox/VBoxDD2.so
165 usr/lib/virtualbox/VBoxOGLrenderspu.so
166 usr/lib/virtualbox/VBoxPython.so
167 usr/lib/virtualbox/VBoxDD.so
168 usr/lib/virtualbox/VBoxDDU.so
169 usr/lib/virtualbox/VBoxREM64.so
170 usr/lib/virtualbox/VBoxSharedClipboard.so
171 usr/lib/virtualbox/VBoxHeadless.so
172 usr/lib/virtualbox/VBoxRT.so
173 usr/lib/virtualbox/VBoxREM.so
174 usr/lib/virtualbox/VBoxSettings.so
175 usr/lib/virtualbox/VBoxKeyboard.so
176 usr/lib/virtualbox/VBoxSharedCrOpenGL.so
177 usr/lib/virtualbox/VBoxVMM.so
178 usr/lib/virtualbox/VirtualBox.so
179 usr/lib/virtualbox/VBoxOGLhosterrorspu.so
180 usr/lib/virtualbox/components/VBoxC.so
181 usr/lib/virtualbox/components/VBoxSVCM.so
182 usr/lib/virtualbox/components/VBoxDDU.so
183 usr/lib/virtualbox/components/VBoxRT.so
184 usr/lib/virtualbox/components/VBoxREM.so
185 usr/lib/virtualbox/components/VBoxVMM.so
186 usr/lib/virtualbox/VBoxREM32.so
187 usr/lib/virtualbox/VBoxPython2_4.so
188 usr/lib/virtualbox/VBoxPython2_5.so
189 usr/lib/virtualbox/VBoxPython2_6.so
190 usr/lib/virtualbox/VBoxPython2_7.so
191 usr/lib/virtualbox/VBoxXPCOMC.so
192 usr/lib/virtualbox/VBoxOGLhostcrutil.so
193 usr/lib/virtualbox/VBoxNetDHCP.so"
194
195 REQUIRED_USE="
196 java? ( sdk )
197 python? ( sdk )
198 vboxwebsrv? ( java )
199 "
200
201 pkg_setup() {
202 if ! use headless && ! use qt4 ; then
203 einfo "No USE=\"qt4\" selected, this build will not include"
204 einfo "any Qt frontend."
205 elif use headless && use qt4 ; then
206 einfo "You selected USE=\"headless qt4\", defaulting to"
207 einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
208 fi
209
210 if ! use opengl ; then
211 einfo "No USE=\"opengl\" selected, this build will lack"
212 einfo "the OpenGL feature."
213 fi
214 java-pkg-opt-2_pkg_setup
215 python_set_active_version 2
216 python_pkg_setup
217 }
218
219 src_prepare() {
220 # Remove shipped binaries (kBuild,yasm), see bug #232775
221 rm -rf kBuild/bin tools
222
223 # Disable things unused or split into separate ebuilds
224 sed -e "s/MY_LIBDIR/$(get_libdir)/" \
225 "${FILESDIR}"/${PN}-4-localconfig > LocalConfig.kmk || die
226
227 # unset useless/problematic checks in configure
228 epatch "${FILESDIR}/${PN}-ose-3.2.8-mesa-check.patch" \
229 "${FILESDIR}/${PN}-4-makeself-check.patch" \
230 "${FILESDIR}/${PN}-4-mkisofs-check.patch"
231
232 # fix build with --as-needed (bug #249295 and bug #350907)
233 epatch "${FILESDIR}/${PN}-4.1.4-asneeded.patch"
234
235 # Respect LDFLAGS
236 sed -e "s/_LDFLAGS\.${ARCH}*.*=/& ${LDFLAGS}/g" \
237 -i Config.kmk src/libs/xpcom18a4/Config.kmk || die
238
239 # We still want to use ${HOME}/.VirtualBox/Machines as machines dir.
240 epatch "${FILESDIR}/${PN}-4.0.2-restore_old_machines_dir.patch"
241
242 # Don't build vboxpci.ko module (D'oh!)
243 epatch "${FILESDIR}"/${PN}-4.1.2-vboxpci-build.patch
244
245 # Use PAM only when pam USE flag is enbaled (bug #376531)
246 if ! use pam ; then
247 elog "Disabling PAM removes the possibility to use the VRDP features."
248 sed -i 's/^.*VBOX_WITH_PAM/#VBOX_WITH_PAM/' Config.kmk || die
249 sed -i 's;\(.*/auth/Makefile.kmk.*\);#\1;' \
250 src/VBox/HostServices/Makefile.kmk || die
251 fi
252
253 # add correct java path
254 if use java ; then
255 sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \
256 -i "${S}"/Config.kmk || die
257 java-pkg-opt-2_src_prepare
258 fi
259
260 # Fix compile error on hardened bug 339914 (disable PIE)
261 if gcc-specs-pie ; then
262 epatch "${FILESDIR}"/virtualbox_nopie.patch
263 fi
264 }
265
266 src_configure() {
267 local myconf
268 use alsa || myconf+=" --disable-alsa"
269 use opengl || myconf+=" --disable-opengl"
270 use pulseaudio || myconf+=" --disable-pulse"
271 use python || myconf+=" --disable-python"
272 use java || myconf+=" --disable-java"
273 use vboxwebsrv && myconf+=" --enable-webservice"
274 use vnc && myconf+=" --enable-vnc"
275 use doc || myconf+=" --disable-docs"
276 if ! use headless ; then
277 use qt4 || myconf+=" --disable-qt4"
278 else
279 myconf+=" --build-headless --disable-opengl"
280 fi
281 # not an autoconf script
282 ./configure \
283 --with-gcc="$(tc-getCC)" \
284 --with-g++="$(tc-getCXX)" \
285 --disable-kmods \
286 --disable-dbus \
287 ${myconf} \
288 || die "configure failed"
289 }
290
291 src_compile() {
292 source ./env.sh
293
294 # Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
295 # and strip all flags
296 # strip-flags
297
298 MAKE="kmk" emake \
299 VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'_Gentoo_ \
300 TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
301 TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
302 TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
303 TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
304 VBOX_GCC_OPT="${CXXFLAGS}" \
305 TOOL_YASM_AS=yasm KBUILD_PATH="${S}/kBuild" \
306 all || die "kmk failed"
307 }
308
309 src_install() {
310 cd "${S}"/out/linux.${ARCH}/release/bin || die
311
312 # Create configuration files
313 insinto /etc/vbox
314 newins "${FILESDIR}/${PN}-4-config" vbox.cfg
315
316 # Set the right libdir
317 sed -i \
318 -e "s/MY_LIBDIR/$(get_libdir)/" \
319 "${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
320
321 # Symlink binaries to the shipped wrapper
322 exeinto /usr/$(get_libdir)/${PN}
323 newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox" || die
324 fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
325 fperms 0750 /usr/$(get_libdir)/${PN}/VBox
326
327 dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
328 dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
329 dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
330 dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
331
332 # Install binaries and libraries
333 insinto /usr/$(get_libdir)/${PN}
334 doins -r components || die
335
336 if use sdk ; then
337 doins -r sdk || die
338 fi
339
340 if use vboxwebsrv ; then
341 doins vboxwebsrv || die
342 fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
343 fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
344 dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
345 newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
346 newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
347 fi
348
349 for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,ExtPackHelperApp} *so *r0 *gc ; do
350 doins $each || die
351 fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
352 fperms 0750 /usr/$(get_libdir)/${PN}/${each}
353 done
354 # VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
355 fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetAdpCtl
356 fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetDHCP
357
358 if ! use headless ; then
359 for each in VBox{SDL,Headless} ; do
360 doins $each || die
361 fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
362 fperms 4750 /usr/$(get_libdir)/${PN}/${each}
363 pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
364 done
365
366 if use opengl && use qt4 ; then
367 doins VBoxTestOGL || die
368 fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
369 fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
370 fi
371
372 dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
373
374 if use qt4 ; then
375 doins VirtualBox || die
376 fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
377 fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
378 pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox
379
380 dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
381
382 newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
383 fi
384
385 pushd "${S}"/src/VBox/Resources/OSE &>/dev/null || die
386 for size in 16 20 32 40 48 64 128 ; do
387 insinto /usr/share/icons/hicolor/${size}x${size}/apps
388 newins ${PN}-${size}px.png ${PN}.png
389 done
390 insinto /usr/share/pixmaps
391 newins ${PN}-48px.png ${PN}.png
392 popd &>/dev/null || die
393 else
394 doins VBoxHeadless || die
395 fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
396 fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
397 pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
398 fi
399
400 insinto /usr/$(get_libdir)/${PN}
401 # Install EFI Firmware files (bug #320757)
402 pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
403 for fwfile in VBoxEFI{32,64}.fd ; do
404 doins ${fwfile} || die
405 fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile} || die
406 done
407 popd &>/dev/null || die
408
409 # New way of handling USB device nodes for VBox (bug #356215)
410 insinto /lib/udev
411 doins VBoxCreateUSBNode.sh
412 fowners root:vboxusers /lib/udev/VBoxCreateUSBNode.sh
413 fperms 0750 /lib/udev/VBoxCreateUSBNode.sh
414 insinto /lib/udev/rules.d
415 doins "${FILESDIR}"/10-virtualbox.rules
416
417 insinto /usr/share/${PN}
418 if ! use headless && use qt4 ; then
419 doins -r nls
420 fi
421
422 # VRDPAuth only works with this (bug #351949)
423 dosym VBoxAuth.so /usr/$(get_libdir)/${PN}/VRDPAuth.so
424
425 # set an env-variable for 3rd party tools
426 echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
427 doenvd "${T}/90virtualbox"
428
429 if use java ; then
430 java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
431 java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
432 fi
433 }
434
435 pkg_postinst() {
436 fdo-mime_desktop_database_update
437
438 udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
439
440 if ! use headless && use qt4 ; then
441 elog "To launch VirtualBox just type: \"VirtualBox\"."
442 fi
443 elog "You must be in the vboxusers group to use VirtualBox."
444 elog ""
445 elog "The latest user manual is available for download at:"
446 elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
447 elog ""
448 elog "For advanced networking setups you should emerge:"
449 elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
450 elog ""
451 elog "IMPORTANT!"
452 elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
453 elog "\"env-update\" as root and logout and relogin as the user you wish"
454 elog "to run ${PN} as."
455 elog ""
456 elog "Starting with version 4.0.0, ${PN} has USB-1 support."
457 elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
458 elog " app-emulation/virtualbox-extpack-oracle"
459 elog "package."
460 if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
461 elog ""
462 elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
463 elog "or else USB in ${PN} won't work."
464 fi
465 }
466
467 pkg_postrm() {
468 fdo-mime_desktop_database_update
469 }