Version bump/cleanout. added RDEPEND=!dev-embedded/sdcc-cvs. Changed einstall to make DESTDIR=${D}

9 files changed, 22 insertions, 60 deletions

diff --git a/dev-embedded/sdcc/ChangeLog b/dev-embedded/sdcc/ChangeLog
index aba303355919..dd71b7ee8dbc 100644
--- a/dev-embedded/sdcc/ChangeLog
+++ b/dev-embedded/sdcc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-embedded/sdcc
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/ChangeLog,v 1.18 2004/09/11 16:10:57 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/ChangeLog,v 1.19 2004/09/28 07:22:23 dragonheart Exp $
+
+*sdcc-2.4.0_p20040927 (28 Sep 2004)
+
+  28 Sep 2004; Daniel Black <dragonheart@gentoo.org> sdcc-2.4.0.ebuild,
+  -sdcc-2.4.0_p20040606.ebuild, sdcc-2.4.0_p20040716.ebuild,
+  sdcc-2.4.0_p20040908.ebuild, -sdcc-2.4.0_p20040908.ebuild:
+  Version bump/cleanout. added RDEPEND=!dev-embedded/sdcc-cvs. Changed einstall
+  to make DESTDIR=${D}
 
 *sdcc-2.4.0_p20040908 (12 Sep 2004)
 
diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest
index 5075b1236205..79ff5aadc495 100644
--- a/dev-embedded/sdcc/Manifest
+++ b/dev-embedded/sdcc/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 7d36efc2d3cf66fe798832feb7034d92 metadata.xml 254
 MD5 4e0d2fc9f4e354e9b107982e24366fd4 ChangeLog 2962
 MD5 8259a585eb262f69bc4c544b9043b20d sdcc-2.4.0.ebuild 1003
 MD5 b207be1afdb019753ee2d4752332e365 sdcc-2.4.0_p20040908.ebuild 1058
+MD5 86d9cb428d75cee58ca9700815e746a9 sdcc-2.4.0_p20040927.ebuild 1068
 MD5 08798e2253489e52f039e0a3651db906 sdcc-2.4.0_p20040716.ebuild 1057
 MD5 eb10ab8e4ae71d278f630be908acca8b sdcc-2.4.0_p20040606.ebuild 1057
 MD5 c6d600c0755afb74e884f8d079c47787 files/digest-sdcc-2.4.0_p20040908 70
 MD5 bfc177a29ceb52dfa8883108634d1e7e files/digest-sdcc-2.4.0 63
 MD5 3376a38178a27988e0b7ef423aa68f2c files/digest-sdcc-2.4.0_p20040716 70
+MD5 cea9a416749ed5e475a0f546a7f60388 files/digest-sdcc-2.4.0_p20040927 70
 MD5 746d6df6bd806843345936959e624bd4 files/digest-sdcc-2.4.0_p20040606 70
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBQyQ1mdTrptrqvGERAnjDAJsFCiu//M53YWNytXwB1ozGInNNyACdFV7C
-M1ETkjdVu1rsrc/F+mgdaL4=
-=T0Ix
------END PGP SIGNATURE-----
diff --git a/dev-embedded/sdcc/files/digest-sdcc-2.4.0_p20040606 b/dev-embedded/sdcc/files/digest-sdcc-2.4.0_p20040606
deleted file mode 100644
index 39d1387eda50..000000000000
--- a/dev-embedded/sdcc/files/digest-sdcc-2.4.0_p20040606
+++ /dev/null
@@ -1 +0,0 @@
-MD5 48452b59759b2f624993c128c32ff7c3 sdcc-src-20040606.tar.gz 3152070
diff --git a/dev-embedded/sdcc/files/digest-sdcc-2.4.0_p20040908 b/dev-embedded/sdcc/files/digest-sdcc-2.4.0_p20040908
deleted file mode 100644
index 0f2b19eb1ab3..000000000000
--- a/dev-embedded/sdcc/files/digest-sdcc-2.4.0_p20040908
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ce2ba347c241f92503a46bc1dbc1ebf6 sdcc-src-20040908.tar.gz 3363876
diff --git a/dev-embedded/sdcc/files/digest-sdcc-2.4.0_p20040927 b/dev-embedded/sdcc/files/digest-sdcc-2.4.0_p20040927
new file mode 100644
index 000000000000..20cc27d8bcd7
--- /dev/null
+++ b/dev-embedded/sdcc/files/digest-sdcc-2.4.0_p20040927
@@ -0,0 +1 @@
+MD5 494f76c01ae3683accb4dec0d0303e40 sdcc-src-20040927.tar.gz 3372453
diff --git a/dev-embedded/sdcc/sdcc-2.4.0.ebuild b/dev-embedded/sdcc/sdcc-2.4.0.ebuild
index 923e4703907f..a540f0c02a42 100644
--- a/dev-embedded/sdcc/sdcc-2.4.0.ebuild
+++ b/dev-embedded/sdcc/sdcc-2.4.0.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/sdcc/sdcc-2.4.0.ebuild,v 1.9 2004/06/29 13:27:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-2.4.0.ebuild,v 1.10 2004/09/28 07:22:23 dragonheart Exp $
 
 DESCRIPTION="Small device C compiler (for various microprocessors)"
 HOMEPAGE="http://sdcc.sourceforge.net/"
