stop using old WANT_AUTOTOOL_#_# syntax

3 files changed, 24 insertions, 26 deletions

diff --git a/media-video/drip/Manifest b/media-video/drip/Manifest
index f03b6efe0394..a5f255348402 100644
--- a/media-video/drip/Manifest
+++ b/media-video/drip/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5c4e8e74b779e7af29af297d207f572c drip-0.8.1-r5.ebuild 3104
 MD5 cd69b99975eb051565bbff0d6f95e0e6 ChangeLog 3349
+MD5 f187c0191a793f9ae075d14fce025136 drip-0.8.1-r5.ebuild 3075
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 92570e0baaf6ff7a0d87e7d590afe9ac drip-0.9.0.ebuild 2656
+MD5 8c0cd2d25707891d6c381bd3be8038c2 drip-0.9.0.ebuild 2642
 MD5 39f83fd93ac2e8bb8b9b89afcbcaedcd files/digest-drip-0.8.1-r5 62
 MD5 5a5df6046a26634c3fc453c01d52db4b files/drip-0.9.0-cflags.patch 712
 MD5 636fd81a0bb66385faca9b7c72cb1cbc files/drip-0.8.1-fix-dvd-symlink.patch 1305
@@ -15,9 +15,9 @@ MD5 a7d5edb693cf81b8e5fbc833cf221516 files/dripgetdvd.sh 1330
 MD5 27ca218152ac3b83a6f59a84c7a7f539 files/libmpeg2.patch 3677
 MD5 7f9daf1e0ac3dae373c1c892c46d1476 files/digest-drip-0.9.0 137
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBbXMzArHZZzCEUG0RAnyYAJ4rtCisLx+uJsAT6GICYavqlO86FwCfRZoK
-HZU661GnsLVI7vgnj+oml+4=
-=4VCD
+iD8DBQFBhYyXHTu7gpaalycRAggVAJ42j/aAaFh2Td5Y5NfblOhsxTls0gCgqaUm
+pI+yg7ylfN3uDh4bCfibRLc=
+=4p30
 -----END PGP SIGNATURE-----
diff --git a/media-video/drip/drip-0.8.1-r5.ebuild b/media-video/drip/drip-0.8.1-r5.ebuild
index 1c35f20c61e7..4674829b7caa 100644
--- a/media-video/drip/drip-0.8.1-r5.ebuild
+++ b/media-video/drip/drip-0.8.1-r5.ebuild
@@ -1,10 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/drip/drip-0.8.1-r5.ebuild,v 1.9 2004/06/25 00:38:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/drip/drip-0.8.1-r5.ebuild,v 1.10 2004/11/01 01:08:07 vapier Exp $
 
-DESCRIPTION="Drip - A DVD to DIVX convertor frontend"
+DESCRIPTION="A DVD to DIVX convertor frontend"
 HOMEPAGE="http://drip.sourceforge.net/"
-SRC_URI="${SRC_URI} http://drip.sourceforge.net/files/${P}.tar.gz"
+SRC_URI="http://drip.sourceforge.net/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+IUSE="nls"
 
 RDEPEND="gnome-base/gnome-libs
 	>=media-video/avifile-0.7.4.20020426-r2
@@ -13,16 +18,10 @@ RDEPEND="gnome-base/gnome-libs
 	>=media-libs/libdvdcss-1.1.1
 	>=media-libs/libdvdread-0.9.2
 	media-libs/gdk-pixbuf"
-
 DEPEND="${RDEPEND}
 	dev-lang/nasm
 	>=sys-devel/automake-1.5-r1"
 
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 -ppc"
-IUSE="nls"
-
 src_unpack() {
 	AF_MINOR_VER="$(avifile-config --data-dir | cut -d. -f2)"
 	unpack ${A}
@@ -66,7 +65,7 @@ src_unpack() {
 	cd ${S}
 	# Remove stale script ... "automake --add-missing" will add it again
 	rm -f ${S}/missing
-	export WANT_AUTOMAKE_1_5=1
+	export WANT_AUTOMAKE=1.5
 	aclocal -I macros
 	automake --add-missing
 	autoconf
@@ -74,7 +73,7 @@ src_unpack() {
 
 src_compile() {
 
-	export WANT_AUTOMAKE_1_5=1
+	export WANT_AUTOMAKE=1.5
 
 	local myconf
 	use nls || myconf="--disable-nls"
diff --git a/media-video/drip/drip-0.9.0.ebuild b/media-video/drip/drip-0.9.0.ebuild
index d08903bd849c..15ef98c84744 100644
--- a/media-video/drip/drip-0.9.0.ebuild
+++ b/media-video/drip/drip-0.9.0.ebuild
@@ -1,14 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/drip/drip-0.9.0.ebuild,v 1.1 2004/10/13 18:25:40 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/drip/drip-0.9.0.ebuild,v 1.2 2004/11/01 01:08:07 vapier Exp $
 
 inherit eutils libtool flag-o-matic
 
-DESCRIPTION="Drip - A DVD to DIVX convertor frontend"
+DESCRIPTION="A DVD to DIVX convertor frontend"
 HOMEPAGE="http://drip.sourceforge.net/"
 SRC_URI="http://drip.sourceforge.net/files/${P}.tar.gz
 	 mirror://debian/pool/main/d/drip/drip_0.8.3.2+0.9.0-rc3-5.diff.gz"
 
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="nls"
+
 RDEPEND="gnome-base/gnome-libs
 	>=media-video/avifile-0.7.34
 	>=media-libs/a52dec-0.7.3
@@ -22,16 +27,10 @@ RDEPEND="gnome-base/gnome-libs
 	dev-libs/libxml2
 	sys-apps/eject
 	>=sys-devel/gcc-3"
-
 DEPEND="${RDEPEND}
 	dev-lang/nasm
 	>=sys-devel/automake-1.5-r1"
 
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="nls"
-
 src_unpack() {
 	unpack ${A}
 
@@ -56,7 +55,7 @@ src_unpack() {
 	# Remove stale script ... "automake --add-missing" will add it again
 	einfo "Rerunnig autoconf/automake..."
 	cd ${S} ; rm -f ${S}/missing
-	export WANT_AUTOMAKE_1_5=1
+	export WANT_AUTOMAKE=1.5
 	aclocal -I macros
 	automake --add-missing
 	autoconf