amd64 stable, QA clean up.

Package-Manager: portage-2.1.3.19

3 files changed, 20 insertions, 18 deletions

diff --git a/x11-misc/x2x/ChangeLog b/x11-misc/x2x/ChangeLog
index 06206153e42d..c5f6ca2ea8a6 100644
--- a/x11-misc/x2x/ChangeLog
+++ b/x11-misc/x2x/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/x2x
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/ChangeLog,v 1.19 2007/07/22 03:33:36 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/ChangeLog,v 1.20 2007/11/15 17:15:23 drac Exp $
+
+  15 Nov 2007; Samuli Suominen <drac@gentoo.org> x2x-1.27-r2.ebuild:
+  amd64 stable, QA clean up.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; x2x-1.27.ebuild,
   x2x-1.27-r1.ebuild, x2x-1.27-r2.ebuild:
diff --git a/x11-misc/x2x/Manifest b/x11-misc/x2x/Manifest
index ade1b3f5149a..456585fc0105 100644
--- a/x11-misc/x2x/Manifest
+++ b/x11-misc/x2x/Manifest
@@ -7,18 +7,18 @@ EBUILD x2x-1.27-r1.ebuild 1322 RMD160 64f506bb49db040ea80eb818c42d60d49f173272 S
 MD5 1fbdfca52e60abb281774e03060c250b x2x-1.27-r1.ebuild 1322
 RMD160 64f506bb49db040ea80eb818c42d60d49f173272 x2x-1.27-r1.ebuild 1322
 SHA256 a45defe525d9d8dd05c9aac19c9685e573fcece069eda0c44f672728fd98aa81 x2x-1.27-r1.ebuild 1322
-EBUILD x2x-1.27-r2.ebuild 1477 RMD160 82c51f63f9e2a007ea22a9ae6fb2d58f12c29f2a SHA1 8e2adb17cf5ef4eb7e775aca8fc7cad31a5f4a48 SHA256 e5c64092c0f2f9502593b49ba72e68f6baf6d6073945d1d0ec6fdb06c009c119
-MD5 7d115206499891e18da5d879e9c184d1 x2x-1.27-r2.ebuild 1477
-RMD160 82c51f63f9e2a007ea22a9ae6fb2d58f12c29f2a x2x-1.27-r2.ebuild 1477
-SHA256 e5c64092c0f2f9502593b49ba72e68f6baf6d6073945d1d0ec6fdb06c009c119 x2x-1.27-r2.ebuild 1477
+EBUILD x2x-1.27-r2.ebuild 1495 RMD160 b2567bd8300a0576ad634a5d5e9f4f658d0008cf SHA1 8a4ae327ded663ebcf79a291cdc86ae59c234882 SHA256 53bbd540706bf794f03038075c903aea9429db276c242814a9f0b6e013756d92
+MD5 f98162e5edfc6963c8f83c140cd62141 x2x-1.27-r2.ebuild 1495
+RMD160 b2567bd8300a0576ad634a5d5e9f4f658d0008cf x2x-1.27-r2.ebuild 1495
+SHA256 53bbd540706bf794f03038075c903aea9429db276c242814a9f0b6e013756d92 x2x-1.27-r2.ebuild 1495
 EBUILD x2x-1.27.ebuild 1017 RMD160 acd7351f51c087c13e93de75c8e7637beac59af9 SHA1 632a1264f3e2c0445375661f6c340363d8830617 SHA256 c46f6fb2a42d1cc72a7d0c254d65ecf32be42977aea7eb27207e0778778273cd
 MD5 8ddbc39a17fb60b5aca6545c8daf853e x2x-1.27.ebuild 1017
 RMD160 acd7351f51c087c13e93de75c8e7637beac59af9 x2x-1.27.ebuild 1017
 SHA256 c46f6fb2a42d1cc72a7d0c254d65ecf32be42977aea7eb27207e0778778273cd x2x-1.27.ebuild 1017
-MISC ChangeLog 2469 RMD160 850ae7fa90dbef8681e272b8c008816e90e6765b SHA1 2f68fd059b7fff46b0b0100f705d6642fb012af8 SHA256 2ca7da7440065bf4e1c9f9d56b7de5bf9cbd155ec2e17843dd945da3d3800573
-MD5 ae34e70146f1618cab7d745c98b82c0e ChangeLog 2469
-RMD160 850ae7fa90dbef8681e272b8c008816e90e6765b ChangeLog 2469
-SHA256 2ca7da7440065bf4e1c9f9d56b7de5bf9cbd155ec2e17843dd945da3d3800573 ChangeLog 2469
+MISC ChangeLog 2563 RMD160 48c04bb25976d9a253ce6d80e85e2542b9115a2c SHA1 d6b50180b7a1c7066a1c3157935f144a86ce152b SHA256 90e5e20cd513ca2611f47fe6ceac2391337da112a9724f3b248c06b34436372e
+MD5 514ecad9e73545b6bec53d9f3b0854eb ChangeLog 2563
+RMD160 48c04bb25976d9a253ce6d80e85e2542b9115a2c ChangeLog 2563
+SHA256 90e5e20cd513ca2611f47fe6ceac2391337da112a9724f3b248c06b34436372e ChangeLog 2563
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
diff --git a/x11-misc/x2x/x2x-1.27-r2.ebuild b/x11-misc/x2x/x2x-1.27-r2.ebuild
index d3911e75f56d..6f0bd927695f 100644
--- a/x11-misc/x2x/x2x-1.27-r2.ebuild
+++ b/x11-misc/x2x/x2x-1.27-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/x2x-1.27-r2.ebuild,v 1.2 2007/07/22 03:33:36 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/x2x-1.27-r2.ebuild,v 1.3 2007/11/15 17:15:23 drac Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.digital.com/pub/Digital/SRC/x2x/${P}.tar.gz
 	mirror://gentoo/${P}-license.patch.gz
 	mirror://gentoo/${P}-keymap.diff.gz"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~mips ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# Patch from Debian to add -north and -south, among other fixes
 	epatch ${DISTDIR}/x2x_1.27-8.diff.gz
@@ -42,16 +42,15 @@ src_unpack() {
 	epatch ${DISTDIR}/${P}-keymap.diff.gz
 
 	# Man-page is packaged as x2x.1 but needs to be x2x.man for building
-	mv x2x.1 x2x.man || die
+	mv x2x.1 x2x.man
 }
 
 src_compile() {
-	xmkmf || die
-	emake || die
+	xmkmf || die "xmkmf failed."
+	emake || die "emake failed."
 }
 
 src_install () {
-	make DESTDIR=${D} install || die
-	newman x2x.man x2x.1 || die
-	dodoc LICENSE || die
+	make DESTDIR="${D}" install || die "emake install failed."
+	newman x2x.man x2x.1
 }