Version bump; drop version 2.1.0

svn path=/trunk/; revision=621

5 files changed, 15 insertions, 43 deletions

diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index fb0397e..b182a5a 100644
--- a/app-emulation/virtualbox-guest-additions/ChangeLog
+++ b/app-emulation/virtualbox-guest-additions/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.8 2008/12/18 12:14:53 flameeyes Exp $
 
+  20 Feb 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  -files/virtualbox-guest-additions-2.1.0-allow-gcc43.patch,
+  -virtualbox-guest-additions-2.1.0.ebuild,
+  +virtualbox-guest-additions-2.1.4.ebuild:
+  Version bump; drop version 2.1.0
+
   23 Jan 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
   -virtualbox-guest-additions-2.0.4-r1.ebuild,
   -virtualbox-guest-additions-2.0.6.ebuild,
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 82b223c..a4d10b1 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,11 +1,10 @@
 AUX virtualbox-guest-additions-2-localconfig 877 RMD160 7a09c0e50c1294c289cfd0665dc29986e55f2f7c SHA1 186a04d197c4f1a22376f767b4804cb05a8c811a SHA256 0115ff252376fa9c1244f79f183041a8e1b078f64d8bea2126d344e8b21a7b84
-AUX virtualbox-guest-additions-2.1.0-allow-gcc43.patch 1005 RMD160 1df49daed9cfeff53fccf1726907d775c9384b07 SHA1 f50b04f92db79f055c946f21d2671e8cdb7b03ff SHA256 6043e881307346b6beaed08dbe27b6bfc05a72191bdde62a66dec592767c21fd
 AUX virtualbox-guest-additions.initd 1463 RMD160 4daceefa3e10659381f4b714512548944c7f54fd SHA1 f5290150bbf99feac5c6d81c4f82f9191e5f1786 SHA256 933dbdc5e5363dfbdc2d51deed0726ab91f1ea89e330298266b9ffb03c38989a
 DIST VirtualBox-1.6.6-OSE.tar.bz2 35483853 RMD160 4b17428371089806cf6f5e52d1905936f7beb01d SHA1 7c323b35d77277c650cbce2821ab6778d1e3270e SHA256 acb3c20ef751ed408489d7b5c2d5d441226055a6e83bfeb9258ce2d55baba4da
-DIST VirtualBox-2.1.0-OSE.tar.bz2 39382682 RMD160 8c35b83889fcba3bc263d54a0523690cc1bda8b3 SHA1 a6ad07118c4a1161c4afa44ccb95db25ef07b7e0 SHA256 80d9dbab379de5ef097019f3b94a8a7e7a6535c37aa0168286c8b2bf4a960c7a
 DIST VirtualBox-2.1.2-OSE.tar.bz2 47889575 RMD160 7deb3f77fa546872abdd16ca3eee39085e8509cf SHA1 1035a4a33a8106c7492b79ef58a7d7c2cf35ad29 SHA256 d3c1ae8ed7594094aaf8496204c5415479e1943e5b5179c5baae8a66885362de
+DIST VirtualBox-2.1.4-OSE.tar.bz2 47895473 RMD160 e0511a66fdda2dab9a9b8e7236a963047b332219 SHA1 cc69ba3b1553964916fad6a04afa2b9ee951ff2a SHA256 4b7adb41ba65dac2b98740382602d07a37e9ac17b5641b88c036c45920b3b95c
 EBUILD virtualbox-guest-additions-1.6.6-r1.ebuild 3546 RMD160 abfc28519443c5f0bef48575ab871f85c38a49c5 SHA1 828495c100e24d4834babd84860891876c130705 SHA256 9033fd2fb5eae2d37f5cf6b233685285fbfce68295f494640d72015f0002572c
-EBUILD virtualbox-guest-additions-2.1.0.ebuild 4492 RMD160 4b12b1584c7261b7b39b3b89940217d85e6acda6 SHA1 04f96193d92570d249de76be4d82e3e877a67552 SHA256 ea0c28efef7e7a0934f87a5d300ffef3c015948a63efdf94b7866b2253c0b80c
-EBUILD virtualbox-guest-additions-2.1.2.ebuild 3990 RMD160 10fd8a740804c2b09382d7abedbc5f37cded32bd SHA1 4c3af8fa91bf40db30e339beb7048cddc1663a1d SHA256 2247c3ec0842593d6e8e5463b3ffbd9b852c219cea1ce4eab45a40dc112cf859
-MISC ChangeLog 8415 RMD160 07f1adc30a1e92cb82bd12aa9f49abd5f37e2690 SHA1 185f5ffcbdf1e33729a03c64273bf1a58421de18 SHA256 d737ffc02c4bc686ec22c316c77036faacc8ca9cf64f56ab5606f4f9425dc4d6
+EBUILD virtualbox-guest-additions-2.1.2.ebuild 3849 RMD160 64ddef1a9245cd98a2b63bdc962628cb25ed7bbc SHA1 0e66c4ade289b2bd7572cbfa1166bc614185a9fc SHA256 bea9bb1d660831090cb7df1d7d4a188f3c33c253a29a88823705fbaa493e3219
+EBUILD virtualbox-guest-additions-2.1.4.ebuild 3849 RMD160 64ddef1a9245cd98a2b63bdc962628cb25ed7bbc SHA1 0e66c4ade289b2bd7572cbfa1166bc614185a9fc SHA256 bea9bb1d660831090cb7df1d7d4a188f3c33c253a29a88823705fbaa493e3219
+MISC ChangeLog 8660 RMD160 b5725087d5299e4cb85a1d32e8c44ed2eb20945e SHA1 b4a7d0f9dc42a95752f239aff85f45805742f74a SHA256 5bdd8f04d282241640d01e78661d24d95e23d8b63878b74d45b319387067b6c8
 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-2.1.0-allow-gcc43.patch b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-2.1.0-allow-gcc43.patch
