From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QJ6Po-0008DH-JZ for garchives@archives.gentoo.org; Sun, 08 May 2011 16:01:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA05FE0459; Sun, 8 May 2011 16:00:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 77765E0459 for ; Sun, 8 May 2011 16:00:57 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B649B1B400E for ; Sun, 8 May 2011 16:00:56 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2245) id 326E320054; Sun, 8 May 2011 16:00:55 +0000 (UTC) From: "Lars Wendler (polynomial-c)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, polynomial-c@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/virtualbox: ChangeLog virtualbox-4.0.6-r1.ebuild virtualbox-4.0.6.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog virtualbox-4.0.6-r1.ebuild virtualbox-4.0.6.ebuild X-VCS-Directories: app-emulation/virtualbox X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler Content-Type: text/plain; charset=utf8 Message-Id: <20110508160055.326E320054@flycatcher.gentoo.org> Date: Sun, 8 May 2011 16:00:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 22f4d81e04acc310bac23c182a4d6482 polynomial-c 11/05/08 16:00:55 Modified: ChangeLog Added: virtualbox-4.0.6-r1.ebuild Removed: virtualbox-4.0.6.ebuild Log: Handle USB devices better (bug #356215) =20 (Portage version: 2.2.0_alpha31/cvs/Linux x86_64) Revision Changes Path 1.69 app-emulation/virtualbox/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt= ualbox/ChangeLog?rev=3D1.69&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt= ualbox/ChangeLog?rev=3D1.69&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt= ualbox/ChangeLog?r1=3D1.68&r2=3D1.69 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- ChangeLog 22 Apr 2011 16:10:32 -0000 1.68 +++ ChangeLog 8 May 2011 16:00:55 -0000 1.69 @@ -1,6 +1,14 @@ # ChangeLog for app-emulation/virtualbox # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v = 1.68 2011/04/22 16:10:32 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v = 1.69 2011/05/08 16:00:55 polynomial-c Exp $ + +*virtualbox-4.0.6-r1 (08 May 2011) + + 08 May 2011; Lars Wendler + +files/10-virtualbox.rules, -virtualbox-4.0.6.ebuild, + +virtualbox-4.0.6-r1.ebuild: + Handle USB devices through new udev rules as intended by upstream (bug + #356215). =20 22 Apr 2011; Lars Wendler +files/virtualbox-4.0.4-gcc46.patch, virtualbox-4.0.6.ebuild: 1.1 app-emulation/virtualbox/virtualbox-4.0.6-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt= ualbox/virtualbox-4.0.6-r1.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt= ualbox/virtualbox-4.0.6-r1.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: virtualbox-4.0.6-r1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.= 0.6-r1.ebuild,v 1.1 2011/05/08 16:00:55 polynomial-c Exp $ EAPI=3D4 inherit eutils fdo-mime flag-o-matic linux-info pax-utils qt4-r2 toolchai= n-funcs java-pkg-opt-2 if [[ ${PV} =3D=3D "9999" ]] ; then # XXX: should finish merging the -9999 ebuild into this one ... ESVN_REPO_URI=3D"http://www.virtualbox.org/svn/vbox/trunk" inherit linux-mod subversion else MY_P=3DVirtualBox-${PV} SRC_URI=3D"http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.b= z2" S=3D"${WORKDIR}/${MY_P}_OSE" fi DESCRIPTION=3D"Software family of powerful x86 virtualization" HOMEPAGE=3D"http://www.virtualbox.org/" LICENSE=3D"GPL-2" SLOT=3D"0" KEYWORDS=3D"~amd64 ~x86" IUSE=3D"+additions alsa doc extensions headless java pulseaudio +opengl p= ython +qt4 +sdk vboxwebsrv vnc" RDEPEND=3D"!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-${PV} dev-libs/libIDL >=3Ddev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=3Dnet-libs/libvncserver-0.9.7 ) java? ( >=3Dvirtual/jre-1.5 )" DEPEND=3D"${RDEPEND} >=3Ddev-util/kbuild-0.1.5-r1 >=3Ddev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-power/iasl media-libs/libpng sys-libs/pam sys-libs/libcap doc? ( dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( >=3Dvirtual/jdk-1.5 ) dev-util/pkgconfig alsa? ( >=3Dmedia-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama ) pulseaudio? ( media-sound/pulseaudio ) python? ( >=3Ddev-lang/python-2.3[threads] ) vboxwebsrv? ( >=3Dnet-libs/gsoap-2.7.13 )" PDEPEND=3D"additions? ( ~app-emulation/virtualbox-additions-${PV} ) extensions? ( ~app-emulation/virtualbox-extpack-oracle-${PV} )" QA_TEXTRELS_x86=3D"usr/lib/virtualbox-ose/VBoxGuestPropSvc.so usr/lib/virtualbox/VBoxSDL.so usr/lib/virtualbox/VBoxSharedFolders.so usr/lib/virtualbox/VBoxDD2.so usr/lib/virtualbox/VBoxOGLrenderspu.so usr/lib/virtualbox/VBoxPython.so usr/lib/virtualbox/VBoxDD.so usr/lib/virtualbox/VBoxDDU.so usr/lib/virtualbox/VBoxREM64.so usr/lib/virtualbox/VBoxSharedClipboard.so usr/lib/virtualbox/VBoxHeadless.so usr/lib/virtualbox/VBoxRT.so usr/lib/virtualbox/VBoxREM.so usr/lib/virtualbox/VBoxSettings.so usr/lib/virtualbox/VBoxKeyboard.so usr/lib/virtualbox/VBoxSharedCrOpenGL.so usr/lib/virtualbox/VBoxVMM.so usr/lib/virtualbox/VirtualBox.so usr/lib/virtualbox/VBoxOGLhosterrorspu.so usr/lib/virtualbox/components/VBoxC.so usr/lib/virtualbox/components/VBoxSVCM.so usr/lib/virtualbox/components/VBoxDDU.so usr/lib/virtualbox/components/VBoxRT.so usr/lib/virtualbox/components/VBoxREM.so usr/lib/virtualbox/components/VBoxVMM.so usr/lib/virtualbox/VBoxREM32.so usr/lib/virtualbox/VBoxPython2_4.so usr/lib/virtualbox/VBoxPython2_5.so usr/lib/virtualbox/VBoxPython2_6.so usr/lib/virtualbox/VBoxPython2_7.so usr/lib/virtualbox/VBoxXPCOMC.so usr/lib/virtualbox/VBoxOGLhostcrutil.so usr/lib/virtualbox/VBoxNetDHCP.so" REQUIRED_USE=3D"java? ( sdk ) python? ( sdk )" pkg_setup() { if built_with_use sys-devel/gcc hardened && gcc-config -c | grep -qv -E = "hardenednopie|vanilla"; then eerror "The PIE feature provided by the \"hardened\" compiler is incomp= atible with ${PF}." eerror "You must use gcc-config to select a profile without this featur= e. You may" eerror "choose either \"hardenednopie\", \"hardenednopiessp\" or \"vani= lla\" profile;" eerror "however, \"hardenednopie\" is preferred because it gives the mo= st hardening." eerror "Remember to run \"source /etc/profile\" before continuing. See= bug #339914." die fi if ! use headless && ! use qt4 ; then einfo "No USE=3D\"qt4\" selected, this build will not include" einfo "any Qt frontend." elif use headless && use qt4 ; then einfo "You selected USE=3D\"headless qt4\", defaulting to" einfo "USE=3D\"headless\", this build will not include any X11/Qt front= end." fi if ! use opengl ; then einfo "No USE=3D\"opengl\" selected, this build will lack" einfo "the OpenGL feature." fi java-pkg-opt-2_pkg_setup } src_prepare() { # Remove shipped binaries (kBuild,yasm), see bug #232775 rm -rf kBuild/bin tools # Disable things unused or split into separate ebuilds sed -e "s/MY_LIBDIR/$(get_libdir)/" \ "${FILESDIR}"/${PN}-4-localconfig > LocalConfig.kmk || die # unset useless/problematic checks in configure epatch "${FILESDIR}/${PN}-ose-3.2.8-mesa-check.patch" \ "${FILESDIR}/${PN}-4-makeself-check.patch" \ "${FILESDIR}/${PN}-4-mkisofs-check.patch" # fix build with --as-needed (bug #249295 and bug #350907) epatch "${FILESDIR}/${PN}-4-asneeded.patch" # Respect LDFLAGS sed -e "s/_LDFLAGS\.${ARCH}*.*=3D/& ${LDFLAGS}/g" \ -i Config.kmk src/libs/xpcom18a4/Config.kmk || die # We still want to use ${HOME}/.VirtualBox/Machines as machines dir. epatch "${FILESDIR}/${PN}-4.0.2-restore_old_machines_dir.patch" # make configure accept gcc-4.6.x (bug #362861) epatch "${FILESDIR}/${PN}-4.0.4-gcc46.patch" # add correct java path if use java ; then sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \ -i "${S}"/Config.kmk || die fi java-pkg-opt-2_src_prepare } src_configure() { local myconf use alsa || myconf+=3D" --disable-alsa" use opengl || myconf+=3D" --disable-opengl" use pulseaudio || myconf+=3D" --disable-pulse" use python || myconf+=3D" --disable-python" use java || myconf+=3D" --disable-java" use vboxwebsrv && myconf+=3D" --enable-webservice" use vnc && myconf+=3D" --enable-vnc" use doc || myconf+=3D" --disable-docs" if ! use headless ; then use qt4 || myconf+=3D" --disable-qt4" else myconf+=3D" --build-headless --disable-opengl" fi # not an autoconf script ./configure \ --with-gcc=3D"$(tc-getCC)" \ --with-g++=3D"$(tc-getCXX)" \ --disable-kmods \ --disable-dbus \ ${myconf} \ || die "configure failed" } src_compile() { source ./env.sh # Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529) # and strip all flags # strip-flags MAKE=3D"kmk" emake \ TOOL_GCC3_CC=3D"$(tc-getCC)" TOOL_GCC3_CXX=3D"$(tc-getCXX)" \ TOOL_GCC3_AS=3D"$(tc-getCC)" TOOL_GCC3_AR=3D"$(tc-getAR)" \ TOOL_GCC3_LD=3D"$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD=3D"$(tc-getLD)" \ TOOL_GCC3_CFLAGS=3D"${CFLAGS}" TOOL_GCC3_CXXFLAGS=3D"${CXXFLAGS}" \ VBOX_GCC_OPT=3D"${CXXFLAGS}" \ TOOL_YASM_AS=3Dyasm KBUILD_PATH=3D"${S}/kBuild" \ all || die "kmk failed" } src_install() { cd "${S}"/out/linux.${ARCH}/release/bin || die # Create configuration files insinto /etc/vbox newins "${FILESDIR}/${PN}-4-config" vbox.cfg # Set the right libdir sed -i \ -e "s/MY_LIBDIR/$(get_libdir)/" \ "${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed" # Symlink binaries to the shipped wrapper exeinto /usr/$(get_libdir)/${PN} newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox" || die fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox fperms 0750 /usr/$(get_libdir)/${PN}/VBox dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl # Install binaries and libraries insinto /usr/$(get_libdir)/${PN} doins -r components || die if use sdk ; then doins -r sdk || die fi if use vboxwebsrv ; then doins vboxwebsrv || die fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv fi for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,ExtPackHe= lperApp} *so *r0 *gc ; do doins $each || die fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each} fperms 0750 /usr/$(get_libdir)/${PN}/${each} done # VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any cas= e.. fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetAdpCtl fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetDHCP if ! use headless ; then for each in VBox{SDL,Headless} ; do doins $each || die fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each} fperms 4750 /usr/$(get_libdir)/${PN}/${each} pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each} done if use opengl && use qt4 ; then doins VBoxTestOGL || die fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL fi dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL if use qt4 ; then doins VirtualBox || die fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop fi newicon "${S}"/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_32px= .png ${PN}.png else doins VBoxHeadless || die fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless fi # Install EFI Firmware files (bug #320757) pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die for fwfile in VBoxEFI{32,64}.fd ; do doins ${fwfile} || die fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile} || die done popd &>/dev/null || die # New way of handling USB device nodes for VBox (bug #356215) exeinto /lib/udev doexe VBoxCreateUSBNode.sh insinto /lib/udev/rules.d doins "${FILESDIR}"/10-virtualbox.rules insinto /usr/share/${PN} if ! use headless && use qt4 ; then doins -r nls fi # VRDPAuth only works with this (bug #351949) dosym VBoxAuth.so /usr/$(get_libdir)/${PN}/VRDPAuth.so # set an env-variable for 3rd party tools echo -n "VBOX_APP_HOME=3D/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox" doenvd "${T}/90virtualbox" if use java ; then java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/v= boxjxpcom.jar" java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so" fi } pkg_postinst() { fdo-mime_desktop_database_update udevadm control --reload-rules && udevadm trigger --subsystem-match=3Dus= b if ! use headless && use qt4 ; then elog "To launch VirtualBox just type: \"VirtualBox\"." fi elog "You must be in the vboxusers group to use VirtualBox." elog "" elog "The latest user manual is available for download at:" elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf" elog "" elog "For advanced networking setups you should emerge:" elog "net-misc/bridge-utils and sys-apps/usermode-utilities" elog "" elog "IMPORTANT!" elog "If you upgrade from app-emulation/virtualbox-ose make sure to run" elog "\"env-update\" as root and logout and relogin as the user you wish= " elog "to run ${PN} as." elog "" elog "Starting with version 4.0.0, ${PN} has USB-1 support." elog "For USB-2 support, PXE-boot ability and VRDP support please" elog "emerge app-emulation/virtualbox-extpack-oracle package." } pkg_postrm() { fdo-mime_desktop_database_update }