Version bump (bug #410811). Removed old

Package-Manager: portage-2.2.0_alpha99/cvs/Linux x86_64

3 files changed, 37 insertions, 13 deletions

diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index a7372eea5eff..eae94ec70ced 100644
--- a/x11-drivers/xf86-video-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-video-virtualbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-video-virtualbox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.86 2012/03/18 18:50:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.87 2012/04/05 07:45:44 polynomial-c Exp $
+
+*xf86-video-virtualbox-4.1.12 (05 Apr 2012)
+
+  05 Apr 2012; Lars Wendler <polynomial-c@gentoo.org>
+  -xf86-video-virtualbox-4.1.6-r1.ebuild, +xf86-video-virtualbox-4.1.12.ebuild:
+  Version bump (bug #410811). Removed old.
 
   18 Mar 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #118003.
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index c428833296ee..c41d2b26ffd5 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX xf86-video-virtualbox-2.2.0-enable-opengl.patch 303 RMD160 c8c8e6a9aaea1ec53f3c0cb285750921287959a6 SHA1 7d68f5529a921f7d9786b232e8ecc7ebe7ba0e1b SHA256 194b7bca875f18e1621f065640d1c1a1364640e17475c493ec3b56f6e7e5ce66
 AUX xf86-video-virtualbox-3-localconfig 996 RMD160 4e986699d9484a3b7d9b11eb1bb30ca9d3a33fb3 SHA1 52d13e385d75d55aac64697eb715421df856c728 SHA256 ff777086ae7d0337e59066b4f7d6538823ca1804b57906e07cd562c8a48e054f
@@ -9,19 +9,29 @@ AUX xf86-video-virtualbox-4-makeself-check.patch 289 RMD160 ff0385e86ad83501d58f
 AUX xf86-video-virtualbox-4-mkisofs-check.patch 356 RMD160 2562cee4530976224ae128a732ae99d79eece99d SHA1 050479d15ee5fed1504646c0687fd6e2c8a22dc1 SHA256 0e72a5ef8d915c550fd92865b40c265153dc2d4621714a599d3a7172726b6fff
 AUX xf86-video-virtualbox-link-lazy.patch 996 RMD160 587325847ef92508959b9ab58011f6c3b757d80c SHA1 f85cb63faa7dfea274ee90d05045684818cf922a SHA256 976e922756f9f2f01f625b07a012d6f287811b3d099f1a855c9d4453cc4f5a3b
 DIST VirtualBox-4.1.10.tar.bz2 73325320 RMD160 b5eedd1235db74bfaa4e061193528696058923e7 SHA1 bb95253fd574648298bd56f13586f5a510a55863 SHA256 47e3faa607b405ea1d31e65a35984374e44f09f44a0f40607da6a773b31a57bf
+DIST VirtualBox-4.1.12.tar.bz2 73250628 RMD160 a3ee3e4dac21d969f5314c7269ca9ef9fa7d80a7 SHA1 4cda0678fa44ff53af87dbcd9375a43720c69d3f SHA256 4e4b9181a61ee9ccbe5fd28dbf528dde708fba490af5de6fac0d138b283b1d02
 DIST VirtualBox-4.1.4.tar.bz2 73837275 RMD160 475a68dc6beebdb588688743b3652bbb9ab3f507 SHA1 6ec0dd31844da91c9773611a6fb553eef575e899 SHA256 aa368de95f9dd2020394f9e8f145908c236c0899d24bb27436ed2f670725cefb
-DIST VirtualBox-4.1.6.tar.bz2 73793713 RMD160 1bf368464ac0d431ac799e4710835f3426a9a5f6 SHA1 19a801444102a10d2b62ab35daacb7ddc415bab0 SHA256 554137cb33a806bf0dd74dc0de0c3008dd9bb20d483cdcebaf8a929720c0ab7e
 DIST VirtualBox-4.1.8.tar.bz2 73822230 RMD160 f8ae296406fe370eded166d0772be7e4558ecc3a SHA1 4683e30aa32d0d6ca764e5ce366d7216705cf0f2 SHA256 ef16d6729c9bcc298a33eff636549872dcfe291ac01bfa117cdf7aaf8a4004e0
 EBUILD xf86-video-virtualbox-4.1.10.ebuild 4683 RMD160 992fe0fe66a2b0d422126fe34c421f586b7e29b1 SHA1 d5947237b882f27f41792079f60b3e98cf61f942 SHA256 40e43ff3c10eb55f96029c31f7e49cf141a8a9e5345475ccedb5c8cbd5122105
+EBUILD xf86-video-virtualbox-4.1.12.ebuild 4683 RMD160 e63528c4ba4b9528263f802820df965a1f030768 SHA1 e3be3e00f8948f6598e7de82b5b5d4b580dd6df4 SHA256 3fd40103a0b84ff6b1320ad7d9205b05063a7ea6b250d492786927bbd20424ce
 EBUILD xf86-video-virtualbox-4.1.4.ebuild 4407 RMD160 69163556717abea1f5059dec71bcff354335c511 SHA1 58db795b6669439860e7aae1900d0023dd6b335d SHA256 984dd1fcee7a14bdceffcf8bac1cfcdb2a93b388bdc0f579bd26ca70f4b81f26
-EBUILD xf86-video-virtualbox-4.1.6-r1.ebuild 4412 RMD160 cc073a0d3eed43e1275df6c84ddfd9f5024e8716 SHA1 95259249d23882ae2eb2d4318ed309bdaf56689b SHA256 feb55c08c97207b80f7731b15c15ce55e1a65e148a2c6ea339d95c8401bdd0af
 EBUILD xf86-video-virtualbox-4.1.8.ebuild 4550 RMD160 725e991bd06045aea4e75bb0e700abab60af2672 SHA1 8b5bec847a4f01013d54843aff19be24ee0a3ffe SHA256 2aa34736c66b4359bdf2e310999bac205d122ff7ae5b184c01b48bb0b540fe12
-MISC ChangeLog 19646 RMD160 db8719ec9a3e402fe23dc2a298c22635a729db27 SHA1 9edd13fd237ee55e9bc3a020eaa80b55a69db350 SHA256 14601d70c624094b602c043ff0f2b17d7cc4564e1ab5d8610a60d697c098bb9f
+MISC ChangeLog 19876 RMD160 6c79600e845ca2d6c1feacb3f8d00f9f29e83918 SHA1 2c3949af048d951fe01a9d3cd50fb4fa3a8b52d8 SHA256 f0128d7c09ce40bd482b1f95b4a53eed681d44f82e456015119bc3866a69728c
 MISC metadata.xml 328 RMD160 d36053bee7fcf8469ff02d45d7d320c3abdf26ab SHA1 9a8133ee6195fe35d220c0ee9d96c8f3d85abea4 SHA256 18c49e38babc89b001d395d7abd3612daf5a46e80d175a20077a2bec61d5eb24
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk9mLocACgkQCaWpQKGI+9TTogCcD6/bWPb0lspv88Tw53YRCful
-GYwAn0OzH+arGLAI8Zg25SXcrdIEee9u
-=g9zM
+iQIcBAEBCgAGBQJPfU2tAAoJEPiazRVxLXTFhQMP/A33b41i5yisK3rL9u8pxM8R
+WhFJhAIwkhYyYm9ufxoIaswrnXYo4FkeCY6hoLglZdL9dZ62kbiNZ7mHdLR2gk6u
+oFKwXOqoCwM+2TgASxXYBoVPako9WU9Ex1Xrur2rB1qD5wQQqPOTSNzo/uwl5X+q
+ItnosPFOzVg9sCHcx1ZJUA0iZAuHcf5oTukIq7wTXAwYQ+owwOuP9PraP0+OX8KD
+ObkK0HAh+kCS6DRlxDR74vO1xLVhiTbktSPmrQtccIX56EHRwC/U/3pg0h/e7oin
+UAsUsmmwPPDE+E5XWsM1si/sbRg2RovZtr+KuNGeIeu3CARI7Tqb8bNuVl47u3GS
+JME2AFswrQYVJ64w91/zTA96pqARF3RPUFCqfPAKpXYC0WBj+85dgtv7YRuAgvL2
+vl9rKtgPYAYi1Y08FOHbkXx5G9vra/VNEy4M1Rrw+TgILo9YDXjaj1Va0k5Bxbhj
+78tfaepLBhdXsIFWpRfYfDa7xVHLq4wgYsl1Wis2kHtINWfmxKNJp3CPt8UlTDZU
+lPqAT14xvYLQgOBqAVGZGIqOLnAQtaraXyRLADmXlvQFqZBDUv3nkJXmxFK+2u5Q
+cOsbsYpAX0TVdddwLBMSlWYCoLoU8K27ntpc6Ea/Niq0XYlBRFmgjy/hATw6Fw7m
+R8JDXhRMQuTKjyCKX4a5
+=hthh
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.6-r1.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.12.ebuild
index 81e518a8405c..fee2ff7dd23a 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.6-r1.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.12.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.6-r1.ebuild,v 1.2 2012/01/19 14:24:29 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.12.ebuild,v 1.1 2012/04/05 07:45:44 polynomial-c Exp $
 
 EAPI=2
 
-inherit eutils linux-mod multilib python versionator
+inherit eutils linux-mod multilib python versionator toolchain-funcs
 
 MY_P=VirtualBox-${PV}
 DESCRIPTION="VirtualBox video driver"
@@ -42,7 +42,7 @@ BUILD_TARGETS="all"
 BUILD_TARGET_ARCH="${ARCH}"
 MODULE_NAMES="vboxvideo(misc:${WORKDIR}/vboxvideo_drm:${WORKDIR}/vboxvideo_drm)"
 
-S="${WORKDIR}/${MY_P}_OSE"
+S="${WORKDIR}/${MY_P}"
 
 QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
 
@@ -80,6 +80,11 @@ src_prepare() {
 		epatch "${FILESDIR}/${PN}-3.2.8-mesa-check.patch" \
 			"${FILESDIR}/${PN}-4-makeself-check.patch" \
 			"${FILESDIR}/${PN}-4-mkisofs-check.patch"
+
+		# Patch to link with lazy on hardened #394757
+		if gcc-specs-now ; then
+			epatch "${FILESDIR}/${PN}-link-lazy.patch"
+		fi
 }
 
 src_configure() {
@@ -119,8 +124,11 @@ src_install() {
 		cd "${S}/out/linux.${ARCH}/release/bin/additions"
 		insinto /usr/$(get_libdir)/xorg/modules/drivers
 
+		# xorg-server-1.12.x
+		if has_version ">=x11-base/xorg-server-1.12" ; then
+				newins vboxvideo_drv_112.so vboxvideo_drv.so
 		# xorg-server-1.11.x
-		if has_version ">=x11-base/xorg-server-1.11" ; then
+		elif has_version ">=x11-base/xorg-server-1.11" ; then
 				newins vboxvideo_drv_111.so vboxvideo_drv.so
 		# xorg-server-1.10.x
 		elif has_version ">=x11-base/xorg-server-1.10" ; then