Improve support for Modular Xorg by using the correct path for app-defaults, pinpointing the virtual/x11 dependency and respecting LDFLAGS. See bug #139820.

Package-Manager: portage-2.1.1_pre2-r6

3 files changed, 48 insertions, 20 deletions

diff --git a/x11-misc/xvkbd/ChangeLog b/x11-misc/xvkbd/ChangeLog
index afd86fd1b28c..1611b183a7d8 100644
--- a/x11-misc/xvkbd/ChangeLog
+++ b/x11-misc/xvkbd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xvkbd
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvkbd/ChangeLog,v 1.13 2006/02/11 16:34:52 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvkbd/ChangeLog,v 1.14 2006/07/10 17:51:12 flameeyes Exp $
+
+  10 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> xvkbd-2.6.ebuild:
+  Improve support for Modular Xorg by using the correct path for app-defaults,
+  pinpointing the virtual/x11 dependency and respecting LDFLAGS. See bug
+  #139820.
 
   11 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org> xvkbd-2.6.ebuild:
   Added rman do DEPEND, fixes bug #122466.
diff --git a/x11-misc/xvkbd/Manifest b/x11-misc/xvkbd/Manifest
index de492c8eb04a..dad9abab7221 100644
--- a/x11-misc/xvkbd/Manifest
+++ b/x11-misc/xvkbd/Manifest
@@ -1,12 +1,26 @@
-MD5 ffedbbf7077ed3d7f7e374461d526a43 ChangeLog 1488
-RMD160 0cbc6027c766a195abf4fc8cde5e455d72b08c14 ChangeLog 1488
-SHA256 52e35fa8df5e539ac732931303b63a2cbafc5d1e64e93d2f05791848f67c35a9 ChangeLog 1488
-MD5 45cc9870e3d9e12c330fdc8e8b4026ad files/digest-xvkbd-2.6 226
-RMD160 94270c504718fe8c05574551dbc188b183da624b files/digest-xvkbd-2.6 226
-SHA256 50f987c527f6f859e90693391c3b5f519eeb419d4863a4a8dd6f3062b38a87dc files/digest-xvkbd-2.6 226
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST xvkbd-2.6.tar.gz 59829 RMD160 0a6a011f8ee5b89187dffa2dc919a357a8f27361 SHA1 52e43cce2d3de07c0833a01ba8c85c1fcb2bcb8e SHA256 654c7f51940e4632e8e08023bdfff11c8f814130beb57d480027720dc5b50606
+EBUILD xvkbd-2.6.ebuild 1151 RMD160 24662415950b259eea31773fd2d6bf37742c5e08 SHA1 acfca887d2175c61eb5e90cae09bb635b4ce5b34 SHA256 c8cf2a5bdd6a9f210c307fc911f8bf0d695a324618e9b8284a560d7c5fdacaf4
+MD5 78bb52051c238d9e036d94518b9eb000 xvkbd-2.6.ebuild 1151
+RMD160 24662415950b259eea31773fd2d6bf37742c5e08 xvkbd-2.6.ebuild 1151
+SHA256 c8cf2a5bdd6a9f210c307fc911f8bf0d695a324618e9b8284a560d7c5fdacaf4 xvkbd-2.6.ebuild 1151
+MISC ChangeLog 1724 RMD160 2d5157054a0c8bc7802cf3db39d059a9f5ac02d3 SHA1 998c719c0ab217913f7adcc21873cc3f37e4250d SHA256 8dacf3628e567c9be73e765a34b4dbd029f002ef1d17a289b3218c862c7a0051
+MD5 038d0157f64cd9082ba90311b31382af ChangeLog 1724
+RMD160 2d5157054a0c8bc7802cf3db39d059a9f5ac02d3 ChangeLog 1724
+SHA256 8dacf3628e567c9be73e765a34b4dbd029f002ef1d17a289b3218c862c7a0051 ChangeLog 1724
+MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 metadata.xml 166
-MD5 652fea54ae8cda336fd302ecb6e90d12 xvkbd-2.6.ebuild 872
-RMD160 01bafe137dea0e43d2c3ce586b5ffe268e57cb0a xvkbd-2.6.ebuild 872
-SHA256 ee64717bd9c777adbff0dde3cf3633c24366b921651ee99d4c6746845048d2f5 xvkbd-2.6.ebuild 872
+MD5 45cc9870e3d9e12c330fdc8e8b4026ad files/digest-xvkbd-2.6 226
+RMD160 94270c504718fe8c05574551dbc188b183da624b files/digest-xvkbd-2.6 226
+SHA256 50f987c527f6f859e90693391c3b5f519eeb419d4863a4a8dd6f3062b38a87dc files/digest-xvkbd-2.6 226
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFEspOiAiZjviIA2XgRAnhnAKDoQwPRa4DvmCg8S4xWYpYnd2JdYQCgys12
+qNApptx0SSoCym8++jL4Bn4=
+=m/5/
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xvkbd/xvkbd-2.6.ebuild b/x11-misc/xvkbd/xvkbd-2.6.ebuild
index b256d2f34397..c09e7b9155a5 100644
--- a/x11-misc/xvkbd/xvkbd-2.6.ebuild
+++ b/x11-misc/xvkbd/xvkbd-2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvkbd/xvkbd-2.6.ebuild,v 1.9 2006/02/11 16:34:52 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvkbd/xvkbd-2.6.ebuild,v 1.10 2006/07/10 17:51:12 flameeyes Exp $
 
 DESCRIPTION="virtual keyboard for X window system"
 HOMEPAGE="http://homepage3.nifty.com/tsato/xvkbd/"
@@ -11,12 +11,10 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-RDEPEND="|| ( ( x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXtst
-		)
-		virtual/x11
-	)
+RDEPEND="|| ( (
+			x11-libs/libXtst
+			x11-libs/libXmu
+		) <virtual/x11-7 )
 	x11-libs/Xaw3d"
 
 DEPEND="${RDEPEND}
@@ -25,16 +23,27 @@ DEPEND="${RDEPEND}
 		app-text/rman
 		x11-proto/xextproto
 		)
-		virtual/x11
+		<virtual/x11-7
 	)"
 
+pkg_setup() {
+	has_version '<x11-base/xorg-x11-7' && \
+		appdefaultsdir="/etc/X11/app-defaults/" || \
+		appdefaultsdir="/usr/share/X11/app-defaults/"
+}
+
 src_compile() {
 	xmkmf -a || die
-	emake CDEBUGFLAGS="${CFLAGS}" || die "emake failed"
+
+	emake \
+		XAPPLOADDIR="${appdefaultsdir}" \
+		LOCAL_LDFLAGS="${LDFLAGS}" \
+		CDEBUGFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	emake XAPPLOADDIR="${appdefaultsdir}" DESTDIR="${D}" install || die "make install failed"
+	rm -rf "${D}/usr/lib/X11"
 
 	dodoc README
 	newman ${PN}.man ${PN}.1