Remove monolithic X from dependencies, `` to $() and other minor cleanup.

Package-Manager: portage-2.1.2_pre3-r6

3 files changed, 41 insertions, 29 deletions

diff --git a/x11-misc/xkbd/ChangeLog b/x11-misc/xkbd/ChangeLog
index ae347f3811f6..08e8a1854bbd 100644
--- a/x11-misc/xkbd/ChangeLog
+++ b/x11-misc/xkbd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xkbd
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkbd/ChangeLog,v 1.10 2006/01/14 12:14:35 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkbd/ChangeLog,v 1.11 2006/10/21 22:37:29 omp Exp $
+
+  21 Oct 2006; David Shakaryan <omp@gentoo.org> xkbd-0.8.12.ebuild:
+  Remove monolithic X from dependencies, `` to $() and other minor cleanup.
 
   14 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> xkbd-0.8.12.ebuild:
   Removed sys-devel/libtool from RDEPEND.
diff --git a/x11-misc/xkbd/Manifest b/x11-misc/xkbd/Manifest
index 8b7cfed08cf0..6378ac635763 100644
--- a/x11-misc/xkbd/Manifest
+++ b/x11-misc/xkbd/Manifest
@@ -1,4 +1,26 @@
-MD5 08be08b9793b3689acc1beac3c609516 ChangeLog 1220
-MD5 e6e96176b8bde356f7f4596effc96e48 files/digest-xkbd-0.8.12 63
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST xkbd-0.8.12.tar.gz 223030
+EBUILD xkbd-0.8.12.ebuild 967 RMD160 6cd068239c5995c2a8e59e271046ee5f9792126c SHA1 852aaeb296bfc430206323282e1233c652ae58ad SHA256 ba5be7ca7bf52bbea44146cc70dbbe4a2a525fa68f405c559ad97eaec7326496
+MD5 a41f9d6398de107dd5fa4e1a235c0f9c xkbd-0.8.12.ebuild 967
+RMD160 6cd068239c5995c2a8e59e271046ee5f9792126c xkbd-0.8.12.ebuild 967
+SHA256 ba5be7ca7bf52bbea44146cc70dbbe4a2a525fa68f405c559ad97eaec7326496 xkbd-0.8.12.ebuild 967
+MISC ChangeLog 1360 RMD160 983cb0ed3504b801119387edafecda39b71f6967 SHA1 c36fcaf7b6cb83c5c0a5791f52740811ea67aa4f SHA256 8af6a4281db4fa013ff2c9dd59db2469152f3b393e3e4fac72d735f5d7e69f89
+MD5 aed5123ebff2d86d2eebec7dc55e8f53 ChangeLog 1360
+RMD160 983cb0ed3504b801119387edafecda39b71f6967 ChangeLog 1360
+SHA256 8af6a4281db4fa013ff2c9dd59db2469152f3b393e3e4fac72d735f5d7e69f89 ChangeLog 1360
+MISC metadata.xml 165 RMD160 4ebc1c537fcebcb28586a47c958a7d0237f3bbcc SHA1 87fed26b774e4dd2226bea04c4bcc8ba39fcc4c3 SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec
 MD5 9ba3ceca3ae81ec759fbb9a277c0e45c metadata.xml 165
-MD5 ad88db728d7423fe8ff268858408523b xkbd-0.8.12.ebuild 1022
+RMD160 4ebc1c537fcebcb28586a47c958a7d0237f3bbcc metadata.xml 165
+SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec metadata.xml 165
+MD5 e6e96176b8bde356f7f4596effc96e48 files/digest-xkbd-0.8.12 63
+RMD160 2f8e7439fc21ecb553721946b79fc4711c0a8d3c files/digest-xkbd-0.8.12 63
+SHA256 dc4d763ab06448dc05628812fc3a34878dd4d3b9746d342ca41515767bf2983e files/digest-xkbd-0.8.12 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFOqEyvSApE0uP4UsRApKAAKCQt31fEzFFIjTmLLr6ZhK1yfeKzgCeNsdx
+gsJk+WOAcaDKPteE6XqAoHg=
+=LTwv
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xkbd/xkbd-0.8.12.ebuild b/x11-misc/xkbd/xkbd-0.8.12.ebuild
index 261bbb7ef5c0..27d50ea30331 100644
--- a/x11-misc/xkbd/xkbd-0.8.12.ebuild
+++ b/x11-misc/xkbd/xkbd-0.8.12.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/xkbd/xkbd-0.8.12.ebuild,v 1.11 2006/01/14 12:14:35 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkbd/xkbd-0.8.12.ebuild,v 1.12 2006/10/21 22:37:29 omp Exp $
 
 DESCRIPTION="Xkbd - onscreen soft keyboard for X11"
 HOMEPAGE="http://handhelds.org/~mallum/xkbd/"
@@ -8,44 +8,31 @@ SRC_URI="http://handhelds.org/~mallum/xkbd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-
 KEYWORDS="~amd64 ~ppc x86"
-
 IUSE="doc debug"
 
-RDEPEND="|| ( ( x11-libs/libXrender
-			x11-libs/libX11
-			virtual/xft
-			x11-libs/libXtst
-			x11-libs/libXpm
-		)
-		virtual/x11
-	)
+RDEPEND="x11-libs/libXrender
+	x11-libs/libX11
+	virtual/xft
+	x11-libs/libXtst
+	x11-libs/libXpm
 	media-libs/freetype
 	dev-libs/expat
 	sys-libs/zlib
 	doc? ( app-text/docbook-sgml-utils )"
-
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xproto
-			x11-proto/xextproto
-		)
-		virtual/x11
-	)"
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 src_compile() {
-	econf\
-	`use_enable debug` || die "econf failed"
+	econf $(use_enable debug) || die "econf failed"
+	emake || die "emake failed"
 
-	emake || die
-
-	if use doc; then
-		docbook2html README
-	fi
+	use doc && docbook2html README
 }
 
 src_install() {
-	einstall || die
+	einstall || die "einstall failed"
 	dodoc AUTHORS NEWS README
 
 	if use doc; then