@@ -20,7 +20,8 @@ DEPEND="virtual/libc
 		virtual/tetex
 		>=app-office/lyx-1.3.4
 		sys-apps/sed )"
-RDEPEND="virtual/libc"
+RDEPEND="virtual/libc
+	!dev-embedded/sdcc-cvs"
 
 S=${WORKDIR}/${PN}
 
diff --git a/dev-embedded/sdcc/sdcc-2.4.0_p20040606.ebuild b/dev-embedded/sdcc/sdcc-2.4.0_p20040606.ebuild
deleted file mode 100644
index 66120a7b5e22..000000000000
--- a/dev-embedded/sdcc/sdcc-2.4.0_p20040606.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.4 2004/07/18 06:27:08 dragonheart Exp $
-
-MY_PV=${PV/*_p/}
-DESCRIPTION="Small device C compiler (for various microprocessors)"
-HOMEPAGE="http://sdcc.sourceforge.net/"
-SRC_URI="http://sdcc.sourceforge.net/snapshots/sdcc-src/${PN}-src-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64"
-IUSE="doc"
-
-DEPEND="virtual/libc
-	sys-apps/gawk
-	sys-devel/libtool
-	sys-apps/grep
-	sys-devel/bison
-	doc? ( dev-tex/latex2html
-		virtual/tetex
-		>=app-office/lyx-1.3.4
-		sys-apps/sed )"
-RDEPEND="virtual/libc"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	econf || die "Configure failed"
-	emake || die "Make failed"
-	use doc && {
-		emake -C doc || die "Making documentation failed"
-	}
-}
-
-src_install() {
-	einstall || die "Make install failed"
-	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_p20040716.ebuild b/dev-embedded/sdcc/sdcc-2.4.0_p20040716.ebuild
index e6ffcfb3e3ab..c275acd1e99a 100644
--- a/dev-embedded/sdcc/sdcc-2.4.0_p20040716.ebuild
+++ b/dev-embedded/sdcc/sdcc-2.4.0_p20040716.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/sdcc/sdcc-2.4.0_p20040716.ebuild,v 1.2 2004/09/11 16:10:57 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-2.4.0_p20040716.ebuild,v 1.3 2004/09/28 07:22:23 dragonheart Exp $
 
 MY_PV=${PV/*_p/}
 DESCRIPTION="Small device C compiler (for various microprocessors)"
@@ -21,7 +21,8 @@ DEPEND="virtual/libc
 		virtual/tetex
 		>=app-office/lyx-1.3.4
 		sys-apps/sed )"
-RDEPEND="virtual/libc"
+RDEPEND="virtual/libc
+	!dev-embedded/sdcc-cvs"
 
 S=${WORKDIR}/${PN}
 
diff --git a/dev-embedded/sdcc/sdcc-2.4.0_p20040908.ebuild b/dev-embedded/sdcc/sdcc-2.4.0_p20040927.ebuild
index 7729aaad895d..f89f38eba4f9 100644
--- a/dev-embedded/sdcc/sdcc-2.4.0_p20040908.ebuild
+++ b/dev-embedded/sdcc/sdcc-2.4.0_p20040927.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/sdcc/sdcc-2.4.0_p20040908.ebuild,v 1.1 2004/09/11 16:10:57 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-2.4.0_p20040927.ebuild,v 1.1 2004/09/28 07:22:23 dragonheart Exp $
 
 MY_PV=${PV/*_p/}
 DESCRIPTION="Small device C compiler (for various microprocessors)"
@@ -21,7 +21,8 @@ DEPEND="virtual/libc
 		virtual/tetex
 		>=app-office/lyx-1.3.4
 		sys-apps/sed )"
-RDEPEND="virtual/libc"
+RDEPEND="virtual/libc
+	!dev-embedded/sdcc-cvs"
 
 S=${WORKDIR}/${PN}
 
@@ -34,7 +35,7 @@ src_compile() {
 }
 
 src_install() {
-	einstall || die "Make install failed"
+	emake DESTDIR=${D} || die "Make install failed"
 	dodoc ChangeLog doc/README.txt doc/libdoc.txt doc/INSTALL.txt
 	use doc && emake -C doc docdir=${D}/usr/share/doc/${P}/ install
 }