Respect ldflags (bug #338899) and use $(MAKE) for recursive make, by Wormo, bug #264273

Package-Manager: portage-2.2.0_alpha2/cvs/Linux x86_64

5 files changed, 279 insertions, 5 deletions

diff --git a/app-text/noweb/ChangeLog b/app-text/noweb/ChangeLog
index b998c97e22a5..66a7e4f1c0b2 100644
--- a/app-text/noweb/ChangeLog
+++ b/app-text/noweb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/noweb
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/noweb/ChangeLog,v 1.47 2010/10/30 22:01:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/noweb/ChangeLog,v 1.48 2010/10/30 22:23:22 aballier Exp $
+
+*noweb-2.11b-r2 (30 Oct 2010)
+
+  30 Oct 2010; Alexis Ballier <aballier@gentoo.org> +noweb-2.11b-r2.ebuild,
+  +files/noweb-2.11b-ldflags.patch, +files/noweb-2.11b-recmake.patch:
+  Respect ldflags (bug #338899) and use $(MAKE) for recursive make, by
+  Wormo, bug #264273
 
   30 Oct 2010; Alexis Ballier <aballier@gentoo.org> -noweb-2.9-r5.ebuild,
   -noweb-2.9-r6.ebuild, -files/noweb-2.9-gentoo.diff, -noweb-2.11b.ebuild:
diff --git a/app-text/noweb/Manifest b/app-text/noweb/Manifest
index 3001993695da..e96da98051fe 100644
--- a/app-text/noweb/Manifest
+++ b/app-text/noweb/Manifest
@@ -2,15 +2,18 @@
 Hash: SHA1
 
 AUX 50noweb-gentoo.el 216 RMD160 e6685f97704dac9dd922c7c83277f49ec3541e02 SHA1 be9e3b9d3c2f9bd4459d48572b50a7b9f7e6412e SHA256 8216492bf2537ed68953c64e72f12dc073a579eb866a4e0e23f1320ec056680e
+AUX noweb-2.11b-ldflags.patch 619 RMD160 843f553269e9f111e2b00a3927862e750986e0c5 SHA1 ddbf2f5eb54aab77535e73ff1725f65ce0747de4 SHA256 0a7c2712855ce1d5efd8eba3655df527312f23fc51bc551b8ae6a5b6be669056
+AUX noweb-2.11b-recmake.patch 5470 RMD160 373dcaa86ac50650c82f196a5dc78f10d01f9f8e SHA1 ccdcf02b49d88bf5dfa2be1812f08b55d995c1c6 SHA256 2673b9719982285a6b1a4741160e702584854b56aa3873f4568ba29aa89f5078
 AUX noweb-2.9-security.patch 6558 RMD160 df2613a2278b13f032a74af62b553495e1b11786 SHA1 8aa4f219c4cfa691b99c46a645b3cb0b2176ff9c SHA256 45492023f74919efbf32806fd891c68697a00526eac9c924af2ef26b43477746
 DIST noweb-2.11b.tgz 738870 RMD160 01e4fbb636dfd0f6d117caa045cf105e49d25fca SHA1 3b391c42f46dcb8a002b863fb2e483560a7da51d SHA256 c913f26c1edb37e331c747619835b4cade000b54e459bb08f4d38899ab690d82
 EBUILD noweb-2.11b-r1.ebuild 2643 RMD160 7cb53313054caa55f7460831d173b706f96e219d SHA1 567f7625b3a503f619ca3931c15365b20ebfd006 SHA256 c01992783a85dfb4516598f5f381bd07dc8a66a2e07af069bc493313a2746f42
-MISC ChangeLog 5912 RMD160 4eaef83ed9d53961cb7e479c4b151d5dd4340e74 SHA1 0d59a98a2c0c2622dff550ccfc12bac8b26c9582 SHA256 ac0fc95e8cdacc22c65de46476c85729b09e72b32b40cffc5bbe26a753872dd4
+EBUILD noweb-2.11b-r2.ebuild 2758 RMD160 9e46dcb0e2d664425aaee43b192264e000bce052 SHA1 8acbed25cd0806a842ecf9dd6b0745b5ff6954e7 SHA256 51382080a681e328b62cdcfa2a6fceff6b1858e0fdad634631c8ff4de26b565d
+MISC ChangeLog 6182 RMD160 cdde70ed0a5a64d9f44cec4de55cad494979ce5b SHA1 6b59a5346ae3415220c42ece2a5b418dac7d45d1 SHA256 ff984c9bb7ed72c789548f43425550065ea7ae65336f90ff4a0e585bcefdba3f
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzMlc0ACgkQvFcC4BYPU0rBCQCeM/b7jNFsX3c9oZYZbx20HDFm
-YDYAn0FJoU/01xixKmn5adFPkImknlp3
-=cti7
+iEYEARECAAYFAkzMmuAACgkQvFcC4BYPU0r79ACdE5Ur/OKFRQCgswNIhprhV/TW
+RsAAoIypKr5piHdA3W7S+R8jKSH4aqPM
+=Vwnc
 -----END PGP SIGNATURE-----
diff --git a/app-text/noweb/files/noweb-2.11b-ldflags.patch b/app-text/noweb/files/noweb-2.11b-ldflags.patch
new file mode 100644
index 000000000000..3fe114cb1dd9
--- /dev/null
+++ b/app-text/noweb/files/noweb-2.11b-ldflags.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/show_bug.cgi?id=338899
+
+Index: noweb-2.11b/src/c/Makefile
+===================================================================
+--- noweb-2.11b.orig/src/c/Makefile
++++ noweb-2.11b/src/c/Makefile
+@@ -41,16 +41,16 @@ CPIF=>
+ all:	nt markup mnt finduses
+ 
+ nt:	$(TANGLEOBJS)
+-	$(CC) $(CFLAGS) -o nt $(TANGLEOBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o nt $(TANGLEOBJS)
+ 
+ finduses:	$(FINDUSESOBJS)
+-	$(CC) $(CFLAGS) -o finduses $(FINDUSESOBJS)
++
+ 
+ markup:	$(MARKUPOBJS)
+-	$(CC) $(CFLAGS) -o markup $(MARKUPOBJS)
++
+ 
+ mnt:	$(MNTOBJS)
+-	$(CC) $(CFLAGS) -o mnt $(MNTOBJS)
++
+ 
+ source:	$(SRCS)
+ touch: $(SRCS)
diff --git a/app-text/noweb/files/noweb-2.11b-recmake.patch b/app-text/noweb/files/noweb-2.11b-recmake.patch
new file mode 100644
index 000000000000..98b29935b7d1
--- /dev/null
+++ b/app-text/noweb/files/noweb-2.11b-recmake.patch
@@ -0,0 +1,136 @@
+https://bugs.gentoo.org/show_bug.cgi?id=264273
+
+Index: noweb-2.11b/Makefile
+===================================================================
+--- noweb-2.11b.orig/Makefile
++++ noweb-2.11b/Makefile
+@@ -9,14 +9,14 @@ SHELL=/bin/sh
+ CINAME=-Nv`echo $(VERSION) | tr . _`
+ CIMSG=-f -m'standard checkin preparing to export version $(VERSION)'
+ 
+-source: ;	for i in src; do (cd $$i; make source); done
+-www: ;		for i in src/xdoc examples; do (cd $$i; make www); done
++source: ;	for i in src; do (cd $$i; $(MAKE) source); done
++www: ;		for i in src/xdoc examples; do (cd $$i; $(MAKE) www); done
+ 
+ clean:
+-	for i in src examples contrib; do (cd $$i; make clean); done
++	for i in src examples contrib; do (cd $$i; $(MAKE) clean); done
+ 	rm -f nwsrcfilter *~ */*~
+ clobber: clean
+-	for i in src examples contrib; do (cd $$i; make clobber); done
++	for i in src examples contrib; do (cd $$i; $(MAKE) clobber); done
+ 
+ DATE:
+ 	(./echo -n "Version $(VERSION) of "; date) > DATE
+@@ -51,6 +51,6 @@ emacscheck:
+ 	diff src/elisp/noweb-mode.el $(HOME)/emacs/noweb-mode.el
+ 
+ checkin:
+-	(cd src; make "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin)
++	(cd src; $(MAKE) "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin)
+ 
+ 
+Index: noweb-2.11b/contrib/norman/Makefile
+===================================================================
+--- noweb-2.11b.orig/contrib/norman/Makefile
++++ noweb-2.11b/contrib/norman/Makefile
+@@ -1,10 +1,10 @@
+ LIB=/dev/null	# to be overridden
+ DIRS=numarkup
+ 
+-all: ;	for i in $(DIRS); do (cd $$i; make ICONC=$(ICONC) ICONT=$(ICONT) all); done
+-install: ;	for i in $(DIRS); do (cd $$i; make LIB=$(LIB) BIN=$(BIN) install); done
+-source: ;	for i in $(DIRS); do (cd $$i; make source); done
+-clean: ;	for i in $(DIRS); do (cd $$i; make clean); done
++all: ;	for i in $(DIRS); do (cd $$i; $(MAKE) ICONC=$(ICONC) ICONT=$(ICONT) all); done
++install: ;	for i in $(DIRS); do (cd $$i; $(MAKE) LIB=$(LIB) BIN=$(BIN) install); done
++source: ;	for i in $(DIRS); do (cd $$i; $(MAKE) source); done
++clean: ;	for i in $(DIRS); do (cd $$i; $(MAKE) clean); done
+ iconlib:	# cheap hack for slackmake
+ 	true
+ 
+Index: noweb-2.11b/contrib/norman/numarkup/Makefile
+===================================================================
+--- noweb-2.11b.orig/contrib/norman/numarkup/Makefile
++++ noweb-2.11b/contrib/norman/numarkup/Makefile
+@@ -11,11 +11,11 @@ OBJS = main.o pass1.o latex.o input.o sc
+ 
+ all: 
+ 	noweb -t numarkup.nw
+-	make $(TARGET)
++	$(MAKE) $(TARGET)
+ 
+ install:
+ 	noweb -t numarkup.nw
+-	make $(TARGET)
++	$(MAKE) $(TARGET)
+ 	strip $(TARGET)
+ 	cp $(TARGET) $(LIB)
+ 
+Index: noweb-2.11b/src/Makefile
+===================================================================
+--- noweb-2.11b.orig/src/Makefile
++++ noweb-2.11b/src/Makefile
+@@ -41,9 +41,9 @@ LIBNAME=$(LIB)
+ TEXNAME=$(TEXINPUTS)
+ 
+ all: 
+-	cd c; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" all 
+-	for i in shell lib xdoc tex; do (cd $$i; make all); done
+-	cd $(LIBSRC); make "ICONT=$(ICONT)" "ICONC=$(ICONC)" all
++	cd c; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" all 
++	for i in shell lib xdoc tex; do (cd $$i; $(MAKE) all); done
++	cd $(LIBSRC); $(MAKE) "ICONT=$(ICONT)" "ICONC=$(ICONC)" all
+ 
+ FAQ: FAQ.html
+ 	sleep 1; html2ascii FAQ.html > FAQ
+@@ -101,13 +101,13 @@ install-code: install-shell
+ 	-mkdir $(BIN) $(LIB) 2>/dev/null
+ 	true c/nt c/markup c/mnt c/finduses
+ 	cp c/nt c/markup c/mnt c/finduses $(LIB)
+-	cd $(LIBSRC); make ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) install
+-	cd lib; make LIB=$(LIB) install
++	cd $(LIBSRC); $(MAKE) ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) install
++	cd lib; $(MAKE) LIB=$(LIB) install
+ 
+ uninstall-code: uninstall-shell
+ 	rm $(LIB)/nt $(LIB)/markup $(LIB)/mnt $(LIB)/finduses 
+-	cd $(LIBSRC); make ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) uninstall
+-	cd lib; make LIB=$(LIB) uninstall
++	cd $(LIBSRC); $(MAKE) ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) uninstall
++	cd lib; $(MAKE) LIB=$(LIB) uninstall
+ install-man:
+ 	-mkdir $(MAN) $(MANDIR) $(MAN7DIR) 2>/dev/null
+ 	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.1 > $(MANDIR)/cpif.$(MANEXT)
+@@ -193,24 +193,24 @@ install-elisp:
+ uninstall-elisp:
+ 	rm -f $(ELISP)/noweb-mode.el
+ checkin:
+-	for i in lib tex xdoc; do (cd $$i; make "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin); done
++	for i in lib tex xdoc; do (cd $$i; $(MAKE) "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin); done
+ 	for i in c icon awk; do (cd $$i; ci -l $(CINAME) $(CIMSG) *.nw Makefile); done
+ 	(cd elisp; ci -l $(CINAME) $(CIMSG) *.el)
+ 	ci -l $(CINAME) $(CIMSG) Makefile.nw INSTALL INSTALL.DOS README FAQ COPYRIGHT nwmake *.nw
+ 
+ source: FAQ
+-	for i in c shell lib xdoc icon awk tex; do (cd $$i; make CPIF=">" source); done
++	for i in c shell lib xdoc icon awk tex; do (cd $$i; $(MAKE) CPIF=">" source); done
+ 	sleep 1
+-	for i in c shell lib xdoc icon awk tex; do (cd $$i; make touch); done
++	for i in c shell lib xdoc icon awk tex; do (cd $$i; $(MAKE) touch); done
+ touch:
+ 	touch FAQ
+-	for i in c shell lib xdoc icon awk tex; do (cd $$i; make touch); done
++	for i in c shell lib xdoc icon awk tex; do (cd $$i; $(MAKE) touch); done
+ clean:
+-	for i in c shell lib xdoc icon awk tex; do (cd $$i; make clean); done
++	for i in c shell lib xdoc icon awk tex; do (cd $$i; $(MAKE) clean); done
+ 	rm -f nwsrcfilter *~ */*~
+ 
+ clobber: clean
+-	for i in c lib icon awk xdoc; do (cd $$i; make clobber); done
++	for i in c lib icon awk xdoc; do (cd $$i; $(MAKE) clobber); done
+ 
+ Makefile: Makefile.nw
+ 	chmod +w Makefile
diff --git a/app-text/noweb/noweb-2.11b-r2.ebuild b/app-text/noweb/noweb-2.11b-r2.ebuild
new file mode 100644
index 000000000000..55cd99d009c1
--- /dev/null
+++ b/app-text/noweb/noweb-2.11b-r2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/noweb/noweb-2.11b-r2.ebuild,v 1.1 2010/10/30 22:23:22 aballier Exp $
+
+inherit eutils toolchain-funcs elisp-common
+
+DESCRIPTION="a literate programming tool, lighter than web"
+HOMEPAGE="http://www.eecs.harvard.edu/~nr/noweb/"
+SRC_URI="http://www.eecs.harvard.edu/~nr/noweb/dist/${P}.tgz"
+
+LICENSE="freedist emacs? ( GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="emacs examples"
+
+DEPEND="virtual/tex-base
+	dev-lang/icon
+	sys-apps/debianutils
+	emacs? ( virtual/emacs )"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${P}/src
+
+SITEFILE=50${PN}-gentoo.el
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# glibc2.10 compat (bug 270757)
+#	mkdir d && cp -r c/* d/
+	sed "s:getline (:getline_nonlibc (:" -i c/getline.{c,h} || die
+	sed "s:getline(:getline_nonlibc(:" -i c/{notangle.c,getline.c,finduses.c} || die
+#	diff -u d/ c/
+
+	epatch "${FILESDIR}"/${PN}-2.9-security.patch
+	# dont run texhash...
+	sed -i -e "s/texhash/true/" Makefile
+	# dont strip...
+	sed -i -e "s/strip/true/" Makefile
+
+	cd "${WORKDIR}/${P}"
+	epatch "${FILESDIR}"/${P}-recmake.patch
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+}
+
+src_compile() {
+	# noweb tries to use notangle and noweb; see bug #50429
+	( cd c; emake ICONC="icont" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LIBSRC="icon" ) || die
+	export PATH="${PATH}:${T}"
+	emake ICONC="icont" CC="$(tc-getCC)" BIN="${T}" LIB="${T}" LIBSRC="icon" install-code \
+		|| die "make temporal install failed."
+
+	emake ICONC="icont" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LIBSRC="icon" || die "make failed"
+	# Set awk to awk not nawk
+	./awkname awk
+
+	if use emacs; then
+		elisp-compile elisp/noweb-mode.el || die "elisp-compile failed"
+	fi
+}
+
+src_install () {
+	# It needs the directories to exist first...
+	dodir /usr/bin
+	dodir /usr/libexec/${PN}
+	dodir /usr/share/man
+	dodir /usr/share/texmf/tex/inputs
+	emake ICONC="icont" \
+		BIN="${D}/usr/bin" \
+		LIBSRC="icon" \
+		LIBNAME="/usr/libexec/${PN}" \
+		LIB="${D}/usr/libexec/${PN}" \
+		MAN="${D}/usr/share/man" \
+		TEXNAME="/usr/share/texmf/tex/inputs" \
+		TEXINPUTS="${D}/usr/share/texmf/tex/inputs" \
+		install || die "make install failed"
+	cd "${WORKDIR}/${P}"
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*
+	fi
+	dodoc CHANGES README
+
+	if use emacs; then
+		elisp-install ${PN} src/elisp/noweb-mode.{el,elc} \
+			|| die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+			|| die "elisp-site-file-install failed"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	einfo "Running texhash to complete installation.."
+	texhash
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}