Add missing DEPEND (libX11), remove unused DEPEND (libXext). Clean up path names in patch. Fix underlinking (bug #369319). Respect CC.

(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

3 files changed, 32 insertions, 21 deletions

diff --git a/x11-misc/i855crt/ChangeLog b/x11-misc/i855crt/ChangeLog
index 18ca15301660..e059d1a62350 100644
--- a/x11-misc/i855crt/ChangeLog
+++ b/x11-misc/i855crt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/i855crt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/i855crt/ChangeLog,v 1.8 2011/12/04 16:55:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/i855crt/ChangeLog,v 1.9 2011/12/04 17:10:39 jer Exp $
+
+  04 Dec 2011; Jeroen Roovers <jer@gentoo.org> files/i855crt-i915support.diff,
+  i855crt-0.4-r1.ebuild:
+  Add missing DEPEND (libX11), remove unused DEPEND (libXext). Clean up path
+  names in patch. Fix underlinking (bug #369319). Respect CC.
 
   04 Dec 2011; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Remove meaningless maintainer tag.
diff --git a/x11-misc/i855crt/files/i855crt-i915support.diff b/x11-misc/i855crt/files/i855crt-i915support.diff
index 83c9c38dd19a..5aea3a7dd96c 100644
--- a/x11-misc/i855crt/files/i855crt-i915support.diff
+++ b/x11-misc/i855crt/files/i855crt-i915support.diff
@@ -1,6 +1,5 @@
-diff -ur ../i855-crt-0.4/dumpreg.c ./dumpreg.c
---- ../i855-crt-0.4/dumpreg.c	2004-05-01 17:50:45.000000000 +0100
-+++ ./dumpreg.c	2005-05-31 15:18:12.927156400 +0100
+--- a/dumpreg.c
++++ b/dumpreg.c
 @@ -36,10 +36,11 @@
  		(p = strstr(*buff_ptr, I810_DC100STR_1)) != NULL ||
  		(p = strstr(*buff_ptr, I810_DC100STR_2)) != NULL ||
@@ -24,9 +23,8 @@ diff -ur ../i855-crt-0.4/dumpreg.c ./dumpreg.c
  		exit(1);
  	}
  	pclose(pci_f);
-diff -ur ../i855-crt-0.4/i855crt.c ./i855crt.c
---- ../i855-crt-0.4/i855crt.c	2004-05-08 13:27:20.000000000 +0100
-+++ ./i855crt.c	2005-05-31 15:17:57.100562408 +0100
+--- a/i855crt.c
++++ b/i855crt.c
 @@ -254,14 +254,15 @@
  		(p = strstr(*buff_ptr, I810_DC100STR_1)) != NULL ||
  		(p = strstr(*buff_ptr, I810_DC100STR_2)) != NULL ||
@@ -55,9 +53,8 @@ diff -ur ../i855-crt-0.4/i855crt.c ./i855crt.c
  		exit(1);
  	}
  	pclose(pci_f);
-diff -ur ../i855-crt-0.4/i855crt.h ./i855crt.h
---- ../i855-crt-0.4/i855crt.h	2004-05-01 17:06:28.000000000 +0100
-+++ ./i855crt.h	2005-05-31 15:07:53.232364328 +0100
+--- a/i855crt.h
++++ b/i855crt.h
 @@ -1,3 +1,4 @@
 +
  /* 
diff --git a/x11-misc/i855crt/i855crt-0.4-r1.ebuild b/x11-misc/i855crt/i855crt-0.4-r1.ebuild
index 28202162afcf..e3a9fe666dd1 100644
--- a/x11-misc/i855crt/i855crt-0.4-r1.ebuild
+++ b/x11-misc/i855crt/i855crt-0.4-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/i855crt/i855crt-0.4-r1.ebuild,v 1.2 2010/07/21 14:41:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/i855crt/i855crt-0.4-r1.ebuild,v 1.3 2011/12/04 17:10:39 jer Exp $
 
-inherit eutils
+EAPI=4
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Intel Montara 855GM CRT out auxiliary driver"
 HOMEPAGE="http://i855crt.sourceforge.net/"
@@ -13,21 +15,28 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-DEPEND="x11-libs/libXext
-	x11-libs/libXv"
+DEPEND="
+	x11-libs/libX11
+	x11-libs/libXv
+"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-i915support.diff
 
+	# respect CC, fix underlinking
+	sed -i Makefile \
+		-e 's|gcc|$(CC)|g;/LDFLAGS/{s|$| -lX11|g};s|-lXext||g' \
+		|| die
+	export LIBS="-lX11"
+	tc-export CC
+
 	# upstream ships it with the binary, we want to make sure we compile it
-	make clean || die
+	emake clean
 }
 
 src_install() {
-	dobin i855crt || die
+	dobin i855crt
 	insinto /etc
-	doins i855crt.conf || die
+	doins i855crt.conf
 }