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