Version bump erlang to 16.2 (R16B02).

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x30380381

4 files changed, 213 insertions, 6 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index 1fac309ea308..dd879635b5ea 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/erlang
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.243 2013/09/08 11:55:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.244 2013/11/04 15:55:58 djc Exp $
+
+*erlang-16.2 (04 Nov 2013)
+
+  04 Nov 2013; Dirkjan Ochtman <djc@gentoo.org> +erlang-16.2.ebuild,
+  +files/16.2-tinfo.patch:
+  Version bump erlang to 16.2 (R16B02).
 
 *erlang-16.1-r1 (08 Sep 2013)
 
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index a00e1d399572..8354315fa363 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 16.2-tinfo.patch 458 SHA256 f5a873b982d32afccbd3a5166da188e0d74e710b3db53809ef5611b78e7169e5 SHA512 782a00e59abf36e2beaa7ae794ed516dfc6e398500efc1ac54598c093e61c97e7215a2a025f6cf6a99aab964ff0077b2c68e046ed8f4e2ae6b379fbb79948cca WHIRLPOOL 5b97d005bdfc4ac549e1f4de8616d12fad54d94370c3d67256dc1973ebedd6fb1b55cf9c0f8ec763adf4be8ba4847b3d1515c99b60e1667c35395d9daf388fee
 AUX 50erlang-gentoo.el 134 SHA256 97e1da82cae31a554134d7370739520e4c67b2544e5a13f887651a62e710b4d4 SHA512 7a862e0ef1e96e88a484e80aeb92eb4465c7e8661efb0291c28abc13225eb3aa69442fe29417f5ad0d264e54399d645d9cd4713bc9869b48e87a91e50b9b2473 WHIRLPOOL 6080f0f76c90f2e5f4577e8a6fc6dd046fc671078eda215c5bd33138aad61c2f2dfc585372966b65fcca24a46df0921a3fd2c4af02c68ef02f2fff443336c702
 AUX epmd.init 509 SHA256 110e6616b2978e74a55a76e119d3e16ac313b4b1b780abec6422f2dd924baa87 SHA512 e9e14f50ffc197f67706e9f419c2b7a7821d42b4d992fcd4b72fdd42a29983a84efaa3afb02a8758a871da6fd11c08e720ec416cc21b29a852d1dd9fc162ba42 WHIRLPOOL 7b9dd42fc706e7dddc98221c08e68759ed0d657030a04e6063131220dc4d6bfbc610a9e574ff5e62b79bb20d601febae4365ee960c316031986cc9a35e67843f
 AUX epmd.service 138 SHA256 689a50cfe05cf644f62b2308920f8ed7f602e1de94d53a67f5fd37eb0249ef17 SHA512 405740f8f9cd55d4ecd7420748399ab3f374b7cb09e53605f44ba49d0af86b70e4a1baf1fde05a703fb90c8a83dbcdd5cfbbf09185e9d7b58ff9612aefc2dd28 WHIRLPOOL 7d4eb5c5290c8026bdc915210b2273cffd429ea1162cc0ad77f67661a2a660794b9518290c2437cb999abef8051275d6fd30b3dae8b98cf52c65f5c210d3c61b
@@ -16,13 +17,24 @@ DIST otp_src_R16B01.tar.gz 65813898 SHA256 da388bc07b8ebdd008f5bb6c3d2c280e358bd
 EBUILD erlang-15.2.3.1.ebuild 5453 SHA256 cb8595ac6c0173e27b7293cbf6438f59e8ffb50e1c9e938275731f775f477fa4 SHA512 c2d8faec99021a2b57ca14ab694301dbe89ccbc394086cdcf2e529653d3545a8c6d1d72ae55e5e7421ae05f6fe2f810d89366dca80d932eba59cfbdb2d48d939 WHIRLPOOL 76562a411d37fb57633242f1f459510a91785d093453728a6d757a7ef467cc68e69654c8d5678a021e4bc34e4e93384a8ff9eafb3a52bdc4151c7a0f7d3dd8e3
 EBUILD erlang-16.1-r1.ebuild 5427 SHA256 84c304a433264a667c881109019461a8e5f40c010691d1bc63b6a051fa5690a1 SHA512 cab3213e4efe2c3370c4b34e1c23e41f89843a43b9ec4b38433a2261c6c93972e393ac175a92d687e85560cfb1658885c4ac2b008b763b033aff116e1f0ea81a WHIRLPOOL 69fbdeadb74c955a698e8509510bd3957fd60cb871e566b99808548b9ac62898420b6ee0989bd175f3a557f9a9d3e167d92435144a52a37a2127ff4f67f8783b
 EBUILD erlang-16.1.ebuild 5440 SHA256 a9632b10492adda9452d92668b5057f7771cdd63a1bd68702d1dfee17d9010ec SHA512 3c41879d80f7627496841fad17b3138a37a2b1f7603942af2f1c5648590b0e29c792975ea9f40772c950f8458c64d0f78ae45496856573d4c6ce5571d6ccee1d WHIRLPOOL 6c2c36557176c0b9a90fe03bd510a544e17f66026dbcdd9b38323c35e7c96b200df6e08c0107e1147e1b746f296560e364fae7d1fc5b7050800050cc405d856b