deleted file mode 100644
index 1aae626..0000000
--- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-2.1.0-allow-gcc43.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig	2008-12-23 16:34:42.000000000 +0100
-+++ configure	2008-12-23 16:35:26.000000000 +0100
-@@ -389,16 +389,6 @@
-         fail really
-       elif [ $cc_maj -eq 4 -a $cc_min -eq 0 -a "OS" = "darwin" ]; then
-         log_success "found version $cc_ver"
--      elif [ $cc_maj -eq 4 -a $cc_min -eq 3 ]; then
--        if [ -z "$CC_COMPAT" ]; then
--          log ""
--          log "  ** There are known problems with gcc version 4.3 when compiling the recompiler"
--          log "  ** stuff. You need to specify a compatibility compiler with version < 4.3. Look"
--          log "  ** for a package compat-gcc-34 on Fedora systems or something similar on other"
--          log "  ** distributions and call configure with parameter --with-gcc-compat=gcc34."
--          fail really
--        fi
--        log_success "found version $cc_ver + compat version $cc_compat_ver"
-       # gcc-4.0 is allowed for Darwin only
-       elif [ $cc_maj -lt 3 \
-              -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.1.2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.1.2.ebuild
index 85c6b69..c0cf79a 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.1.2.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.0.4.ebuild,v 1.1 2008/10/27 18:26:13 jokey Exp $
+# $Header: $
 
 inherit eutils linux-mod
 
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.1.0.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.1.4.ebuild
index f020912..c0cf79a 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.1.0.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.0.4.ebuild,v 1.1 2008/10/27 18:26:13 jokey Exp $
+# $Header: $
 
 inherit eutils linux-mod
 
@@ -22,7 +22,7 @@ RDEPEND="x11-libs/libXt
 			 x11-apps/xrefresh
 			 x11-libs/libXmu )"
 DEPEND="${RDEPEND}
-		>=dev-util/kbuild-0.1.4
+		>=dev-util/kbuild-0.1.5
 		>=dev-lang/yasm-0.6.2
 		sys-devel/bin86
 		sys-devel/dev86
@@ -34,20 +34,9 @@ BUILD_TARGET_ARCH="${ARCH}"
 MODULE_NAMES="vboxadd(misc:${WORKDIR}/vboxadd:${WORKDIR}/vboxadd)
 			vboxvfs(misc:${WORKDIR}/vboxvfs:${WORKDIR}/vboxvfs)"
 
-S=${WORKDIR}/${MY_P/-OSE/}
+S=${WORKDIR}/${MY_P/-OSE/_OSE}
 
 pkg_setup() {
-		# gcc 4.3 is *not supported* by upstream,
-		# please do not report bugs upstream at this time.
-		if [[ "$(gcc-major-version)$(gcc-minor-version)" == "43" ]]; then
-				elog ""
-				elog "Warning:"
-				elog "gcc-$(gcc-major-version).$(gcc-minor-version) was detected"
-				elog "this gcc release is *not supported* by upstream, please"
-				elog "*don't* file bug reports upstream reporting gcc failures."
-				elog ""
-		fi
-
 		linux-mod_pkg_setup
 		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
 }
@@ -57,7 +46,7 @@ src_unpack() {
 
 		# Create and unpack a tarball with the sources of the Linux guest
 		# kernel modules, to include all the needed files
-		"${MY_P/-OSE/}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
+		"${MY_P/-OSE/_OSE}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
 		unpack ./vbox-kmod.tar.gz
 
 		# Remove shipped binaries (kBuild,yasm), see bug #232775
@@ -66,9 +55,6 @@ src_unpack() {
 
 		# Disable things unused or splitted into separate ebuilds
 		cp "${FILESDIR}/${PN}-2-localconfig" LocalConfig.kmk
-
-		# Disable gcc 4.3.x checks in configure
-		epatch "${FILESDIR}/${P}-allow-gcc43.patch"
 }
 
 src_compile() {