Update dependencies, add die messages, fix quotes.

Package-Manager: portage-2.1.3_rc8

3 files changed, 33 insertions, 22 deletions

diff --git a/x11-misc/xtrlock/ChangeLog b/x11-misc/xtrlock/ChangeLog
index cdcaf504ff52..b4890032fafb 100644
--- a/x11-misc/xtrlock/ChangeLog
+++ b/x11-misc/xtrlock/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xtrlock
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtrlock/ChangeLog,v 1.11 2007/02/22 00:12:33 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtrlock/ChangeLog,v 1.12 2007/07/21 12:11:23 omp Exp $
+
+  21 Jul 2007; David Shakaryan <omp@gentoo.org> xtrlock-2.0-r1.ebuild:
+  Update dependencies, add die messages, fix quotes.
 
   22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-misc/xtrlock/Manifest b/x11-misc/xtrlock/Manifest
index 62a630720fe0..8f85322fed11 100644
--- a/x11-misc/xtrlock/Manifest
+++ b/x11-misc/xtrlock/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xtrlock-2.0-gcc34.patch 310 RMD160 31b72db38ede27e5457c811b88c162d7fd489711 SHA1 85739330c849c2f99ea0f2684c2bddb1fa21d935 SHA256 f3096b636804179450c3fa89ceed54d5a2b47398917074e4905a1fde5622c7c8
 MD5 5cd5750d76f6d3cc6e18d5db25e64acb files/xtrlock-2.0-gcc34.patch 310
 RMD160 31b72db38ede27e5457c811b88c162d7fd489711 files/xtrlock-2.0-gcc34.patch 310
@@ -8,18 +11,18 @@ RMD160 10950d5e6abc79444f26d03dbb637d895aa9bc58 files/xtrlock-2.0-overflow.patch
 SHA256 a8c7258706aed96dc71a989210ee9aa5cd6ecc7848ecef46c0bb786d261f2b3d files/xtrlock-2.0-overflow.patch 712
 DIST xtrlock_2.0-12.tar.gz 7642 RMD160 d4fb80b24f3be974673501b3e60c5e9a9a3ddee4 SHA1 fa405cf2da351c83d7b86cd1843a71d2b0afe0f2 SHA256 bcd5ea4a32b000ab7826a5520b45c4b17b0daeb4e9875ae942944099f7303bc9
 DIST xtrlock_2.0-6.tar.gz 6801 RMD160 2d77f7331f42404686046a806d3ef034254f9faa SHA1 4829b89e5174a972e3c68e63a82c24575c1acc70 SHA256 57b5d5bffe1fc318272579f87570891caefb800ca22558a17ba6e57da5c959e5
-EBUILD xtrlock-2.0-r1.ebuild 994 RMD160 d5023a2f098d0d79a841add7875255ad21c04fd2 SHA1 46919baa6768dd2ae5adb0370f78623c92999244 SHA256 5687143ccf6cdb6647685dc255e47edb880879595efef7beaf38a5f84081779c
-MD5 450d216ef739ac5116f58462a6b966da xtrlock-2.0-r1.ebuild 994
-RMD160 d5023a2f098d0d79a841add7875255ad21c04fd2 xtrlock-2.0-r1.ebuild 994
-SHA256 5687143ccf6cdb6647685dc255e47edb880879595efef7beaf38a5f84081779c xtrlock-2.0-r1.ebuild 994
+EBUILD xtrlock-2.0-r1.ebuild 976 RMD160 ec1c0a4adf577588f3e552bf60afe3f6fe0785c5 SHA1 c3247057834aeb9d9ed4befcd5f0ad9fa0b84342 SHA256 4aebbbef01a975362e120340dab86a5682962663dc808e0d5f35b34b6080c626
+MD5 f4658d37a89fb4b5710c3dfaccb71c2b xtrlock-2.0-r1.ebuild 976
+RMD160 ec1c0a4adf577588f3e552bf60afe3f6fe0785c5 xtrlock-2.0-r1.ebuild 976
+SHA256 4aebbbef01a975362e120340dab86a5682962663dc808e0d5f35b34b6080c626 xtrlock-2.0-r1.ebuild 976
 EBUILD xtrlock-2.0-r2.ebuild 801 RMD160 5663d93417842aed4019d0806dc481b38beb85bf SHA1 6e528dd1e71852872e37a643258e8a471646ce10 SHA256 f1e41a88b8ddb756ae2df640ee24212f7eb82aa6c4f6ab302cdad06363fe9286
 MD5 c1458cc3afdba5dbabdde022d9a1819f xtrlock-2.0-r2.ebuild 801
 RMD160 5663d93417842aed4019d0806dc481b38beb85bf xtrlock-2.0-r2.ebuild 801
 SHA256 f1e41a88b8ddb756ae2df640ee24212f7eb82aa6c4f6ab302cdad06363fe9286 xtrlock-2.0-r2.ebuild 801
