*** empty log message ***

5 files changed, 124 insertions, 24 deletions

diff --git a/app-text/noweb/ChangeLog b/app-text/noweb/ChangeLog
index 999563c0d706..91669cf9b425 100644
--- a/app-text/noweb/ChangeLog
+++ b/app-text/noweb/ChangeLog
@@ -1,6 +1,59 @@
 # ChangeLog for app-text/noweb
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-text/noweb/ChangeLog,v 1.1 2002/02/01 21:53:10 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/noweb/ChangeLog,v 1.1.1.1 2005/11/30 10:07:11 chriswhite Exp $
+
+  02 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> noweb-2.9-r3.ebuild,
+  noweb-2.9-r4.ebuild:
+  Fixed corrupted totex when installing noweb for the first time.
+  See bug #50429.
+
+*noweb-2.9-r4 (01 Sep 2004)
+
+  01 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> files/noweb-2.9-gentoo.diff,
+  -files/noweb-2.9-r1-gentoo.diff, -files/noweb-2.9-r2-gentoo.diff,
+  noweb-2.9-r3.ebuild, +noweb-2.9-r4.ebuild:
+  Added icon USE flag, see bug #62163.
+
+  09 Feb 2004; Dylan Carlson <absinthe@gentoo.org> noweb-2.9-r3.ebuild:
+  added amd64 keyword.
+
+  29 Nov 2003; Mike Gardiner <obz@gentoo.org> metadata.xml,
+  noweb-2.9-r2.ebuild, noweb-2.9-r3.ebuild:
+  Let's try again on the timestamps fix. Changed the 'find all and touch' method
+  to the 'make touch' method, which should be more selective in the files it
+  touches
+
+  04 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> noweb-2.9-r2.ebuild,
+  noweb-2.9-r3.ebuild:
+  Changed app-text/tetex to virtual/tetex
+
+  22 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> noweb-2.9-r3 :
+  Touch everything in ${S} so it doesnt try to use the program itself to generate files.
+  Closes #23663.
+
+*noweb-2.9-r3 (28 Jun 2003)
+
+  28 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update. Added Debian patch.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*noweb-2.9-r2 (30 Apr 2002)
+
+  10 Mar 2003; Aron Griffis <agriffis@gentoo.org> noweb-2.9-r2.ebuild:
+  Mark stable on alpha
+
+  2 Aug 2002; phoen][x <phoenix@gentoo.org> noweb-2.9-r2.ebuild :
+  Added LICENSE, SLOT.
+
+  15 Jul 2002; Owen Stampflee <owen@gentoo.org> :
+
+  Added KEYWORDS.
+
+  30 Apr 2002; Seemant Kulleen <seemant@gentoo.org> noweb-2.9-r2.ebuild
+  files/noweb-2.9-r2-gentoo.diff files/digest-noweb-2.9-r2 :
+
+  man pages now installed in /usr/share/man instead.
 
 *noweb-2.9 (1 Feb 2002)
 
diff --git a/app-text/noweb/Manifest b/app-text/noweb/Manifest
index e69de29bb2d1..8ca1fed563a3 100644
--- a/app-text/noweb/Manifest
+++ b/app-text/noweb/Manifest
@@ -0,0 +1,8 @@
+MD5 75941fdbbd7bee8de885941c7e602d80 ChangeLog 2448
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+MD5 d848396ca0d31458c3331d9a8a9c9add noweb-2.9-r3.ebuild 1596
+MD5 dcba3464c5092b4ee5736024b164dc7c noweb-2.9-r4.ebuild 1828
+MD5 813fb3ed94d03e89220c6e9b9a77a5f3 files/digest-noweb-2.9-r3 65
+MD5 802981b1fbeeebbfb88f7edf918dbdc7 files/noweb-2.9-gentoo.diff 14029
+MD5 02040e5c05a1b7bc5339a3dd35e9bd84 files/noweb-2.9-security.patch 3624
+MD5 813fb3ed94d03e89220c6e9b9a77a5f3 files/digest-noweb-2.9-r4 65
diff --git a/app-text/noweb/files/noweb-2.9-gentoo.diff b/app-text/noweb/files/noweb-2.9-gentoo.diff
index d24b8c31b454..5ebd572cc8cd 100644
--- a/app-text/noweb/files/noweb-2.9-gentoo.diff
+++ b/app-text/noweb/files/noweb-2.9-gentoo.diff
@@ -1,5 +1,6 @@
---- Makefile.orig	Wed Mar 28 15:40:00 2001
-+++ Makefile	Wed Aug  1 20:46:24 2001
+diff -ur src-new/Makefile src/Makefile
+--- Makefile	Wed Mar 28 15:40:00 2001
++++ Makefile	Thu Mar 21 12:22:47 2002
 @@ -3,12 +3,12 @@
  #
  # Adjust these two lines for your ANSI C compiler
@@ -9,7 +10,7 @@
  # If you have Icon, you should use the Icon versions of the noweb pipeline.
  # Set LIBSRC=icon
 -LIBSRC=awk
-+LIBSRC=icon
++#LIBSRC=awk
  # If you have no Icon compiler, but do have icont, make ICONC=icont
 -ICONC=iconc
 +ICONC=icont
@@ -177,26 +178,43 @@
  	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.txt  | gzip > $(CATDIR)/cpif.$(MANEXT).gz
  	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nodefs.txt  | gzip > $(CATDIR)/nodefs.$(MANEXT).gz
  	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroots.txt  | gzip > $(CATDIR)/noroots.$(MANEXT).gz
-@@ -143,13 +143,13 @@
+@@ -143,13 +143,14 @@
  	rm -f $(CATDIR)/nountangle.$(MANEXT).gz
  	(cd $(CATDIR); ln notangle.$(MANEXT).gz nountangle.$(MANEXT).gz)
  install-tex:
 -	-mkdir $(TEXINPUTS) 2>/dev/null
 -	cp tex/nwmac.tex tex/noweb.sty $(TEXINPUTS)
+-	-texhash || echo "Program texhash not found or failed"
 +	-mkdir -p ${DESTDIR}/$(TEXINPUTS) 2>/dev/null
 +	cp tex/nwmac.tex tex/noweb.sty ${DESTDIR}/$(TEXINPUTS)
- 	-texhash || echo "Program texhash not found or failed"
++	#-texhash || echo "Program texhash not found or failed"
  
  install-elisp:
 -	-mkdir $(ELISP) 2>/dev/null
 -	cp elisp/noweb-mode.el $(ELISP)
-+	-mkdir -p $(ELISP) 2>/dev/null
-+	cp elisp/noweb-mode.el /$(ELISP)
++	# right now $ELISP is /dev/null so don't mess with it
++	#-mkdir -p $(DESTDIR)/$(ELISP) 2>/dev/null
++	#cp elisp/noweb-mode.el $(DESTDIR)$(ELISP)
  
  checkin:
  	for i in lib tex xdoc; do (cd $$i; make "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin); done
---- icon/Makefile.orig	Thu Sep 14 03:00:00 2000
-+++ icon/Makefile	Wed Aug  1 20:46:03 2001
+diff -ur src-new/awk/Makefile src/awk/Makefile
+--- awk/Makefile	Mon Mar 27 02:00:00 2000
++++ awk/Makefile	Thu Mar 21 12:09:35 2002
+@@ -16,8 +16,8 @@
+ 	touch $(EXECS)
+ 
+ install: all
+-	cp $(LIBEXECS) $(LIB)
+-	cp $(BINEXECS) $(BIN)
++	cp $(LIBEXECS) $(DESTDIR)/$(LIB)
++	cp $(BINEXECS) $(DESTDIR)/$(BIN)
+ 
+ source: $(EXECS)
+ 
+diff -ur src-new/icon/Makefile src/icon/Makefile
+--- icon/Makefile	Thu Sep 14 03:00:00 2000
++++ icon/Makefile	Thu Mar 21 12:08:58 2002
 @@ -32,9 +32,9 @@
  	touch $(SRCS)
  
@@ -210,8 +228,9 @@
  
  clean:
  	/bin/rm -f *.tex *.dvi *.aux *.log *.blg *.bbl *~  *.toc *.html *.u1 *.u2 
---- lib/Makefile.orig	Fri Jun 23 13:56:00 2000
-+++ lib/Makefile	Wed Aug  1 20:46:03 2001
+diff -ur src-new/lib/Makefile src/lib/Makefile
+--- lib/Makefile	Fri Jun 23 13:56:00 2000
++++ lib/Makefile	Thu Mar 21 12:08:58 2002
 @@ -11,9 +11,9 @@
  	chmod +x unmarkup emptydefn toascii nwmtime pipedocs h2a btdefn
  
diff --git a/app-text/noweb/noweb-2.9-r3.ebuild b/app-text/noweb/noweb-2.9-r3.ebuild
index b5552af33921..2d0af0f7d850 100644
--- a/app-text/noweb/noweb-2.9-r3.ebuild
+++ b/app-text/noweb/noweb-2.9-r3.ebuild
@@ -1,37 +1,50 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/noweb/noweb-2.9-r3.ebuild,v 1.1 2003/06/28 19:29:42 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/noweb/noweb-2.9-r3.ebuild,v 1.1.1.1 2005/11/30 10:07:11 chriswhite Exp $
 
 inherit eutils
 
 S=${WORKDIR}/src
 #SRC_URI="ftp://ftp.dante.de/tex-archive/web/noweb/src.tar.gz"
 SRC_URI="http://www.ibiblio.org/pub/Linux/distributions/gentoo/distfiles/noweb-src-${PV}.tar.gz"
-
 HOMEPAGE="http://www.eecs.harvard.edu/~nr/noweb/"
-SLOT="0"
 LICENSE="freedist"
 DESCRIPTION="a literate programming tool, lighter than web"
 
+SLOT="0"
+IUSE=""
+KEYWORDS="x86 ppc sparc alpha amd64"
+
 DEPEND="sys-devel/gcc
-	app-text/tetex
+	virtual/tetex
 	sys-apps/gawk
 	sys-apps/debianutils"
-KEYWORDS="x86 ppc sparc alpha"
 
 src_unpack() {
+
 	unpack ${A} ; cd ${S}
 
 	epatch ${FILESDIR}/${P}-security.patch
 	epatch ${FILESDIR}/${P}-gentoo.diff
+
+	# make touch only touches the files required, not the whole
+	# tree as with find . -type f | xargs touch <obz@gentoo.org>
+	#make touch
+
 }
 
 src_compile() {
-	emake || die
+	# noweb tries to use notangle and noweb; see bug #50429
+	( cd c; emake CFLAGS="${CFLAGS}" LIBSRC="awk" ) || die
+	export PATH="${PATH}:${T}"
+	emake BIN=${T} LIB=${T} LIBSRC="awk" install-code \
+		|| die "make temporal install failed."
+
+	emake CFLAGS="${CFLAGS}" LIBSRC="awk" || die
 }
 
 src_install () {
-	make DESTDIR=${D} install || die
+	make DESTDIR=${D} LIBSRC="awk" install || die
 	[ -x /usr/bin/nawk ] || dosym /usr/bin/gawk /usr/bin/nawk
 
 	# fix man pages to be LFH compliant
diff --git a/app-text/noweb/noweb-2.9-r4.ebuild b/app-text/noweb/noweb-2.9-r4.ebuild
index 30d9a1740a10..6522cc4b725d 100644
--- a/app-text/noweb/noweb-2.9-r4.ebuild
+++ b/app-text/noweb/noweb-2.9-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/noweb/noweb-2.9-r4.ebuild,v 1.1 2004/09/01 09:36:37 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/noweb/noweb-2.9-r4.ebuild,v 1.1.1.1 2005/11/30 10:07:11 chriswhite Exp $
 
 inherit eutils
 
@@ -30,13 +30,20 @@ src_unpack() {
 
 	# make touch only touches the files required, not the whole
 	# tree as with find . -type f | xargs touch <obz@gentoo.org>
-	make touch
+	#make touch || die "make touch failed."
 
 }
 
 src_compile() {
 	local libsrc
 	use icon && libsrc="icon" || libsrc="awk"
+
+	# noweb tries to use notangle and noweb; see bug #50429
+	( cd c; emake CFLAGS="${CFLAGS}" LIBSRC="$libsrc" ) || die
+	export PATH="${PATH}:${T}"
+	emake BIN=${T} LIB=${T} LIBSRC="$libsrc" install-code \
+		|| die "make temporal install failed."
+
 	emake CFLAGS="${CFLAGS}" LIBSRC="$libsrc" || die
 }