fix SRC_URI, thanks to Guy <gcadieux@robertetusa.com> in bug #43679

5 files changed, 34 insertions, 36 deletions

diff --git a/dev-util/vdkbuilder/ChangeLog b/dev-util/vdkbuilder/ChangeLog
index c20eaacb49d0..a045b8c3054b 100644
--- a/dev-util/vdkbuilder/ChangeLog
+++ b/dev-util/vdkbuilder/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/vdkbuilder
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/vdkbuilder/ChangeLog,v 1.9 2004/02/27 19:49:56 bass Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/vdkbuilder/ChangeLog,v 1.10 2004/03/04 16:00:20 seemant Exp $
+
+  04 Mar 2004; Seemant Kulleen <seemant@gentoo.org> vdkbuilder-2.0.2.ebuild,
+  vdkbuilder-2.0.3.ebuild, vdkbuilder-2.0.5.ebuild:
+  fix SRC_URI, thanks to Guy <gcadieux@robertetusa.com> in bug #43679
 
 *vdkbuilder-2.0.5 (27 Feb 2004)
   27 Feb 2004; J.Alberto S.L. <bass@gentoo.org> vdkbuilder-2.0.5.ebuild:
diff --git a/dev-util/vdkbuilder/Manifest b/dev-util/vdkbuilder/Manifest
index 0f22e6bf8f6c..c36b13263cf7 100644
--- a/dev-util/vdkbuilder/Manifest
+++ b/dev-util/vdkbuilder/Manifest
@@ -1,7 +1,7 @@
-MD5 d2f3e06389331dd8cc25b0db2b414d7a vdkbuilder-2.0.3.ebuild 1123
-MD5 74d90feb2736da49fcb4199c29abc224 vdkbuilder-2.0.5.ebuild 1138
-MD5 f9c7783ae031bcc7faa4846ee3a8700b vdkbuilder-2.0.2.ebuild 1063
-MD5 ee33c8c9b2a874df745541e84d04694a ChangeLog 1078
+MD5 1ad37189f716542f7484172093fbe0c0 vdkbuilder-2.0.3.ebuild 1063
+MD5 d6d9e47dcdf7b9af8d81640663ac4e3c vdkbuilder-2.0.5.ebuild 855
+MD5 0bc318bbbfb864dead73f2ff4f7d525c vdkbuilder-2.0.2.ebuild 998
+MD5 6ddcb454663cac2a26e49c6624b87d1a ChangeLog 1282
 MD5 99848ddbdb27f9085a04d4be864953c8 files/digest-vdkbuilder-2.0.2 61
 MD5 517f2d1fd4853a2f7c1cf9a915477202 files/digest-vdkbuilder-2.0.3 69
 MD5 83d1ae829fb0623da0370fb29af1ed63 files/digest-vdkbuilder-2.0.5 69
diff --git a/dev-util/vdkbuilder/vdkbuilder-2.0.2.ebuild b/dev-util/vdkbuilder/vdkbuilder-2.0.2.ebuild
index 5b780c3e66db..8a50ef32348d 100644
--- a/dev-util/vdkbuilder/vdkbuilder-2.0.2.ebuild
+++ b/dev-util/vdkbuilder/vdkbuilder-2.0.2.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/vdkbuilder/vdkbuilder-2.0.2.ebuild,v 1.11 2003/09/06 20:28:41 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/vdkbuilder/vdkbuilder-2.0.2.ebuild,v 1.12 2004/03/04 16:00:20 seemant Exp $
 
 IUSE="nls gnome"
 
 MY_P=${P/builder/}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="A RAD Application Development tool based on VDK (The Visual Development Kit)."
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 HOMEPAGE="http://vdkbuilder.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
+KEYWORDS="x86 sparc"
 
 DEPEND="dev-libs/atk
 	x11-libs/pango
@@ -24,15 +24,14 @@ DEPEND="dev-libs/atk
 
 src_compile() {
 	local myconf
-	use nls \
-		&& myconf="${myconf} --enable-nls" \
-		|| myconf="${myconf} --disable-nls"
 
 	use gnome \
 		&& myconf="${myconf} --enable-gnome=yes" \
 		|| myconf="${myconf} --enable-gnome=no"
 
-	econf ${myconf} || die "econf failed"
+	econf \
+		`use_enable nls` \
+		${myconf} || die "econf failed"
 	emake || die
 }
 
