Include GLIBC 2.4 build fix; Resolves Bug #122383; Please see http://www.erlang.org/ml-archive/erlang-questions/200601/msg00500.html for more information on the GLIBC build fix.

(Portage version: 2.1_pre7-r4)

5 files changed, 156 insertions, 11 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index 7106093cfac8..3d2e752cc3dd 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/erlang
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.28 2006/03/07 23:14:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.29 2006/04/10 20:42:54 mkennedy Exp $
+
+*erlang-10.2.10 (10 Apr 2006)
+
+  10 Apr 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/glibc-2.4-fix.patch, +erlang-10.2.10.ebuild:
+  Include GLIBC 2.4 build fix; Resolves Bug #122383; Please see
+  http://www.erlang.org/ml-archive/erlang-questions/200601/msg00500.html for
+  more information on the GLIBC build fix.
 
   07 Mar 2006; Mike Frysinger <vapier@gentoo.org> erlang-8b.ebuild,
   erlang-9c.ebuild, erlang-9c-r1.ebuild, erlang-9c-r2.ebuild,
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index def1b6754bc8..4f4cf233f196 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,12 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 0f9769ab66fba70233ac52fb446f930d ChangeLog 5255
 RMD160 5aa30b61b47a9b53b374a599eab23da86532c7c8 ChangeLog 5255
 SHA256 712864f546e63c3fe8e531e28e81d34d782fb8508b2c81d2301bb4600b30318c ChangeLog 5255
 MD5 542d1404253f2b21edd106a562bba760 erlang-10.2.0.ebuild 2352
 RMD160 cd0ae744aff89f3a7af60e2f8ee0e106c561929f erlang-10.2.0.ebuild 2352
 SHA256 e5c62cfa064f03cf0cb7a0a05bd2da37964fdbb1f254345e62671a589024c3d6 erlang-10.2.0.ebuild 2352
+MD5 1ccd6ae408db5623bb3273bc35329396 erlang-10.2.10.ebuild 3448
+RMD160 b9829fc2678eb7aec1ac570ce480636deac90599 erlang-10.2.10.ebuild 3448
+SHA256 062835105507a2d4c83ea5fc4e135736898a0584692b73e79eb0d4f8038d73e4 erlang-10.2.10.ebuild 3448
 MD5 15afcfd348a07f127785257e8c876b8d erlang-10.2.5.ebuild 2925
 RMD160 88db440410a862002970318029e845f2c99ae355 erlang-10.2.5.ebuild 2925
 SHA256 27234a1ed6d213a2e2a3e347586f4fe37eae2b570afcd43c4fe035613dc5c83d erlang-10.2.5.ebuild 2925
@@ -46,6 +46,9 @@ SHA256 634f9ef95cae47ab27f464802bbc144606ff6e24d318da0cb1276ada5568fd78 files/9c
 MD5 f3de2b6ca821b977f0e1811a1f0a1409 files/digest-erlang-10.2.0 67
 RMD160 877faf9cd01c7a7440a297f7b007fb33e4b7f302 files/digest-erlang-10.2.0 67
 SHA256 832c2c2b7cd5c257619e0d01729a9ce468b3d29df63b68c7ddcbe70426716364 files/digest-erlang-10.2.0 67
+MD5 58cc2440a6ff67f439916c4fe3ccb0bd files/digest-erlang-10.2.10 1033
+RMD160 a68ccbb17a0b86b4d58f311a553432e6ddfc0b01 files/digest-erlang-10.2.10 1033
+SHA256 4d9f8f7bb59eda00418e74cd3e1cae2dc90af7c6837f1dc699e5c4a5649ff318 files/digest-erlang-10.2.10 1033
 MD5 915a9f490e6f58cafe26c3f6f6aeb54d files/digest-erlang-10.2.5 209
 RMD160 045e0d32ec7f5516361ca930e8d68462aee1ba26 files/digest-erlang-10.2.5 209
 SHA256 7601e79f68cf8dfa93db26685ccb85edae1727a764211f9826aa34bf337235e2 files/digest-erlang-10.2.5 209
@@ -79,13 +82,9 @@ SHA256 8e8ae39cb84c3196fbb773275f0aaaf68fb07fade632682f1866d2185b4dd54b files/er
 MD5 162a0f246dd57cae2c3a6908d8446944 files/erlang-9c.patch 4868
 RMD160 7655db2531fdeb393ba34e608cd0eaa4a78da9b5 files/erlang-9c.patch 4868
 SHA256 8224e0f7d8252e12cf26b545d5f1d32002e2335190a6e038fa06e0d6569fd2df files/erlang-9c.patch 4868
