Version bump erlang to 14.2.2.

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

4 files changed, 203 insertions, 6 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index c66099289529..d7c2d06ec6b3 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/erlang
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.207 2011/01/18 15:44:20 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.208 2011/04/29 18:35:24 djc Exp $
+
+*erlang-14.2.2 (29 Apr 2011)
+
+  29 Apr 2011; Dirkjan Ochtman <djc@gentoo.org> +erlang-14.2.2.ebuild,
+  +files/erlang-14.2.2-interface.patch:
+  Version bump to 14B02.
 
   18 Jan 2011; Christian Faulhammer <fauli@gentoo.org>
   files/erlang-14.2.1-fortify.patch:
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 1857fa825883..964783864d97 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -5,25 +5,30 @@ AUX 50erlang-gentoo.el 134 RMD160 a453ad18f47d20e5ea5ecd1f4e4054d00eab5c35 SHA1
 AUX epmd.init 515 RMD160 7f5927b020809ec9013a6f0e997fc0232489162a SHA1 dd32584a9e4971fac65881ce2e215afb570a5292 SHA256 d60df142ee0e47e9d55f543effe99b057dbf763586cadffb05a82ce74edeb494
 AUX erlang-14.2-respect_LDFLAGS-wx.patch 505 RMD160 4bcb17f832299eb8489640dc0f16f4596a94121a SHA1 de26cc5b539ef8317b1907a8dc75dda70c484a5d SHA256 1564956d52671c908dd08842ba6fc8bfdc572ca57715355dccd6a1def346f7cd
 AUX erlang-14.2.1-fortify.patch 1186 RMD160 d7cd8531ff61263c37316b65ceca4858f4de06d6 SHA1 f2ea336bd49a5011fb1765b86b25898d60f0e326 SHA256 76fea5984a2e0b9fcfb8f0786bac7e5d5e2423b3a00068b0af7e49df3131c7c7
+AUX erlang-14.2.2-interface.patch 288 RMD160 ca4d2c52f2c9f60421128e9f09a01774348f36ba SHA1 b9516bf5dcbeed6015feb65a32c543c11eb2b517 SHA256 05caa069eef56fa6cab7d076c8b5bba05f9b893ca3475bb9d9a4f6d80b722c32
 DIST otp_doc_html_R13B04.tar.gz 27440785 RMD160 7257fad19ecfeee69b1c7021692374d1e29aba79 SHA1 dc0e68cb1dd6f45cbd5ea792260b16f91eaa0e2f SHA256 fdad0db55ab9339703e7cd61626b5cca95f187084d1dabf07ac97f528b4f47aa
 DIST otp_doc_html_R14B.tar.gz 27735095 RMD160 a7a100971543cc238dfeaf010028dea7261673f5 SHA1 d752b4bdc89d64bffde41e64b118eb7c0a8f7c72 SHA256 0189a784a4ea0c192c857835b20fa97a0c9f85054ae5b9868061574f329842a5
 DIST otp_doc_html_R14B01.tar.gz 28332965 RMD160 e5f29f31ce2614e9363bdb74b9a9527e1b734701 SHA1 db406964187a12e9ba1b7d49ec6e092ab1f4dbb8 SHA256 6c16435fb589c4eb777af273f3b789844764331e4bf72fe727612da59ac2c97b
+DIST otp_doc_html_R14B02.tar.gz 28435253 RMD160 ae645dd9c6181f4da3b529a97f0f0166fb864647 SHA1 bccbad3fcc70ca8d4851c760c4b2234a4c719e67 SHA256 36d1052dbf1ab7d7858e270ad9ab5b5ad2988849e4629e69ae141a6f6d69f455
 DIST otp_doc_man_R13B04.tar.gz 1033584 RMD160 3046e54a71bf6e114c9208f263caef831782d090 SHA1 660e52302d270138f8e9f2f2b6a562026998012c SHA256 3646198b64bbea0f3760987d20d3392b0b5b2955394a917b92a2c6664a310dd6
 DIST otp_doc_man_R14B.tar.gz 1067515 RMD160 4c11c653e231edbab0f3f8a7b7fdc275911ed845 SHA1 92f9ae963cfa40c1d49b3e928c225cb8362b53c3 SHA256 4c43ef799c29ef488959ffdfb8a8fc1d1e7756c2c7dccb4cc81061de5ac40c8a
 DIST otp_doc_man_R14B01.tar.gz 1075792 RMD160 5762acf3d72d8e1cc6de8bef30759fa5b06f52c2 SHA1 5428f6ec7cf6d5ef6b09de2312ef948f3f1c5f28 SHA256 167dab262d9ed568e363b611764d0e3f8f3db4793d731af0063a54cb9b50f9be