diff --git a/dev-util/vdkbuilder/vdkbuilder-2.0.3.ebuild b/dev-util/vdkbuilder/vdkbuilder-2.0.3.ebuild
index e74009d629a9..61bc7b5dac8b 100644
--- a/dev-util/vdkbuilder/vdkbuilder-2.0.3.ebuild
+++ b/dev-util/vdkbuilder/vdkbuilder-2.0.3.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/vdkbuilder/vdkbuilder-2.0.3.ebuild,v 1.8 2003/12/14 22:41:32 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/vdkbuilder/vdkbuilder-2.0.3.ebuild,v 1.9 2004/03/04 16:00:20 seemant Exp $
 #	sdl? ( media-libs/vdksdl )
 # if we figure out xdb... there's a --enable-xdb and vdkxdb
 
 IUSE="nls gnome"
 
-DESCRIPTION="The Visual Development Kit used for VDK Builder."
-SRC_URI="mirror://sourceforge/vdkbuilder/${P}.tar.gz"
 S="${WORKDIR}/${P/vdkbuilder/vdkbuilder2}"
+DESCRIPTION="The Visual Development Kit used for VDK Builder."
 HOMEPAGE="http://vdkbuilder.sf.net"
+SRC_URI="mirror://sourceforge/vdkbuilder/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86"
 
 DEPEND="dev-libs/vdk
-		gnome? ( gnome-base/libgnome )"
+	gnome? ( gnome-base/libgnome )"
 
 src_compile() {
 
@@ -25,14 +25,13 @@ src_compile() {
 	# Allows vdkbuilder to compile on gcc3 systems.
 	epatch ${FILESDIR}/vdkbuilder-gcc3.patch || die "Patch Failed"
 
-	use nls \
-		&& myconf="${myconf} --enable-nls" \
-		|| myconf="${myconf} --disable-nls"
 	use gnome \
 		&& myconf="${myconf} --enable-gnome=yes" \
 		|| myconf="${myconf} --enable-gnome=no"
 
-	econf ${myconf} || die "econf failed"
+	econf \
+		`use_enable nls` \
+		${myconf} || die "econf failed"
 	emake || die
 }
 
diff --git a/dev-util/vdkbuilder/vdkbuilder-2.0.5.ebuild b/dev-util/vdkbuilder/vdkbuilder-2.0.5.ebuild
index bf546711a690..8e29089268e2 100644
--- a/dev-util/vdkbuilder/vdkbuilder-2.0.5.ebuild
+++ b/dev-util/vdkbuilder/vdkbuilder-2.0.5.ebuild
@@ -1,37 +1,33 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/vdkbuilder/vdkbuilder-2.0.5.ebuild,v 1.1 2004/02/27 19:49:56 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/vdkbuilder/vdkbuilder-2.0.5.ebuild,v 1.2 2004/03/04 16:00:20 seemant Exp $
 
 IUSE="nls gnome"
 
+MY_P=${PN}2-${PV}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="The Visual Development Kit used for VDK Builder."
-SRC_URI="mirror://sourceforge/vdkbuilder/vdkbulder2-${PV}.tar.gz"
-#SRC_URI="http://unc.dl.sourceforge.net/sourceforge/vdkbuilder/vdkbuilder2-2.0.5.tar.gz"
-S="${WORKDIR}/${P/vdkbuilder/vdkbuilder2}"
 HOMEPAGE="http://vdkbuilder.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86"
 
 DEPEND="dev-libs/vdk
-		gnome? ( gnome-base/libgnome )"
+	gnome? ( gnome-base/libgnome )"
 
 src_compile() {
 
 	local myconf
 
-	# Allows vdkbuilder to compile on gcc3 systems.
-	#epatch ${FILESDIR}/vdkbuilder-gcc3.patch || die "Patch Failed"
-
-	use nls \
-		&& myconf="${myconf} --enable-nls" \
-		|| myconf="${myconf} --disable-nls"
 	use gnome \
 		&& myconf="${myconf} --enable-gnome=yes" \
 		|| myconf="${myconf} --enable-gnome=no"
 
-	econf ${myconf} || die "econf failed"
+	econf \
+		`use_enable nls` \
+		${myconf} || die "econf failed"
 	emake || die
 }