From: Samuli Suominen <ssuominen@gentoo.org>
Date: Fri, 9 Mar 2007 07:46:45 +0000 (+0000)
Subject: Stop using virtual/x11 and remove redudant checks for it.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4a61ba0cd3f66834c9a040f3f0e94c4a09ecc203;p=gentoo.git

Stop using virtual/x11 and remove redudant checks for it.
Package-Manager: portage-2.1.2.2
---

diff --git a/x11-misc/xvkbd/ChangeLog b/x11-misc/xvkbd/ChangeLog
index 748f1eca0210..005c6c1c97bb 100644
--- a/x11-misc/xvkbd/ChangeLog
+++ b/x11-misc/xvkbd/ChangeLog
@@ -1,6 +1,9 @@
 # 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.15 2006/10/11 11:48:22 nelchael Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvkbd/ChangeLog,v 1.16 2007/03/09 07:46:45 drac Exp $
+
+  09 Mar 2007; Samuli Suominen <drac@gentoo.org> xvkbd-2.6.ebuild:
+  Stop using virtual/x11 and remove redudant checks for it.
 
   11 Oct 2006; Krzysiek Pawlik <nelchael@gentoo.org> xvkbd-2.6.ebuild:
   Add missing x11-misc/gccmakedep to DEPEND, see bug #150802.
diff --git a/x11-misc/xvkbd/Manifest b/x11-misc/xvkbd/Manifest
index 290cfe13994a..6bac4d67643a 100644
--- a/x11-misc/xvkbd/Manifest
+++ b/x11-misc/xvkbd/Manifest
@@ -1,15 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST xvkbd-2.6.tar.gz 59829 RMD160 0a6a011f8ee5b89187dffa2dc919a357a8f27361 SHA1 52e43cce2d3de07c0833a01ba8c85c1fcb2bcb8e SHA256 654c7f51940e4632e8e08023bdfff11c8f814130beb57d480027720dc5b50606
-EBUILD xvkbd-2.6.ebuild 1172 RMD160 f3b7a098ef95820901fc40ea1d118faa1d840c88 SHA1 710cd50bf221c7dd28561fb18277b446c27ffcd6 SHA256 a09cdf98d42df652d40d43797eb5e98c2e7bae80cefa194b1ffe9449b5085c3a
-MD5 5b38f69df15311ef60da31c4abf4e002 xvkbd-2.6.ebuild 1172
-RMD160 f3b7a098ef95820901fc40ea1d118faa1d840c88 xvkbd-2.6.ebuild 1172
-SHA256 a09cdf98d42df652d40d43797eb5e98c2e7bae80cefa194b1ffe9449b5085c3a xvkbd-2.6.ebuild 1172
-MISC ChangeLog 1857 RMD160 f4abd1eb45d6e9d772b23e26798ff80bd301d9b3 SHA1 8765e5f740d8dc9129a5155041a9d12493a2f963 SHA256 85fb131d04ee2ff47937b5f7d33c3b71446a80e65b50064dbd68c24853bfed0e
-MD5 8a53a5ecee75aee43fe7dd3cf27de600 ChangeLog 1857
-RMD160 f4abd1eb45d6e9d772b23e26798ff80bd301d9b3 ChangeLog 1857
-SHA256 85fb131d04ee2ff47937b5f7d33c3b71446a80e65b50064dbd68c24853bfed0e ChangeLog 1857
+EBUILD xvkbd-2.6.ebuild 988 RMD160 bcf76be344b33735f3053f5770cb5af15a2c20bd SHA1 7e312e6aeb1a727be3f1a7fb2dbb2724e8d98b96 SHA256 4ced670d43b7fbecae9ab3dfc725f2940e4da52546d247f14aab840540ad846d
+MD5 d50ccf10bdd94d45fdb79c002c2c0741 xvkbd-2.6.ebuild 988
+RMD160 bcf76be344b33735f3053f5770cb5af15a2c20bd xvkbd-2.6.ebuild 988
+SHA256 4ced670d43b7fbecae9ab3dfc725f2940e4da52546d247f14aab840540ad846d xvkbd-2.6.ebuild 988
+MISC ChangeLog 1981 RMD160 9b7e0035adf941eff788e2827c5820a6760cafea SHA1 0173831f4cfa0d97cb320029a63d588fe480cd69 SHA256 2614924cf3a5172b7c828d4f1f658b0e0c3dc3d59fef6e142d7a2624d4ecf2f4
+MD5 dd5e96ccd5be61928c32da2efaea2cc2 ChangeLog 1981
+RMD160 9b7e0035adf941eff788e2827c5820a6760cafea ChangeLog 1981
+SHA256 2614924cf3a5172b7c828d4f1f658b0e0c3dc3d59fef6e142d7a2624d4ecf2f4 ChangeLog 1981
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
@@ -17,10 +14,3 @@ SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 metadata
 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.5 (GNU/Linux)
-
-iD8DBQFFLNopgo/w9rxVVVERAsVVAKC55nOuQcd0nauU+ovk3wROdGveJgCghIYd
-knMa3UCiLSyw2aIbHSk36i4=
-=BQzd
------END PGP SIGNATURE-----
diff --git a/x11-misc/xvkbd/xvkbd-2.6.ebuild b/x11-misc/xvkbd/xvkbd-2.6.ebuild
index 25ae94dfd6a7..a9eb7ed58a8b 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
+# Copyright 1999-2007 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.11 2006/10/11 11:48:22 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvkbd/xvkbd-2.6.ebuild,v 1.12 2007/03/09 07:46:45 drac Exp $
 
 DESCRIPTION="virtual keyboard for X window system"
 HOMEPAGE="http://homepage3.nifty.com/tsato/xvkbd/"
@@ -11,39 +11,28 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-RDEPEND="|| ( (
-			x11-libs/libXtst
-			x11-libs/libXmu
-		) <virtual/x11-7 )
+RDEPEND="x11-libs/libXtst
+	x11-libs/libXmu
 	x11-libs/Xaw3d"
-
 DEPEND="${RDEPEND}
-	|| ( ( x11-misc/imake
-		x11-misc/gccmakedep
-		x11-proto/xproto
-		app-text/rman
-		x11-proto/xextproto
-		)
-		<virtual/x11-7
-	)"
-
-pkg_setup() {
-	has_version '<x11-base/xorg-x11-7' && \
-		appdefaultsdir="/etc/X11/app-defaults/" || \
-		appdefaultsdir="/usr/share/X11/app-defaults/"
-}
+	x11-misc/imake
+	x11-misc/gccmakedep
+	x11-proto/xproto
+	app-text/rman
+	x11-proto/xextproto"
 
 src_compile() {
-	xmkmf -a || die
+	xmkmf -a || die "xmkmf failed."
 
 	emake \
-		XAPPLOADDIR="${appdefaultsdir}" \
+		XAPPLOADDIR="/usr/share/X11/app-defaults" \
 		LOCAL_LDFLAGS="${LDFLAGS}" \
-		CDEBUGFLAGS="${CFLAGS}" || die "emake failed"
+		CDEBUGFLAGS="${CFLAGS}" || die "emake failed."
 }
 
 src_install() {
-	emake XAPPLOADDIR="${appdefaultsdir}" DESTDIR="${D}" install || die "make install failed"
+	emake XAPPLOADDIR="/usr/share/X11/app-defaults" DESTDIR="${D}" install \
+	|| die "emake install failed."
 	rm -rf "${D}/usr/lib/X11"
 
 	dodoc README