diff options
author | Matthew Kennedy <mkennedy@gentoo.org> | 2005-07-18 20:21:03 +0000 |
---|---|---|
committer | Matthew Kennedy <mkennedy@gentoo.org> | 2005-07-18 20:21:03 +0000 |
commit | 88e4150bac92b5010bff08fbce62137adbe3835a (patch) | |
tree | 21516e56439c22736c8cbc82a4c98ff6b4d46144 /dev-lang/erlang | |
parent | Version bump. (diff) | |
download | gentoo-2-88e4150bac92b5010bff08fbce62137adbe3835a.tar.gz gentoo-2-88e4150bac92b5010bff08fbce62137adbe3835a.tar.bz2 gentoo-2-88e4150bac92b5010bff08fbce62137adbe3835a.zip |
.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'dev-lang/erlang')
-rw-r--r-- | dev-lang/erlang/ChangeLog | 16 | ||||
-rw-r--r-- | dev-lang/erlang/Manifest | 37 | ||||
-rw-r--r-- | dev-lang/erlang/erlang-10.2.6.ebuild | 36 | ||||
-rw-r--r-- | dev-lang/erlang/files/10.2.6-manpage-emacs-gentoo.patch | 31 | ||||
-rw-r--r-- | dev-lang/erlang/files/50erlang-gentoo.el | 1 | ||||
-rw-r--r-- | dev-lang/erlang/files/digest-erlang-10.2.6 | 2 | ||||
-rw-r--r-- | dev-lang/erlang/metadata.xml | 1 |
7 files changed, 91 insertions, 33 deletions
diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog index 294881a39916..117d6b044e05 100644 --- a/dev-lang/erlang/ChangeLog +++ b/dev-lang/erlang/ChangeLog @@ -1,6 +1,20 @@ # ChangeLog for dev-lang/erlang # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.20 2005/07/02 22:01:01 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.21 2005/07/18 20:21:03 mkennedy Exp $ + + 18 Jul 2005; Matthew Kennedy <mkennedy@gentoo.org> + +files/10.2.6-manpage-emacs-gentoo.patch, files/50erlang-gentoo.el, + metadata.xml, erlang-10.2.6.ebuild: + Added Emacs Herd to metadata.xml. + + 18 Jul 2005; Matthew Kennedy <mkennedy@gentoo.org> + +files/10.2.6-manpage-emacs-gentoo.patch, files/50erlang-gentoo.el, + erlang-10.2.6.ebuild: + Support man-page documentation in Emacs erlang-mode; Install Erlang + man-pages and HTML documentation via "doc" USE flag; Add missing + dependencies for Java and ODBC support via "odbc" and "java" USE flags; + Rename Erlang man-pages with "erl" suffix to avoid namespace collision; New + upstream version. *erlang-10.2.6 (02 Jul 2005) diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest index bcef71199231..4453e9ac1803 100644 --- a/dev-lang/erlang/Manifest +++ b/dev-lang/erlang/Manifest @@ -1,30 +1,21 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +MD5 b4b2aaf691c6a7ed3bc1f0d2819ad4c0 ChangeLog 3860 +MD5 d0c7b54ad61876c2cf9679c3b4181c6a erlang-10.2.0.ebuild 2364 MD5 f947170e5f0fef952a0efc7dcc947f37 erlang-8b.ebuild 1178 -MD5 b6c3d6f665c823117549728127487f4e metadata.xml 383 -MD5 92087ace1ec7f4f5fafb31419db5fafa erlang-9c-r3.ebuild 1822 MD5 952017d9165b65d7786b75dbf44a10e2 erlang-9c-r1.ebuild 1686 -MD5 888709019e83eac37f3e95c7739de933 erlang-9c.ebuild 1505 -MD5 d0c7b54ad61876c2cf9679c3b4181c6a erlang-10.2.0.ebuild 2364 -MD5 d91db74adc39614debcddf9b96b96868 erlang-10.2.6.ebuild 2313 -MD5 677eb698bbcdbba24b551a030f9e25a6 ChangeLog 3403 MD5 4df8bcb2597f95b5d00f898f0dbc9e96 erlang-9c-r2.ebuild 1808 -MD5 b1f610dc1caa7c176d7da4919bcabba9 files/erlang-10.2.6-export-TARGET.patch 242 -MD5 f3de2b6ca821b977f0e1811a1f0a1409 files/digest-erlang-10.2.0 67 +MD5 92087ace1ec7f4f5fafb31419db5fafa erlang-9c-r3.ebuild 1822 +MD5 888709019e83eac37f3e95c7739de933 erlang-9c.ebuild 1505 +MD5 b6c3d6f665c823117549728127487f4e metadata.xml 383 +MD5 34820f3b88c70b6c30d79e656680a780 erlang-10.2.6.ebuild 2978 +MD5 28397dc6ef4a633a8084ce44fbb1c6f3 files/50erlang-gentoo.el 140 MD5 e61c0249e23b7e44ef3629ea5dc5997a files/9c.patch 2005 -MD5 9a235de49a6c0988f033448fdac8a0a8 files/digest-erlang-9c-r1 66 +MD5 f3de2b6ca821b977f0e1811a1f0a1409 files/digest-erlang-10.2.0 67 MD5 0ef311d4fbeb2b5e16aab201dcf37297 files/digest-erlang-8b 67 MD5 9a235de49a6c0988f033448fdac8a0a8 files/digest-erlang-9c 66 -MD5 29ef492635d7cb7eaf7f27658711dae6 files/digest-erlang-10.2.6 68 -MD5 e88b4d733b41026e691a981320ac7806 files/erlang-9c.patch.gz 1503 -MD5 ae2205c16664d70f5ea47d249b2e566f files/digest-erlang-9c-r3 66 +MD5 9a235de49a6c0988f033448fdac8a0a8 files/digest-erlang-9c-r1 66 MD5 ae2205c16664d70f5ea47d249b2e566f files/digest-erlang-9c-r2 66 -MD5 f3f6915d00f2f3f9f580db9ee946160a files/50erlang-gentoo.el 104 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCxw66gIKl8Uu19MoRAjgQAJ9w/npRGqGHafaF9qawjXVni8yHLQCcCKAD -0Fo7xCKeZkPPQFrTxcaPHWU= -=u7kL ------END PGP SIGNATURE----- +MD5 ae2205c16664d70f5ea47d249b2e566f files/digest-erlang-9c-r3 66 +MD5 e88b4d733b41026e691a981320ac7806 files/erlang-9c.patch.gz 1503 +MD5 935d6f9403c781eb7c3234136b1684e0 files/digest-erlang-10.2.6 210 +MD5 b1f610dc1caa7c176d7da4919bcabba9 files/erlang-10.2.6-export-TARGET.patch 242 +MD5 34433096e1c6e84b5dbb4a50a4e3c2e8 files/10.2.6-manpage-emacs-gentoo.patch 1348 diff --git a/dev-lang/erlang/erlang-10.2.6.ebuild b/dev-lang/erlang/erlang-10.2.6.ebuild index 80f22d31dc0d..116aff4e1829 100644 --- a/dev-lang/erlang/erlang-10.2.6.ebuild +++ b/dev-lang/erlang/erlang-10.2.6.ebuild @@ -1,26 +1,30 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-10.2.6.ebuild,v 1.1 2005/07/02 22:01:01 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-10.2.6.ebuild,v 1.2 2005/07/18 20:21:03 mkennedy Exp $ inherit eutils toolchain-funcs flag-o-matic elisp-common #erlang uses a really weird versioning scheme which caused quite a few problems already #Thus we do a slight modification converting all letters to digits to make it more sane (see e.g. #26420) #the next line selects the right source. -MY_P=otp_src_R10B-6 +MY_PV=R10B-6 +MY_P=otp_src_${MY_PV} DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries" HOMEPAGE="http://www.erlang.org/" -SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz" - +SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz + doc? ( http://erlang.org/download/otp_doc_man_${MY_PV}.tar.gz + http://erlang.org/download/otp_doc_html_${MY_PV}.tar.gz )" LICENSE="EPL" SLOT="0" KEYWORDS="~x86 ~ppc ~sparc ~amd64" -IUSE="X ssl emacs" +IUSE="X ssl emacs doc java odbc" DEPEND=">=dev-lang/perl-5.6.1 X? ( virtual/x11 ) ssl? ( >=dev-libs/openssl-0.9.7d ) - emacs? ( virtual/emacs )" + emacs? ( virtual/emacs ) + java? ( >=virtual/jdk-1.2* ) + odbc? ( dev-db/unixODBC )" S=${WORKDIR}/${MY_P} @@ -29,7 +33,8 @@ SITEFILE=50erlang-gentoo.el src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${P}-export-TARGET.patch + epatch ${FILESDIR}/${P}-export-TARGET.patch + epatch ${FILESDIR}/${PV}-manpage-emacs-gentoo.patch } src_compile() { @@ -42,7 +47,7 @@ src_compile() { make || die if use emacs ; then - pushd "${D}"/lib/tools/emacs + pushd lib/tools/emacs elisp-compile *.el popd fi @@ -70,9 +75,22 @@ src_install() { ## Clean up the no longer needed files rm ${D}/${ERL_LIBDIR}/Install + if use doc; then + for file in ${WORKDIR}/man/man*/*.[1-9]; do + # Avoid namespace collisions + local newfile=${file}erl + cp $file $newfile + # Man page processing tools expect a capitalized "SEE ALSO" section + # header + sed -i -e 's,\.SH See Also,\.SH SEE ALSO,g' $newfile + doman ${newfile} + done + dohtml -A README,erl,hrl,c,h,kwc,info -r ${WORKDIR}/doc ${WORKDIR}/lib ${WORKDIR}/erts-* + fi + if use emacs ; then pushd "${S}" - elisp-install erlang lib/tools/emacs/*.el + elisp-install erlang lib/tools/emacs/*.{el,elc} elisp-site-file-install ${FILESDIR}/${SITEFILE} popd fi diff --git a/dev-lang/erlang/files/10.2.6-manpage-emacs-gentoo.patch b/dev-lang/erlang/files/10.2.6-manpage-emacs-gentoo.patch new file mode 100644 index 000000000000..a5183d480cd6 --- /dev/null +++ b/dev-lang/erlang/files/10.2.6-manpage-emacs-gentoo.patch @@ -0,0 +1,31 @@ +diff -ur otp_src_R10B-6.orig/lib/tools/emacs/erlang.el otp_src_R10B-6/lib/tools/emacs/erlang.el +--- otp_src_R10B-6.orig/lib/tools/emacs/erlang.el 2004-09-30 02:05:50.000000000 -0500 ++++ otp_src_R10B-6/lib/tools/emacs/erlang.el 2005-07-18 13:52:13.000000000 -0500 +@@ -2518,7 +2518,7 @@ + + (defun erlang-man-make-menu-item (file) + "Create a menu item containing the name of the man page." +- (and (string-match ".*/\\([^/]+\\)\\.[^.]$" file) ++ (and (string-match ".*/\\([^/]+\\)\\.[0-9]erl\\.gz$" file) + (let ((page (substring file (match-beginning 1) (match-end 1)))) + (list (capitalize page) + (list 'lambda '() +@@ -2529,7 +2529,7 @@ + + (defun erlang-man-get-files (dir) + "Return files in directory DIR." +- (directory-files dir t ".*\\.[0-9]\\'")) ++ (directory-files dir t ".*\\.[0-9]erl\\.gz\\'")) + + + (defun erlang-man-module (&optional module) +@@ -2690,7 +2690,7 @@ + (error nil)) + (if file + (let ((process-environment (copy-sequence process-environment))) +- (if (string-match "\\(.*\\)/man[^/]*/\\([^/]+\\)\\.[^.]$" file) ++ (if (string-match "\\(.*\\)/man[^/]*/\\([^/]+\\)\\.[0-9]erl.gz$" file) + (let ((dir (substring file (match-beginning 1) (match-end 1))) + (page (substring file (match-beginning 2) (match-end 2)))) + (if (fboundp 'setenv) +Only in otp_src_R10B-6/lib/tools/emacs: erlang.el~ diff --git a/dev-lang/erlang/files/50erlang-gentoo.el b/dev-lang/erlang/files/50erlang-gentoo.el index 439d3b33a94e..468726a6d158 100644 --- a/dev-lang/erlang/files/50erlang-gentoo.el +++ b/dev-lang/erlang/files/50erlang-gentoo.el @@ -2,3 +2,4 @@ (add-to-list 'load-path "@SITELISP@") (load-library "erlang-start") +(setq erlang-root-dir "/usr/share") diff --git a/dev-lang/erlang/files/digest-erlang-10.2.6 b/dev-lang/erlang/files/digest-erlang-10.2.6 index 0a5b9ef538e7..4a1cf692b626 100644 --- a/dev-lang/erlang/files/digest-erlang-10.2.6 +++ b/dev-lang/erlang/files/digest-erlang-10.2.6 @@ -1 +1,3 @@ MD5 6463f70b40e2a6c3587e54653add8414 otp_src_R10B-6.tar.gz 10037987 +MD5 0243d2ff01fb2bac03115bcbe2284b20 otp_doc_man_R10B-6.tar.gz 601812 +MD5 9f50340fd1c25af5d5a6fcf9f14b2e49 otp_doc_html_R10B-6.tar.gz 4602685 diff --git a/dev-lang/erlang/metadata.xml b/dev-lang/erlang/metadata.xml index 60361cca52d9..989022db6e2d 100644 --- a/dev-lang/erlang/metadata.xml +++ b/dev-lang/erlang/metadata.xml @@ -2,6 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>lang-misc</herd> +<herd>emacs</herd> <longdescription> Erlang is a programming language designed at the Ericsson Computer Science Laboratory. Open-source Erlang is being |