Version bump erlang to 15.2 (bug 399155) and include compat-ethread USE flag (bug 392669).

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

4 files changed, 202 insertions, 9 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index ed5a8fa6ba99..64486afd6ef8 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,13 @@
 # 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.213 2011/12/07 17:44:39 ulm Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.214 2012/03/01 10:03:53 djc Exp $
+
+*erlang-15.2 (01 Mar 2012)
+
+  01 Mar 2012; Dirkjan Ochtman <djc@gentoo.org> +erlang-15.2.ebuild,
+  metadata.xml:
+  Version bump to 15.2 (bug 399155) and include compat-ethread USE flag (bug
+  392669).
 
   07 Dec 2011; Ulrich Mueller <ulm@gentoo.org> erlang-13.2.4.ebuild,
   erlang-14.2.2-r1.ebuild, erlang-14.2.3.ebuild, erlang-14.2.4.ebuild:
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 9aee650328d9..137af6c1bcc5 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 50erlang-gentoo.el 134 RMD160 a453ad18f47d20e5ea5ecd1f4e4054d00eab5c35 SHA1 7c17979f533654ef05bbfcc8ae30554e7843923b SHA256 97e1da82cae31a554134d7370739520e4c67b2544e5a13f887651a62e710b4d4
 AUX epmd.init 515 RMD160 7f5927b020809ec9013a6f0e997fc0232489162a SHA1 dd32584a9e4971fac65881ce2e215afb570a5292 SHA256 d60df142ee0e47e9d55f543effe99b057dbf763586cadffb05a82ce74edeb494
@@ -8,24 +8,28 @@ DIST otp_doc_html_R13B04.tar.gz 27440785 RMD160 7257fad19ecfeee69b1c7021692374d1
 DIST otp_doc_html_R14B02.tar.gz 28435253 RMD160 ae645dd9c6181f4da3b529a97f0f0166fb864647 SHA1 bccbad3fcc70ca8d4851c760c4b2234a4c719e67 SHA256 36d1052dbf1ab7d7858e270ad9ab5b5ad2988849e4629e69ae141a6f6d69f455
 DIST otp_doc_html_R14B03.tar.gz 28691748 RMD160 7be3c667de0b5e42f0d56eeadd155bcf977488cf SHA1 c662e3b4387772c916f2f8c3e9dbceb275207d8c SHA256 d05031cc9f3e3af63b891737f9f203c7ab862adf490d67f7d7e3a9d245667958
 DIST otp_doc_html_R14B04.tar.gz 28816088 RMD160 0e44a933ae35fe95d1ecd9958c9e86ce398e259f SHA1 86f76adee9bf953e5578d7998fda9e7dfc0d43f5 SHA256 3b066d23d82667e2d0477856b22ea94262d65baf7366babe1c10d8bddc28ab5a
+DIST otp_doc_html_R15B.tar.gz 28996680 RMD160 79606286c3708a56dbc9e54efb60f184fe36c809 SHA1 a163b940fa6e4c60f4c9cfe47d993977660e7ed1 SHA256 40504ad983b450a2c6f7611b3be88ebd6349079764520cca050e9c8f6e79dc93
 DIST otp_doc_man_R13B04.tar.gz 1033584 RMD160 3046e54a71bf6e114c9208f263caef831782d090 SHA1 660e52302d270138f8e9f2f2b6a562026998012c SHA256 3646198b64bbea0f3760987d20d3392b0b5b2955394a917b92a2c6664a310dd6
 DIST otp_doc_man_R14B02.tar.gz 1080313 RMD160 8a8429c12cf15095916ed5e67df562e6faa1f5d3 SHA1 d4533603b2406ad125ac0dc5e88fb3cdf2a35e34 SHA256 d254dea54fa7af38df8ac52889bb080548ea2335257eaf7dfc628c73b63b57ff
 DIST otp_doc_man_R14B03.tar.gz 1116113 RMD160 f6e30764fe122cc0e571f8338f7c3eb3ff3bd893 SHA1 6bd773d2eee069762ba344dc8825ac52722398e1 SHA256 78882849e69ab7449a75accbdaa85015209114a93e60cb6781e03f2af592a4e5
 DIST otp_doc_man_R14B04.tar.gz 1117663 RMD160 420d89fd32f2851253a5cef124ced50851dc2bb0 SHA1 41f4ea59c9622e39b30882e173983252b6faca81 SHA256 8514511e8a8ac3f3f67db06f333548edf283d9a8afcbc9e9eeca7b1af9a107da
