move from net-ftp #45968

2 files changed, 18 insertions, 28 deletions

diff --git a/media-sound/vorbis-tools/vorbis-tools-1.0-r2.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.0-r2.ebuild
index 9fb6726bc14a..487c823f1f05 100644
--- a/media-sound/vorbis-tools/vorbis-tools-1.0-r2.ebuild
+++ b/media-sound/vorbis-tools/vorbis-tools-1.0-r2.ebuild
@@ -1,32 +1,25 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.0-r2.ebuild,v 1.2 2004/01/21 10:51:40 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.0-r2.ebuild,v 1.3 2004/03/29 01:01:02 vapier Exp $
 
-IUSE="nls"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="tools for using the Ogg Vorbis sound file format"
-SRC_URI="http://fatpipe.vorbis.com/files/1.0/unix/vorbis-tools-1.0.tar.gz"
 HOMEPAGE="http://www.xiph.org/ogg/vorbis/index.html"
+SRC_URI="http://fatpipe.vorbis.com/files/1.0/unix/vorbis-tools-1.0.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
+IUSE="nls"
 
 RDEPEND=">=media-libs/libvorbis-${PV}
 	>=media-libs/libogg-${PV}
 	>=media-libs/libao-0.8.2
-	>=net-ftp/curl-7.9"
-
+	>=net-misc/curl-7.9"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
-LICENSE="as-is"
-
 src_compile() {
-
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
-
-	econf ${myconf} || die
+	econf `use_enable nls` || die
 	emake || die
 }
 
@@ -34,8 +27,7 @@ src_install () {
 	make DESTDIR=${D} install || die
 
 	rm -rf ${D}/usr/share/doc
-	dodoc AUTHORS COPYING README
+	dodoc AUTHORS README
 	docinto ogg123
 	dodoc ogg123/ogg123rc-example
 }
-
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.0.1.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.0.1.ebuild
index 2ff8689ba5e2..0996dbfe55fc 100644
--- a/media-sound/vorbis-tools/vorbis-tools-1.0.1.ebuild
+++ b/media-sound/vorbis-tools/vorbis-tools-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.0.1.ebuild,v 1.5 2004/03/16 01:17:28 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.0.1.ebuild,v 1.6 2004/03/29 01:01:02 vapier Exp $
 
 inherit gcc flag-o-matic
 
@@ -15,19 +15,17 @@ IUSE="nls flac"
 
 RDEPEND=">=media-libs/libvorbis-1.0
 	>=media-libs/libao-0.8.2
-	>=net-ftp/curl-7.9
+	>=net-misc/curl-7.9
 	flac? ( media-libs/flac )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_compile() {
-	[ `use hppa` ] && [ "`gcc-fullversion`" == "3.3.2" ] && replace-flags -march=2.0 -march=1.0
-
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
-	use flac || myconf="${myconf} --without-flac"
-
-	econf ${myconf} || die
+	use hppa && [ "`gcc-fullversion`" == "3.3.2" ] && replace-flags -march=2.0 -march=1.0
+	econf \
+		`use_enable nls` \
+		`use_with flac` \
+		|| die
 	emake || die
 }
 
@@ -35,7 +33,7 @@ src_install() {
 	make DESTDIR=${D} install || die
 
 	rm -rf ${D}/usr/share/doc
-	dodoc AUTHORS COPYING README
+	dodoc AUTHORS README
 	docinto ogg123
 	dodoc ogg123/ogg123rc-example
 }