some SERIOUS f'ing cleanup on this ebuild

4 files changed, 30 insertions, 82 deletions

diff --git a/dev-embedded/avr-gcc/ChangeLog b/dev-embedded/avr-gcc/ChangeLog
index c10e5f99abb1..9cfe4c7f7f02 100644
--- a/dev-embedded/avr-gcc/ChangeLog
+++ b/dev-embedded/avr-gcc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-embedded/avr-gcc
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avr-gcc/ChangeLog,v 1.2 2004/03/07 19:28:07 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avr-gcc/ChangeLog,v 1.3 2004/03/15 02:16:10 seemant Exp $
+
+  14 Mar 2004; Seemant Kulleen <seemant@gentoo.org> avr-gcc-3.3-r1.ebuild:
+  some SERIOUS f'ing cleanup on this ebuild
 
   07 Mar 2004; Alexander Gabert <pappy@gentoo.org> avr-gcc-3.3-r1.ebuild:
   removed leading and trailing whitespaces
diff --git a/dev-embedded/avr-gcc/avr-gcc-3.3-r1.ebuild b/dev-embedded/avr-gcc/avr-gcc-3.3-r1.ebuild
index 2cccbd859321..fa73044922cf 100644
--- a/dev-embedded/avr-gcc/avr-gcc-3.3-r1.ebuild
+++ b/dev-embedded/avr-gcc/avr-gcc-3.3-r1.ebuild
@@ -1,59 +1,29 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avr-gcc/avr-gcc-3.3-r1.ebuild,v 1.2 2004/03/07 19:28:07 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avr-gcc/avr-gcc-3.3-r1.ebuild,v 1.3 2004/03/15 02:16:10 seemant Exp $
 
-DESCRIPTION="The GNU C compiler for the AVR microcontroller architecture"
-
-# Homepage, not used by Portage directly but handy for developer reference
+IUSE=""
 
+MY_P=${P/avr-/}
+DESCRIPTION="The GNU C compiler for the AVR microcontroller architecture"
 HOMEPAGE="http://sources.redhat.com/binutils"
-
-
-S="${WORKDIR}/gcc-3.3"
-
-A="gcc-3.3.tar.bz2"
-
-SRC_URI="http://ftp.gnu.org/gnu/gcc/${A}"
-
-LICENSE="GPL-2"
+SRC_URI="http://ftp.gnu.org/gnu/gcc/${MY_P}.tar.bz2"
 
 SLOT="0"
-
+LICENSE="GPL-2"
 KEYWORDS="x86"
-IUSE=""
-
-INSTALLDIR=/usr
-MANDIR=/usr/share/man
-INFODIR=/usr/share/info
-
-# Build-time dependencies, such as
-#    ssl? ( >=openssl-0.9.6b )
-#    >=perl-5.6.1-r1
-# It is advisable to use the >= syntax show above, to reflect what you
-# had installed on your system when you tested the package.  Then
-# other users hopefully won't be caught without the right version of
-# a dependency.
-DEPEND="virtual/glibc dev-embedded/avr-binutils"
 
-# Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
-#RDEPEND=""
+DEPEND="virtual/glibc
+	dev-embedded/avr-binutils"
 
 src_compile() {
-	pwd
-	./configure \
-		--host=${CHOST} \
+	econf \
 		--target=avr \
-		--prefix=${INSTALLDIR} \
-		--enable-languages=c \
-		--infodir=${INFODIR} \
-		--mandir=${MANDIR} || die "./configure failed"
+		--enable-languages=c || die
 
 	emake || die
 }
 
 src_install() {
-	make prefix=${D}${INSTALLDIR} \
-		mandir=${D}${MANDIR} \
-		infodir=${D}${INFODIR} \
-		install || die
+	einstall || die
 }
diff --git a/dev-embedded/avr-libc/ChangeLog b/dev-embedded/avr-libc/ChangeLog
index a822be08136d..ad6af7935afe 100644
--- a/dev-embedded/avr-libc/ChangeLog
+++ b/dev-embedded/avr-libc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-embedded/avr-libc
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avr-libc/ChangeLog,v 1.1 2004/03/07 19:29:04 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avr-libc/ChangeLog,v 1.2 2004/03/15 02:18:57 seemant Exp $
+
+  14 Mar 2004; Seemant Kulleen <seemant@gentoo.org> avr-libc-1.0.2-r1.ebuild:
+  some SERIOUS f'ing cleanup on this ebuild
 
 *avr-libc-1.0.2-r1 (07 Mar 2004)
 
diff --git a/dev-embedded/avr-libc/avr-libc-1.0.2-r1.ebuild b/dev-embedded/avr-libc/avr-libc-1.0.2-r1.ebuild
index a7de5b034586..233fd66c1c6d 100644
--- a/dev-embedded/avr-libc/avr-libc-1.0.2-r1.ebuild
+++ b/dev-embedded/avr-libc/avr-libc-1.0.2-r1.ebuild
@@ -1,62 +1,34 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avr-libc/avr-libc-1.0.2-r1.ebuild,v 1.1 2004/03/07 19:29:04 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avr-libc/avr-libc-1.0.2-r1.ebuild,v 1.2 2004/03/15 02:18:57 seemant Exp $
 
-DESCRIPTION="Libc for the AVR microcontroller architecture"
-
-# Homepage, not used by Portage directly but handy for developer reference
+IUSE="nls"
 
+MY_P=${P/avr-/}
+DESCRIPTION="Libc for the AVR microcontroller architecture"
 HOMEPAGE="http:////www.nongnu.org/avr-libc/"
+SRC_URI="http://savannah.nongnu.org/download/avr-libc/${MY_P}.tar.bz2"
 
-
-S="${WORKDIR}/avr-libc-1.0.2"
-
-A="avr-libc-1.0.2.tar.gz"
-
-SRC_URI="http://savannah.nongnu.org/download/avr-libc/${A}"
-
-LICENSE="GPL-2"
-
-CFLAGS=""
 SLOT="0"
-
+LICENSE="GPL-2"
 KEYWORDS="x86"
-IUSE=""
-
-INSTALLDIR=/usr
-MANDIR=/usr/share/man
-INFODIR=/usr/share/info
 
-# Build-time dependencies, such as
-#    ssl? ( >=openssl-0.9.6b )
-#    >=perl-5.6.1-r1
-# It is advisable to use the >= syntax show above, to reflect what you
-# had installed on your system when you tested the package.  Then
-# other users hopefully won't be caught without the right version of
-# a dependency.
 DEPEND="dev-embedded/avr-gcc"
 
-# Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
-#RDEPEND=""
-
 src_compile() {
 	mkdir obj-avr
 	cd obj-avr
-	pwd
 	CC=avr-gcc CFLAGS="" ../configure \
 		--target=avr \
-		--prefix=${INSTALLDIR} \
-		--infodir=${INFODIR} \
-		--mandir=${MANDIR} || die "./configure failed"
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		`use_enable nls` || die "./configure failed"
 
 	emake || die
 }
 
 src_install() {
 	cd obj-avr
-	pwd
-	make prefix=${D}${INSTALLDIR} \
-		mandir=${D}${MANDIR} \
-		infodir=${D}${INFODIR} \
-		install || die
+	einstall || die
 }