New upstream version; Added epoll support and condition support for dev-lang/tk via X USE flag; Resolves Bug #106208.

(Portage version: 2.0.53_rc6)

6 files changed, 176 insertions, 8 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index 97d2fbc02d04..300d54d515d8 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,14 @@
 # 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.24 2005/09/05 19:17:37 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.25 2005/10/29 20:25:08 mkennedy Exp $
+
+*erlang-10.2.7 (29 Oct 2005)
+
+  29 Oct 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/erlang-10.2.7-export-TARGET.patch,
+  +files/10.2.7-manpage-emacs-gentoo.patch, +erlang-10.2.7.ebuild:
+  New upstream version; Added epoll support and condition support for
+  dev-lang/tk via X USE flag; Resolves Bug #106208.
 
   05 Sep 2005; Jason Wever <weeve@gentoo.org> erlang-10.2.5.ebuild:
   Stable on SPARC.
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 209a9fdb8a3f..8da3b6d1e63b 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,23 +1,27 @@
 MD5 6ecd68c50e96d92bca786f624bc4cbc0 ChangeLog 4390
 MD5 dc1d9134a5f6e8146cc4ca6c5e130f0a erlang-10.2.0.ebuild 2372
+MD5 363c1727652dbfbd85dbff66e246b467 erlang-10.2.5.ebuild 2944
+MD5 f710894b1b9115ed6aa49b7abf22e22f erlang-10.2.6.ebuild 2938
+MD5 6e06e8cbf081b4b3f43885825a6b637f erlang-10.2.7.ebuild 3084
 MD5 f947170e5f0fef952a0efc7dcc947f37 erlang-8b.ebuild 1178
 MD5 952017d9165b65d7786b75dbf44a10e2 erlang-9c-r1.ebuild 1686
 MD5 4df8bcb2597f95b5d00f898f0dbc9e96 erlang-9c-r2.ebuild 1808
 MD5 92087ace1ec7f4f5fafb31419db5fafa erlang-9c-r3.ebuild 1822
 MD5 888709019e83eac37f3e95c7739de933 erlang-9c.ebuild 1505
-MD5 aea374917adc11a2d42b0b9d1bba3598 metadata.xml 402
-MD5 f710894b1b9115ed6aa49b7abf22e22f erlang-10.2.6.ebuild 2938
-MD5 363c1727652dbfbd85dbff66e246b467 erlang-10.2.5.ebuild 2944
+MD5 34433096e1c6e84b5dbb4a50a4e3c2e8 files/10.2.6-manpage-emacs-gentoo.patch 1348
+MD5 34433096e1c6e84b5dbb4a50a4e3c2e8 files/10.2.7-manpage-emacs-gentoo.patch 1348
 MD5 28397dc6ef4a633a8084ce44fbb1c6f3 files/50erlang-gentoo.el 140
 MD5 e61c0249e23b7e44ef3629ea5dc5997a files/9c.patch 2005
 MD5 f3de2b6ca821b977f0e1811a1f0a1409 files/digest-erlang-10.2.0 67
+MD5 915a9f490e6f58cafe26c3f6f6aeb54d files/digest-erlang-10.2.5 209
+MD5 935d6f9403c781eb7c3234136b1684e0 files/digest-erlang-10.2.6 210
+MD5 9a4549378412ae567bc58f2d7a9336a3 files/digest-erlang-10.2.7 280
 MD5 0ef311d4fbeb2b5e16aab201dcf37297 files/digest-erlang-8b 67
 MD5 9a235de49a6c0988f033448fdac8a0a8 files/digest-erlang-9c 66
 MD5 9a235de49a6c0988f033448fdac8a0a8 files/digest-erlang-9c-r1 66
 MD5 ae2205c16664d70f5ea47d249b2e566f files/digest-erlang-9c-r2 66
 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
