diff options
author | Dirkjan Ochtman <djc@gentoo.org> | 2013-11-04 15:55:58 +0000 |
---|---|---|
committer | Dirkjan Ochtman <djc@gentoo.org> | 2013-11-04 15:55:58 +0000 |
commit | 311aa1fe486f7b8f66346c434a373220cc9398c8 (patch) | |
tree | 113cdf58e0738bfa3ed99d91c292c53a5f8ebf32 /dev-lang/erlang | |
parent | add IUSE pam, fixes Bug #488660 by Pat Erley (diff) | |
download | gentoo-2-311aa1fe486f7b8f66346c434a373220cc9398c8.tar.gz gentoo-2-311aa1fe486f7b8f66346c434a373220cc9398c8.tar.bz2 gentoo-2-311aa1fe486f7b8f66346c434a373220cc9398c8.zip |
Version bump erlang to 16.2 (R16B02).
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 30380381)
Diffstat (limited to 'dev-lang/erlang')
-rw-r--r-- | dev-lang/erlang/ChangeLog | 8 | ||||
-rw-r--r-- | dev-lang/erlang/erlang-16.2.ebuild | 178 | ||||
-rw-r--r-- | dev-lang/erlang/files/16.2-tinfo.patch | 11 |
3 files changed, 196 insertions, 1 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/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") |