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

Package-Manager: portage-2.1.5_rc3

4 files changed, 60 insertions, 11 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/Manifest b/x11-misc/xcalib/Manifest
index 8fc6a257646d..9ecad17af2b0 100644
--- a/x11-misc/xcalib/Manifest
+++ b/x11-misc/xcalib/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.6-Makefile-ldflags.diff 575 RMD160 c60173c774e57e9cf36a127c9d101da76f41435a SHA1 8db1486c0ff82bc143325ba14e4a5361c6b899bf SHA256 12ca5601924ad2979beeceb7e4949e5a424f956dab042b341c91392517a9071c
+AUX xcalib-0.8-ldflags.patch 1157 RMD160 77098ac2ede67c31a572233f69224986f34aaba4 SHA1 6ba5352250806dc74e86fd65c2d37999c5b164b2 SHA256 145a1d48a99023662a26f36a1538d2ac8e863bdd7a2663c62c1d2a02d0a81793
 DIST xcalib-source-0.6.tar.gz 150354 RMD160 58f66a9d44039e6dcab588440611360788e63d08 SHA1 2f3eb5900b793c2d6f1792e27c423a212f220b18 SHA256 f942a39021d55cde9c25ee0e80e015d1b6ca48e60868382f903085aa2d747c2d
 DIST xcalib-source-0.8.tar.gz 32782 RMD160 5cf0674c1c5687d930a1653dc39f9b241000bfda SHA1 93565ff3df6cf78fd8d1cbeefd094aea6ba070fd SHA256 8a112ee710e5446f6c36e62345b2066f10639d500259db8c48bf1716caea06e6
 EBUILD xcalib-0.6-r1.ebuild 920 RMD160 c737e99bcb614f15b427a415166beac57c0da976 SHA1 6f797b8e7b10a97045982befbd20e5303bffc53c SHA256 20d8be12935dd582397e98c7a89d0f4d59ad6a0ddb2f83cbb8c15a5992663263
-EBUILD xcalib-0.8.ebuild 823 RMD160 fac4cf80c04e18007430cbf6f58375cfa8da42c5 SHA1 25e3424531a0f1ca9359ae6fd63f273af370c034 SHA256 e918623bef78349b4087006b4e2c35b16b984acba2ae54e99d35c946992d92fb
-MISC ChangeLog 1383 RMD160 b89f93ec3871bcfe5fd7dda95688189d5110fb28 SHA1 a59db3c277f02f36404038bd8808f15e03bdfdb3 SHA256 89effea68381a2621dbd237a017783f3f18b262c375cc9f433b2a8cca25cda81
+EBUILD xcalib-0.8.ebuild 1012 RMD160 b3f2c439d75ef212f55ab5d19950331bfa19171c SHA1 3ed81234ead822d3120ff8ec0a99605d3915d579 SHA256 13a0b8e6a7e7d8961833f7ec961c28b5ce5ac3f00729418b6751bf4f40fb6509
+MISC ChangeLog 1606 RMD160 44d96733533ceca96bcf2e075b7e1197372c4e6c SHA1 79fa2d87b77aaa3581eada8e556a3022b7d2a482 SHA256 4d86c62d1d034aff1d65cac4ce4e5fc6f205c0a135f2f0d7a96603b9538595b7
 MISC metadata.xml 251 RMD160 df72d20e36f1fbbdfafcee71e79739e623e4a1d9 SHA1 18d311b89d961d761ccfa45ec7a089d50862ab48 SHA256 9cd1b414990fd6b32ad4aa48f8a1dc58f01479901f910210a340b8705f92e72a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgDQfAACgkQAiZjviIA2Xh6iQCgvydDce+XD1KHVIfbqspCO5ZL
+QqwAoPMyXTJLm6zk/Ufsq0B7Ecj8IAVx
+=b8tA
+-----END PGP SIGNATURE-----
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'
 }