clean up things and change glibc to libc

31 files changed, 257 insertions, 361 deletions

diff --git a/dev-embedded/gpsim-lcd/gpsim-lcd-0.1.1.ebuild b/dev-embedded/gpsim-lcd/gpsim-lcd-0.1.1.ebuild
index 812e6af23e80..5a4f58015ba9 100644
--- a/dev-embedded/gpsim-lcd/gpsim-lcd-0.1.1.ebuild
+++ b/dev-embedded/gpsim-lcd/gpsim-lcd-0.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim-lcd/gpsim-lcd-0.1.1.ebuild,v 1.6 2004/06/24 22:06:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim-lcd/gpsim-lcd-0.1.1.ebuild,v 1.7 2004/06/29 13:23:16 vapier Exp $
 
 inherit eutils
 
@@ -26,11 +26,6 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-display_fix.patch
 }
 
-src_compile(){
-	econf || die
-	emake || die
-}
-
 src_install() {
 	einstall || die
 	dodoc AUTHORS ChangeLog INSTALL NEWS README
diff --git a/dev-embedded/gpsim-led/gpsim-led-0.0.3.ebuild b/dev-embedded/gpsim-led/gpsim-led-0.0.3.ebuild
index b937fbd44aad..186debcdcd3f 100644
--- a/dev-embedded/gpsim-led/gpsim-led-0.0.3.ebuild
+++ b/dev-embedded/gpsim-led/gpsim-led-0.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim-led/gpsim-led-0.0.3.ebuild,v 1.5 2004/06/24 22:06:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim-led/gpsim-led-0.0.3.ebuild,v 1.6 2004/06/29 13:23:33 vapier Exp $
 
 inherit eutils
 
@@ -25,11 +25,6 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-gcc33.patch
 }
 
