# HG changeset patch # User holger # Date 1321731959 -3600 # Node ID 70542d3b74e54c1f3008c4e637a14d354c006891 # Parent fc2276723d9aa7fc37f9a08ee61e81d452721cc4 bump erlang to 14.2.4 with fixes for zlib & jdk7 diff -r fc2276723d9a -r 70542d3b74e5 dev-lang/erlang/Manifest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-lang/erlang/Manifest Sat Nov 19 20:45:59 2011 +0100 @@ -0,0 +1,7 @@ +AUX 50erlang-gentoo.el 134 RMD160 a453ad18f47d20e5ea5ecd1f4e4054d00eab5c35 SHA1 7c17979f533654ef05bbfcc8ae30554e7843923b SHA256 97e1da82cae31a554134d7370739520e4c67b2544e5a13f887651a62e710b4d4 +AUX epmd.init 515 RMD160 7f5927b020809ec9013a6f0e997fc0232489162a SHA1 dd32584a9e4971fac65881ce2e215afb570a5292 SHA256 d60df142ee0e47e9d55f543effe99b057dbf763586cadffb05a82ce74edeb494 +DIST otp_doc_html_R14B04.tar.gz 28816088 RMD160 0e44a933ae35fe95d1ecd9958c9e86ce398e259f SHA1 86f76adee9bf953e5578d7998fda9e7dfc0d43f5 SHA256 3b066d23d82667e2d0477856b22ea94262d65baf7366babe1c10d8bddc28ab5a +DIST otp_doc_man_R14B04.tar.gz 1117663 RMD160 420d89fd32f2851253a5cef124ced50851dc2bb0 SHA1 41f4ea59c9622e39b30882e173983252b6faca81 SHA256 8514511e8a8ac3f3f67db06f333548edf283d9a8afcbc9e9eeca7b1af9a107da +DIST otp_src_R14B04.tar.gz 70773703 RMD160 1619a05e7d3df9cb5f9c41e32d9cfb0d8b4edd56 SHA1 e469c20c8be6c51bb584a2dec235c4714a60b4db SHA256 099b35910e635b9148ac90f70fd9dd592920ed02406eb26c349efd8d1e959b6e +EBUILD erlang-14.2.4.ebuild 5515 RMD160 8b4daa61581d227a9302e05c95b53c1bb8a783c0 SHA1 5d1a1694917e8c33ad3db548cf77d73db3773d7e SHA256 8ce7e0ce276d473132cb972341a3a087615535d61270836ac3901f070094555c +MISC metadata.xml 744 RMD160 47d7adeeeb67a91bb6d124522946f4075021a2f3 SHA1 1bc2d0cd3e1c8f4f10290087ab7e1ace28d3002b SHA256 81b659111fcfcd664dc7c096a52fd295b6010663eb4de875d863ed6e40dbae82 diff -r fc2276723d9a -r 70542d3b74e5 dev-lang/erlang/erlang-14.2.4.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-lang/erlang/erlang-14.2.4.ebuild Sat Nov 19 20:45:59 2011 +0100 @@ -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.3.ebuild,v 1.1 2011/06/06 08:53:33 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 + !=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 + # prevent sandbox violations with JDK7 + use java && addpredict /proc/self/coredump_filter +} + +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 + echo "before 'pwd'"; pwd + echo "before 'ls -l'"; ls -l + 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 +} diff -r fc2276723d9a -r 70542d3b74e5 dev-lang/erlang/files/50erlang-gentoo.el --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-lang/erlang/files/50erlang-gentoo.el Sat Nov 19 20:45:59 2011 +0100 @@ -0,0 +1,5 @@ +;;; erlang site-lisp configuration + +(add-to-list 'load-path "@SITELISP@") +(require 'erlang-start) +(setq erlang-root-dir "/usr/share") diff -r fc2276723d9a -r 70542d3b74e5 dev-lang/erlang/files/epmd.init --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-lang/erlang/files/epmd.init Sat Nov 19 20:45:59 2011 +0100 @@ -0,0 +1,20 @@ +#!/sbin/runscript +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/files/epmd.init,v 1.1 2010/11/08 00:47:30 fauli Exp $ + +depend() { + need net +} + +start() { + ebegin "Starting Erlang Port Mapper Daemon" + start-stop-daemon --start --quiet --user nobody --group nobody --exec /usr/bin/epmd -- -daemon + eend $? +} + +stop() { + ebegin "Stopping Erlang Port Mapper Daemon" + /usr/bin/epmd -kill >/dev/null + eend $? +} diff -r fc2276723d9a -r 70542d3b74e5 dev-lang/erlang/metadata.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-lang/erlang/metadata.xml Sat Nov 19 20:45:59 2011 +0100 @@ -0,0 +1,21 @@ + + + +lang-misc + +djc@gentoo.org +Dirkjan Ochtman + + + HIgh Performance Erlang extension + Enable halfword emulator + Enable kernel polling support + Support for Stream Control Transmission Protocol + + +Erlang is a programming language designed at the Ericsson +Computer Science Laboratory. Open-source Erlang is being +released to help encourage the spread of Erlang outside +Ericsson. + +