[gentoo-commits] gentoo-x86 commit in x11-misc/xcalib: xcalib-0.8.ebuild ChangeLog

[Diego Petteno (flameeyes)]

flameeyes    08/04/14 11:36:53

  Modified:             xcalib-0.8.ebuild ChangeLog
  Log:
  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)

Revision  Changes    Path
1.4                  x11-misc/xcalib/xcalib-0.8.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xcalib/xcalib-0.8.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xcalib/xcalib-0.8.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xcalib/xcalib-0.8.ebuild?r1=1.3&r2=1.4

Index: xcalib-0.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/xcalib/xcalib-0.8.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xcalib-0.8.ebuild	12 Apr 2008 12:03:08 -0000	1.3
+++ xcalib-0.8.ebuild	14 Apr 2008 11:36:52 -0000	1.4
@@ -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 @@
 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'
 }
 



1.12                 x11-misc/xcalib/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xcalib/ChangeLog?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xcalib/ChangeLog?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xcalib/ChangeLog?r1=1.11&r2=1.12

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/xcalib/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ChangeLog	12 Apr 2008 12:03:08 -0000	1.11
+++ ChangeLog	14 Apr 2008 11:36:52 -0000	1.12
@@ -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@g.o>
+  +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@g.o> xcalib-0.8.ebuild:
   Stable on ppc wrt bug 216626



-- 
gentoo-commits@l.g.o mailing list