-MISC ChangeLog 2136 RMD160 08d187cbc4aaf21ccf596b27650ff25b3958e81f SHA1 ca7e6643a47888112d5cc703b88c8c963f77128c SHA256 86f07f4679df202c620565fddea03edc3180ee3380b05d4d1baf5a7ac736038d
-MD5 87cd95fe3740063d68fb962d0faa8e58 ChangeLog 2136
-RMD160 08d187cbc4aaf21ccf596b27650ff25b3958e81f ChangeLog 2136
-SHA256 86f07f4679df202c620565fddea03edc3180ee3380b05d4d1baf5a7ac736038d ChangeLog 2136
+MISC ChangeLog 2259 RMD160 ff7d46eeb384917bf448f776cfacbbddf5d72819 SHA1 6094e22c48c4a9b3860f5208d5914a4e799190ba SHA256 b14aab9f96feab80b4e5cc469c3b7b90e7f47700def199cf4cfd480816aa64d4
+MD5 deb07cab598a94c8cb2a28c690a1b29b ChangeLog 2259
+RMD160 ff7d46eeb384917bf448f776cfacbbddf5d72819 ChangeLog 2259
+SHA256 b14aab9f96feab80b4e5cc469c3b7b90e7f47700def199cf4cfd480816aa64d4 ChangeLog 2259
 MISC metadata.xml 173 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e SHA1 ca2ea648208cc74669b8a084f1b74e5cd4415777 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f
 MD5 fe402b096905cae8dcb4a503d3a838ac metadata.xml 173
 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e metadata.xml 173
@@ -30,3 +33,10 @@ SHA256 e0ed857c3e022175b6927ec14b0a99f81239c2c55dfe5a4fb1f30d0d29f9cad1 files/di
 MD5 17786eff40e90c62ce5fc81b35fdccbe files/digest-xtrlock-2.0-r2 238
 RMD160 ac048faff86b0d625407a6184d28b7649fc2721c files/digest-xtrlock-2.0-r2 238
 SHA256 7dbff6388667aa661c5677774d775bd9e6dcc85b667bf75db2ae5644b270b430 files/digest-xtrlock-2.0-r2 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGofftvSApE0uP4UsRAhZCAJ4/XWKivPKaAuc/fEfFH1NE+98LXwCgjYXZ
+yJvChstWyhE2GJQuaPM03MQ=
+=TMYj
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xtrlock/xtrlock-2.0-r1.ebuild b/x11-misc/xtrlock/xtrlock-2.0-r1.ebuild
index eba4f0ab060f..74946abc7984 100644
--- a/x11-misc/xtrlock/xtrlock-2.0-r1.ebuild
+++ b/x11-misc/xtrlock/xtrlock-2.0-r1.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/xtrlock/xtrlock-2.0-r1.ebuild,v 1.8 2006/01/13 12:21:05 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtrlock/xtrlock-2.0-r1.ebuild,v 1.9 2007/07/21 12:11:23 omp Exp $
 
 inherit eutils flag-o-matic
 
@@ -14,30 +14,28 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ppc ~amd64"
 IUSE=""
 
-RDEPEND="|| ( (
-			x11-libs/libX11
-			x11-misc/imake )
-		virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-misc/imake"
 
 DEPEND="${RDEPEND}
-		|| ( x11-proto/xproto virtual/x11 )"
+	x11-proto/xproto"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-overflow.patch
-	epatch ${FILESDIR}/${P}-gcc34.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-overflow.patch"
+	epatch "${FILESDIR}/${P}-gcc34.patch"
 }
 
 src_compile() {
-	xmkmf || die
+	xmkmf || die "xmkmf failed"
 	cp Makefile Makefile.orig
-	make CFLAGS="${CFLAGS} -DSHADOW_PWD" xtrlock || die
+	make CFLAGS="${CFLAGS} -DSHADOW_PWD" xtrlock || die "make failed"
 }
 
 src_install() {
 	dobin xtrlock
-	chmod u+s ${D}/usr/bin/xtrlock
+	chmod u+s "${D}/usr/bin/xtrlock"
 	mv xtrlock.man xtrlock.1
 	doman xtrlock.1
 }