+DIST otp_doc_man_R14B02.tar.gz 1080313 RMD160 8a8429c12cf15095916ed5e67df562e6faa1f5d3 SHA1 d4533603b2406ad125ac0dc5e88fb3cdf2a35e34 SHA256 d254dea54fa7af38df8ac52889bb080548ea2335257eaf7dfc628c73b63b57ff
 DIST otp_src_R13B04.tar.gz 59060560 RMD160 5546431e710814da2089d70d5d02c658a1a2f79b SHA1 fe785833a8029cbb3aee188bdb417f4da33fbd06 SHA256 e2694383b3857f5edfc242b8c3acbfba4683e448387fa124d8e587cba234af43
 DIST otp_src_R14B.tar.gz 59800980 RMD160 69578a2019fcaab4e7c11f2d1d2d5eef21d5c5fa SHA1 811c17346415159644f16387f1267004a632c452 SHA256 b35af03c69c40c0e4758ee011f71e28ce92783368afec764ce46e6e54cb05d9f
 DIST otp_src_R14B01.tar.gz 64846537 RMD160 d91401fb100c18eb79899c9292e05574a51e88c8 SHA1 f0e0529ed73587c2c4aaeb3f3a01555bd6cfe05c SHA256 88349fa9f112e21b09726434ee5f4013d3ed3fb1d0f2623f22689dc20886f2f8
+DIST otp_src_R14B02.tar.gz 66133818 RMD160 87e3715decd883ec082ac20faac015bd96a9976c SHA1 3b117f93a4e28c376278bbcca0ede0f936952c88 SHA256 849d050b59821e9f2831fee2e3267d84b410eee860a55f6fc9320cc00b5205bd
 EBUILD erlang-13.2.4.ebuild 5164 RMD160 2d746d7d8383a0504bd4f80a24505bb20e4cbeda SHA1 ecdd965ef4c747762671a4bb6f8b44aeb1b41193 SHA256 203e4238e06787b5e988366c56c763e3656d63eb44c52038ed6ff271dace9bd7
 EBUILD erlang-14.2-r1.ebuild 5384 RMD160 67956026df6643572045a6262a62320113907988 SHA1 c24cb867ed5d51c3562934b2f58a1638555fa664 SHA256 282073dcceff8a87045d2f0ac5e3c626dcbfecbb5cef2e23395616c49b45291f
 EBUILD erlang-14.2.1.ebuild 5280 RMD160 b59d14772a32515099e625718be32c081ebb79e1 SHA1 67c6f9175b9c89dc294753801b2d7373eb6a4304 SHA256 c5e7b4ce23d33604c44aa974d036026fe2232dcf6124871a463fc8123077f288
+EBUILD erlang-14.2.2.ebuild 5274 RMD160 5cc16efd1d2ea0dff6572f7565ddd73b8031ce7c SHA1 0b642b781ebe79ff34489ddd60c6a5089723f9fa SHA256 6e41887cb775f690c625daea8ef9539a67a37c9b48fcb40cfb272383de7d8a28
 EBUILD erlang-14.2.ebuild 5509 RMD160 2062caa472f9d11fc2959fda1978ad0d389c9e4f SHA1 716db64602f732fa7c3b3e409f3f75cb4b4fa967 SHA256 a3b644ca2c4d937bae04410dea074ecb1a1276c0af176d413fd57621ec97f837