+DIST otp_doc_man_R15B.tar.gz 1122044 RMD160 ba9352d78462a3ec3461ea955ae46b96cad95400 SHA1 4fb7b64ce06a5209a420914962784ca4a38d2113 SHA256 1839cc4cab3120401989e0e1d7ad6872a59e2fd9d3cd82f05ca8c4ebef18eb6b
 DIST otp_src_R13B04.tar.gz 59060560 RMD160 5546431e710814da2089d70d5d02c658a1a2f79b SHA1 fe785833a8029cbb3aee188bdb417f4da33fbd06 SHA256 e2694383b3857f5edfc242b8c3acbfba4683e448387fa124d8e587cba234af43
 DIST otp_src_R14B02.tar.gz 66133818 RMD160 87e3715decd883ec082ac20faac015bd96a9976c SHA1 3b117f93a4e28c376278bbcca0ede0f936952c88 SHA256 849d050b59821e9f2831fee2e3267d84b410eee860a55f6fc9320cc00b5205bd
 DIST otp_src_R14B03.tar.gz 70620709 RMD160 468736a53b2e74ab0cd0f706751b5b03cbfa87cd SHA1 109812114ef7c2855ade14b90813a870c89f6d43 SHA256 ae0d7c90e860a8be27248114d5c6441a316d44f7e31493d4bae8e7db0cae651d
 DIST otp_src_R14B04.tar.gz 70773703 RMD160 1619a05e7d3df9cb5f9c41e32d9cfb0d8b4edd56 SHA1 e469c20c8be6c51bb584a2dec235c4714a60b4db SHA256 099b35910e635b9148ac90f70fd9dd592920ed02406eb26c349efd8d1e959b6e
+DIST otp_src_R15B.tar.gz 74100507 RMD160 022ed91978e85f5a446a90825aa686dd608061a9 SHA1 8177a5d40e4a3d7eb8dc7f7898241a034f35ea72 SHA256 5bc34fc34fc890f84bae7ff1f7c81fbec2c9aa28a0ef51a57d7a8192204d8aa2
 EBUILD erlang-13.2.4.ebuild 5166 RMD160 a7fc56ff7fda05ba9e9984b9e21ac692845e3fdf SHA1 30c7c49873f07f9451dd698f3e7e6a3571e9f6e4 SHA256 101dfc49700c02666afef4bbc48fc7dddb175099eaedc2e4daecdfd814c42b2d
 EBUILD erlang-14.2.2-r1.ebuild 5304 RMD160 555959af73e444d55f1033a1cd54a4c063559888 SHA1 37bccfc0b73623eddf93bda3f6a7533dcbba7334 SHA256 edd2bec7e545606647b2d96c04b09cd529f75984f93877509fd3a2dd4b5098e9
 EBUILD erlang-14.2.3.ebuild 5251 RMD160 69b041a20e4f7bd3bc8bbe3e07fb112556ab6d9c SHA1 dba4a1a74a6d1a52447badfacfacb811fe64ecc0 SHA256 431eeab01f616868c5e319c7759e74583df265244921ed116b844d6d2e338289
 EBUILD erlang-14.2.4.ebuild 5423 RMD160 3901359b18658cec5366c6cdf978958ad5568737 SHA1 7338235ca60f8022d8298fc35c10ad67cc58add6 SHA256 90f1cbf7efff54a0d3fb5e2d83b1c7a7632fe89ba39a3a5abae567a6ac614e1f
