Optionally install Emacs noweb-mode, bug 230229.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r4 i686

4 files changed, 56 insertions, 14 deletions

diff --git a/app-text/noweb/ChangeLog b/app-text/noweb/ChangeLog
index 9f04e2c0b8b6..cfdfff5e47fe 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.32 2008/06/18 06:31:03 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/noweb/ChangeLog,v 1.33 2008/07/04 03:48:21 ulm Exp $
+
+  04 Jul 2008; Ulrich Mueller <ulm@gentoo.org> +files/50noweb-gentoo.el,
+  noweb-2.11b.ebuild:
+  Optionally install Emacs noweb-mode. Ebuild and site-init file provided by
+  Denys Duchier <denys.duchier@univ-orleans.fr>, bug 230229.
 
   18 Jun 2008; Stephanie Lockwood-Childs <wormo@gentoo.org>
   noweb-2.11b.ebuild:
diff --git a/app-text/noweb/Manifest b/app-text/noweb/Manifest
index c6a053d610ef..4661b2edbc65 100644
--- a/app-text/noweb/Manifest
+++ b/app-text/noweb/Manifest
@@ -1,9 +1,20 @@
+-----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.ebuild 1932 RMD160 afc502950115db514901d01ed49b7d022eb925b7 SHA1 de3ad52503b33f2e84b7864d57494fd49ce81c68 SHA256 199d9930664bcbf87bbd50e80d8b7e5f4314f597f20f70e27c0ec15e6eb5065b
+EBUILD noweb-2.11b.ebuild 2405 RMD160 635966127005d3c896df64df63d2835715d72bb6 SHA1 9375f8036c20889e5095beeef93fd93ba8e5c764 SHA256 9d38b195cf64c1eb9850f67e4010dc3de6da5fcef28916d3d363e690ba41de44
 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 4141 RMD160 5d91a5f6e5d1576774299c7c4de4b52e7ae6ba61 SHA1 46adbe3ab93c126d7d6d68914308626d1bdb88c7 SHA256 d72362e7fc5a507cbf8f8ce76a73ed9f0809a9ae01495c246630bcc48f259db9
+MISC ChangeLog 4373 RMD160 906d117abff66288c3aad9712772afa05e5756f0 SHA1 3a2aa51a0cf1a4928b90e64cf1552e41f19b0fff SHA256 072ad8ecc72307f2717a24250610cd08d2d590abe54ebc011ef3fa4aa2add444
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEARECAAYFAkhtnYoACgkQOeoy/oIi7uyLCACgxc+4VTpjH3qpfo1QQMQIIZTv
+b+wAn1y7/FWr75BATWNAvPIqZ/5e5rZX
+=PQpm
+-----END PGP SIGNATURE-----
diff --git a/app-text/noweb/files/50noweb-gentoo.el b/app-text/noweb/files/50noweb-gentoo.el
new file mode 100644
index 000000000000..62b50cfa1732
--- /dev/null
+++ b/app-text/noweb/files/50noweb-gentoo.el
@@ -0,0 +1,7 @@
+
+;;; noweb site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload  'noweb-mode "noweb-mode"
+  "Minor meta mode for editing noweb files." t)
+(add-to-list 'auto-mode-alist '("\\.nw\\'" . noweb-mode))
diff --git a/app-text/noweb/noweb-2.11b.ebuild b/app-text/noweb/noweb-2.11b.ebuild
index 37648e37f915..77ce8e40c523 100644
--- a/app-text/noweb/noweb-2.11b.ebuild
+++ b/app-text/noweb/noweb-2.11b.ebuild
@@ -1,24 +1,27 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/noweb/noweb-2.11b.ebuild,v 1.2 2008/06/18 06:31:03 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/noweb/noweb-2.11b.ebuild,v 1.3 2008/07/04 03:48:21 ulm Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs elisp-common
 
-SRC_URI="http://www.eecs.harvard.edu/~nr/noweb/dist/${P}.tgz"
-HOMEPAGE="http://www.eecs.harvard.edu/~nr/noweb/"
-LICENSE="freedist"
 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"
-IUSE="examples"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="emacs examples"
 
 DEPEND="virtual/tex-base
 	dev-lang/icon
-	sys-apps/debianutils"
+	sys-apps/debianutils
+	emacs? ( virtual/emacs )"
 
 S=${WORKDIR}/${P}/src
 
+SITEFILE=50${PN}-gentoo.el
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -32,18 +35,22 @@ src_unpack() {
 
 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
+	( 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 \
+	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"
+	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 exisst first...
+	# It needs the directories to exist first...
 	dodir /usr/bin
 	dodir /usr/libexec/${PN}
 	dodir /usr/share/man
@@ -63,9 +70,21 @@ src_install () {
 		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
+}