remove base eclass and clean up

6 files changed, 21 insertions, 114 deletions

diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index 8dbc802cb5a8..e5198dde7be7 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -1,7 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 8bc51dfa075ad46d84ab838d06d263d3 ChangeLog 2765
-MD5 68bff79e90e65fb7e519cc2860f8dcbd recode-3.5.ebuild 902
-MD5 1fc2e03b8b7330523b28165f746158f2 recode-3.6-r1.ebuild 1273
-MD5 fb77fd93dd4c486849f19788b291b127 recode-3.6.ebuild 1126
-MD5 9df596b08fd43d27c68ebb9801dc0cdd files/digest-recode-3.5 62
-MD5 e442e84aa8cba1c847368c7fd1cefda1 files/digest-recode-3.6 63
+MD5 e5afe25d8c15850a2583e121714f0476 recode-3.6-r1.ebuild 1006
 MD5 6d0ba2283055f0ad0f91ff4dfd0acfd9 files/digest-recode-3.6-r1 133
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.8 (GNU/Linux)
+
+iD8DBQFBGEt/HTu7gpaalycRArrbAJwNxrerR7NnU3ziKnJgtWM3g/+EuQCfUvaj
+1eSArTZmGUcdAMifxvRhOZo=
+=dVSQ
+-----END PGP SIGNATURE-----
diff --git a/app-text/recode/files/digest-recode-3.5 b/app-text/recode/files/digest-recode-3.5
deleted file mode 100644
index 1de9d7c13f46..000000000000
--- a/app-text/recode/files/digest-recode-3.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5f2c54592e9f7af31a11e62c7babc81c recode-3.5.tar.gz 879673
diff --git a/app-text/recode/files/digest-recode-3.6 b/app-text/recode/files/digest-recode-3.6
deleted file mode 100644
index 06fe5e4c39ed..000000000000
--- a/app-text/recode/files/digest-recode-3.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 be3f40ad2e93dae5cd5f628264bf1877 recode-3.6.tar.gz 1751886
diff --git a/app-text/recode/recode-3.5.ebuild b/app-text/recode/recode-3.5.ebuild
deleted file mode 100644
index a50076e3a257..000000000000
--- a/app-text/recode/recode-3.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/recode/recode-3.5.ebuild,v 1.16 2004/07/01 12:03:10 eradicator Exp $
-
-DESCRIPTION="Convert files between various character sets."
-SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/recode/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc"
-IUSE="nls"
-
-DEPEND="virtual/libc
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf
-	use nls || myconf="--disable-nls"
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		$myconf || die
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
-	dodoc AUTHORS BACKLOG COPYING* ChangeLog INSTALL
-	dodoc NEWS README THANKS TODO
-}
diff --git a/app-text/recode/recode-3.6-r1.ebuild b/app-text/recode/recode-3.6-r1.ebuild
index c4014597d221..685a7b0327ab 100644
--- a/app-text/recode/recode-3.6-r1.ebuild
+++ b/app-text/recode/recode-3.6-r1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/recode/recode-3.6-r1.ebuild,v 1.10 2004/07/01 12:03:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/recode/recode-3.6-r1.ebuild,v 1.11 2004/08/10 04:13:05 vapier Exp $
 
-inherit flag-o-matic base eutils gcc
+inherit flag-o-matic eutils gcc
 
-DESCRIPTION="Convert files between various character sets."
+DESCRIPTION="Convert files between various character sets"
 HOMEPAGE="http://www.gnu.org/software/recode/"
 SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.gz
 	mirror://gentoo/${P}-debian.diff.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc ppc amd64 alpha ia64 mips"
+KEYWORDS="x86 ppc sparc mips alpha amd64 ia64"
 IUSE="nls"
 
 DEPEND="virtual/libc
@@ -24,31 +24,16 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf=""
-	use nls || myconf="--disable-nls"
-
 	# gcc-3.2 crashes if we don't remove any -O?
-	if [ "`gcc-version`" == "3.2" ] && [ ${ARCH} == "x86" ] ; then
-		filter-flags -O?
-	fi
-
-	replace-flags "-march=pentium4" "-march=pentium3"
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		$myconf || die
+	[ "`gcc-version`" == "3.2" ] && [ ${ARCH} == "x86" ] \
+		&& filter-flags -O?
+	replace-cpu-flags pentium3 pentium4
 
+	econf `use_enable nls` || die
 	emake || die
 }
 
 src_install() {
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
-	dodoc AUTHORS BACKLOG COPYING* ChangeLog INSTALL
-	dodoc NEWS README THANKS TODO
+	make install DESTDIR=${D} || die
+	dodoc AUTHORS BACKLOG ChangeLog INSTALL NEWS README THANKS TODO
 }
diff --git a/app-text/recode/recode-3.6.ebuild b/app-text/recode/recode-3.6.ebuild
deleted file mode 100644
index fec39a3f9e46..000000000000
--- a/app-text/recode/recode-3.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/recode/recode-3.6.ebuild,v 1.20 2004/07/01 12:03:10 eradicator Exp $
-
-inherit flag-o-matic gcc
-
-DESCRIPTION="Convert files between various character sets."
-HOMEPAGE="http://www.gnu.org/software/recode/"
-SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ~ppc"
-IUSE="nls"
-
-DEPEND="virtual/libc
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf=""
-	use nls || myconf="--disable-nls"
-
-	replace-flags "-march=pentium4" "-march=pentium3"
-	# gcc-3.2 crashes if we don't remove any -O?
-	if [ ! -z "`gcc-version`" == "3.2" ] && [ ${ARCH} == "x86" ] ; then
-		filter-flags -O?
-	fi
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		$myconf || die
-
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
-	dodoc AUTHORS BACKLOG COPYING* ChangeLog INSTALL
-	dodoc NEWS README THANKS TODO
-}