From d5b9931ea17dc9bf82d228296da2a92d760bff15 Mon Sep 17 00:00:00 2001 From: Christian Faulhammer Date: Sat, 24 Feb 2007 11:30:28 +0000 Subject: [PATCH] added smp and kpoll USE flags to enable/disable those features, adjusted some bits; thanks to Max Loparyev Package-Manager: portage-2.1.2-r9 --- dev-lang/erlang/ChangeLog | 9 +- dev-lang/erlang/Manifest | 25 ++- dev-lang/erlang/erlang-11.2.3-r1.ebuild | 155 ++++++++++++++++++ dev-lang/erlang/files/digest-erlang-11.2.3-r1 | 9 + 4 files changed, 193 insertions(+), 5 deletions(-) create mode 100644 dev-lang/erlang/erlang-11.2.3-r1.ebuild create mode 100644 dev-lang/erlang/files/digest-erlang-11.2.3-r1 diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog index c3fe646f37fc..a3b56e2dfffb 100644 --- a/dev-lang/erlang/ChangeLog +++ b/dev-lang/erlang/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-lang/erlang # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.56 2007/02/22 10:28:42 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.57 2007/02/24 11:30:28 opfer Exp $ + +*erlang-11.2.3-r1 (24 Feb 2007) + + 24 Feb 2007; Christian Faulhammer + +erlang-11.2.3-r1.ebuild: + added smp and kpoll USE flags to enable/disable those features, adjusted + some bits; thanks to Max Loparyev 22 Feb 2007; Simon Stelling erlang-11.2.3.ebuild: put back the export-TARGET patch; bug 167909 diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest index 651917cbb850..50c0d2056dcf 100644 --- a/dev-lang/erlang/Manifest +++ b/dev-lang/erlang/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 10.2.6-manpage-emacs-gentoo.patch 1348 RMD160 9b71f1253a400a8a8e99db0a1761d10a40e19e7a SHA1 c02e5a195ae42de5e26547e8f9ba13c5bf198b8b SHA256 3c8981e860600447c077a090fbafb2467fbf9da6e15f43825c7f2e9b8702adbb MD5 34433096e1c6e84b5dbb4a50a4e3c2e8 files/10.2.6-manpage-emacs-gentoo.patch 1348 RMD160 9b71f1253a400a8a8e99db0a1761d10a40e19e7a files/10.2.6-manpage-emacs-gentoo.patch 1348 @@ -43,14 +46,18 @@ EBUILD erlang-11.2.2-r1.ebuild 4946 RMD160 b9c304df225e66d1f3db36ecfa2598688cf24 MD5 eaba9c98f2d0fc52a5cb6707ed3a957d erlang-11.2.2-r1.ebuild 4946 RMD160 b9c304df225e66d1f3db36ecfa2598688cf2495e erlang-11.2.2-r1.ebuild 4946 SHA256 816c1d1b2d14b0166321d8b834557e9ac0566e71763c3af31bf582fb43f606e3 erlang-11.2.2-r1.ebuild 4946 +EBUILD erlang-11.2.3-r1.ebuild 4613 RMD160 8277851251af1987ea8be7027ae39d30a70acdac SHA1 d7d1c941606d82bf97838306a41bcf7f9dc2c715 SHA256 bb4f17e7624dcee7237e6e000d2069421ed4133c221796eed0aa0c04fa7a0061 +MD5 39851f6055497a7362eaf92eaef12262 erlang-11.2.3-r1.ebuild 4613 +RMD160 8277851251af1987ea8be7027ae39d30a70acdac erlang-11.2.3-r1.ebuild 4613 +SHA256 bb4f17e7624dcee7237e6e000d2069421ed4133c221796eed0aa0c04fa7a0061 erlang-11.2.3-r1.ebuild 4613 EBUILD erlang-11.2.3.ebuild 4805 RMD160 0406a1dd401f7ff08af37112901ac10617c17437 SHA1 c03f30a8dd2c2b7472f2819a9a06556cc0ae1363 SHA256 8e98d02bf69c18e6dd8029af88924f23395edd2a03ae87c0915ae34fab4a3615 MD5 bd74ef43593d2a0be30386eb618f1fec erlang-11.2.3.ebuild 4805 RMD160 0406a1dd401f7ff08af37112901ac10617c17437 erlang-11.2.3.ebuild 4805 SHA256 8e98d02bf69c18e6dd8029af88924f23395edd2a03ae87c0915ae34fab4a3615 erlang-11.2.3.ebuild 4805 -MISC ChangeLog 10426 RMD160 8760856d31e4cbfa3616b9d115eddb3000256bc4 SHA1 3b29850a74eda8c6fd4f2dd5f0a09ec64805e30f SHA256 4fba96fdb551310890919c7099424b964019e2daf6e37760bcf3eade4d39ff7a -MD5 419046008e285baca862bf65827133be ChangeLog 10426 -RMD160 8760856d31e4cbfa3616b9d115eddb3000256bc4 ChangeLog 10426 -SHA256 4fba96fdb551310890919c7099424b964019e2daf6e37760bcf3eade4d39ff7a ChangeLog 10426 +MISC ChangeLog 10676 RMD160 a00a03fbad89239449c8c173b6d2d64c8ba2520f SHA1 9d81d2d3cac483f874eaf4ddf988d454090cb1c6 SHA256 7a4f360f462f581f05e869c61a62dd9ab1589549eba18806ef9204fc556c2c25 +MD5 2297727c45b18f8e06a6f60dd5323423 ChangeLog 10676 +RMD160 a00a03fbad89239449c8c173b6d2d64c8ba2520f ChangeLog 10676 +SHA256 7a4f360f462f581f05e869c61a62dd9ab1589549eba18806ef9204fc556c2c25 ChangeLog 10676 MISC metadata.xml 402 RMD160 3d4e0e7953d95f43de89f62eacb37969caa29336 SHA1 2a45564353e8d0c2b9555294a6a269e56e0b6056 SHA256 c713a207afd5d65ef21d1c1e5fd3b867ce063dd9e46fc53db0734ad19f59ffe7 MD5 aea374917adc11a2d42b0b9d1bba3598 metadata.xml 402 RMD160 3d4e0e7953d95f43de89f62eacb37969caa29336 metadata.xml 402 @@ -67,3 +74,13 @@ SHA256 4f2b1667397c5abd23d28c6b9927ff68d2774a3bb814bc7cd5341c6e48061166 files/di MD5 b81e69a2b3129fddd7a9c8963c75c863 files/digest-erlang-11.2.3 768 RMD160 444ab43f988c3355997ea60dcbdc52a30827f1f0 files/digest-erlang-11.2.3 768 SHA256 510ba14d6371c731134f8e675778184fd98c14bd8873629c0b788517224afa47 files/digest-erlang-11.2.3 768 +MD5 b81e69a2b3129fddd7a9c8963c75c863 files/digest-erlang-11.2.3-r1 768 +RMD160 444ab43f988c3355997ea60dcbdc52a30827f1f0 files/digest-erlang-11.2.3-r1 768 +SHA256 510ba14d6371c731134f8e675778184fd98c14bd8873629c0b788517224afa47 files/digest-erlang-11.2.3-r1 768 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFF4CGsNQqtfCuFneMRAl4vAJ41dbCYMxsGOkUcC/44mjObBO/+xgCbBw/A +N7Esp63HQLuyrLmGZs/M/E8= +=k3aH +-----END PGP SIGNATURE----- diff --git a/dev-lang/erlang/erlang-11.2.3-r1.ebuild b/dev-lang/erlang/erlang-11.2.3-r1.ebuild new file mode 100644 index 000000000000..30f7e002598b --- /dev/null +++ b/dev-lang/erlang/erlang-11.2.3-r1.ebuild @@ -0,0 +1,155 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-11.2.3-r1.ebuild,v 1.1 2007/02/24 11:30:28 opfer Exp $ + +inherit elisp-common eutils flag-o-matic multilib versionator + +# NOTE: You need to adjust the version number +# in the last comment. +# 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="R$(get_major_version)B-$(get_version_component_range 3)" + +# 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 + doc? ( http://erlang.org/download/otp_doc_man_${MY_PV}.tar.gz + http://erlang.org/download/otp_doc_html_${MY_PV}.tar.gz )" + +LICENSE="EPL" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" +IUSE="doc emacs hipe java kpoll odbc smp ssl tk" + +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} + tk? ( dev-lang/tk )" + +S="${WORKDIR}/${MY_P}" + +SITEFILE=50erlang-gentoo.el + +src_unpack() { + ## fix compilation on hardened systems, see bug #154338 + filter-flags "-fstack-protector" + filter-flags "-fstack-protector-all" + + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${PN}-10.2.6-export-TARGET.patch" + use odbc || sed -i 's: odbc : :' lib/Makefile +# epatch "${DISTDIR}"/otp_src_${MY_PV}_epoll.patch + epatch "${FILESDIR}/erl_process_dump_R11B-3.patch" + + if use hipe; then + ewarn + ewarn "You enabled High performance Erlang. Be aware that this extension" + ewarn "can break the compilation in many ways, especially on hardened systems." + ewarn "Don't cry, don't file bugs, just disable it!" + ewarn + fi +} + +src_compile() { + use java || export JAVAC=false + + econf \ + --enable-threads \ + $(use_enable hipe) \ + $(use_with ssl) \ + $(use_enable kpoll kernell-poll) \ + $(use_enable smp smp-support) \ + || die "econf failed" + emake -j1 || die "emake failed" + + if use emacs ; then + pushd lib/tools/emacs + elisp-compile *.el + 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) + + make INSTALL_PREFIX="${D}" install || die + dodoc AUTHORS EPLICENCE README + + dosym ${ERL_LIBDIR}/bin/erl /usr/bin/erl + dosym ${ERL_LIBDIR}/bin/erlc /usr/bin/erlc + dosym ${ERL_LIBDIR}/bin/ecc /usr/bin/ecc + dosym ${ERL_LIBDIR}/bin/elink /usr/bin/elink + dosym ${ERL_LIBDIR}/bin/ear /usr/bin/ear + 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 + + ## Remove ${D} from the following files + dosed ${ERL_LIBDIR}/bin/erl + dosed ${ERL_LIBDIR}/bin/start + cd ${ERL_LIBDIR}/erts-${ERL_ERTS_VER} + grep -rle "${D}" "${D}"/${ERL_LIBDIR}/erts-${ERL_ERTS_VER} | xargs sed -i -e "s:${D}::g" + + ## Clean up the no longer needed files + rm "${D}"/${ERL_LIBDIR}/Install + + if use doc ; then + for i in "${WORKDIR}"/man/man* ; do + dodir /usr/share/${i##${WORKDIR}}erl + done + for file in "${WORKDIR}"/man/man*/*.[1-9]; do + # Avoid namespace collisions + local newfile=${file}erl + cp ${file} ${newfile} + # Man page processing tools expect a capitalized "SEE ALSO" section + # header + sed -i -e 's,\.SH See Also,\.SH SEE ALSO,g' ${newfile} + # doman sucks so we can't use it + cp ${newfile} "${D}"/usr/share/man/man${newfile##*.}/ + done + 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} + elisp-site-file-install "${FILESDIR}"/${SITEFILE} + popd + fi +} + +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 and tell the maintainers." + elog + elog "Gentoo's versioning scheme differs from the author's, so please refer to this version as R11B-3" + elog +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-lang/erlang/files/digest-erlang-11.2.3-r1 b/dev-lang/erlang/files/digest-erlang-11.2.3-r1 new file mode 100644 index 000000000000..ac72be2ef9bb --- /dev/null +++ b/dev-lang/erlang/files/digest-erlang-11.2.3-r1 @@ -0,0 +1,9 @@ +MD5 85bc43e52fa5066577ef412c80848dc0 otp_doc_html_R11B-3.tar.gz 4852262 +RMD160 ed61cb47f1632b5e627a213beaa17652da5ab99c otp_doc_html_R11B-3.tar.gz 4852262 +SHA256 01f1625b4d004b2b30c298d12e286ddbf512d316207fb8859ca598f98c553fb2 otp_doc_html_R11B-3.tar.gz 4852262 +MD5 645ef1ded84b470e9c05a4757dce88cf otp_doc_man_R11B-3.tar.gz 694238 +RMD160 d0f016d2388fad5721280b07634fd49c115b0153 otp_doc_man_R11B-3.tar.gz 694238 +SHA256 ec3ff0f2979ba91d485b37a232ad7d2186829f2948a9f7adcd6067890e55f928 otp_doc_man_R11B-3.tar.gz 694238 +MD5 2806e5a2f26cb1b20f3ea1a6f3ec0276 otp_src_R11B-3.tar.gz 11420612 +RMD160 1ba0cc072d6f33e5f12149ae36e24438a9d70199 otp_src_R11B-3.tar.gz 11420612 +SHA256 7024ca196a5e4a2d80363de1af78051b36de47833e848b812656d552baa5dde2 otp_src_R11B-3.tar.gz 11420612 -- 2.26.2