-MISC ChangeLog 34360 RMD160 9185b8411b54e5c2235b1793d6c0e798b101f782 SHA1 4ed5a61ea99864803a6d4fd9bc1960461ca9ea16 SHA256 7df981fea6dfc9f09f3c74d4d8f9eb8b6736330041cf9cce2009b85b4f74a558
-MISC metadata.xml 744 RMD160 47d7adeeeb67a91bb6d124522946f4075021a2f3 SHA1 1bc2d0cd3e1c8f4f10290087ab7e1ace28d3002b SHA256 81b659111fcfcd664dc7c096a52fd295b6010663eb4de875d863ed6e40dbae82
+EBUILD erlang-15.2.ebuild 5515 RMD160 70ec519b1695923b43f03921fb5f99873cba66a8 SHA1 32a011cf0f39c33d859eba52eb1e0b2322b9e3cf SHA256 c54698ee1e8e920cd574cd428ea7cfbdc1873997d2be7011aa09d7045f14ee31
+MISC ChangeLog 34562 RMD160 7b3baa80379f3afc35193495286a84ca13b76438 SHA1 dd7a84acd1aded4e7c4f783fa706094c1f47ed49 SHA256 2837aebae43e1dff762953d64abb42caf8d3817bc12d03d4a1d7702e67e75b16
+MISC metadata.xml 852 RMD160 23b6c329ba522bbe8ff4198713967d5331fbd952 SHA1 3f79d6a608037384d2b28dbcaeef49c9bd0d4bc2 SHA256 5782640d216cf818d9088bd5eb963002210d83e9eb47e98edfd3844fe579dc27
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7fqE8ACgkQOeoy/oIi7uxF7gCdEeLq/7ZeouNAGy+xVfPSSNXo
-GCQAoMCaQKCVFZpOozpgGDtUivuz1wtW
-=WMTT
+iEYEAREKAAYFAk9PSZUACgkQxeMuLWsGW/urLQCgvqKfeScZIRUgV2MtyOgM2FjX
+zNIAoL7nKTTT61PcwtiVwCbcSN1Toar3
+=59Co
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-15.2.ebuild b/dev-lang/erlang/erlang-15.2.ebuild
new file mode 100644
index 000000000000..1a4136761bba
--- /dev/null
+++ b/dev-lang/erlang/erlang-15.2.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-15.2.ebuild,v 1.1 2012/03/01 10:03:53 djc Exp $
+
+EAPI=3
+WX_GTK_VER="2.8"
+
+inherit elisp-common eutils java-pkg-opt-2 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)B${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="ErlPL-1.1"
+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="compat-ethread doc emacs halfword hipe java kpoll odbc smp sctp ssl tk wxwidgets"
+
+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}
+	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
+	if use halfword ; then
+		use amd64 || die "halfword support is limited to amd64"
+	fi
+}
+
+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
+
+	# 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
+
+	# bug 383697
+	sed -i '1i#define OF(x) x' erts/emulator/drivers/common/gzio.c || die
+}
+
+src_configure() {
+	use java || export JAVAC=false
+
+	econf \
+		--enable-threads \
+		--enable-shared-zlib \ \
+		$(use_enable sctp) \
+		$(use_enable halfword halfword-emulator) \
+		$(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) \
+		$(use compat-ethread && echo "--enable-ethread-pre-pentium4-compatibility") \
+		|| 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/metadata.xml b/dev-lang/erlang/metadata.xml
index 508db6669e95..b78c5d38c90e 100644
--- a/dev-lang/erlang/metadata.xml
+++ b/dev-lang/erlang/metadata.xml
@@ -11,6 +11,7 @@
     <flag name="halfword">Enable halfword emulator</flag>
     <flag name="kpoll">Enable kernel polling support</flag>
     <flag name="sctp">Support for Stream Control Transmission Protocol</flag>
+    <flag name="compat-ethread">Enable compatibility with pre-pentium 4 CPUs in the ethread library.</flag>
   </use>
 <longdescription>
 Erlang is a programming language designed at the Ericsson