Version bump erlang to 14.2.4, fix bug 383697, remove blocker.

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

5 files changed, 199 insertions, 12 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index 1602da58726b..134dee83821a 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,11 @@
 # 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.211 2011/06/06 08:53:33 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.212 2011/11/30 15:50:14 djc Exp $
+
+*erlang-14.2.4 (30 Nov 2011)
+
+  30 Nov 2011; Dirkjan Ochtman <djc@gentoo.org> +erlang-14.2.4.ebuild:
+  Version bump to 14.2.4, fix bug 383697, remove blocker.
 
 *erlang-14.2.3 (06 Jun 2011)
 
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 5f87e08a61bd..211e6f2a5d4b 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
@@ -7,21 +7,25 @@ AUX erlang-14.2.2-interface.patch 288 RMD160 ca4d2c52f2c9f60421128e9f09a01774348
 DIST otp_doc_html_R13B04.tar.gz 27440785 RMD160 7257fad19ecfeee69b1c7021692374d1e29aba79 SHA1 dc0e68cb1dd6f45cbd5ea792260b16f91eaa0e2f SHA256 fdad0db55ab9339703e7cd61626b5cca95f187084d1dabf07ac97f528b4f47aa
 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_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_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
 EBUILD erlang-13.2.4.ebuild 5164 RMD160 2d746d7d8383a0504bd4f80a24505bb20e4cbeda SHA1 ecdd965ef4c747762671a4bb6f8b44aeb1b41193 SHA256 203e4238e06787b5e988366c56c763e3656d63eb44c52038ed6ff271dace9bd7
-EBUILD erlang-14.2.2-r1.ebuild 5346 RMD160 0a01df00e443c879a25be92c731d129d163d98e7 SHA1 e1a9c216f132f7f5396d99be022d4060e10eb440 SHA256 c49799468afcb519c35ded290c2d1d78cbde3c640e6ce3f4b7f8f3b9eba34361
-EBUILD erlang-14.2.3.ebuild 5293 RMD160 5238329306e44f652e7ce326bbe8ef6c5385758d SHA1 9cf38af9bf59879c3afbe159bf439a9b26145d23 SHA256 6802e03780939544a90d8963d2a15d7c72110048dd50dcbdbd2a875c58433b40
-MISC ChangeLog 33911 RMD160 0e604278a8ef3f03aa8b6f1ae02d8aac96ebb5a2 SHA1 2091ec7ada2ef32f5e5430b8fca5a72df398c613 SHA256 36a25994d60d9dc36b0191c5658c213a7bad6e3eeb8ef20cfccbbb1c3037e601
+EBUILD erlang-14.2.2-r1.ebuild 5298 RMD160 c893c48e54ec5bf0a6db1c3c970f8cf22b9dd3ed SHA1 4ba7c870eac7c637c0a7b761688f9f70d4798077 SHA256 5a0345300ab658ab748c15d3dfc3b3b8bb2d829b66e342edc45c7e7892c43018
+EBUILD erlang-14.2.3.ebuild 5245 RMD160 0cf81d007ca787481a42caa228b9c891531ba2d4 SHA1 369eff8d533be59d575d9dc399485302b05ae204 SHA256 4ee4c3fd0ca0cc04689cfd01ffb55c77bc5b877fe76dab54f1f2eae3c5485090
+EBUILD erlang-14.2.4.ebuild 5417 RMD160 14977e408f76406e4bc5dbd5e6f9062a7e1151a1 SHA1 aee6128fea0fb572431fc6b90f044219ab0cb631 SHA256 b680759a630a02f31f37f2e826a9663d16bbddbacd1dbd946889823f34d2f50a
+MISC ChangeLog 34071 RMD160 240523de24249198390b50fea817f22d6ff847e6 SHA1 989889778538376847426f5385d99fb2e5facf9f SHA256 e4fa91b73e3c7c08d3653eac3251f6224b70166eebb9956bd225c467465ac5f3
 MISC metadata.xml 744 RMD160 47d7adeeeb67a91bb6d124522946f4075021a2f3 SHA1 1bc2d0cd3e1c8f4f10290087ab7e1ace28d3002b SHA256 81b659111fcfcd664dc7c096a52fd295b6010663eb4de875d863ed6e40dbae82
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3slZoACgkQxeMuLWsGW/vYiACeJOyEvJdhuqoUEF+7cALehzii
-eFAAoJ5C968kNiPxWmy8zqdD5Q0xxbJd
-=dcMQ
+iEYEAREKAAYFAk7WUMAACgkQxeMuLWsGW/vhSgCghd5nvM6lvLN3p66fk/kConW1
+9CkAnR//eBSEZPKX9BsXzvOEVCr3c3/w
+=8qHI
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-14.2.2-r1.ebuild b/dev-lang/erlang/erlang-14.2.2-r1.ebuild
index 586d1ef69a32..e94ae72b5afb 100644
--- a/dev-lang/erlang/erlang-14.2.2-r1.ebuild
+++ b/dev-lang/erlang/erlang-14.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2011/05/04 08:11:31 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-14.2.2-r1.ebuild,v 1.2 2011/11/30 15:50:14 djc Exp $
 
 EAPI=3
 WX_GTK_VER="2.8"
@@ -33,7 +33,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebs
 IUSE="doc emacs halfword 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 )
diff --git a/dev-lang/erlang/erlang-14.2.3.ebuild b/dev-lang/erlang/erlang-14.2.3.ebuild
index 799c57c4972f..f8d7ff2c2a8b 100644
--- a/dev-lang/erlang/erlang-14.2.3.ebuild
+++ b/dev-lang/erlang/erlang-14.2.3.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.1 2011/06/06 08:53:33 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-14.2.3.ebuild,v 1.2 2011/11/30 15:50:14 djc Exp $
 
 EAPI=3
 WX_GTK_VER="2.8"
@@ -33,7 +33,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebs
 IUSE="doc emacs halfword 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 )
diff --git a/dev-lang/erlang/erlang-14.2.4.ebuild b/dev-lang/erlang/erlang-14.2.4.ebuild
new file mode 100644
index 000000000000..a535bcc4600c
--- /dev/null
+++ b/dev-lang/erlang/erlang-14.2.4.ebuild
@@ -0,0 +1,180 @@
+# 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.4.ebuild,v 1.1 2011/11/30 15:50:14 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)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 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) \
+		|| 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
+}