[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/

["Emil Karlson" <jekarlson@gmail.com>]

commit:     ad9f4468d50049ac3cbf255a04cda0c38302da53
Author:     Emil Karlson <jekarlson <AT> gmail <DOT> com>
AuthorDate: Sun Oct 14 20:16:00 2012 +0000
Commit:     Emil Karlson <jekarlson <AT> gmail <DOT> com>
CommitDate: Sun Oct 14 20:16:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=ad9f4468

x11-drivers/ati-drivers: Version bump

Version bump from ubuntu repositories.
Modified src_unpack accordingly.

---
 ...eta.ebuild => ati-drivers-12.9_beta9000.ebuild} |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/x11-drivers/ati-drivers/ati-drivers-12.9_beta.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.9_beta9000.ebuild
similarity index 97%
rename from x11-drivers/ati-drivers/ati-drivers-12.9_beta.ebuild
rename to x11-drivers/ati-drivers/ati-drivers-12.9_beta9000.ebuild
index 1cb2182..95e9207 100644
--- a/x11-drivers/ati-drivers/ati-drivers-12.9_beta.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-12.9_beta9000.ebuild
@@ -10,8 +10,8 @@ DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and ne
 HOMEPAGE="http://www.amd.com"
 MY_V=( $(get_version_components) )
 #RUN="${WORKDIR}/amd-driver-installer-9.00-x86.x86_64.run"
-SRC_URI="http://www2.ati.com/drivers/beta/amd-driver-installer-12-9-beta-x86.x86_64.zip"
-FOLDER_PREFIX="common/"
+SRC_URI="https://launchpad.net/ubuntu/quantal/+source/fglrx-installer/2:9.000-0ubuntu3/+files/fglrx-installer_9.000.orig.tar.gz"
+FOLDER_PREFIX=""
 IUSE="debug +modules multilib qt4 static-libs disable-watermark"
 
 LICENSE="AMD GPL-2 QPL-1.0 as-is"
@@ -21,7 +21,7 @@ SLOT="1"
 RESTRICT="bindist"
 
 RDEPEND="
-	<=x11-base/xorg-server-1.12.49[-minimal]
+	<=x11-base/xorg-server-1.13.49[-minimal]
 	>=app-admin/eselect-opengl-1.0.7
 	app-admin/eselect-opencl
 	sys-power/acpid
@@ -279,14 +279,18 @@ pkg_setup() {
 }
 
 src_unpack() {
-	#please note, RUN may be insanely assigned at top near SRC_URI
-	if [[ ${A} =~ .*\.zip ]]; then
+	if [[ ${A} =~ .*\.tar\.gz ]]; then
 		unpack ${A}
-		[[ -z "$RUN" ]] && RUN="${S}/${A/%.zip/.run}"
 	else
-		RUN="${DISTDIR}/${A}"
+		#please note, RUN may be insanely assigned at top near SRC_URI
+		if [[ ${A} =~ .*\.zip ]]; then
+			unpack ${A}
+			[[ -z "$RUN" ]] && RUN="${S}/${A/%.zip/.run}"
+		else
+			RUN="${DISTDIR}/${A}"
+		fi
+		sh ${RUN} --extract "${S}" 2>&1 > /dev/null || die
 	fi
-	sh ${RUN} --extract "${S}" 2>&1 > /dev/null || die
 }
 
 src_prepare() {