glibc2.10 compat (bug 270757)

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

3 files changed, 106 insertions, 13 deletions

diff --git a/app-text/noweb/ChangeLog b/app-text/noweb/ChangeLog
index 99dda962369c..32465d2e9abf 100644
--- a/app-text/noweb/ChangeLog
+++ b/app-text/noweb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/noweb
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/noweb/ChangeLog,v 1.40 2008/08/25 17:15:29 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/noweb/ChangeLog,v 1.41 2009/05/21 23:05:11 hkbst Exp $
+
+*noweb-2.11b-r1 (21 May 2009)
+
+  21 May 2009; Marijn Schouten <hkBst@gentoo.org> +noweb-2.11b-r1.ebuild:
+  glibc2.10 compat (bug 270757)
 
   25 Aug 2008; Markus Meier <maekke@gentoo.org> noweb-2.11b.ebuild:
   amd64 stable, bug #234191
diff --git a/app-text/noweb/Manifest b/app-text/noweb/Manifest
index df47af7d5c3e..d84581e40001 100644
--- a/app-text/noweb/Manifest
+++ b/app-text/noweb/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 50noweb-gentoo.el 216 RMD160 e6685f97704dac9dd922c7c83277f49ec3541e02 SHA1 be9e3b9d3c2f9bd4459d48572b50a7b9f7e6412e SHA256 8216492bf2537ed68953c64e72f12dc073a579eb866a4e0e23f1320ec056680e
 AUX noweb-2.9-gentoo.diff 14029 RMD160 5b2f0566ccfa04d87dbff87ddd0a81cfb1ebc855 SHA1 1e296518d490ef2194f5c5a9ba1021a04b6ee650 SHA256 63edbfd245396c5fa9f8e0ffac544ab6e872f49036c228ac7e6101789340f8a4
 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
 DIST noweb-src-2.9.tar.gz 457749 RMD160 737d18acc361a88cc857a87e75de46f00bdb3608 SHA1 67201320a20b88a46d253b9bf90991ef60bbc006 SHA256 e955f69eb159981d6796070114c26fc966722950823d8d828051caa54162be7e
+EBUILD noweb-2.11b-r1.ebuild 2650 RMD160 d36cac257b25e0ada6f22f5c1ebfdfb7e982c6a5 SHA1 936ce6a0784f961d94e2eb643dd3ac6bf8cbdfe5 SHA256 8e9d7da72fae4541b1d5d8d2bbfd23590c58613eaa6cf5f83b846aabce7beb3c
 EBUILD noweb-2.11b.ebuild 2400 RMD160 bf07dc6e6d50150082859612029b5ace6aa95eee SHA1 38e8d455bd00a7bb624a855305d56e583e4f5720 SHA256 3a237cf374d42ea3b64573e789f0d4f516bce02072098d2c5d652238c7dfb8b8
 EBUILD noweb-2.9-r5.ebuild 1596 RMD160 f88a3fd8dac7b105e1bf26c13eb933da12abdfad SHA1 8101e4fa310ca12c6afae6e8133938077210238f SHA256 8060de9c9b3b5dcd4a64388cfcc3f0d56e3c1bac13b3c6e1a06014c43f7e74a2
 EBUILD noweb-2.9-r6.ebuild 1842 RMD160 6c7a7f4b7b8e3f0f94959114371ce0bc1e02ca11 SHA1 7ea938b4a3b224955fb39ab74ab351b833a81ff6 SHA256 46db6c749d9e0c98fab493854ad6a07c12191d45270d7c1dfc0faf22870c2fa9
-MISC ChangeLog 5086 RMD160 1a1a4951efaea9e6ffb2b0e7d8d3532a9947b393 SHA1 fdd3ccbba7cd87d934d2e2b1c7b26222ff4dd29e SHA256 9aa5eeae27947508aa67af82183b1a68542c35601c947c1733f1ea3508fedc3e
+MISC ChangeLog 5223 RMD160 b222750efbc4891d84d6de055312dcb738757326 SHA1 76db55c851e1c0c9ce7cb13624cd98d9a507963c SHA256 b583ba09ab8f5e90a1791ba8bef475d56d288ee2c62da4b07458b4dcf22c32ec
 MISC metadata.xml 245 RMD160 d0dd8293520989e0e3f3870db181bf2b8fb892b0 SHA1 2dd047b98fd498784d92cc795a81d6499c9f2016 SHA256 3ad872fc713d7d5ea6a224b2e9933f7ca7396454069a362627018c1ccdd39bb8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiy6QMACgkQkKaRLQcq0GKQdgCfVYHJtEp3ueOnK4YF+1VFV8WC
-ZjsAn2uUgTyN6lmgYptNjeJo5TsNlYgm
-=iPjO
------END PGP SIGNATURE-----
diff --git a/app-text/noweb/noweb-2.11b-r1.ebuild b/app-text/noweb/noweb-2.11b-r1.ebuild
new file mode 100644
index 000000000000..2591e63a83aa
--- /dev/null
+++ b/app-text/noweb/noweb-2.11b-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/noweb/noweb-2.11b-r1.ebuild,v 1.1 2009/05/21 23:05:11 hkbst 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
+}
+
+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
+}