-MISC ChangeLog 33280 RMD160 a1c9cf6d416bfd0ac9940939adfef4a02b3c3cc9 SHA1 7bc3b940fcf37a8100debb42c08649b7dc8d67ca SHA256 f9d83ae53dbfb361ee9e5957a7c09edea56903b7a73ba86376a946ca27a0b4a8
+MISC ChangeLog 33445 RMD160 25378b65901676c8bdec235b68ea8ef5a5f98aae SHA1 69e4df3b788a3bd1d48d774b3d611ba5e1077ba1 SHA256 81ba77af4f0882afd0a767ef7c500fa836d4509d511f8fbd9ffddb1a9ed7c1b5
 MISC metadata.xml 686 RMD160 34c15154f1852e2fbcad7bcdd26173d7ef747f8d SHA1 68d80eb2b99abae9bbfb8232aff5eebc52b0bfd4 SHA256 1e1adf26a34eb6cd5b00bed792f786e22157787beeea738a4a5db96fb2fe7b95
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk01tmsACgkQNQqtfCuFneMvxwCfQSIIBPGDnf2SJX91eN+EWiJ9
-0wgAnjzDclW4qZTwpmFFUtaca8PNAvLx
-=c8vH
+iEYEARECAAYFAk27BPgACgkQxeMuLWsGW/so0QCfbsP6qM6NDB4WdGuHjLNQD8gF
+DecAn11GrUD//dH/RpL5/cyBQZgw0xYk
+=BZYG
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-14.2.2.ebuild b/dev-lang/erlang/erlang-14.2.2.ebuild
new file mode 100644
index 000000000000..709b3dbffcf7
--- /dev/null
+++ b/dev-lang/erlang/erlang-14.2.2.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-14.2.2.ebuild,v 1.1 2011/04/29 18:35:24 djc Exp $
+
+EAPI=3
+WX_GTK_VER="2.8"
+
+inherit elisp-common eutils multilib versionator wxwidgets
+
+# NOTE: If you need symlinks for binaries please tell maintainers or
+# open up a bug to let it be created.
+
+# 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.
+ERL_VER=($(get_version_components))
+MY_PV="R$(get_major_version)B0${ERL_VER[2]}"
+
+# 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
+	http://erlang.org/download/otp_doc_man_${MY_PV}.tar.gz
+	doc? ( http://erlang.org/download/otp_doc_html_${MY_PV}.tar.gz )"
+
+LICENSE="EPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+IUSE="doc emacs hipe java kpoll odbc smp sctp ssl tk wxwidgets"
+
+RDEPEND=">=dev-lang/perl-5.6.1
+	!<app-accessibility/speech-dispatcher-0.7.1-r1
+	ssl? ( >=dev-libs/openssl-0.9.7d )
+	emacs? ( virtual/emacs )
+	java? ( >=virtual/jdk-1.2 )
+	odbc? ( dev-db/unixODBC )"
+DEPEND="${RDEPEND}
+	wxwidgets? ( x11-libs/wxGTK:2.8[opengl] )
+	sctp? ( net-misc/lksctp-tools )
+	tk? ( dev-lang/tk )"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE=50${PN}-gentoo.el
+
+pkg_setup() {
+	use wxwidgets && wxwidgets_pkg_setup
+}
+
+src_prepare() {
+	use odbc || sed -i 's: odbc : :' lib/Makefile
+
+	# bug 263129, don't ignore LDFLAGS, reported upstream
+	sed -e 's:LDFLAGS = \$(DED_LDFLAGS):LDFLAGS += \$(DED_LDFLAGS):' -i "${S}"/lib/megaco/src/flex/Makefile.in || die
+
+	if ! use wxwidgets; then
+		sed -i 's: wx : :' lib/Makefile
+		rm -rf lib/wx
+	fi
+
+	# Nasty workaround, reported upstream
+	cp "${S}"/lib/configure.in.src "${S}"/lib/configure.in || die
+	epatch "${FILESDIR}/${P}-interface.patch" || die
+
+	# prevent configure from injecting -m32 by default on Darwin, bug #334155
+	# Nasty hack
+	sed -i -e 's/Darwin-i386/Darwin-NO/' configure.in || die
+	sed -i -e '/\<\(LD\|C\)FLAGS="-m32/s/-m32//' erts/configure.in || die
+}
+
+src_configure() {
+	use java || export JAVAC=false
+
+	econf \
+		--enable-threads \
+		--enable-shared-zlib \ \
+		$(use_enable sctp) \
+		$(use_enable hipe) \
+		$(use_with ssl ssl "${EPREFIX}"/usr) \
+		$(use_enable ssl dynamic-ssl-lib) \
+		$(use_enable kpoll kernel-poll) \
+		$(use_enable smp smp-support) \
+		|| die
+}
+
+src_compile() {
+	use java || export JAVAC=false
+	emake -j1 || die
+
+	if use emacs ; then
+		pushd lib/tools/emacs
+		elisp-compile *.el || die
+		popd
+	fi
+}
+
+extract_version() {
+	sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
+}
+
+src_install() {
+	local ERL_LIBDIR=/usr/$(get_libdir)/erlang
+	local ERL_INTERFACE_VER=$(extract_version lib/erl_interface EI_VSN)
+	local ERL_ERTS_VER=$(extract_version erts VSN)
+
+	emake -j1 INSTALL_PREFIX="${D}" install || die
+	dodoc AUTHORS README.md
+
+	dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
+	dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
+	dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
+	dosym \
+		"${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
+		/usr/bin/erl_call
+	dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
+	use smp && dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
+
+	## Remove ${D} from the following files
+	sed -e "s:${D}::g" -i "${ED}${ERL_LIBDIR}/bin/erl" || die
+	sed -e "s:${D}::g" -i "${ED}${ERL_LIBDIR}/bin/start" || die
+	grep -rle "${D}" "${ED}/${ERL_LIBDIR}/erts-${ERL_ERTS_VER}" | xargs sed -i -e "s:${D}::g"
+
+	## Clean up the no longer needed files
+	rm "${ED}/${ERL_LIBDIR}/Install"||die
+
+	for i in "${WORKDIR}"/man/man* ; do
+		dodir "${ERL_LIBDIR}/${i##${WORKDIR}}"
+	done
+	for file in "${WORKDIR}"/man/man*/*.[1-9]; do
+			# doman sucks so we can't use it
+		cp ${file} "${ED}/${ERL_LIBDIR}"/man/man${file##*.}/
+	done
+	# extend MANPATH, so the normal man command can find it
+	# see bug 189639
+	dodir /etc/env.d/
+	echo "MANPATH=\"${EPREFIX}${ERL_LIBDIR}/man\"" > "${ED}/etc/env.d/90erlang"
+
+	if use doc ; then
+		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}
+		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
+			"${FILESDIR}"/${SITEFILE} > "${T}"/${SITEFILE}
+		elisp-site-file-install "${T}"/${SITEFILE}
+		popd
+	fi
+
+	# prepare erl for SMP, fixes bug #188112
+	use smp && sed -i -e 's:\(exec.*erlexec\):\1 -smp:' \
+		"${ED}/${ERL_LIBDIR}/bin/erl"
+
+	newinitd "${FILESDIR}"/epmd.init epmd || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	elog
+	elog "If you need a symlink to one of Erlang's binaries,"
+	elog "please open a bug on http://bugs.gentoo.org/"
+	elog
+	elog "Gentoo's versioning scheme differs from the author's, so please refer to this version as ${MY_PV}"
+	elog
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/erlang/files/erlang-14.2.2-interface.patch b/dev-lang/erlang/files/erlang-14.2.2-interface.patch
new file mode 100644
index 000000000000..a3ede6a04fc6
--- /dev/null
+++ b/dev-lang/erlang/files/erlang-14.2.2-interface.patch
@@ -0,0 +1,11 @@
+https://github.com/erlang/otp/commit/c302809fbe5b3873d5c459da11ed49ea73a6739f
+--- lib/erl_interface/src/legacy/erl_timeout.c
++++ lib/erl_interface/src/legacy/erl_timeout.c
+@@ -43,6 +43,7 @@
+ # endif
+ #endif
+
++#include "erl_interface.h"
+ #include "erl_timeout.h"
+ 
+ typedef struct jmp_s {