Version bump. Removed old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

3 files changed, 44 insertions, 20 deletions

diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index 3b788cd2b2bb..01e2b72dd5ac 100644
--- a/app-emulation/virtualbox-bin/ChangeLog
+++ b/app-emulation/virtualbox-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/virtualbox-bin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.181 2014/06/08 09:44:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.182 2014/07/18 13:49:00 polynomial-c Exp $
+
+*virtualbox-bin-4.3.14.95030 (18 Jul 2014)
+*virtualbox-bin-4.2.26.95022 (18 Jul 2014)
+
+  18 Jul 2014; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-bin-4.2.22.ebuild, +virtualbox-bin-4.2.26.95022.ebuild,
+  -virtualbox-bin-4.3.10.93012.ebuild, +virtualbox-bin-4.3.14.95030.ebuild:
+  Version bump. Removed old.
 
   08 Jun 2014; Agostino Sarubbo <ago@gentoo.org> virtualbox-bin-4.2.24.ebuild:
   Stable for x86, wrt bug #507824
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.2.22.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.26.95022.ebuild
index 0a4cf4506002..5e1a6124929c 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.2.22.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.26.95022.ebuild
@@ -1,37 +1,53 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.22.ebuild,v 1.3 2014/01/16 20:28:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.26.95022.ebuild,v 1.1 2014/07/18 13:49:00 polynomial-c Exp $
 
 EAPI=5
 
-inherit eutils unpacker fdo-mime gnome2 pax-utils udev
-
-MY_PV=${PV/beta/BETA}
-MY_PV=${MY_PV/rc/RC}
-VBOX_PV=${MY_PV}-91556
-SDK_PV=${VBOX_PV}
-EXTP_PV=${SDK_PV}
-MY_P=VirtualBox-${VBOX_PV}-Linux
-EXTP_PN=Oracle_VM_VirtualBox_Extension_Pack
+inherit eutils fdo-mime gnome2 pax-utils udev unpacker versionator
+
+MAIN_PV="$(get_version_component_range 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+fi
+VBOX_BUILD_ID="$(get_version_component_range 4)"
+VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
+MY_P="VirtualBox-${VBOX_PV}-Linux"
+# needed as sometimes the extpack gets another build ID
+EXTP_PV="${VBOX_PV}"
+EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
+EXTP_P="${EXTP_PN}-${EXTP_PV}"
+# needed as sometimes the SDK gets another build ID
+SDK_PV="${VBOX_PV}"
+SDK_P="VirtualBoxSDK-${SDK_PV}"
 
 DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
 HOMEPAGE="http://www.virtualbox.org/"
 SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
 	x86? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
-	sdk? ( http://download.virtualbox.org/virtualbox/${MY_PV}/VirtualBoxSDK-${SDK_PV}.zip )
-	http://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_PN}-${EXTP_PV}.vbox-extpack -> ${EXTP_PN}-${EXTP_PV}.tar.gz"
+	http://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
 
 LICENSE="GPL-2 PUEL"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+additions +chm headless python sdk vboxwebsrv rdesktop-vrdp"
+KEYWORDS="~amd64 ~x86"
+IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
 RESTRICT="mirror"
 
+if [[ "${PV}" != *beta* ]] ; then
+	SRC_URI+="
+		sdk? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
+	IUSE+=" sdk"
+fi
+
 DEPEND="app-arch/unzip"
 
 RDEPEND="!!app-emulation/virtualbox
 	!app-emulation/virtualbox-additions
-	~app-emulation/virtualbox-modules-${PV}
+	~app-emulation/virtualbox-modules-${MAIN_PV}
 	!headless? (
 		x11-libs/libXcursor
 		media-libs/libsdl[X]
@@ -154,10 +170,10 @@ src_unpack() {
 
 	mkdir "${S}"/${EXTP_PN} || die
 	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	unpack ${EXTP_PN}-${EXTP_PV}.tar.gz
+	unpack ${EXTP_P}.tar.gz
 	popd &>/dev/null || die
 
-	if use sdk; then
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
 		unpack VirtualBoxSDK-${SDK_PV}.zip
 	fi
 }
@@ -203,7 +219,7 @@ src_install() {
 
 	doins UserManual.pdf
 
-	if use sdk ; then
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
 		doins -r sdk
 	fi
 
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.3.10.93012.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.3.14.95030.ebuild
index 477b77e4a392..505a424b6e55 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.3.10.93012.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.3.14.95030.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.3.10.93012.ebuild,v 1.2 2014/03/27 12:14:29 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.3.14.95030.ebuild,v 1.1 2014/07/18 13:49:00 polynomial-c Exp $
 
 EAPI=5