Fixed lyx depend to version 1.3.4. Version bump to 20040331

6 files changed, 64 insertions, 15 deletions

diff --git a/dev-embedded/sdcc/ChangeLog b/dev-embedded/sdcc/ChangeLog
index 57add75be9ee..642dd583a79f 100644
--- a/dev-embedded/sdcc/ChangeLog
+++ b/dev-embedded/sdcc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-embedded/sdcc
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/ChangeLog,v 1.6 2004/03/30 14:05:28 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/ChangeLog,v 1.7 2004/04/03 03:16:56 dragonheart Exp $
+
+*sdcc-2.4.0_p20040331 (03 Apr 2004)
+
+  03 Apr 2004; Daniel Black <dragonheart@gentoo.org> sdcc-2.4.0.ebuild,
+  sdcc-2.4.0_p20040304.ebuild, sdcc-2.4.0_p20040331.ebuild:
+  Fixed lyx depend to version 1.3.4. Version bump to 20040331
 
   30 Mar 2004; Daniel Black <dragonheart@gentoo.org> sdcc-2.4.0.ebuild,
   sdcc-2.4.0_p20040304.ebuild:
diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest
index 1288f9224b54..2a7bf6668128 100644
--- a/dev-embedded/sdcc/Manifest
+++ b/dev-embedded/sdcc/Manifest
@@ -1,6 +1,8 @@
-MD5 31cdd8bf8db730be4128b1a36bbf593a ChangeLog 1043
 MD5 7d36efc2d3cf66fe798832feb7034d92 metadata.xml 254
-MD5 35a3b64b7a7c65d2fdf3cd0c874fc99c sdcc-2.4.0.ebuild 1038
-MD5 4b6fbf672d370e16b93755ce17744478 sdcc-2.4.0_p20040304.ebuild 1109
+MD5 a5cc9bde738866f1bcc0d789f9456b0e ChangeLog 1275
+MD5 8704d16b6d1652f9dc0a68f765dc2948 sdcc-2.4.0.ebuild 1050
+MD5 77be95f4612faa6217bdad56ee7f27d2 sdcc-2.4.0_p20040304.ebuild 1074
+MD5 10f26cc613436e31b9101c7c11d1c947 sdcc-2.4.0_p20040331.ebuild 1074
+MD5 be860dd165960980a4b42cc8d0ea657d files/digest-sdcc-2.4.0_p20040331 70
 MD5 bfc177a29ceb52dfa8883108634d1e7e files/digest-sdcc-2.4.0 63
 MD5 16ffff1d91865672c6157b851f8c7e3a files/digest-sdcc-2.4.0_p20040304 70
diff --git a/dev-embedded/sdcc/files/digest-sdcc-2.4.0_p20040331 b/dev-embedded/sdcc/files/digest-sdcc-2.4.0_p20040331
new file mode 100644
index 000000000000..54453e4529e6
--- /dev/null
+++ b/dev-embedded/sdcc/files/digest-sdcc-2.4.0_p20040331
@@ -0,0 +1 @@
+MD5 2bbe1597286010b990e741d856ea61e8 sdcc-src-20040331.tar.gz 3050626
diff --git a/dev-embedded/sdcc/sdcc-2.4.0.ebuild b/dev-embedded/sdcc/sdcc-2.4.0.ebuild
index 7593774d6bfe..a1383b638a77 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 Technologies, Inc.
 # 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.2 2004/03/30 14:05:29 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-2.4.0.ebuild,v 1.3 2004/04/03 03:16:56 dragonheart Exp $
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="Small device C compiler (for various microprocessors)"
@@ -13,7 +13,6 @@ LICENSE="GPL-2"
 KEYWORDS="~x86"
 
 IUSE="doc"
-
 DEPEND="virtual/glibc
 	sys-apps/gawk
 	sys-devel/libtool
@@ -21,7 +20,7 @@ DEPEND="virtual/glibc
 	sys-devel/bison
 	doc? ( dev-tex/latex2html
 		app-text/tetex
-		app-office/lyx
+		 >=app-office/lyx-1.3.4
 		sys-apps/sed )"
 
 RDEPEND="virtual/glibc"
@@ -30,7 +29,8 @@ src_compile() {
 	econf || die "Configure failed"
 	emake || die "Make failed"
 	use doc && {
-		echo -e "\n\n" | emake -C doc
+		#echo -e "\n\n" | 
+		emake -C doc
 		# || die "Making documentation failed"
 	}
 }
diff --git a/dev-embedded/sdcc/sdcc-2.4.0_p20040304.ebuild b/dev-embedded/sdcc/sdcc-2.4.0_p20040304.ebuild
index 7a8bf04f1fdc..75a9cf010fc1 100644
--- a/dev-embedded/sdcc/sdcc-2.4.0_p20040304.ebuild
+++ b/dev-embedded/sdcc/sdcc-2.4.0_p20040304.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-2.4.0_p20040304.ebuild,v 1.3 2004/03/30 14:05:29 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-2.4.0_p20040304.ebuild,v 1.4 2004/04/03 03:16:56 dragonheart Exp $
 
 S=${WORKDIR}/${PN}
 MY_PV=${PV/*_p/}
@@ -19,10 +19,10 @@ DEPEND="virtual/glibc
 	sys-devel/libtool
 	sys-apps/grep
 	sys-devel/bison
-	doc? ( dev-tex/latex2html )
-	doc? ( app-text/tetex )
-	doc? ( app-office/lyx )
-	doc? ( sys-apps/sed )"
+	doc? ( dev-tex/latex2html
+		app-text/tetex )
+		>=app-office/lyx-1.3.4
+		sys-apps/sed )"
 
 RDEPEND="virtual/glibc"
 
@@ -30,8 +30,7 @@ src_compile() {
 	econf || die "Configure failed"
 	emake || die "Make failed"
 	use doc && {
-		echo -e "\n\n" | emake -C doc
-		# || die "Making documentation failed"
+		emake -C doc || die "Making documentation failed"
 	}
 }
 
diff --git a/dev-embedded/sdcc/sdcc-2.4.0_p20040331.ebuild b/dev-embedded/sdcc/sdcc-2.4.0_p20040331.ebuild
new file mode 100644
index 000000000000..0ef45f34e9c2
--- /dev/null
+++ b/dev-embedded/sdcc/sdcc-2.4.0_p20040331.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/04/03 03:16:56 dragonheart 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/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+
+IUSE="doc"
+DEPEND="virtual/glibc
+	sys-apps/gawk
+	sys-devel/libtool
+	sys-apps/grep
+	sys-devel/bison
+	doc? ( dev-tex/latex2html
+		app-text/tetex )
+		>=app-office/lyx-1.3.4
+		sys-apps/sed )"
+
+RDEPEND="virtual/glibc"
+
+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 COPYING ChangeLog doc/README.txt doc/libdoc.txt doc/INSTALL.txt
+	use doc && emake -C doc docdir=${D}/usr/share/doc/${P}/ install
+}