Fix bug #100391, thanks to Patrik Kullman.

(Portage version: 2.0.51.22-r2)

5 files changed, 65 insertions, 3 deletions

diff --git a/app-laptop/radeontool/ChangeLog b/app-laptop/radeontool/ChangeLog
index d2b2aac9b294..65d2d2be7721 100644
--- a/app-laptop/radeontool/ChangeLog
+++ b/app-laptop/radeontool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-laptop/radeontool
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/radeontool/ChangeLog,v 1.11 2005/04/21 19:01:05 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/radeontool/ChangeLog,v 1.12 2005/08/26 10:47:06 brix Exp $
+
+*radeontool-1.5-r2 (26 Aug 2005)
+
+  26 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/radeontool-1.5-vga-ati.patch, +radeontool-1.5-r2.ebuild:
+  Fix bug #100391, thanks to Patrik Kullman.
 
   21 Apr 2005; Simon Stelling <blubb@gentoo.org> radeontool-1.5-r1.ebuild:
   stable on amd64
diff --git a/app-laptop/radeontool/Manifest b/app-laptop/radeontool/Manifest
index a91e2793f5ef..4dba474db9cc 100644
--- a/app-laptop/radeontool/Manifest
+++ b/app-laptop/radeontool/Manifest
@@ -1,5 +1,8 @@
-MD5 521ff00374793204b127739fe4e9c53c ChangeLog 1655
-MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 f38426836f597728a8491509de988d97 radeontool-1.5-r1.ebuild 827
+MD5 d01c207f3418c5a556c3963682f0c978 ChangeLog 1855
+MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
+MD5 18915c1712aae42f56e50ee31554a714 radeontool-1.5-r2.ebuild 761
 MD5 354913651b0e6e37c53069e84329bde4 files/digest-radeontool-1.5-r1 65
+MD5 354913651b0e6e37c53069e84329bde4 files/digest-radeontool-1.5-r2 65
+MD5 2d97b579ecca328f1be6a1c0c3be9edf files/radeontool-1.5-vga-ati.patch 612
 MD5 322e4f9536fffd2172a01583f65d46ca files/radeontool-1.5-mmap.patch 502
diff --git a/app-laptop/radeontool/files/digest-radeontool-1.5-r2 b/app-laptop/radeontool/files/digest-radeontool-1.5-r2
new file mode 100644
index 000000000000..bb8d2632d1b7
--- /dev/null
+++ b/app-laptop/radeontool/files/digest-radeontool-1.5-r2
@@ -0,0 +1 @@
+MD5 8065eebe5a2b163e43b40461bfe49a56 radeontool-1.5.tar.gz 20869
diff --git a/app-laptop/radeontool/files/radeontool-1.5-vga-ati.patch b/app-laptop/radeontool/files/radeontool-1.5-vga-ati.patch
new file mode 100644
index 000000000000..8a1e9dd127d5
--- /dev/null
+++ b/app-laptop/radeontool/files/radeontool-1.5-vga-ati.patch
@@ -0,0 +1,11 @@
+--- radeontool-1.5/radeontool.c		2005-07-26 20:59:16.000000000 +0200
++++ radeontool-1.5-ati-vga/radeontool.c	2005-07-26 20:59:48.000000000 +0200
+@@ -293,7 +293,7 @@
+        if(fgets(line,sizeof(line),fp) == NULL) {  /* if end of file */
+           fatal("Radeon hardware not found in lspci output.\n");
+        }
+-       if(strstr(line,"Radeon") || strstr(line,"ATI Tech")) {  /* if line contains a "radeon" string */
++       if(strstr(line,"Radeon") || strstr(line,"VGA compatible controller: ATI Tech")) {  /* if line contains a "radeon" string */
+           if(skip-- < 1) {
+              break;
+           }
diff --git a/app-laptop/radeontool/radeontool-1.5-r2.ebuild b/app-laptop/radeontool/radeontool-1.5-r2.ebuild
new file mode 100644
index 000000000000..9a9ce2b5fdc7
--- /dev/null
+++ b/app-laptop/radeontool/radeontool-1.5-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/radeontool/radeontool-1.5-r2.ebuild,v 1.1 2005/08/26 10:47:06 brix Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Control the backlight and external video output of ATI Radeon Mobility graphics cards"
+
+HOMEPAGE="http://fdd.com/software/radeon/"
+SRC_URI="http://fdd.com/software/radeon/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+IUSE=""
+
+DEPEND="sys-apps/sed"
+RDEPEND="sys-apps/pciutils"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-mmap.patch
+	epatch ${FILESDIR}/${P}-vga-ati.patch
+
+	sed -i \
+		-e "s:-Wall -O2:${CFLAGS}:" \
+		-e "s:gcc:$(tc-getCC):" \
+		${S}/Makefile
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin radeontool
+	dodoc CHANGES
+}