Making changes suggested by Jory Pratt.

svn path=/; revision=14

1 files changed, 19 insertions, 7 deletions

diff --git a/x11-drivers/ati-drivers/ati-drivers-8.39.4.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.39.4.ebuild
index 48e9f24..fbc9eb9 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.39.4.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.39.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.ati.com"
 ATI_URL="https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/"
 SRC_URI="${ATI_URL}/ati-driver-installer-${PV}-x86.x86_64.run"
 
-LICENSE="AMD GPL-2 as-is"
+LICENSE="AMD GPL-2 QPL-1.0 as-is"
 KEYWORDS="~amd64 ~x86"
 
 # The portage dep is for COLON_SEPARATED support in env-update.
@@ -32,7 +32,12 @@ DEPEND="${RDEPEND}
 	x11-proto/xf86miscproto
 	x11-proto/xf86vidmodeproto"
 
-EMULTILIB_PKG="true"
+# EMULTILIB_PKG="true"
+
+# Ignore QA warnings about multilib-pkg-force not existing:
+# multilib.eclass uses it (without it we do not install the 32 bit
+# libraries on amd64) --marienz
+RESTRICT="multilib-pkg-force"
 
 QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so
 	usr/lib/opengl/ati/lib/libGL.so.1.2
@@ -91,7 +96,12 @@ pkg_setup() {
 		die "CONFIG_PARAVIRT enabled"
 	fi
 
-	BASE_DIR="${S}/x710"
+	# xorg-server 1.1 and its prereleases correspond to xorg 7.1.
+	if has_version ">=x11-base/xorg-server-1.0.99"; then
+		BASE_DIR="${S}/x710"
+	else
+		BASE_DIR="${S}/x690"
+	fi
 
 	if use amd64 ; then
 		BASE_DIR="${BASE_DIR}_64a"
@@ -109,9 +119,11 @@ src_unpack() {
 	# This is apparently a nonstandard makeself archive, so extract
 	# the offset by hand.
 	local offset=$(grep -am1 SKIP "${src}" | sed -e 's/SKIP="\([0-9]\+\)"/\1/')
-	# It is off by one because of an (unused) checksum field.
-	unpack_makeself "${src}" $(( offset + 1 )) tail || die "unpack failed"
 
+	#Switching to a standard way to extract the files since otherwise no signature file 
+	#would be creted
+	"${src}" --extract "${S}" 2&>1 /dev/null
+ 
 	gunzip common/usr/share/man/man8/atieventsd.8 || die "manpage unzip failed"
 
 	# These are the userspace utilities that we also have source for.
@@ -150,7 +162,6 @@ src_unpack() {
 	popd >/dev/null
 
 	mkdir extra || die "mkdir failed"
-	# The ./ in these unpacks is required (or unpack looks in ${DISTDIR})
 	cd extra
 	unpack ./../common/usr/src/ati/fglrx_sample_source.tgz
 	sed -i -e 's:include/extensions/extutil.h:X11/extensions/extutil.h:' \
@@ -158,6 +169,7 @@ src_unpack() {
 	# Add a category.
 	mv programs/fglrx_gamma/fglrx_xgamma.{man,1} || die "man mv failed"
 	cd ..
+
 }
 
 src_compile() {
@@ -274,7 +286,7 @@ src_install() {
 	# etc.
 	insinto /etc/ati
 	# Everything except for the authatieventsd.sh script.
-	doins common/etc/ati/{fglrxprofiles.csv,fglrxrc,logo*}
+	doins common/etc/ati/{fglrxprofiles.csv,fglrxrc,logo*,control,atiogl.xml,signature}
 	if use acpi; then
 		doins common/etc/ati/authatieventsd.sh
 	fi