Add a patch to respect LDFLAGS; fix broken dependencies; use the correct path for X11 (no more /usr/X11R6).

(Portage version: 2.1.5_rc3)

3 files changed, 47 insertions, 9 deletions

diff --git a/x11-misc/xcalib/ChangeLog b/x11-misc/xcalib/ChangeLog
index c6c4c8adb371..fb2bd7833a17 100644
--- a/x11-misc/xcalib/ChangeLog
+++ b/x11-misc/xcalib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xcalib
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcalib/ChangeLog,v 1.11 2008/04/12 12:03:08 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcalib/ChangeLog,v 1.12 2008/04/14 11:36:52 flameeyes Exp $
+
+  14 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/xcalib-0.8-ldflags.patch, xcalib-0.8.ebuild:
+  Add a patch to respect LDFLAGS; fix broken dependencies; use the correct
+  path for X11 (no more /usr/X11R6).
 
   12 Apr 2008; nixnut <nixnut@gentoo.org> xcalib-0.8.ebuild:
   Stable on ppc wrt bug 216626
diff --git a/x11-misc/xcalib/files/xcalib-0.8-ldflags.patch b/x11-misc/xcalib/files/xcalib-0.8-ldflags.patch
new file mode 100644
index 000000000000..a21a5fbabe0b
--- /dev/null
+++ b/x11-misc/xcalib/files/xcalib-0.8-ldflags.patch
@@ -0,0 +1,24 @@
+Index: xcalib-0.8/Makefile
+===================================================================
+--- xcalib-0.8.orig/Makefile
++++ xcalib-0.8/Makefile
+@@ -50,16 +50,16 @@ all: xcalib
+ # low overhead version (internal parser)
+ xcalib: xcalib.c
+ 	$(CC) $(CFLAGS) -c xcalib.c -I$(XINCLUDEDIR) -DXCALIB_VERSION=\"$(XCALIB_VERSION)\"
+-	$(CC) $(CFLAGS) -L$(XLIBDIR) -lm -o xcalib xcalib.o -lX11 -lXxf86vm -lXext
++	$(CC) $(LDFLAGS) -L$(XLIBDIR) -o xcalib xcalib.o -lX11 -lXxf86vm -lXext -lm
+ 
+ fglrx_xcalib: xcalib.c
+ 	$(CC) $(CFLAGS) -c xcalib.c -I$(XINCLUDEDIR) -DXCALIB_VERSION=\"$(XCALIB_VERSION)\" -I$(FGLRXINCLUDEDIR) -DFGLRX
+-	$(CC) $(CFLAGS) -L$(XLIBDIR) -L$(FGLRXLIBDIR) -lm -o xcalib xcalib.o -lX11 -lXxf86vm -lXext -lfglrx_gamma
++	$(CC) $(LDFLAGS) -L$(XLIBDIR) -L$(FGLRXLIBDIR) -o xcalib xcalib.o -lX11 -lXxf86vm -lXext -lfglrx_gamma -lm
+ 
+ win_xcalib: xcalib.c
+ 	$(CC) $(CFLAGS) -c xcalib.c -DXCALIB_VERSION=\"$(XCALIB_VERSION)\" -DWIN32GDI
+ 	windres.exe resource.rc resource.o
+-	$(CC) $(CFLAGS) -mwindows -lm resource.o -o xcalib xcalib.o
++	$(CC) $(LDFLAGS) -mwindows -lm resource.o -o xcalib xcalib.o
+ 
+ install:
+ 	cp ./xcalib $(DESTDIR)/usr/local/bin/
diff --git a/x11-misc/xcalib/xcalib-0.8.ebuild b/x11-misc/xcalib/xcalib-0.8.ebuild
index cc4e1fe79ae0..4c55af7fd31d 100644
--- a/x11-misc/xcalib/xcalib-0.8.ebuild
+++ b/x11-misc/xcalib/xcalib-0.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcalib/xcalib-0.8.ebuild,v 1.3 2008/04/12 12:03:08 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcalib/xcalib-0.8.ebuild,v 1.4 2008/04/14 11:36:52 flameeyes Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs multilib
 
 DESCRIPTION="xcalib is a tiny monitor calibration loader for X.org"
 HOMEPAGE="http://www.etg.e-technik.uni-erlangen.de/web/doe/xcalib/"
@@ -13,18 +13,27 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="
-	x11-libs/libX11
+RDEPEND="x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-proto/xf86vidmodeproto
-"
-RDEPEND=""
+	x11-libs/libXxf86vm"
+
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-ldflags.patch"
+}
 
 src_compile() {
 	emake \
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		XINCLUDEDIR=/usr/include \
+		XLIBDIR=/usr/$(get_libdir) \
 		|| die 'make failed'
 }