+EBUILD erlang-16.2.ebuild 5497 SHA256 a3df0fec365eebda7301b9ac31e5b2b7b6021440858838cad6fd7b6daf4c5f8f SHA512 997668e6094e376c7fc7f56f3664de4c4c9105c8a92135adeedfd3041c9aa1ddf023cda673b7a4945c15805d2fad05b80c13d097c3ce28fee96c2006953bad6e WHIRLPOOL be85a80dd12eca3ccbe8efe8565a6dc9f2ea3628e3e96e25263a818d089966ecfc5b5aa96477212fd8f0b68ecc03f091e65c1666d48f3a7eeb1fb789197e5ce2
 EBUILD erlang-16.ebuild 5361 SHA256 548dd3adc14b755a9ebfdaab874a09baa0bcd3b8efcedfcfaac96e89c6fc97b5 SHA512 1aa018fa55035d1f7e0e4ebab8ff2b74aade7f55385a12f2b60c8da8769808da07c08cc9fab0b132e8f66be09b44d6963495331083775922171cda7c1fd2d0c1 WHIRLPOOL 28d8fed55e4921d72e38f5b566feb2b74837c203b2b4f93c1b93af171c67edcc74e0d344c59ce06b099818603faf6960bb431196b5ee3c51a4121c42ba0e1f7c
-MISC ChangeLog 38185 SHA256 b353f330454eeabd2d557989cd11ee4b3da74657b2f19522472bd81fbb677ca2 SHA512 6e63d5167146039f4a8ab1b184c033d9fabb19c40eebe3ae2042b7cfba83921d6ae19bc1104f35b95256b4aad1cecf1833dc4359df7ec9be88e112521f07c769 WHIRLPOOL 7ce537cf33d85b917bc865ca8fb8310549c1b48ac91626d59e1e6ae8c79ff75791ca04da3b23e1aea6c13581aadf7cd75fae81b9aed118186db277b6a013aea3
+MISC ChangeLog 38348 SHA256 297edc9d9fd8f1b3721f69be10f353261af7c519ff190673c7e401662128bc43 SHA512 e1ccdc845ce39b2987ab6c8310c2c18954be5e45e44c0185785cd28cdc566fe78161e7b1169bb79c58419c4a33a5e45fa055fff3420101dc71e1460e163d071e WHIRLPOOL 79e628d62f83ccbabb1c79a14127110cf7fad2eac73b5d9ce886258423efcd21e937e38105e24a2dfcf3ed4adb06ce853279b9040f3c56bdb9c66e83d9e2893b
 MISC metadata.xml 852 SHA256 5782640d216cf818d9088bd5eb963002210d83e9eb47e98edfd3844fe579dc27 SHA512 1b22c6d550e7ca634694408f000bd99827aa86037db59b1bb3ca7a2b4259c38d69caac14b0a0db6611f7888dfcdc7972ee70e57a716eb2ac7684aa043b9d3208 WHIRLPOOL 748a8b4560773d970987880ef457194437024ee0f72b3ae9972f6033a5fc14da8e2835dab385c559ae0fe22e2bd31e8e4da3dc946e504388588d23baa39208bd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlIsZb4ACgkQCaWpQKGI+9QtswCfYZbky/ejrYIhmbO/XYnz5xCI