-src_compile(){
-	econf || die
-	emake || die
-}
-
 src_install() {
 	einstall || die
 	dodoc AUTHORS ChangeLog INSTALL NEWS README
diff --git a/dev-embedded/gpsim-logic/gpsim-logic-0.0.2.ebuild b/dev-embedded/gpsim-logic/gpsim-logic-0.0.2.ebuild
index 7c5c141e61ba..1f5c4d1a1b5d 100644
--- a/dev-embedded/gpsim-logic/gpsim-logic-0.0.2.ebuild
+++ b/dev-embedded/gpsim-logic/gpsim-logic-0.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim-logic/gpsim-logic-0.0.2.ebuild,v 1.4 2004/06/24 22:07:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim-logic/gpsim-logic-0.0.2.ebuild,v 1.5 2004/06/29 13:23:51 vapier Exp $
 
 inherit eutils
 
@@ -20,11 +20,6 @@ DEPEND=">=dev-embedded/gpsim-0.20*"
 
 S=${WORKDIR}/${MY_P}
 
-src_compile(){
-	econf || die
-	emake || die
-}
-
 src_install() {
 	einstall || die
 	dodoc AUTHORS ChangeLog INSTALL NEWS README
diff --git a/dev-embedded/gpsim/gpsim-0.20.14-r1.ebuild b/dev-embedded/gpsim/gpsim-0.20.14-r1.ebuild
index 1f448f4acbf7..dcf960a42a6b 100644
--- a/dev-embedded/gpsim/gpsim-0.20.14-r1.ebuild
+++ b/dev-embedded/gpsim/gpsim-0.20.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/gpsim-0.20.14-r1.ebuild,v 1.4 2004/06/24 22:06:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/gpsim-0.20.14-r1.ebuild,v 1.5 2004/06/29 13:22:59 vapier Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -26,14 +26,9 @@ src_unpack() {
 	fi
 }
 
-src_compile(){
-	econf || die
-	emake || die
-}
-
 src_install() {
 	einstall || die
-	dodoc ANNOUNCE AUTHORS COPYING ChangeLog HISTORY INSTALL NEWS PROCESSORS
+	dodoc ANNOUNCE AUTHORS ChangeLog HISTORY INSTALL NEWS PROCESSORS
 	dodoc README README.EXAMPLES README.MODULES TODO
 	dodoc doc/*.lyx
 	cp -ra ${S}/examples ${D}/usr/share/doc/${PF}
diff --git a/dev-embedded/gpsim/gpsim-0.20.14.ebuild b/dev-embedded/gpsim/gpsim-0.20.14.ebuild
index 5134caae4442..61c00692845a 100644
--- a/dev-embedded/gpsim/gpsim-0.20.14.ebuild
+++ b/dev-embedded/gpsim/gpsim-0.20.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/gpsim-0.20.14.ebuild,v 1.3 2004/06/24 22:06:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/gpsim-0.20.14.ebuild,v 1.4 2004/06/29 13:22:59 vapier Exp $
 
 inherit eutils
 
@@ -21,13 +21,8 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-gcc3.2.patch
 }
 
-src_compile(){
-	econf || die
-	emake || die
-}
-
 src_install() {
 	einstall || die
-	dodoc ANNOUNCE AUTHORS COPYING ChangeLog HISTORY INSTALL NEWS PROCESSORS
+	dodoc ANNOUNCE AUTHORS ChangeLog HISTORY INSTALL NEWS PROCESSORS
 	dodoc README README.EXAMPLES README.MODULES TODO
 }
diff --git a/dev-embedded/gputils/gputils-0.10.6.ebuild b/dev-embedded/gputils/gputils-0.10.6.ebuild
index 2a9682475f29..36cb49877f5a 100644
--- a/dev-embedded/gputils/gputils-0.10.6.ebuild
+++ b/dev-embedded/gputils/gputils-0.10.6.ebuild
@@ -1,24 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gputils/gputils-0.10.6.ebuild,v 1.5 2004/06/24 22:07:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gputils/gputils-0.10.6.ebuild,v 1.6 2004/06/29 13:24:15 vapier Exp $
 
 DESCRIPTION="Utils for the PICxxx procesors"
-SRC_URI="mirror://sourceforge/gputils/${P}.tar.gz"
 HOMEPAGE="http://gputils.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gputils/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 sparc"
 IUSE=""
-DEPEND="virtual/glibc"
 
-src_compile() {
-	econf || die
-	emake || die
-}
+DEPEND="virtual/libc"
 
 src_install() {
 	einstall || die
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-	dodoc doc/gputils.ps
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO doc/gputils.ps
 }
diff --git a/dev-embedded/gputils/gputils-0.11.4.ebuild b/dev-embedded/gputils/gputils-0.11.4.ebuild
index 9e1ae91ce13e..c72207572670 100644
--- a/dev-embedded/gputils/gputils-0.11.4.ebuild
+++ b/dev-embedded/gputils/gputils-0.11.4.ebuild
@@ -1,24 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gputils/gputils-0.11.4.ebuild,v 1.6 2004/06/24 22:07:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gputils/gputils-0.11.4.ebuild,v 1.7 2004/06/29 13:24:15 vapier Exp $
 
 DESCRIPTION="Utils for the PICxxx procesors"
-SRC_URI="mirror://sourceforge/gputils/${P}.tar.gz"
 HOMEPAGE="http://gputils.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gputils/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 sparc"
 IUSE=""
-DEPEND="virtual/glibc"
 
-src_compile() {
-	econf || die
-	emake || die
-}
+DEPEND="virtual/libc"
 
 src_install() {
 	einstall || die
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-	dodoc doc/gputils.ps
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO doc/gputils.ps
 }
diff --git a/dev-embedded/gputils/gputils-0.11.6.ebuild b/dev-embedded/gputils/gputils-0.11.6.ebuild
index 3d88d5fcdc58..52ef512c0295 100644
--- a/dev-embedded/gputils/gputils-0.11.6.ebuild
+++ b/dev-embedded/gputils/gputils-0.11.6.ebuild
@@ -1,24 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gputils/gputils-0.11.6.ebuild,v 1.6 2004/06/24 22:07:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gputils/gputils-0.11.6.ebuild,v 1.7 2004/06/29 13:24:15 vapier Exp $
 
 DESCRIPTION="Utils for the PICxxx procesors"
-SRC_URI="mirror://sourceforge/gputils/${P}.tar.gz"
 HOMEPAGE="http://gputils.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gputils/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 sparc"
 IUSE=""
-DEPEND="virtual/glibc"
 
-src_compile() {
-	econf || die
-	emake || die
-}
+DEPEND="virtual/libc"
 
 src_install() {
 	einstall || die
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-	dodoc doc/gputils.ps
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO doc/gputils.ps
 }
diff --git a/dev-embedded/gputils/gputils-0.11.7.ebuild b/dev-embedded/gputils/gputils-0.11.7.ebuild
index 0122e4f1553e..aaba99976722 100644
--- a/dev-embedded/gputils/gputils-0.11.7.ebuild
+++ b/dev-embedded/gputils/gputils-0.11.7.ebuild
@@ -1,24 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gputils/gputils-0.11.7.ebuild,v 1.6 2004/06/24 22:07:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gputils/gputils-0.11.7.ebuild,v 1.7 2004/06/29 13:24:15 vapier Exp $
 
 DESCRIPTION="Collection of tools including assembler, linker and librarian for PIC microcontrollers"
-SRC_URI="mirror://sourceforge/gputils/${P}.tar.gz"
 HOMEPAGE="http://gputils.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gputils/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 sparc"
 IUSE=""
-DEPEND="virtual/glibc"
 
-src_compile() {
-	econf || die
-	emake || die
-}
+DEPEND="virtual/libc"
 
 src_install() {
 	einstall || die
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-	dodoc doc/gputils.ps
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO doc/gputils.ps
 }
diff --git a/dev-embedded/gputils/gputils-0.11.8.ebuild b/dev-embedded/gputils/gputils-0.11.8.ebuild
index 2dd0ce80575d..81d278e25246 100644
--- a/dev-embedded/gputils/gputils-0.11.8.ebuild
+++ b/dev-embedded/gputils/gputils-0.11.8.ebuild
@@ -1,24 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gputils/gputils-0.11.8.ebuild,v 1.6 2004/06/24 22:07:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gputils/gputils-0.11.8.ebuild,v 1.7 2004/06/29 13:24:15 vapier Exp $
 
 DESCRIPTION="Collection of tools including assembler, linker and librarian for PIC microcontrollers"
-SRC_URI="mirror://sourceforge/gputils/${P}.tar.gz"
 HOMEPAGE="http://gputils.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gputils/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 sparc"
 IUSE=""
-DEPEND="virtual/glibc"
 
-src_compile() {
-	econf || die
-	emake || die
-}
+DEPEND="virtual/libc"
 
 src_install() {
 	einstall || die
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
 	dodoc doc/gputils.ps doc/gputils.lyx doc/gputils.pdf
 }
diff --git a/dev-embedded/gputils/gputils-0.12.0.ebuild b/dev-embedded/gputils/gputils-0.12.0.ebuild
index ba576ea0515a..faf0e989d99b 100644
--- a/dev-embedded/gputils/gputils-0.12.0.ebuild
+++ b/dev-embedded/gputils/gputils-0.12.0.ebuild
@@ -1,31 +1,24 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gputils/gputils-0.12.0.ebuild,v 1.6 2004/06/24 22:07:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gputils/gputils-0.12.0.ebuild,v 1.7 2004/06/29 13:24:15 vapier Exp $
 
 DESCRIPTION="Collection of tools including assembler, linker and librarian for PIC microcontrollers"
-SRC_URI="mirror://sourceforge/gputils/${P}.tar.gz"
 HOMEPAGE="http://gputils.sourceforge.net/"
-RESTRICT="nomirror"
+SRC_URI="mirror://sourceforge/gputils/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 sparc ppc ~amd64"
 IUSE=""
-DEPEND="virtual/glibc
+
+DEPEND="virtual/libc
 	sys-devel/gcc
 	sys-devel/flex
 	sys-devel/bison"
-
-RDEPEND="virtual/glibc"
-
-
-src_compile() {
-	econf || die
-	emake || die
-}
+RDEPEND="virtual/libc"
 
 src_install() {
 	einstall || die
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
 	dodoc doc/gputils.ps doc/gputils.lyx doc/gputils.pdf
 }
diff --git a/dev-embedded/icdprog/icdprog-0.3.ebuild b/dev-embedded/icdprog/icdprog-0.3.ebuild
index 987490e12825..e49fcedc4736 100644
--- a/dev-embedded/icdprog/icdprog-0.3.ebuild
+++ b/dev-embedded/icdprog/icdprog-0.3.ebuild
@@ -1,17 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/icdprog/icdprog-0.3.ebuild,v 1.4 2004/06/24 22:07:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/icdprog/icdprog-0.3.ebuild,v 1.5 2004/06/29 13:24:32 vapier Exp $
 
 DESCRIPTION="Microchip PIC Programmer using ICD hardware"
-HOMEPAGE="http://${PN}.sf.net/"
+HOMEPAGE="http://icdprg.sf.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 IUSE=""
+
 DEPEND="sys-devel/gcc
 	>=sys-apps/sed-4"
-RDEPEND="" #we don't depend on anything after we are compiled
+RDEPEND=""
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-embedded/include/include-0.3.2.ebuild b/dev-embedded/include/include-0.3.2.ebuild
index 54ec35735f74..e2353fe11075 100644
--- a/dev-embedded/include/include-0.3.2.ebuild
+++ b/dev-embedded/include/include-0.3.2.ebuild
@@ -1,29 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/include/include-0.3.2.ebuild,v 1.7 2004/06/24 22:07:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/include/include-0.3.2.ebuild,v 1.8 2004/06/29 13:24:49 vapier Exp $
 
 DESCRIPTION="This is a collection of the useful independent include files for C/Assembler developers."
-SRC_URI="mirror://sourceforge/openwince/${P}.tar.bz2"
 HOMEPAGE="http://openwince.sourceforge.net/include/"
-KEYWORDS="x86 sparc"
-SLOT="0"
+SRC_URI="mirror://sourceforge/openwince/${P}.tar.bz2"
+
 LICENSE="BSD"
+SLOT="0"
+KEYWORDS="x86 sparc"
 IUSE=""
-RESTRICT="nomirror"
+
 DEPEND="sys-apps/grep
 	sys-apps/gawk"
-
 RDEPEND=""
 
-src_compile(){
-	econf || die "Failed to configure"
-	emake || die "Failed to compile"
-}
-
-src_install(){
+src_install() {
 	emake DESTDIR=${D} install
 }
-
-
-
-
diff --git a/dev-embedded/jtag/jtag-0.5.1.ebuild b/dev-embedded/jtag/jtag-0.5.1.ebuild
index 8f50ab3a67e1..9fe297e94203 100644
--- a/dev-embedded/jtag/jtag-0.5.1.ebuild
+++ b/dev-embedded/jtag/jtag-0.5.1.ebuild
@@ -1,31 +1,25 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/jtag/jtag-0.5.1.ebuild,v 1.4 2004/06/24 22:07:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/jtag/jtag-0.5.1.ebuild,v 1.5 2004/06/29 13:25:12 vapier Exp $
 
-DESCRIPTION="JTAG Tools is a software package which enables working with JTAG-aware (IEEE 1149.1) hardware devices (parts) and boards through JTAG adapter."
-SRC_URI="mirror://sourceforge/openwince/${P}.tar.bz2"
+DESCRIPTION="software package for working with JTAG-aware (IEEE 1149.1) hardware devices (parts) and boards through JTAG adapter"
 HOMEPAGE="http://openwince.sourceforge.net/jtag/"
+SRC_URI="mirror://sourceforge/openwince/${P}.tar.bz2"
+
 KEYWORDS="x86 sparc"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
-RESTRICT="nomirror"
+
 DEPEND="dev-embedded/include
 	sys-apps/gawk
 	sys-apps/grep
 	sys-apps/sed
 	sys-devel/gcc
 	sys-devel/gettext"
-
 RDEPEND="dev-embedded/include
-	virtual/glibc"
-
-
-src_compile(){
-	econf || die "failed to configure"
-	emake || die "failed to compile"
-}
+	virtual/libc"
 
-src_install(){
+src_install() {
 	emake DESTDIR=${D} install || die "failed to install"
 }
diff --git a/dev-embedded/picprog/picprog-1.5.ebuild b/dev-embedded/picprog/picprog-1.5.ebuild
index cfacc052350b..dc7c4813e924 100644
--- a/dev-embedded/picprog/picprog-1.5.ebuild
+++ b/dev-embedded/picprog/picprog-1.5.ebuild
@@ -1,27 +1,28 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picprog/picprog-1.5.ebuild,v 1.3 2004/06/24 22:08:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picprog/picprog-1.5.ebuild,v 1.4 2004/06/29 13:25:49 vapier Exp $
 
 DESCRIPTION="a pic16xxx series microcontroller programmer software for the simple serial port device"
 HOMEPAGE="http://www.iki.fi/hyvatti/pic/${PN}.html"
 SRC_URI="http://www.iki.fi/hyvatti/pic/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 KEYWORDS="x86"
+IUSE=""
+
 DEPEND="sys-devel/gcc
-	virtual/glibc
+	virtual/libc
 	sys-apps/coreutils"
-
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 
 src_compile() {
 	emake CXXFLAGS="${CXXFLAGS}" || die
 }
 
 src_install() {
-	dobin picprog
-	dodoc README #jdm*.png adapter.jpg
+	dobin picprog || die
+	dodoc README
 	dohtml picprog.html *.jpg *.png
 	doman picprog.1
 }
diff --git a/dev-embedded/picprog/picprog-1.6.ebuild b/dev-embedded/picprog/picprog-1.6.ebuild
index b3d373b67498..fd07d29a781a 100644
--- a/dev-embedded/picprog/picprog-1.6.ebuild
+++ b/dev-embedded/picprog/picprog-1.6.ebuild
@@ -1,27 +1,28 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picprog/picprog-1.6.ebuild,v 1.3 2004/06/24 22:08:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picprog/picprog-1.6.ebuild,v 1.4 2004/06/29 13:25:49 vapier Exp $
 
 DESCRIPTION="a pic16xxx series microcontroller programmer software for the simple serial port device"
 HOMEPAGE="http://www.iki.fi/hyvatti/pic/picprog.html"
 SRC_URI="http://www.iki.fi/hyvatti/pic/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 KEYWORDS="x86"
+IUSE=""
+
 DEPEND="sys-devel/gcc
-	virtual/glibc
+	virtual/libc
 	sys-apps/coreutils"
-
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 
 src_compile() {
 	emake CXXFLAGS="${CXXFLAGS}" || die
 }
 
 src_install() {
-	dobin picprog
-	dodoc README #jdm*.png adapter.jpg
+	dobin picprog || die
+	dodoc README
 	dohtml picprog.html *.jpg *.png
 	doman picprog.1
 }
diff --git a/dev-embedded/picprog/picprog-1.7.ebuild b/dev-embedded/picprog/picprog-1.7.ebuild
index 77603cc63e9c..5e0ff58312a0 100644
--- a/dev-embedded/picprog/picprog-1.7.ebuild
+++ b/dev-embedded/picprog/picprog-1.7.ebuild
@@ -1,26 +1,27 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picprog/picprog-1.7.ebuild,v 1.3 2004/06/24 22:08:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picprog/picprog-1.7.ebuild,v 1.4 2004/06/29 13:25:49 vapier Exp $
 
 DESCRIPTION="a pic16xxx series microcontroller programmer software for the simple serial port device"
 HOMEPAGE="http://www.iki.fi/hyvatti/pic/picprog.html"
 SRC_URI="http://www.iki.fi/hyvatti/pic/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 KEYWORDS="~x86 ~ppc"
+IUSE=""
+
 DEPEND="sys-devel/gcc
-	virtual/glibc
+	virtual/libc
 	sys-apps/coreutils"
-
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 
 src_compile() {
 	emake CXXFLAGS="${CXXFLAGS}" || die
 }
 
 src_install() {
-	dobin picprog
+	dobin picprog || die
 	dodoc README
 	dohtml picprog.html *.png
 	doman picprog.1
diff --git a/dev-embedded/picptk/picptk-0.5a.ebuild b/dev-embedded/picptk/picptk-0.5a.ebuild
index 39594ef53a19..679352f9a36a 100644
--- a/dev-embedded/picptk/picptk-0.5a.ebuild
+++ b/dev-embedded/picptk/picptk-0.5a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picptk/picptk-0.5a.ebuild,v 1.3 2004/06/24 22:08:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picptk/picptk-0.5a.ebuild,v 1.4 2004/06/29 13:26:11 vapier Exp $
 
 #this is for autoconf
 inherit kde-functions eutils
@@ -9,12 +9,17 @@ DESCRIPTION="Picptk is a programmer supporting the whole PIC family including al
 HOMEPAGE="http://huizen.dds.nl/~gnupic/programmers_mike_butler.html"
 # http://huizen.dds.nl/~gnupic/picptk-0.5a.tar.gz
 SRC_URI="http://huizen.dds.nl/~gnupic/picptk-0.5a.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 KEYWORDS="~x86"
+IUSE=""
+
 RDEPEND="dev-tcltk/itcl"
-DEPEND="${RDEPEND} sys-devel/gcc sys-devel/automake sys-devel/autoconf"
+DEPEND="${RDEPEND}
+	sys-devel/gcc
+	sys-devel/automake
+	sys-devel/autoconf"
 
 src_unpack() {
 	unpack ${A}
@@ -25,11 +30,6 @@ src_unpack() {
 	autoconf
 }
 
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
 src_install() {
 	#dobin picprog
 	#dodoc README #jdm*.png adapter.jpg
diff --git a/dev-embedded/pikdev/pikdev-0.4.4-r1.ebuild b/dev-embedded/pikdev/pikdev-0.4.4-r1.ebuild
index 3709b68ac021..4febced8fa78 100644
--- a/dev-embedded/pikdev/pikdev-0.4.4-r1.ebuild
+++ b/dev-embedded/pikdev/pikdev-0.4.4-r1.ebuild
@@ -1,7 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pikdev/pikdev-0.4.4-r1.ebuild,v 1.4 2004/06/24 22:08:31 agriffis Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pikdev/pikdev-0.4.4-r1.ebuild,v 1.5 2004/06/29 13:26:49 vapier Exp $
 
 inherit kde
 need-kde 3
@@ -9,34 +8,33 @@ need-kde 3
 DESCRIPTION="Graphical IDE for PIC-based application development"
 HOMEPAGE="http://pikdev.free.fr/"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 IUSE=""
-RDEPEND="	x11-libs/qt
-		virtual/x11
-		sys-libs/zlib
-		dev-libs/expat
-		sys-devel/gcc
-		media-libs/fontconfig
-		media-libs/freetype
-		media-libs/jpeg
-		media-libs/libart_lgpl
-		media-libs/libmng
-		media-libs/libpng
-		media-libs/nas
-		sys-devel/gcc
-		dev-embedded/gputils
-		app-admin/fam
-		virtual/glibc"
 
+RDEPEND="x11-libs/qt
+	virtual/x11
+	sys-libs/zlib
+	dev-libs/expat
+	sys-devel/gcc
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/jpeg
+	media-libs/libart_lgpl
+	media-libs/libmng
+	media-libs/libpng
+	media-libs/nas
+	sys-devel/gcc
+	dev-embedded/gputils
+	app-admin/fam
+	virtual/libc"
 # build system uses some perl
 DEPEND="${RDEPEND}
-		dev-lang/perl
-		>=sys-devel/gcc-3.0.0
-		>=sys-apps/sed-4"
-
-S=${WORKDIR}/${P}
+	dev-lang/perl
+	>=sys-devel/gcc-3
+	>=sys-apps/sed-4"
 
 src_compile() {
 	kde_src_compile myconf configure
@@ -45,8 +43,6 @@ src_compile() {
 }
 
 pkg_postinst() {
-
 	einfo "The author request you email alain.gibaud@free.fr when you install this program. See the"
 	einfo "http://pikdev.free.fr/download.php3 for details"
 }
-
diff --git a/dev-embedded/pikdev/pikdev-0.4.4.ebuild b/dev-embedded/pikdev/pikdev-0.4.4.ebuild
index 17494e4c0095..f50144a5f36b 100644
--- a/dev-embedded/pikdev/pikdev-0.4.4.ebuild
+++ b/dev-embedded/pikdev/pikdev-0.4.4.ebuild
@@ -1,43 +1,40 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pikdev/pikdev-0.4.4.ebuild,v 1.8 2004/06/24 22:08:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pikdev/pikdev-0.4.4.ebuild,v 1.9 2004/06/29 13:26:49 vapier Exp $
 
 DESCRIPTION="Graphical IDE for PIC-based application development"
 HOMEPAGE="http://pikdev.free.fr/"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 IUSE="xinerama"
-RDEPEND=">=kde-base/kdelibs-3.0
-		x11-libs/qt
-		virtual/x11
-		sys-libs/zlib
-		dev-libs/expat
-		sys-devel/gcc
-		media-libs/fontconfig
-		media-libs/freetype
-		media-libs/jpeg
-		media-libs/libart_lgpl
-		media-libs/libmng
-		media-libs/libpng
-		media-libs/nas
-		sys-devel/gcc
-		dev-embedded/gputils
-		app-admin/fam
-		virtual/glibc"
 
+RDEPEND=">=kde-base/kdelibs-3.0
+	x11-libs/qt
+	virtual/x11
+	sys-libs/zlib
+	dev-libs/expat
+	sys-devel/gcc
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/jpeg
+	media-libs/libart_lgpl
+	media-libs/libmng
+	media-libs/libpng
+	media-libs/nas
+	sys-devel/gcc
+	dev-embedded/gputils
+	app-admin/fam
+	virtual/libc"
 # build system uses some perl
 DEPEND="${RDEPEND}
-		dev-lang/perl
-		>=sys-devel/gcc-3*"
-
-S=${WORKDIR}/${P}
+	dev-lang/perl
+	>=sys-devel/gcc-3"
 
 src_compile() {
-	local myconf
-	myconf="`use_with xinerama`"
-	econf ${myconf} || die "econf failed"
+	econf `use_with xinerama` || die "econf failed"
 	emake clean || die "emake clean failed"
 	emake || die "emake failed"
 }
diff --git a/dev-embedded/pikdev/pikdev-0.6.5b.ebuild b/dev-embedded/pikdev/pikdev-0.6.5b.ebuild
index ec48261f4ed2..e9daf9ae05a0 100644
--- a/dev-embedded/pikdev/pikdev-0.6.5b.ebuild
+++ b/dev-embedded/pikdev/pikdev-0.6.5b.ebuild
@@ -1,32 +1,29 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pikdev/pikdev-0.6.5b.ebuild,v 1.2 2004/06/24 22:08:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pikdev/pikdev-0.6.5b.ebuild,v 1.3 2004/06/29 13:26:49 vapier Exp $
 
 inherit kde
 need-kde 3
 DESCRIPTION="Graphical IDE for PIC-based application development"
 HOMEPAGE="http://pikdev.free.fr/"
 SRC_URI="http://pikdev.free.fr/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 IUSE="xinerama"
-RDEPEND="sys-libs/zlib
-		media-libs/libpng
-		dev-embedded/gputils
-		app-admin/fam"
 
+RDEPEND="sys-libs/zlib
+	media-libs/libpng
+	dev-embedded/gputils
+	app-admin/fam"
 # build system uses some perl
 DEPEND="${RDEPEND}
-		dev-lang/perl
-		>=sys-devel/gcc-3*"
-
-S=${WORKDIR}/${P}
+	dev-lang/perl
+	>=sys-devel/gcc-3"
 
 src_compile() {
-	local myconf
-	myconf="`use_with xinerama`"
-	econf ${myconf} || die "econf failed"
+	econf `use_with xinerama` || die "econf failed"
 	emake clean || die "emake clean failed"
 	emake || die "emake failed"
 }
diff --git a/dev-embedded/pikdev/pikdev-0.6.5c-r1.ebuild b/dev-embedded/pikdev/pikdev-0.6.5c-r1.ebuild
index 523d85fe9d5f..68e1e63172c4 100644
--- a/dev-embedded/pikdev/pikdev-0.6.5c-r1.ebuild
+++ b/dev-embedded/pikdev/pikdev-0.6.5c-r1.ebuild
@@ -1,7 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pikdev/pikdev-0.6.5c-r1.ebuild,v 1.3 2004/06/24 22:08:31 agriffis Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pikdev/pikdev-0.6.5c-r1.ebuild,v 1.4 2004/06/29 13:26:49 vapier Exp $
 
 inherit kde
 need-kde 3
@@ -10,38 +9,35 @@ DESCRIPTION="Graphical IDE for PIC-based application development"
 HOMEPAGE="http://pikdev.free.fr/"
 SRC_URI="http://pikdev.free.fr/${P}.tar.gz"
 
-# restrict at Authors request
-RESTRICT="nomirror"
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
-RDEPEND="kde-base/kdelibs
-		x11-libs/qt
-		virtual/x11
-		sys-libs/zlib
-		dev-libs/expat
-		sys-devel/gcc
-		media-libs/fontconfig
-		media-libs/freetype
-		media-libs/jpeg
-		media-libs/libart_lgpl
-		media-libs/libmng
-		media-libs/libpng
-		media-libs/nas
-		sys-devel/gcc
-		dev-embedded/gputils
-		app-admin/fam
-		virtual/glibc"
+# restrict at Authors request
+RESTRICT="nomirror"
 
+RDEPEND="kde-base/kdelibs
+	x11-libs/qt
+	virtual/x11
+	sys-libs/zlib
+	dev-libs/expat
+	sys-devel/gcc
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/jpeg
+	media-libs/libart_lgpl
+	media-libs/libmng
+	media-libs/libpng
+	media-libs/nas
+	sys-devel/gcc
+	dev-embedded/gputils
+	app-admin/fam
+	virtual/libc"
 # build system uses some perl
 DEPEND="${RDEPEND}
-		dev-lang/perl
-		>=sys-devel/gcc-3.0.0
-		>=sys-apps/sed-4"
-
-S=${WORKDIR}/${P}
+	dev-lang/perl
+	>=sys-devel/gcc-3
+	>=sys-apps/sed-4"
 
 src_compile() {
 	kde_src_compile myconf configure
@@ -55,7 +51,6 @@ src_install() {
 }
 
 pkg_postinst() {
-
 	einfo "The author request you email alain.gibaud@free.fr when you install this program. See the"
 	einfo "http://pikdev.free.fr/download.php3 for details"
 
@@ -64,4 +59,3 @@ pkg_postinst() {
 	ewarn " contains a local copy of configuration files and prevents new functionnalities to appear"
 	ewarn " in menus/toolbars."
 }
-
diff --git a/dev-embedded/pikdev/pikdev-0.6.5c.ebuild b/dev-embedded/pikdev/pikdev-0.6.5c.ebuild
index 7ac9eb357d32..834089703d8f 100644
--- a/dev-embedded/pikdev/pikdev-0.6.5c.ebuild
+++ b/dev-embedded/pikdev/pikdev-0.6.5c.ebuild
@@ -1,7 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pikdev/pikdev-0.6.5c.ebuild,v 1.4 2004/06/24 22:08:31 agriffis Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pikdev/pikdev-0.6.5c.ebuild,v 1.5 2004/06/29 13:26:49 vapier Exp $
 
 inherit kde
 need-kde 3
@@ -10,35 +9,34 @@ DESCRIPTION="Graphical IDE for PIC-based application development"
 HOMEPAGE="http://pikdev.free.fr/"
 SRC_URI="http://pikdev.free.fr/${P}.tar.gz"
 
-# restrict at Authors request
-RESTRICT="nomirror"
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
-RDEPEND="	x11-libs/qt
-		virtual/x11
-		sys-libs/zlib
-		dev-libs/expat
-		sys-devel/gcc
-		media-libs/fontconfig
-		media-libs/freetype
-		media-libs/jpeg
-		media-libs/libart_lgpl
-		media-libs/libmng
-		media-libs/libpng
-		media-libs/nas
-		sys-devel/gcc
-		dev-embedded/gputils
-		app-admin/fam
-		virtual/glibc"
+# restrict at Authors request
+RESTRICT="nomirror"
 
+RDEPEND="x11-libs/qt
+	virtual/x11
+	sys-libs/zlib
+	dev-libs/expat
+	sys-devel/gcc
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/jpeg
+	media-libs/libart_lgpl
+	media-libs/libmng
+	media-libs/libpng
+	media-libs/nas
+	sys-devel/gcc
+	dev-embedded/gputils
+	app-admin/fam
+	virtual/libc"
 # build system uses some perl
 DEPEND="${RDEPEND}
-		dev-lang/perl
-		>=sys-devel/gcc-3.0.0
-		>=sys-apps/sed-4"
+	dev-lang/perl
+	>=sys-devel/gcc-3
+	>=sys-apps/sed-4"
 
 S=${WORKDIR}/${P}
 
@@ -54,7 +52,6 @@ src_install() {
 }
 
 pkg_postinst() {
-
 	einfo "The author request you email alain.gibaud@free.fr when you install this program. See the"
 	einfo "http://pikdev.free.fr/download.php3 for details"
 
@@ -63,4 +60,3 @@ pkg_postinst() {
 	ewarn " contains a local copy of configuration files and prevents new functionnalities to appear"
 	ewarn " in menus/toolbars."
 }
-
diff --git a/dev-embedded/pikdev/pikdev-0.6.6.ebuild b/dev-embedded/pikdev/pikdev-0.6.6.ebuild
index af729d9b69d1..a45e4937074e 100644
--- a/dev-embedded/pikdev/pikdev-0.6.6.ebuild
+++ b/dev-embedded/pikdev/pikdev-0.6.6.ebuild
@@ -1,7 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pikdev/pikdev-0.6.6.ebuild,v 1.2 2004/06/24 22:08:31 agriffis Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pikdev/pikdev-0.6.6.ebuild,v 1.3 2004/06/29 13:26:49 vapier Exp $
 
 inherit kde
 need-kde 3
@@ -10,39 +9,35 @@ DESCRIPTION="Graphical IDE for PIC-based application development"
 HOMEPAGE="http://pikdev.free.fr/"
 SRC_URI="http://pikdev.free.fr/${P}.tar.gz"
 
-# restrict at Authors request
-RESTRICT="nomirror"
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
-RDEPEND="	x11-libs/qt
-		virtual/x11
-		sys-libs/zlib
-		dev-libs/expat
-		sys-devel/gcc
-		media-libs/fontconfig
-		media-libs/freetype
-		media-libs/jpeg
-		media-libs/libart_lgpl
-		media-libs/libmng
-		media-libs/libpng
-		media-libs/nas
-		sys-devel/gcc
-		dev-embedded/gputils
-		app-admin/fam
-		virtual/glibc
-		kde-base/kdelibs
-		"
+# restrict at Authors request
+RESTRICT="nomirror"
 
+RDEPEND="x11-libs/qt
+	virtual/x11
+	sys-libs/zlib
+	dev-libs/expat
+	sys-devel/gcc
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/jpeg
+	media-libs/libart_lgpl
+	media-libs/libmng
+	media-libs/libpng
+	media-libs/nas
+	sys-devel/gcc
+	dev-embedded/gputils
+	app-admin/fam
+	virtual/libc
+	kde-base/kdelibs"
 # build system uses some perl
 DEPEND="${RDEPEND}
-		dev-lang/perl
-		>=sys-devel/gcc-3.0.0
-		>=sys-apps/sed-4"
-
-S=${WORKDIR}/${P}
+	dev-lang/perl
+	>=sys-devel/gcc-3
+	>=sys-apps/sed-4"
 
 src_compile() {
 	kde_src_compile myconf configure
@@ -56,7 +51,6 @@ src_install() {
 }
 
 pkg_postinst() {
-
 	einfo "The author request you email alain.gibaud@free.fr when you install this program. See the"
 	einfo "http://pikdev.free.fr/download.php3 for details"
 
@@ -65,4 +59,3 @@ pkg_postinst() {
 	ewarn " contains a local copy of configuration files and prevents new functionnalities to appear"
 	ewarn " in menus/toolbars."
 }
-
diff --git a/dev-embedded/sdcc/sdcc-2.4.0.ebuild b/dev-embedded/sdcc/sdcc-2.4.0.ebuild
index fe8e1636d79d..923e4703907f 100644
--- a/dev-embedded/sdcc/sdcc-2.4.0.ebuild
+++ b/dev-embedded/sdcc/sdcc-2.4.0.ebuild
@@ -1,19 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-2.4.0.ebuild,v 1.8 2004/06/24 22:08:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-2.4.0.ebuild,v 1.9 2004/06/29 13:27:13 vapier Exp $
 
-S=${WORKDIR}/${PN}
 DESCRIPTION="Small device C compiler (for various microprocessors)"
-SRC_URI="mirror://sourceforge/sdcc/${P}.tar.gz"
 HOMEPAGE="http://sdcc.sourceforge.net/"
-RESTRICT="nomirror"
+SRC_URI="mirror://sourceforge/sdcc/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
-
 IUSE="doc"
-DEPEND="virtual/glibc
+
+DEPEND="virtual/libc
 	sys-apps/gawk
 	sys-devel/libtool
 	sys-apps/grep
@@ -22,8 +20,9 @@ DEPEND="virtual/glibc
 		virtual/tetex
 		>=app-office/lyx-1.3.4
 		sys-apps/sed )"
+RDEPEND="virtual/libc"
 
-RDEPEND="virtual/glibc"
+S=${WORKDIR}/${PN}
 
 src_compile() {
 	econf || die "Configure failed"
@@ -37,6 +36,6 @@ src_compile() {
 
 src_install() {
 	einstall || die "Make install failed"
-	dodoc COPYING ChangeLog doc/README.txt doc/libdoc.txt doc/INSTALL.txt
+	dodoc ChangeLog doc/README.txt doc/libdoc.txt doc/INSTALL.txt
 	use doc && emake -C doc docdir=${D}/usr/share/doc/${P}/ install
 }
diff --git a/dev-embedded/sdcc/sdcc-2.4.0_p20040331.ebuild b/dev-embedded/sdcc/sdcc-2.4.0_p20040331.ebuild
index 75392c532d5d..6f7c6adbc47e 100644
--- a/dev-embedded/sdcc/sdcc-2.4.0_p20040331.ebuild
+++ b/dev-embedded/sdcc/sdcc-2.4.0_p20040331.ebuild
@@ -1,20 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-2.4.0_p20040331.ebuild,v 1.6 2004/06/24 22:08:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-2.4.0_p20040331.ebuild,v 1.7 2004/06/29 13:27:13 vapier Exp $
 
-S=${WORKDIR}/${PN}
 MY_PV=${PV/*_p/}
-
 DESCRIPTION="Small device C compiler (for various microprocessors)"
-SRC_URI="http://sdcc.sourceforge.net/snapshots/sdcc-src/${PN}-src-${MY_PV}.tar.gz"
 HOMEPAGE="http://sdcc.sourceforge.net/"
+SRC_URI="http://sdcc.sourceforge.net/snapshots/sdcc-src/${PN}-src-${MY_PV}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc ~amd64"
-
 IUSE="doc"
-DEPEND="virtual/glibc
+
+DEPEND="virtual/libc
 	sys-apps/gawk
 	sys-devel/libtool
 	sys-apps/grep
@@ -23,8 +21,9 @@ DEPEND="virtual/glibc
 		virtual/tetex
 		>=app-office/lyx-1.3.4
 		sys-apps/sed )"
+RDEPEND="virtual/libc"
 
-RDEPEND="virtual/glibc"
+S=${WORKDIR}/${PN}
 
 src_compile() {
 	econf || die "Configure failed"
@@ -36,6 +35,6 @@ src_compile() {
 
 src_install() {
 	einstall || die "Make install failed"
-	dodoc COPYING ChangeLog doc/README.txt doc/libdoc.txt doc/INSTALL.txt
+	dodoc ChangeLog doc/README.txt doc/libdoc.txt doc/INSTALL.txt
 	use doc && emake -C doc docdir=${D}/usr/share/doc/${P}/ install
 }
diff --git a/dev-embedded/sdcc/sdcc-2.4.0_p20040507.ebuild b/dev-embedded/sdcc/sdcc-2.4.0_p20040507.ebuild
index f9ac76867c9a..d609a85ed665 100644
--- a/dev-embedded/sdcc/sdcc-2.4.0_p20040507.ebuild
+++ b/dev-embedded/sdcc/sdcc-2.4.0_p20040507.ebuild
@@ -1,20 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-2.4.0_p20040507.ebuild,v 1.4 2004/06/24 22:08:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-2.4.0_p20040507.ebuild,v 1.5 2004/06/29 13:27:13 vapier Exp $
 
-S=${WORKDIR}/${PN}
 MY_PV=${PV/*_p/}
-
 DESCRIPTION="Small device C compiler (for various microprocessors)"
-SRC_URI="http://sdcc.sourceforge.net/snapshots/sdcc-src/${PN}-src-${MY_PV}.tar.gz"
 HOMEPAGE="http://sdcc.sourceforge.net/"
+SRC_URI="http://sdcc.sourceforge.net/snapshots/sdcc-src/${PN}-src-${MY_PV}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc ~amd64"
-
 IUSE="doc"
-DEPEND="virtual/glibc
+
+DEPEND="virtual/libc
 	sys-apps/gawk
 	sys-devel/libtool
 	sys-apps/grep
@@ -23,8 +21,9 @@ DEPEND="virtual/glibc
 		virtual/tetex
 		>=app-office/lyx-1.3.4
 		sys-apps/sed )"
+RDEPEND="virtual/libc"
 
-RDEPEND="virtual/glibc"
+S=${WORKDIR}/${PN}
 
 src_compile() {
 	econf || die "Configure failed"
@@ -36,6 +35,6 @@ src_compile() {
 
 src_install() {
 	einstall || die "Make install failed"
-	dodoc COPYING ChangeLog doc/README.txt doc/libdoc.txt doc/INSTALL.txt
+	dodoc ChangeLog doc/README.txt doc/libdoc.txt doc/INSTALL.txt
 	use doc && emake -C doc docdir=${D}/usr/share/doc/${P}/ install
 }
diff --git a/dev-embedded/sdcc/sdcc-2.4.0_p20040606.ebuild b/dev-embedded/sdcc/sdcc-2.4.0_p20040606.ebuild
index 319836782c75..4843b4a9e601 100644
--- a/dev-embedded/sdcc/sdcc-2.4.0_p20040606.ebuild
+++ b/dev-embedded/sdcc/sdcc-2.4.0_p20040606.ebuild
@@ -1,20 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-2.4.0_p20040606.ebuild,v 1.2 2004/06/24 22:08:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-2.4.0_p20040606.ebuild,v 1.3 2004/06/29 13:27:13 vapier Exp $
 
-S=${WORKDIR}/${PN}
 MY_PV=${PV/*_p/}
-
 DESCRIPTION="Small device C compiler (for various microprocessors)"
-SRC_URI="http://sdcc.sourceforge.net/snapshots/sdcc-src/${PN}-src-${MY_PV}.tar.gz"
 HOMEPAGE="http://sdcc.sourceforge.net/"
+SRC_URI="http://sdcc.sourceforge.net/snapshots/sdcc-src/${PN}-src-${MY_PV}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
-
 IUSE="doc"
-DEPEND="virtual/glibc
+
+DEPEND="virtual/libc
 	sys-apps/gawk
 	sys-devel/libtool
 	sys-apps/grep
@@ -23,8 +21,9 @@ DEPEND="virtual/glibc
 		virtual/tetex
 		>=app-office/lyx-1.3.4
 		sys-apps/sed )"
+RDEPEND="virtual/libc"
 
-RDEPEND="virtual/glibc"
+S=${WORKDIR}/${PN}
 
 src_compile() {
 	econf || die "Configure failed"
@@ -36,6 +35,6 @@ src_compile() {
 
 src_install() {
 	einstall || die "Make install failed"
-	dodoc COPYING ChangeLog doc/README.txt doc/libdoc.txt doc/INSTALL.txt
+	dodoc ChangeLog doc/README.txt doc/libdoc.txt doc/INSTALL.txt
 	use doc && emake -C doc docdir=${D}/usr/share/doc/${P}/ install
 }
diff --git a/dev-embedded/uisp/uisp-20030618.ebuild b/dev-embedded/uisp/uisp-20030618.ebuild
index 729b662ff719..d463bb182ff5 100644
--- a/dev-embedded/uisp/uisp-20030618.ebuild
+++ b/dev-embedded/uisp/uisp-20030618.ebuild
@@ -1,22 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/uisp/uisp-20030618.ebuild,v 1.4 2004/06/24 22:09:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/uisp/uisp-20030618.ebuild,v 1.5 2004/06/29 13:27:34 vapier Exp $
 
-DESCRIPTION="Uisp is a tool for AVR microcontrollers which can interface to many hardware in-system programmers"
-SRC_URI="http://savannah.nongnu.org/download/uisp/${P}.tar.gz"
+DESCRIPTION="tool for AVR microcontrollers which can interface to many hardware in-system programmers"
 HOMEPAGE="http://savannah.nongnu.org/projects/uisp"
+SRC_URI="http://savannah.nongnu.org/download/uisp/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 IUSE=""
-DEPEND=""
 
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
+DEPEND=""
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die
 	dodoc doc/*
 	prepalldocs
diff --git a/dev-embedded/uisp/uisp-20040311.ebuild b/dev-embedded/uisp/uisp-20040311.ebuild
index 09af1f1c1170..78b9110b1e74 100644
--- a/dev-embedded/uisp/uisp-20040311.ebuild
+++ b/dev-embedded/uisp/uisp-20040311.ebuild
@@ -1,27 +1,21 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/uisp/uisp-20040311.ebuild,v 1.3 2004/06/24 22:09:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/uisp/uisp-20040311.ebuild,v 1.4 2004/06/29 13:27:34 vapier Exp $
 
-DESCRIPTION="Uisp is a tool for AVR microcontrollers which can interface to many hardware in-system programmers"
-SRC_URI="http://savannah.nongnu.org/download/uisp/${P}.tar.bz2"
+DESCRIPTION="tool for AVR microcontrollers which can interface to many hardware in-system programmers"
 HOMEPAGE="http://savannah.nongnu.org/projects/uisp"
+SRC_URI="http://savannah.nongnu.org/download/uisp/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
+
 DEPEND="sys-apps/gawk
 	sys-devel/gcc"
-
 RDEPEND=""
 
-S=${WORKDIR}/${P}
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die
 	dodoc doc/*
 	prepalldocs
diff --git a/dev-embedded/xgpasm/xgpasm-1.0.ebuild b/dev-embedded/xgpasm/xgpasm-1.0.ebuild
index 013259a74d56..3828babb940a 100644
--- a/dev-embedded/xgpasm/xgpasm-1.0.ebuild
+++ b/dev-embedded/xgpasm/xgpasm-1.0.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/xgpasm/xgpasm-1.0.ebuild,v 1.4 2004/06/24 22:09:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/xgpasm/xgpasm-1.0.ebuild,v 1.5 2004/06/29 13:27:50 vapier Exp $
 
 DESCRIPTION="GUI for GPASM"
 HOMEPAGE="http://xizard.free.fr/logiciels/xgpasm/xgpasm.html"
 SRC_URI="http://xizard.free.fr/download/source/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 IUSE="nls"
+
 DEPEND=">=x11-libs/gtk+-1.2
-		dev-embedded/gputils"
+	dev-embedded/gputils"
 
 src_compile() {
 	econf `use_enable nls` || die "econf failed"