+MD5 734a6808d937b508338553b3ac819cd3 files/glibc-2.4-fix.patch 452
+RMD160 af22ca793fe2f0d025c1eafa75547e4b7093f24c files/glibc-2.4-fix.patch 452
+SHA256 c9d20e483847f580848c75c0d7464af5afce641dba75383b2f3adf6a10b6094b files/glibc-2.4-fix.patch 452
 MD5 aea374917adc11a2d42b0b9d1bba3598 metadata.xml 402
 RMD160 3d4e0e7953d95f43de89f62eacb37969caa29336 metadata.xml 402
 SHA256 c713a207afd5d65ef21d1c1e5fd3b867ce063dd9e46fc53db0734ad19f59ffe7 metadata.xml 402
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEDhQn2+ySkm8kpY0RAvJRAJ4iFB2gIQdBZCj12fts9qDcY9IiigCaA5XF
-rbDrqPqXmbZqZIOn2oF0cq0=
-=nXig
------END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-10.2.10.ebuild b/dev-lang/erlang/erlang-10.2.10.ebuild
new file mode 100644
index 000000000000..1f09d69d838f
--- /dev/null
+++ b/dev-lang/erlang/erlang-10.2.10.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-10.2.10.ebuild,v 1.1 2006/04/10 20:42:54 mkennedy Exp $
+
+inherit eutils multilib flag-o-matic elisp-common versionator
+
+#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="R$(get_major_version)B-$(get_version_component_range 3)"
+# ATTN!! Take care when processing the C, etc version!
+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="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="doc emacs java odbc ssl tcltk"
+
+RDEPEND=">=dev-lang/perl-5.6.1
+	ssl? ( >=dev-libs/openssl-0.9.7d )
+	emacs? ( virtual/emacs )
+	java? ( >=virtual/jdk-1.2 )
+	odbc? ( dev-db/unixODBC )"
+DEPEND="${RDEPEND}
+	tcltk? ( dev-lang/tk )"
+
+S=${WORKDIR}/${MY_P}
+
+SITEFILE=50erlang-gentoo.el
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-10.2.7-export-TARGET.patch"
+	epatch "${FILESDIR}/10.2.7-manpage-emacs-gentoo.patch"
+	use odbc || sed -i 's: odbc : :' lib/Makefile
+	epatch "${DISTDIR}"/otp_src_${MY_PV}_epoll.patch
+
+	# Patch for glibc-2.4 first noted in Bug #128254 -- NOTE this is a
+	# compile time fix, runtime still requires testing, see
+	# http://www.erlang.org/ml-archive/erlang-questions/200601/msg00500.html
+	epatch "${FILESDIR}/glibc-2.4-fix.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/digest-erlang-10.2.10 b/dev-lang/erlang/files/digest-erlang-10.2.10
new file mode 100644
index 000000000000..016f5fc257f9
--- /dev/null
+++ b/dev-lang/erlang/files/digest-erlang-10.2.10
@@ -0,0 +1,12 @@
+MD5 d6e9655ff07af642025b0465c5e7e1a6 otp_doc_html_R10B-10.tar.gz 4655081
+RMD160 d11108d871ab7f164c7e4dd1000cd8cdca7cb64d otp_doc_html_R10B-10.tar.gz 4655081
+SHA256 2373d6935b44b64a137bf8ba198dca3fb782d0c072735b172ae4420c380a5d9c otp_doc_html_R10B-10.tar.gz 4655081
+MD5 207e00bcaf5a9428bd86e3973f9b699f otp_doc_man_R10B-10.tar.gz 594690
+RMD160 b56260b7349cd4751ca56ec15fdc5515041b130b otp_doc_man_R10B-10.tar.gz 594690
+SHA256 8ecfc9b627200f59c35591a743e03a587258ddcdd39052a0b2cb58b80f6fc20b otp_doc_man_R10B-10.tar.gz 594690
+MD5 c1405c885f07d661b7362b822d571586 otp_src_R10B-10.tar.gz 9445437
+RMD160 b0e24e89241a21d5f3304791b505ab133db8fca5 otp_src_R10B-10.tar.gz 9445437
+SHA256 bd87e1b09f1f3d694fc32ef4d27372e25c95ce35b383c7747ab40c27471c28ac otp_src_R10B-10.tar.gz 9445437
+MD5 280f7ff43d4651ff637216800e16e493 otp_src_R10B-10_epoll.patch 15359
+RMD160 40a1282c6223081b4d2d9c06b30bc16163aa495f otp_src_R10B-10_epoll.patch 15359
+SHA256 7b8bbad71649e9b00f9f8639b0fe06060428aa4015eb6164e78d18a0b2508a5b otp_src_R10B-10_epoll.patch 15359
diff --git a/dev-lang/erlang/files/glibc-2.4-fix.patch b/dev-lang/erlang/files/glibc-2.4-fix.patch
new file mode 100644
index 000000000000..f887b86717ef
--- /dev/null
+++ b/dev-lang/erlang/files/glibc-2.4-fix.patch
@@ -0,0 +1,11 @@
+--- otp_src_R10B-10/erts/emulator/hipe/hipe_x86_signal.c.orig	2006-03-31 14:49:28.000000000 +0200
++++ otp_src_R10B-10/erts/emulator/hipe/hipe_x86_signal.c	2006-03-31 14:49:42.000000000 +0200
+@@ -27,7 +27,7 @@
+ #include <stdlib.h>
+ #include "hipe_signal.h"
+ 
+-#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 3
++#if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 3
+ /* See comment below for glibc 2.2. */
+ #ifndef __USE_GNU
+ #define __USE_GNU		/* to un-hide RTLD_NEXT */