-+wcAnjRq/Gx2+bdLLLn6pOXbhXCcPRwv
-=EgtB
+iQIcBAEBCAAGBQJSd8OmAAoJEJ+WuSkwOAOBsWwQAM1UvmSh7E5k64kuqIXGEfh0
+Hx3msHuyDfjmBeHxMP4HMdBYLbcCbJXx+81JIh5NqIivgO+TbLIM5g+bEOQPHQFm
+l+nZmaDREvcPs14L6RKSe+vOUzKKjsgD/vSDIFV0ruaD9NQvk8LSR9l0Bwzt3sRB
+EUmDtEEZDE+75F05SYB4EGNtLsAhPxhyQbDDADKuYuOo9+z3vRFa7F3OHFRq5fNX
+QqCW+ZcD+r6Citv0C/3sXLteTpaE1DFThQPjsY+IqEUw/b4vwl+D9Lj0jlUvm6Ie
+YRlaojLW4UeobVwai94bt7+kax/DDQAjLLUb3EFninWNEewjh6+VNm2r+6V/lcld
+WHHDeWe+D23fNzOr7M2MTA/XOqjkFTZ64LbIAUETjOiRiHg3XAea1lrjsjTAVm3x
+4XEzilhnhxRep0UEgxMpb10OaQLE2nTcGgM4xZ7Zubm0TVUryIQhzqcotS1f/Lwv
+TqmyuPsUF7XCUY+R5qb5RMPanhfYgIShMXR//YBpF3B6QDuO1flUnOfBgCU4K0ZV
+jM5jJxFhzB7x8WbDYeHfejofBTv5UwkTXEFE52cbOK3tHSPRzb4eukhK+quUnMTr
+ootnyslmpXBgQYiOQC+wyG8yIeN9kXUXNrkcC0gKeg2axNtlY+zjJzr9ZQz8jlS1
+MyuOWqimuJJU8ktFvaYz
+=g8eO
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-16.2.ebuild b/dev-lang/erlang/erlang-16.2.ebuild
new file mode 100644
index 000000000000..a35a36e6be7e
--- /dev/null
+++ b/dev-lang/erlang/erlang-16.2.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-16.2.ebuild,v 1.1 2013/11/04 15:55:58 djc Exp $
+
+EAPI=3
+WX_GTK_VER="2.8"
+
+inherit elisp-common eutils java-pkg-opt-2 multilib systemd 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.
+MY_PV="R16B01"
+
+# 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/otp_src_${MY_PV}.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 ~x64-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] virtual/glu )
+	sctp? ( net-misc/lksctp-tools )
+	tk? ( dev-lang/tk )"
+
+S="${WORKDIR}/otp_src_${MY_PV}"
+
+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
+
+	# don't ignore LDFLAGS, reported upstream
+	sed -e 's:LDFLAGS =  \$(ODBC_LIB) \$(EI_LDFLAGS):LDFLAGS += \$(ODBC_LIB) \$(EI_LDFLAGS):' -i "${S}"/lib/odbc/c_src/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
+
+	# bug 383697
+	sed -i '1i#define OF(x) x' erts/emulator/drivers/common/gzio.c || die
+	epatch "${FILESDIR}/${PV}-tinfo.patch" || die
+	cd erts && autoconf || 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") \
+		$(use x64-macos && echo "--enable-darwin-64bit") \
+		|| die
+}
+
+src_compile() {
+	use java || export JAVAC=false
+	emake || 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 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
+
+	newinitd "${FILESDIR}"/epmd.init epmd || die
+	systemd_dounit "${FILESDIR}"/epmd.service ||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/16.2-tinfo.patch b/dev-lang/erlang/files/16.2-tinfo.patch
new file mode 100644
index 000000000000..f51ba582d8c1
--- /dev/null
+++ b/dev-lang/erlang/files/16.2-tinfo.patch
@@ -0,0 +1,11 @@
+--- erts/configure.in.bak	2013-11-04 14:47:47.838188678 +0100
++++ erts/configure.in	2013-11-04 14:46:54.352439671 +0100
+@@ -1322,7 +1322,7 @@
+ if test "x$with_termcap" != "xno" &&
+    test "X$host" != "Xwin32"; then
+     # try these libs
+-    termcap_libs="ncurses curses termcap termlib"
++    termcap_libs="tinfo ncurses curses termcap termlib"
+ 
+     for termcap_lib in $termcap_libs; do
+ 	AC_CHECK_LIB($termcap_lib, tgetent, TERMCAP_LIB="-l$termcap_lib")