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.4.ebuild ChangeLog virtualbox-4.1.0.ebuild
Date: Tue, 04 Oct 2011 18:00:44
Message-Id: 20111004180030.BBA9B2004C@flycatcher.gentoo.org
1 polynomial-c 11/10/04 18:00:30
2
3 Modified: ChangeLog
4 Added: virtualbox-4.1.4.ebuild
5 Removed: virtualbox-4.1.0.ebuild
6 Log:
7 Version bump (bug #385577). Removed old
8
9 (Portage version: 2.2.0_alpha60/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.85 app-emulation/virtualbox/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/ChangeLog?rev=1.85&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/ChangeLog?rev=1.85&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/ChangeLog?r1=1.84&r2=1.85
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v
21 retrieving revision 1.84
22 retrieving revision 1.85
23 diff -u -r1.84 -r1.85
24 --- ChangeLog 1 Sep 2011 08:06:53 -0000 1.84
25 +++ ChangeLog 4 Oct 2011 18:00:30 -0000 1.85
26 @@ -1,6 +1,13 @@
27 # ChangeLog for app-emulation/virtualbox
28 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.84 2011/09/01 08:06:53 polynomial-c Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.85 2011/10/04 18:00:30 polynomial-c Exp $
31 +
32 +*virtualbox-4.1.4 (04 Oct 2011)
33 +
34 + 04 Oct 2011; Lars Wendler <polynomial-c@g.o> -virtualbox-4.1.0.ebuild,
35 + +virtualbox-4.1.4.ebuild, +files/virtualbox-4.1.4-asneeded.patch:
36 + Version bump. Thanks to Christian Inci who reported this in bug #385577.
37 + Removed old.
38
39 01 Sep 2011; Lars Wendler <polynomial-c@g.o> virtualbox-4.1.0.ebuild:
40 Again fixed dependency on kbuild. Thanks to Karel De Vriendt for reporting
41
42
43
44 1.1 app-emulation/virtualbox/virtualbox-4.1.4.ebuild
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.4.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.4.ebuild?rev=1.1&content-type=text/plain
48
49 Index: virtualbox-4.1.4.ebuild
50 ===================================================================
51 # Copyright 1999-2011 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.4.ebuild,v 1.1 2011/10/04 18:00:30 polynomial-c Exp $
54
55 EAPI=4
56
57 inherit eutils fdo-mime flag-o-matic linux-info pax-utils 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}_OSE"
67 fi
68
69 DESCRIPTION="Software family of powerful x86 virtualization"
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 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.7 )
101 java? ( >=virtual/jre-1.5 )"
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 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.5 )
120 dev-util/pkgconfig
121 alsa? ( >=media-libs/alsa-lib-1.0.13 )
122 !headless? ( x11-libs/libXinerama )
123 pulseaudio? ( media-sound/pulseaudio )
124 python? ( >=dev-lang/python-2.3[threads] )
125 vboxwebsrv? ( >=net-libs/gsoap-2.7.13 )"
126 PDEPEND="additions? ( ~app-emulation/virtualbox-additions-${PV} )
127 extensions? ( ~app-emulation/virtualbox-extpack-oracle-${PV} )"
128
129 QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
130 usr/lib/virtualbox/VBoxSDL.so
131 usr/lib/virtualbox/VBoxSharedFolders.so
132 usr/lib/virtualbox/VBoxDD2.so
133 usr/lib/virtualbox/VBoxOGLrenderspu.so
134 usr/lib/virtualbox/VBoxPython.so
135 usr/lib/virtualbox/VBoxDD.so
136 usr/lib/virtualbox/VBoxDDU.so
137 usr/lib/virtualbox/VBoxREM64.so
138 usr/lib/virtualbox/VBoxSharedClipboard.so
139 usr/lib/virtualbox/VBoxHeadless.so
140 usr/lib/virtualbox/VBoxRT.so
141 usr/lib/virtualbox/VBoxREM.so
142 usr/lib/virtualbox/VBoxSettings.so
143 usr/lib/virtualbox/VBoxKeyboard.so
144 usr/lib/virtualbox/VBoxSharedCrOpenGL.so
145 usr/lib/virtualbox/VBoxVMM.so
146 usr/lib/virtualbox/VirtualBox.so
147 usr/lib/virtualbox/VBoxOGLhosterrorspu.so
148 usr/lib/virtualbox/components/VBoxC.so
149 usr/lib/virtualbox/components/VBoxSVCM.so
150 usr/lib/virtualbox/components/VBoxDDU.so
151 usr/lib/virtualbox/components/VBoxRT.so
152 usr/lib/virtualbox/components/VBoxREM.so
153 usr/lib/virtualbox/components/VBoxVMM.so
154 usr/lib/virtualbox/VBoxREM32.so
155 usr/lib/virtualbox/VBoxPython2_4.so
156 usr/lib/virtualbox/VBoxPython2_5.so
157 usr/lib/virtualbox/VBoxPython2_6.so
158 usr/lib/virtualbox/VBoxPython2_7.so
159 usr/lib/virtualbox/VBoxXPCOMC.so
160 usr/lib/virtualbox/VBoxOGLhostcrutil.so
161 usr/lib/virtualbox/VBoxNetDHCP.so"
162
163 REQUIRED_USE="java? ( sdk ) python? ( sdk )"
164
165 pkg_setup() {
166 if built_with_use sys-devel/gcc hardened && gcc-config -c | grep -qv -E "hardenednopie|vanilla"; then
167 eerror "The PIE feature provided by the \"hardened\" compiler is incompatible with ${PF}."
168 eerror "You must use gcc-config to select a profile without this feature. You may"
169 eerror "choose either \"hardenednopie\", \"hardenednopiessp\" or \"vanilla\" profile;"
170 eerror "however, \"hardenednopie\" is preferred because it gives the most hardening."
171 eerror "Remember to run \"source /etc/profile\" before continuing. See bug #339914."
172 die
173 fi
174
175 if ! use headless && ! use qt4 ; then
176 einfo "No USE=\"qt4\" selected, this build will not include"
177 einfo "any Qt frontend."
178 elif use headless && use qt4 ; then
179 einfo "You selected USE=\"headless qt4\", defaulting to"
180 einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
181 fi
182
183 if ! use opengl ; then
184 einfo "No USE=\"opengl\" selected, this build will lack"
185 einfo "the OpenGL feature."
186 fi
187 java-pkg-opt-2_pkg_setup
188 }
189
190 src_prepare() {
191 # Remove shipped binaries (kBuild,yasm), see bug #232775
192 rm -rf kBuild/bin tools
193
194 # Disable things unused or split into separate ebuilds
195 sed -e "s/MY_LIBDIR/$(get_libdir)/" \
196 "${FILESDIR}"/${PN}-4-localconfig > LocalConfig.kmk || die
197
198 # unset useless/problematic checks in configure
199 epatch "${FILESDIR}/${PN}-ose-3.2.8-mesa-check.patch" \
200 "${FILESDIR}/${PN}-4-makeself-check.patch" \
201 "${FILESDIR}/${PN}-4-mkisofs-check.patch"
202
203 # fix build with --as-needed (bug #249295 and bug #350907)
204 epatch "${FILESDIR}/${PN}-4.1.4-asneeded.patch"
205
206 # Respect LDFLAGS
207 sed -e "s/_LDFLAGS\.${ARCH}*.*=/& ${LDFLAGS}/g" \
208 -i Config.kmk src/libs/xpcom18a4/Config.kmk || die
209
210 # We still want to use ${HOME}/.VirtualBox/Machines as machines dir.
211 epatch "${FILESDIR}/${PN}-4.0.2-restore_old_machines_dir.patch"
212
213 # Don't build vboxpci.ko module (D'oh!)
214 epatch "${FILESDIR}"/${PN}-4.1.2-vboxpci-build.patch
215
216 # add correct java path
217 if use java ; then
218 sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \
219 -i "${S}"/Config.kmk || die
220 fi
221 java-pkg-opt-2_src_prepare
222 }
223
224 src_configure() {
225 local myconf
226 use alsa || myconf+=" --disable-alsa"
227 use opengl || myconf+=" --disable-opengl"
228 use pulseaudio || myconf+=" --disable-pulse"
229 use python || myconf+=" --disable-python"
230 use java || myconf+=" --disable-java"
231 use vboxwebsrv && myconf+=" --enable-webservice"
232 use vnc && myconf+=" --enable-vnc"
233 use doc || myconf+=" --disable-docs"
234 if ! use headless ; then
235 use qt4 || myconf+=" --disable-qt4"
236 else
237 myconf+=" --build-headless --disable-opengl"
238 fi
239 # not an autoconf script
240 ./configure \
241 --with-gcc="$(tc-getCC)" \
242 --with-g++="$(tc-getCXX)" \
243 --disable-kmods \
244 --disable-dbus \
245 ${myconf} \
246 || die "configure failed"
247 }
248
249 src_compile() {
250 source ./env.sh
251
252 # Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
253 # and strip all flags
254 # strip-flags
255
256 MAKE="kmk" emake \
257 VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'-Gentoo \
258 TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
259 TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
260 TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
261 TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
262 VBOX_GCC_OPT="${CXXFLAGS}" \
263 TOOL_YASM_AS=yasm KBUILD_PATH="${S}/kBuild" \
264 all || die "kmk failed"
265 }
266
267 src_install() {
268 cd "${S}"/out/linux.${ARCH}/release/bin || die
269
270 # Create configuration files
271 insinto /etc/vbox
272 newins "${FILESDIR}/${PN}-4-config" vbox.cfg
273
274 # Set the right libdir
275 sed -i \
276 -e "s/MY_LIBDIR/$(get_libdir)/" \
277 "${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
278
279 # Symlink binaries to the shipped wrapper
280 exeinto /usr/$(get_libdir)/${PN}
281 newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox" || die
282 fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
283 fperms 0750 /usr/$(get_libdir)/${PN}/VBox
284
285 dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
286 dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
287 dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
288 dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
289
290 # Install binaries and libraries
291 insinto /usr/$(get_libdir)/${PN}
292 doins -r components || die
293
294 if use sdk ; then
295 doins -r sdk || die
296 fi
297
298 if use vboxwebsrv ; then
299 doins vboxwebsrv || die
300 fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
301 fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
302 dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
303 newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
304 newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
305 fi
306
307 for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,ExtPackHelperApp} *so *r0 *gc ; do
308 doins $each || die
309 fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
310 fperms 0750 /usr/$(get_libdir)/${PN}/${each}
311 done
312 # VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
313 fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetAdpCtl
314 fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetDHCP
315
316 if ! use headless ; then
317 for each in VBox{SDL,Headless} ; do
318 doins $each || die
319 fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
320 fperms 4750 /usr/$(get_libdir)/${PN}/${each}
321 pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
322 done
323
324 if use opengl && use qt4 ; then
325 doins VBoxTestOGL || die
326 fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
327 fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
328 fi
329
330 dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
331
332 if use qt4 ; then
333 doins VirtualBox || die
334 fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
335 fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
336 pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox
337
338 dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
339
340 newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
341 fi
342
343 newicon "${S}"/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_32px.png ${PN}.png
344 else
345 doins VBoxHeadless || die
346 fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
347 fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
348 pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
349 fi
350
351 # Install EFI Firmware files (bug #320757)
352 pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
353 for fwfile in VBoxEFI{32,64}.fd ; do
354 doins ${fwfile} || die
355 fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile} || die
356 done
357 popd &>/dev/null || die
358
359 # New way of handling USB device nodes for VBox (bug #356215)
360 insinto /lib/udev
361 doins VBoxCreateUSBNode.sh
362 fowners root:vboxusers /lib/udev/VBoxCreateUSBNode.sh
363 fperms 0750 /lib/udev/VBoxCreateUSBNode.sh
364 insinto /lib/udev/rules.d
365 doins "${FILESDIR}"/10-virtualbox.rules
366
367 insinto /usr/share/${PN}
368 if ! use headless && use qt4 ; then
369 doins -r nls
370 fi
371
372 # VRDPAuth only works with this (bug #351949)
373 dosym VBoxAuth.so /usr/$(get_libdir)/${PN}/VRDPAuth.so
374
375 # set an env-variable for 3rd party tools
376 echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
377 doenvd "${T}/90virtualbox"
378
379 if use java ; then
380 java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
381 java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
382 fi
383 }
384
385 pkg_postinst() {
386 fdo-mime_desktop_database_update
387
388 udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
389
390 if ! use headless && use qt4 ; then
391 elog "To launch VirtualBox just type: \"VirtualBox\"."
392 fi
393 elog "You must be in the vboxusers group to use VirtualBox."
394 elog ""
395 elog "The latest user manual is available for download at:"
396 elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
397 elog ""
398 elog "For advanced networking setups you should emerge:"
399 elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
400 elog ""
401 elog "IMPORTANT!"
402 elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
403 elog "\"env-update\" as root and logout and relogin as the user you wish"
404 elog "to run ${PN} as."
405 elog ""
406 elog "Starting with version 4.0.0, ${PN} has USB-1 support."
407 elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
408 elog " app-emulation/virtualbox-extpack-oracle"
409 elog "package."
410 if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
411 elog ""
412 elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
413 elog "or else USB in ${PN} won't work."
414 fi
415 }
416
417 pkg_postrm() {
418 fdo-mime_desktop_database_update
419 }