Fix econf call for non-autotools configure, fix quoting, remove pregenerated depfile to fix bug #151282, reported by Patrick Lauer.

(Portage version: 2.1.2_pre3)

7 files changed, 36 insertions, 14 deletions

diff --git a/app-i18n/xvnkb/ChangeLog b/app-i18n/xvnkb/ChangeLog
index cc8de0558d0e..450bce96e66b 100644
--- a/app-i18n/xvnkb/ChangeLog
+++ b/app-i18n/xvnkb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/xvnkb
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/xvnkb/ChangeLog,v 1.12 2006/08/27 14:36:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xvnkb/ChangeLog,v 1.13 2006/10/14 10:43:31 flameeyes Exp $
+
+  14 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> xvnkb-0.2.8a-r1.ebuild,
+  xvnkb-0.2.9.ebuild, xvnkb-0.2.9a.ebuild:
+  Fix econf call for non-autotools configure, fix quoting, remove pregenerated
+  depfile to fix bug #151282, reported by Patrick Lauer.
 
   27 Aug 2006; Michael Sterrett <mr_bones_@gentoo.org> xvnkb-0.2.8a.ebuild,
   xvnkb-0.2.8a-r1.ebuild:
diff --git a/app-i18n/xvnkb/files/digest-xvnkb-0.2.8a b/app-i18n/xvnkb/files/digest-xvnkb-0.2.8a
index a29f0d100239..d8e97f341015 100644
--- a/app-i18n/xvnkb/files/digest-xvnkb-0.2.8a
+++ b/app-i18n/xvnkb/files/digest-xvnkb-0.2.8a
@@ -1 +1,3 @@
 MD5 9a94de76689b3ea12a688d4602fc019e xvnkb-0.2.8a.tar.bz2 76221
+RMD160 878131517690314cad39210942c81271719fa388 xvnkb-0.2.8a.tar.bz2 76221
+SHA256 3503ef1d24041cccc447f5f93025945fda07d519a0120183c6b4af9a66e86eb2 xvnkb-0.2.8a.tar.bz2 76221
diff --git a/app-i18n/xvnkb/files/digest-xvnkb-0.2.8a-r1 b/app-i18n/xvnkb/files/digest-xvnkb-0.2.8a-r1
index a29f0d100239..d8e97f341015 100644
--- a/app-i18n/xvnkb/files/digest-xvnkb-0.2.8a-r1
+++ b/app-i18n/xvnkb/files/digest-xvnkb-0.2.8a-r1
@@ -1 +1,3 @@
 MD5 9a94de76689b3ea12a688d4602fc019e xvnkb-0.2.8a.tar.bz2 76221
+RMD160 878131517690314cad39210942c81271719fa388 xvnkb-0.2.8a.tar.bz2 76221
+SHA256 3503ef1d24041cccc447f5f93025945fda07d519a0120183c6b4af9a66e86eb2 xvnkb-0.2.8a.tar.bz2 76221
diff --git a/app-i18n/xvnkb/files/digest-xvnkb-0.2.9a b/app-i18n/xvnkb/files/digest-xvnkb-0.2.9a
index bda6fdb6d4c0..97cd8581f523 100644
--- a/app-i18n/xvnkb/files/digest-xvnkb-0.2.9a
+++ b/app-i18n/xvnkb/files/digest-xvnkb-0.2.9a
@@ -1 +1,3 @@
 MD5 cd242c03831c31cc5b294aa9870a0dc4 xvnkb-0.2.9a.tar.bz2 76429
+RMD160 f472cf0b11e11b77100d4098caf9ed79ba17f28f xvnkb-0.2.9a.tar.bz2 76429
+SHA256 316eccadbf73fac7bf55db3f179ffb985a87f22c48d38cfab87e3dcdb8230cb7 xvnkb-0.2.9a.tar.bz2 76429
diff --git a/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild b/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild
index f477db8a58d0..973772768232 100644
--- a/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild
+++ b/app-i18n/xvnkb/xvnkb-0.2.8a-r1.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/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild,v 1.2 2006/08/27 14:36:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild,v 1.3 2006/10/14 10:43:31 flameeyes Exp $
 
 inherit eutils
 
@@ -22,11 +22,13 @@ DEPEND="${RDEPEND} || ( ( x11-proto/xproto ) virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}.patch
-	epatch ${FILESDIR}/${PV}-putenv.patch
-}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}.patch"
+	epatch "${FILESDIR}/${PV}-putenv.patch"
 
+	# Remove pregenerated dep file.
+	rm -f "${S}/tools/Makefile.dep"
+}
 
 src_compile() {
 	local myconf
@@ -34,9 +36,12 @@ src_compile() {
 	use spell || myconf="${myconf} --no-spellcheck"
 	use truetype || myconf="${myconf} --no-xft"
 
-	econf --use-extstroke ${myconf} || die
+	# *not* autotools
+	./configure \
+		--use-extstroke ${myconf} \
+		|| die "./configure failed"
 
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/app-i18n/xvnkb/xvnkb-0.2.9.ebuild b/app-i18n/xvnkb/xvnkb-0.2.9.ebuild
index e0326ee45868..e5c28d8a040b 100644
--- a/app-i18n/xvnkb/xvnkb-0.2.9.ebuild
+++ b/app-i18n/xvnkb/xvnkb-0.2.9.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/app-i18n/xvnkb/xvnkb-0.2.9.ebuild,v 1.2 2006/01/03 09:33:00 pclouds Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xvnkb/xvnkb-0.2.9.ebuild,v 1.3 2006/10/14 10:43:31 flameeyes Exp $
 
 inherit eutils
 
@@ -26,9 +26,12 @@ src_compile() {
 	use spell || myconf="${myconf} --no-spellcheck"
 	use truetype || myconf="${myconf} --no-xft"
 
-	econf --use-extstroke ${myconf} || die
+	# *not* autotools
+	./configure \
+		--use-extstroke ${myconf} \
+		|| die "./configure failed"
 
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/app-i18n/xvnkb/xvnkb-0.2.9a.ebuild b/app-i18n/xvnkb/xvnkb-0.2.9a.ebuild
index 0d3e44e5c86d..264a20f8d3d4 100644
--- a/app-i18n/xvnkb/xvnkb-0.2.9a.ebuild
+++ b/app-i18n/xvnkb/xvnkb-0.2.9a.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/app-i18n/xvnkb/xvnkb-0.2.9a.ebuild,v 1.1 2006/05/01 09:43:16 pclouds Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xvnkb/xvnkb-0.2.9a.ebuild,v 1.2 2006/10/14 10:43:31 flameeyes Exp $
 
 inherit eutils
 
@@ -26,9 +26,12 @@ src_compile() {
 	use spell || myconf="${myconf} --no-spellcheck"
 	use truetype || myconf="${myconf} --no-xft"
 
-	econf --use-extstroke ${myconf} || die
+	# *not* autotools
+	./configure \
+		--use-extstroke ${myconf} \
+		|| die "./configure failed"
 
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {