Install app-defaults to /usr/share instead of /usr/X11R6/lib and tc-export CC.

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

3 files changed, 22 insertions, 19 deletions

diff --git a/x11-misc/xcb/ChangeLog b/x11-misc/xcb/ChangeLog
index 06f431fd4b88..fcd9f10ce0b7 100644
--- a/x11-misc/xcb/ChangeLog
+++ b/x11-misc/xcb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xcb
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcb/ChangeLog,v 1.12 2006/10/27 06:39:11 omp Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcb/ChangeLog,v 1.13 2009/05/02 10:10:59 ssuominen Exp $
+
+  02 May 2009; Samuli Suominen <ssuominen@gentoo.org> xcb-2.4.ebuild:
+  Install app-defaults to /usr/share instead of /usr/X11R6/lib and tc-export
+  CC.
 
   27 Oct 2006; David Shakaryan <omp@gentoo.org> xcb-2.4.ebuild:
   Minor cleanup and remove monolithic X from dependencies.
diff --git a/x11-misc/xcb/Manifest b/x11-misc/xcb/Manifest
index 367ccd84aa04..e0ee6647ef3a 100644
--- a/x11-misc/xcb/Manifest
+++ b/x11-misc/xcb/Manifest
@@ -1,4 +1,4 @@
 DIST xcb-2.4.tar.gz 19830 RMD160 a6edcdac89091d69d49aa176f05237fbf546d092 SHA1 9c9075a45366b15c25692628e90cb383c0381ecb SHA256 21f25d05907fa3c8393b21474e81f4043af43fb087265f1753a5d57d068bc295
-EBUILD xcb-2.4.ebuild 1084 RMD160 009762983bcbd7495741c1c6cde678a2c53b235a SHA1 a245a6c45bb28534b1fd0a31e2c800e6bf0e4eab SHA256 a99dc59a949eaeff2a94f55477e7d6ec030804657c9081743429ff52a14b83f4
-MISC ChangeLog 1316 RMD160 e7bba27af2ec83c41275f9a95f67803df355e454 SHA1 dceed1b94572b1fc14f8b1381d58107c6a360071 SHA256 dcda15a0cdcb9578fb56a34a5d247940f4eb512e945da2b60953a03547ba0b19
+EBUILD xcb-2.4.ebuild 1070 RMD160 a9410c66fe155ff31f1df9aa62296c8323b3eb11 SHA1 b4d83338a1f6b2f27e166a94bcfa5531847168ca SHA256 376ef774d4b1961a3503b6b67eb45d36358be1dab408c896ac07b885c6876cec
+MISC ChangeLog 1476 RMD160 fda50a74a6146c8a2c08f7932bb9c26c70d827a8 SHA1 c12338ff45086b6a0a55bfcc70792843065004f1 SHA256 089de691d5360ffe3502a3146fa61f11967eaf7c734883892b261e5886ba81f3
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
diff --git a/x11-misc/xcb/xcb-2.4.ebuild b/x11-misc/xcb/xcb-2.4.ebuild
index cb6b21a0e66f..9eeabee45195 100644
--- a/x11-misc/xcb/xcb-2.4.ebuild
+++ b/x11-misc/xcb/xcb-2.4.ebuild
@@ -1,6 +1,9 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcb/xcb-2.4.ebuild,v 1.11 2006/10/27 06:39:11 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcb/xcb-2.4.ebuild,v 1.12 2009/05/02 10:10:59 ssuominen Exp $
+
+EAPI=2
+inherit toolchain-funcs
 
 DESCRIPTION="Marc Lehmann's improved X Cut Buffers"
 HOMEPAGE="http://www.goof.com/pcg/marc/xcb.html"
@@ -19,32 +22,28 @@ DEPEND="${RDEPEND}
 	x11-proto/xproto
 	motif? ( x11-libs/openmotif )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	mv xcb.man xcb.1
-}
-
 src_compile() {
 	local gui libs
 
 	if use motif; then
 		gui="-DMOTIF"
-		libs="-L/usr/X11R6/lib -lXm -lXt -lX11"
+		libs="-lXm -lXt -lX11"
 	else
 		gui="-DATHENA"
-		libs="-L/usr/X11R6/lib -lXaw -lXt -lXext -lX11"
+		libs="-lXaw -lXt -lXext -lX11"
 	fi
 
+	tc-export CC
 	emake -f Makefile.std xcb Xcb.ad \
-		CFLAGS="${CFLAGS} ${gui} -I/usr/X11R6/include" \
+		CFLAGS="${CFLAGS} ${gui}" \
 		GUI="${gui}" \
 		LIBS="${libs}" \
-		|| die 'emake failed'
+		|| die "emake failed"
 }
 
 src_install() {
-	dobin xcb
-	doman xcb.1
-	insinto /usr/X11R6/lib/X11/app-defaults ; newins Xcb.ad Xcb
+	dobin xcb || die "dobin failed"
+	newman xcb.man xcb.1
+	insinto /usr/share/X11/app-defaults
+	newins Xcb.ad Xcb || die "newins failed"
 }