diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2011-10-04 18:00:30 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2011-10-04 18:00:30 +0000 |
| commit | 0531914c151c0ca8945ed1622bbddb40cdb1232b (patch) | |
| tree | c3ec6c464bf7bd814a4d72fd307e331693578142 /app-emulation | |
| parent | Stable for HPPA (bug #355085). (diff) | |
| download | gentoo-2-0531914c151c0ca8945ed1622bbddb40cdb1232b.tar.gz gentoo-2-0531914c151c0ca8945ed1622bbddb40cdb1232b.tar.bz2 gentoo-2-0531914c151c0ca8945ed1622bbddb40cdb1232b.zip | |
Version bump (bug #385577). Removed old
(Portage version: 2.2.0_alpha60/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/virtualbox/ChangeLog | 9 | ||||
| -rw-r--r-- | app-emulation/virtualbox/files/virtualbox-4.1.4-asneeded.patch | 26 | ||||
| -rw-r--r-- | app-emulation/virtualbox/virtualbox-4.1.4.ebuild (renamed from app-emulation/virtualbox/virtualbox-4.1.0.ebuild) | 9 |
3 files changed, 39 insertions, 5 deletions
diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog index a919149fb8f2..823d3add3762 100644 --- a/app-emulation/virtualbox/ChangeLog +++ b/app-emulation/virtualbox/ChangeLog @@ -1,6 +1,13 @@ # 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.84 2011/09/01 08:06:53 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.85 2011/10/04 18:00:30 polynomial-c Exp $ + +*virtualbox-4.1.4 (04 Oct 2011) + + 04 Oct 2011; Lars Wendler <polynomial-c@gentoo.org> -virtualbox-4.1.0.ebuild, + +virtualbox-4.1.4.ebuild, +files/virtualbox-4.1.4-asneeded.patch: + Version bump. Thanks to Christian Inci who reported this in bug #385577. + Removed old. 01 Sep 2011; Lars Wendler <polynomial-c@gentoo.org> virtualbox-4.1.0.ebuild: Again fixed dependency on kbuild. Thanks to Karel De Vriendt for reporting diff --git a/app-emulation/virtualbox/files/virtualbox-4.1.4-asneeded.patch b/app-emulation/virtualbox/files/virtualbox-4.1.4-asneeded.patch new file mode 100644 index 000000000000..003dc5db6978 --- /dev/null +++ b/app-emulation/virtualbox/files/virtualbox-4.1.4-asneeded.patch @@ -0,0 +1,26 @@ +--- VirtualBox-4.1.4_OSE/Config.kmk ++++ VirtualBox-4.1.4_OSE/Config.kmk +@@ -4263,7 +4263,7 @@ + TEMPLATE_VBOXBLDPROG_LDFLAGS.amd64 = -m64 + TEMPLATE_VBOXBLDPROG_LDFLAGS.sparc64 = -m64 + ifeq ($(KBUILD_HOST),linux) +-TEMPLATE_VBOXBLDPROG_LIBS = pthread m rt dl ++TEMPLATE_VBOXBLDPROG_LIBS = pthread m rt dl crypt + else ifeq ($(KBUILD_HOST),os2) + TEMPLATE_VBOXBLDPROG_TOOL = GXX3OMF + TEMPLATE_VBOXBLDPROG_LIBS = socket iconv +--- VirtualBox-4.1.4_OSE/src/libs/xpcom18a4/Makefile.kmk ++++ VirtualBox-4.1.4_OSE/src/libs/xpcom18a4/Makefile.kmk +@@ -469,10 +469,10 @@ + libIDL_config_cflags := $(shell $(VBOX_LIBIDL_CONFIG) --cflags) + libIDL_config_libs := $(shell $(VBOX_LIBIDL_CONFIG) --libs) + xpidl_CFLAGS = \ +- $(libIDL_config_cflags) ++ $(shell pkg-config --cflags libIDL-2.0) + ifeq ($(BUILD_PLATFORM),linux) + xpidl_LDFLAGS = \ +- $(filter-out -l%,$(libIDL_config_libs)) ++ $(filter-out -l%,$(shell pkg-config --libs-only-L libIDL-2.0)) + else + xpidl_LDFLAGS = \ + $(libIDL_config_libs) diff --git a/app-emulation/virtualbox/virtualbox-4.1.0.ebuild b/app-emulation/virtualbox/virtualbox-4.1.4.ebuild index fa1e5c6e5d41..e0767184908a 100644 --- a/app-emulation/virtualbox/virtualbox-4.1.0.ebuild +++ b/app-emulation/virtualbox/virtualbox-4.1.4.ebuild @@ -1,6 +1,6 @@ # 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.1.0.ebuild,v 1.4 2011/09/01 08:06:53 polynomial-c Exp $ +# $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 $ EAPI=4 @@ -50,7 +50,7 @@ RDEPEND="!app-emulation/virtualbox-bin vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( >=virtual/jre-1.5 )" DEPEND="${RDEPEND} - =dev-util/kbuild-0.1.5* + >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 @@ -151,7 +151,7 @@ src_prepare() { "${FILESDIR}/${PN}-4-mkisofs-check.patch" # fix build with --as-needed (bug #249295 and bug #350907) - epatch "${FILESDIR}/${PN}-4-asneeded.patch" + epatch "${FILESDIR}/${PN}-4.1.4-asneeded.patch" # Respect LDFLAGS sed -e "s/_LDFLAGS\.${ARCH}*.*=/& ${LDFLAGS}/g" \ @@ -160,7 +160,8 @@ src_prepare() { # We still want to use ${HOME}/.VirtualBox/Machines as machines dir. epatch "${FILESDIR}/${PN}-4.0.2-restore_old_machines_dir.patch" - epatch "${FILESDIR}"/${P}-vboxpci-build.patch + # Don't build vboxpci.ko module (D'oh!) + epatch "${FILESDIR}"/${PN}-4.1.2-vboxpci-build.patch # add correct java path if use java ; then |