From: Samuli Suominen <ssuominen@gentoo.org>
Date: Fri, 2 Mar 2007 20:55:05 +0000 (+0000)
Subject: Kill virtual/x11. Use emake. Fix quotion and line arragement.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4051f478029099370957dda6edb599e131a61c66;p=gentoo.git

Kill virtual/x11. Use emake. Fix quotion and line arragement.
Package-Manager: portage-2.1.2-r13
---

diff --git a/x11-misc/xclip/ChangeLog b/x11-misc/xclip/ChangeLog
index fa84580e9337..595792bb3927 100644
--- a/x11-misc/xclip/ChangeLog
+++ b/x11-misc/xclip/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xclip
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xclip/ChangeLog,v 1.16 2006/10/21 03:21:14 agriffis Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xclip/ChangeLog,v 1.17 2007/03/02 20:55:05 drac Exp $
+
+  02 Mar 2007; Samuli Suominen <drac@gentoo.org> xclip-0.08-r1.ebuild:
+  Kill virtual/x11. Use emake.
 
   21 Oct 2006; Aron Griffis <agriffis@gentoo.org> -xclip-0.08.ebuild,
   xclip-0.08-r1.ebuild:
diff --git a/x11-misc/xclip/Manifest b/x11-misc/xclip/Manifest
index 8114370ce8d0..054907505c99 100644
--- a/x11-misc/xclip/Manifest
+++ b/x11-misc/xclip/Manifest
@@ -1,12 +1,12 @@
 DIST xclip-0.08.tar.gz 27914 RMD160 644c0418b44ce533fd39e37ec2dd888a394e8f7d SHA1 2b20daab0523a2b4b2cab1f24887481556eadb8b SHA256 ee76e90d38ef19f4efa4cc3cb4f435cb9e64ed215cd4deff1309597ab88cc65f
-EBUILD xclip-0.08-r1.ebuild 1056 RMD160 8087c0b31b2ff253645a99d58d121a6368710f7c SHA1 a133b28664fb9a4678af51b5afab581a34a19bf9 SHA256 44bcf7ebaa034a9fbf0c6cca602ace47bb05985627d90a4b89062b7f8882dedc
-MD5 d031bb9bf14ec1b3a879d2f6c30482e0 xclip-0.08-r1.ebuild 1056
-RMD160 8087c0b31b2ff253645a99d58d121a6368710f7c xclip-0.08-r1.ebuild 1056
-SHA256 44bcf7ebaa034a9fbf0c6cca602ace47bb05985627d90a4b89062b7f8882dedc xclip-0.08-r1.ebuild 1056
-MISC ChangeLog 2508 RMD160 bc13719ebd26b58cfc7e53143bd655db68d8bc32 SHA1 4c6ae43494995088a78571e2f80eed44ad7c7d05 SHA256 e235d22e7d74263edbb9d2a12b2e53d35d106aabfe1aa1914a9b8ee44a58c4b1
-MD5 ed5b114d502819b5f400d0fd65714d16 ChangeLog 2508
-RMD160 bc13719ebd26b58cfc7e53143bd655db68d8bc32 ChangeLog 2508
-SHA256 e235d22e7d74263edbb9d2a12b2e53d35d106aabfe1aa1914a9b8ee44a58c4b1 ChangeLog 2508
+EBUILD xclip-0.08-r1.ebuild 1014 RMD160 9f418b1273f6a8acfd1da5d6f9bc4da8a6c01520 SHA1 90e7305533a7733ac6b16e2162a7cf6be59c19a8 SHA256 793c31deadb3b580fe6aefc279a0636a7b91b50653a1dba88183d8a12f6dd543
+MD5 0d6e24495bf54b0eb131dffe3ce97fa9 xclip-0.08-r1.ebuild 1014
+RMD160 9f418b1273f6a8acfd1da5d6f9bc4da8a6c01520 xclip-0.08-r1.ebuild 1014
+SHA256 793c31deadb3b580fe6aefc279a0636a7b91b50653a1dba88183d8a12f6dd543 xclip-0.08-r1.ebuild 1014
+MISC ChangeLog 2607 RMD160 6475c3c3b2e249052205d2a968253abdc6f7f06a SHA1 66aa0853af07b539836cdf6458906aff4d593a84 SHA256 79d1e59145c5be858ac67ddfd1ab0626de746b81248de8f9f7e0fe880e809d98
+MD5 074515af09129f986ee8e3be40160013 ChangeLog 2607
+RMD160 6475c3c3b2e249052205d2a968253abdc6f7f06a ChangeLog 2607
+SHA256 79d1e59145c5be858ac67ddfd1ab0626de746b81248de8f9f7e0fe880e809d98 ChangeLog 2607
 MISC metadata.xml 165 RMD160 4ebc1c537fcebcb28586a47c958a7d0237f3bbcc SHA1 87fed26b774e4dd2226bea04c4bcc8ba39fcc4c3 SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec
 MD5 9ba3ceca3ae81ec759fbb9a277c0e45c metadata.xml 165
 RMD160 4ebc1c537fcebcb28586a47c958a7d0237f3bbcc metadata.xml 165
diff --git a/x11-misc/xclip/xclip-0.08-r1.ebuild b/x11-misc/xclip/xclip-0.08-r1.ebuild
index c5dfc649f38d..d37d331b5e98 100644
--- a/x11-misc/xclip/xclip-0.08-r1.ebuild
+++ b/x11-misc/xclip/xclip-0.08-r1.ebuild
@@ -1,8 +1,7 @@
-# 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/xclip/xclip-0.08-r1.ebuild,v 1.4 2006/10/21 03:21:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xclip/xclip-0.08-r1.ebuild,v 1.5 2007/03/02 20:55:05 drac Exp $
 
-S=${WORKDIR}/xclip
 DESCRIPTION="Command-line utility to read data from standard in and place it in an X selection for pasting into X applications."
 SRC_URI="http://people.debian.org/~kims/xclip/${P}.tar.gz"
 HOMEPAGE="http://people.debian.org/~kims/xclip/"
@@ -12,26 +11,24 @@ LICENSE="GPL-2"
 KEYWORDS="alpha amd64 hppa ia64 ppc x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-libs/libXext )
-	virtual/x11 )"
+S="${WORKDIR}/${PN}"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xproto
-			app-text/rman
-			x11-misc/imake )
-		virtual/x11 )"
+	app-text/rman
+	x11-misc/imake"
 
 src_compile() {
-	xmkmf || die
-	make || die
+	xmkmf || die "xmkmf failed."
+	emake || die "emake failed."
 }
 
 src_install () {
-	make DESTDIR=${D} install || die
-	make DESTDIR=${D} MANPATH=/usr/share/man MANSUFFIX=1 \
+	emake DESTDIR=${D} install || die
+	emake DESTDIR=${D} MANPATH=/usr/share/man MANSUFFIX=1 \
 		install.man || die
 	rm -f ${D}/usr/lib/X11/doc/html/*
 	find ${D} -depth -type d | xargs -n1 rmdir 2>/dev/null