-MD5 915a9f490e6f58cafe26c3f6f6aeb54d files/digest-erlang-10.2.5 209
+MD5 b1f610dc1caa7c176d7da4919bcabba9 files/erlang-10.2.7-export-TARGET.patch 242
+MD5 e88b4d733b41026e691a981320ac7806 files/erlang-9c.patch.gz 1503
+MD5 aea374917adc11a2d42b0b9d1bba3598 metadata.xml 402
diff --git a/dev-lang/erlang/erlang-10.2.7.ebuild b/dev-lang/erlang/erlang-10.2.7.ebuild
new file mode 100644
index 000000000000..e043725cee1f
--- /dev/null
+++ b/dev-lang/erlang/erlang-10.2.7.ebuild
@@ -0,0 +1,110 @@
+# 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.7.ebuild,v 1.1 2005/10/29 20:25:08 mkennedy Exp $
+
+inherit eutils multilib 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_PV=R10B-7
+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
+	doc? ( http://erlang.org/download/otp_doc_man_${MY_PV}.tar.gz
+		http://erlang.org/download/otp_doc_html_${MY_PV}.tar.gz )
+	http://developer.sipphone.com/ejabberd/erlang_epoll_patch/otp_src_${MY_PV}_epoll.patch"
+
+LICENSE="EPL"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc emacs java odbc ssl X"
+
+RDEPEND=">=dev-lang/perl-5.6.1
+	X? ( virtual/x11 )
+	ssl? ( >=dev-libs/openssl-0.9.7d )
+	emacs? ( virtual/emacs )
+	java? ( >=virtual/jdk-1.2 )
+	odbc? ( dev-db/unixODBC )"
+DEPEND="${RDEPEND}
+	X? ( dev-lang/tk )"
+
+S=${WORKDIR}/${MY_P}
+
+SITEFILE=50erlang-gentoo.el
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-export-TARGET.patch
+	epatch "${FILESDIR}"/${PV}-manpage-emacs-gentoo.patch
+	use odbc || sed -i 's: odbc : :' lib/Makefile
+	epatch "${DISTDIR}"/otp_src_${MY_PV}_epoll.patch
+}
+
+src_compile() {
+	use java || export JAVAC=false
+	econf \
+		--enable-threads \
+		$(use_with ssl) \
+		|| die
+	make || die
+
+	if use emacs ; then
+		pushd lib/tools/emacs
+		elisp-compile *.el
+		popd
+	fi
+}
+
+src_install() {
+	local ERL_LIBDIR=/usr/$(get_libdir)/erlang
+
+	make INSTALL_PREFIX="${D}" install || die
+	dodoc AUTHORS EPLICENCE README
+
+	dosym ${ERL_LIBDIR}/bin/erl /usr/bin/erl
+	dosym ${ERL_LIBDIR}/bin/erlc /usr/bin/erlc
+	dosym ${ERL_LIBDIR}/bin/ecc /usr/bin/ecc
+	dosym ${ERL_LIBDIR}/bin/elink /usr/bin/elink
+	dosym ${ERL_LIBDIR}/bin/ear /usr/bin/ear
+	dosym ${ERL_LIBDIR}/bin/escript /usr/bin/escript
+
+	## Remove ${D} from the following files
+	dosed ${ERL_LIBDIR}/bin/erl
+	dosed ${ERL_LIBDIR}/bin/start
+	cd ${ERL_LIBDIR}/erts-*
+	grep -rle "${D}" "${D}"/${ERL_LIBDIR}/erts-* | xargs sed -i -e "s:${D}::g"
+
+	## 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,elc}
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+		popd
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/erlang/files/10.2.7-manpage-emacs-gentoo.patch b/dev-lang/erlang/files/10.2.7-manpage-emacs-gentoo.patch
new file mode 100644
index 000000000000..a5183d480cd6
--- /dev/null
+++ b/dev-lang/erlang/files/10.2.7-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/digest-erlang-10.2.7 b/dev-lang/erlang/files/digest-erlang-10.2.7
new file mode 100644
index 000000000000..fb15461fddfa
--- /dev/null
+++ b/dev-lang/erlang/files/digest-erlang-10.2.7
@@ -0,0 +1,4 @@
+MD5 c73010c3d6c929c4474b8b8b38a4925c otp_doc_html_R10B-7.tar.gz 4601134
+MD5 53b251d1a690d5a97434c6a5b0086921 otp_doc_man_R10B-7.tar.gz 601650
+MD5 fc039c62862ebae141e27370401aaab0 otp_src_R10B-7.tar.gz 10058423
+MD5 37b6e5972b2cbf536dbbf55fe61c6251 otp_src_R10B-7_epoll.patch 14823
diff --git a/dev-lang/erlang/files/erlang-10.2.7-export-TARGET.patch b/dev-lang/erlang/files/erlang-10.2.7-export-TARGET.patch
new file mode 100644
index 000000000000..13a68021e8be
--- /dev/null
+++ b/dev-lang/erlang/files/erlang-10.2.7-export-TARGET.patch
@@ -0,0 +1,11 @@
+--- Makefile.in
++++ Makefile.in
+@@ -85,7 +85,7 @@
+ MAKE    = @MAKE_PROG@
+ 
+ # This should be set to the target "arch-vendor-os"
+-TARGET  = @TARGET@
++export TARGET  = @TARGET@
+ 
+ # A BSD compatible install program
+ INSTALL         = @INSTALL@