From 12f4a194bdf148884b757832ea2b07204028dcb7 Mon Sep 17 00:00:00 2001 From: Christian Faulhammer Date: Tue, 20 Feb 2007 23:33:08 +0000 Subject: [PATCH] version bump which needs fewer patches and fixes, as reported by Christopher Covington in bug 167335 Package-Manager: portage-2.1.2-r9 --- dev-lang/erlang/ChangeLog | 9 +- dev-lang/erlang/Manifest | 38 +++-- dev-lang/erlang/erlang-11.2.3.ebuild | 156 ++++++++++++++++++ dev-lang/erlang/files/digest-erlang-11.2.3 | 9 + .../files/erl_process_dump_R11B-3.patch | 24 +++ 5 files changed, 223 insertions(+), 13 deletions(-) create mode 100644 dev-lang/erlang/erlang-11.2.3.ebuild create mode 100644 dev-lang/erlang/files/digest-erlang-11.2.3 create mode 100644 dev-lang/erlang/files/erl_process_dump_R11B-3.patch diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog index 8353a27f052b..3838d362e759 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.54 2007/01/31 14:28:59 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.55 2007/02/20 23:33:08 opfer Exp $ + +*erlang-11.2.3 (20 Feb 2007) + + 20 Feb 2007; Christian Faulhammer + +files/erl_process_dump_R11B-3.patch, +erlang-11.2.3.ebuild: + version bump which needs fewer patches and fixes, as reported by Christopher + Covington in bug 167335 31 Jan 2007; Marius Mauch erlang-11.2.1.ebuild, erlang-11.2.2-r1.ebuild: diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest index 850bb8bc8aea..f78ef79d0260 100644 --- a/dev-lang/erlang/Manifest +++ b/dev-lang/erlang/Manifest @@ -9,6 +9,10 @@ AUX 50erlang-gentoo.el 140 RMD160 fd086fc5e1c15e5c8753315cf0a2759e8f3cc666 SHA1 MD5 28397dc6ef4a633a8084ce44fbb1c6f3 files/50erlang-gentoo.el 140 RMD160 fd086fc5e1c15e5c8753315cf0a2759e8f3cc666 files/50erlang-gentoo.el 140 SHA256 2f494178e3e64af141398b4deac5d7f148b47d3cbc1cd8ec083229092f4aa3df files/50erlang-gentoo.el 140 +AUX erl_process_dump_R11B-3.patch 721 RMD160 1ea403822d4fa314cbd4d3896687e5d117bf7716 SHA1 976ad7db018275900c0fac5d593d60268ab1ae94 SHA256 824087a7abc9e82dd90fbfe251026e1a75198d427e145c2a5f2b4d8ded373f81 +MD5 9437b08f4e8a463fdafc746a34bc4276 files/erl_process_dump_R11B-3.patch 721 +RMD160 1ea403822d4fa314cbd4d3896687e5d117bf7716 files/erl_process_dump_R11B-3.patch 721 +SHA256 824087a7abc9e82dd90fbfe251026e1a75198d427e145c2a5f2b4d8ded373f81 files/erl_process_dump_R11B-3.patch 721 AUX erlang-10.2.6-export-TARGET.patch 242 RMD160 5f8443e482920358c6c13f85b1c554977bfcc950 SHA1 5c1b5d3c0ab48e7845eceba5ac99944847304962 SHA256 8e8ae39cb84c3196fbb773275f0aaaf68fb07fade632682f1866d2185b4dd54b MD5 b1f610dc1caa7c176d7da4919bcabba9 files/erlang-10.2.6-export-TARGET.patch 242 RMD160 5f8443e482920358c6c13f85b1c554977bfcc950 files/erlang-10.2.6-export-TARGET.patch 242 @@ -17,16 +21,19 @@ AUX glibc-2.4-fix.patch 452 RMD160 af22ca793fe2f0d025c1eafa75547e4b7093f24c SHA1 MD5 734a6808d937b508338553b3ac819cd3 files/glibc-2.4-fix.patch 452 RMD160 af22ca793fe2f0d025c1eafa75547e4b7093f24c files/glibc-2.4-fix.patch 452 SHA256 c9d20e483847f580848c75c0d7464af5afce641dba75383b2f3adf6a10b6094b files/glibc-2.4-fix.patch 452 -DIST otp_doc_html_R10B-10.tar.gz 4655081 RMD160 d11108d871ab7f164c7e4dd1000cd8cdca7cb64d SHA256 2373d6935b44b64a137bf8ba198dca3fb782d0c072735b172ae4420c380a5d9c +DIST otp_doc_html_R10B-10.tar.gz 4655081 RMD160 d11108d871ab7f164c7e4dd1000cd8cdca7cb64d SHA1 3373386714efbc2c1c9f5b849931d55c62d3972d SHA256 2373d6935b44b64a137bf8ba198dca3fb782d0c072735b172ae4420c380a5d9c DIST otp_doc_html_R11B-1.tar.gz 4717809 RMD160 2a7425f55245b12037a02082ace85411c04c5bb6 SHA1 1c1734482ebce4fab096b24ac8b91d33966a47cd SHA256 225212891e2290d0ea21e489445113d7f79ad51e4b3e3e4f0042f8876383a7bc DIST otp_doc_html_R11B-2.tar.gz 4739895 RMD160 82a4ab769566705333e059d920861d05be31754b SHA1 44a6006bf5437566ce770a4a3a2bf6c9e015e656 SHA256 588514c6b96b33dbaffd40aa5b51b9c0be65d02b6e81644c53b4c705a866db47 -DIST otp_doc_man_R10B-10.tar.gz 594690 RMD160 b56260b7349cd4751ca56ec15fdc5515041b130b SHA256 8ecfc9b627200f59c35591a743e03a587258ddcdd39052a0b2cb58b80f6fc20b +DIST otp_doc_html_R11B-3.tar.gz 4852262 RMD160 ed61cb47f1632b5e627a213beaa17652da5ab99c SHA1 5efe290641c06d9150a8e8505bae5d1e037db9c6 SHA256 01f1625b4d004b2b30c298d12e286ddbf512d316207fb8859ca598f98c553fb2 +DIST otp_doc_man_R10B-10.tar.gz 594690 RMD160 b56260b7349cd4751ca56ec15fdc5515041b130b SHA1 a59f09e9656979642a2b83cc1e9c3889ecec5031 SHA256 8ecfc9b627200f59c35591a743e03a587258ddcdd39052a0b2cb58b80f6fc20b DIST otp_doc_man_R11B-1.tar.gz 627132 RMD160 666899dedc72f22387d478ffe4a1f313c57bdb01 SHA1 28f1318964946634996f146770cc9a2be0c20953 SHA256 706e7da589cddee06b9d0a24a09e2105ae719bbfb8b6a08fe55ae45d5dbf4bd6 DIST otp_doc_man_R11B-2.tar.gz 632153 RMD160 90b37a71ed29f14ec0d14a520aef47ed7b7ccad0 SHA1 5e09c0dcea2956d8b2cdc2a6ab846d9a922cefe3 SHA256 643fb8210a2059b2c283c17601a0d5893f5cf409f05ed4852fbf2b0607693ac9 -DIST otp_src_R10B-10.tar.gz 9445437 RMD160 b0e24e89241a21d5f3304791b505ab133db8fca5 SHA256 bd87e1b09f1f3d694fc32ef4d27372e25c95ce35b383c7747ab40c27471c28ac -DIST otp_src_R10B-10_epoll.patch 15359 RMD160 40a1282c6223081b4d2d9c06b30bc16163aa495f SHA256 7b8bbad71649e9b00f9f8639b0fe06060428aa4015eb6164e78d18a0b2508a5b +DIST otp_doc_man_R11B-3.tar.gz 694238 RMD160 d0f016d2388fad5721280b07634fd49c115b0153 SHA1 04c7252efd4bdf56e2372601a46123089ae58dbd SHA256 ec3ff0f2979ba91d485b37a232ad7d2186829f2948a9f7adcd6067890e55f928 +DIST otp_src_R10B-10.tar.gz 9445437 RMD160 b0e24e89241a21d5f3304791b505ab133db8fca5 SHA1 b08e93540d0f7b532a27fcb12f832759af07ac29 SHA256 bd87e1b09f1f3d694fc32ef4d27372e25c95ce35b383c7747ab40c27471c28ac +DIST otp_src_R10B-10_epoll.patch 15359 RMD160 40a1282c6223081b4d2d9c06b30bc16163aa495f SHA1 021ed43a2ebb9d0ff13c9c3ffbf0e8f3d9aa81f7 SHA256 7b8bbad71649e9b00f9f8639b0fe06060428aa4015eb6164e78d18a0b2508a5b DIST otp_src_R11B-1.tar.gz 11144896 RMD160 db658f8221c4226f52c88ff56d2f68afbe47bac2 SHA1 5831578f1c189a2cdf23b19b045be19589cd918f SHA256 d5a8530dfee0b2348c4ad0107409fa73ac3233f31e2300ece625a2abd9eb4da7 DIST otp_src_R11B-2.tar.gz 11244153 RMD160 989bab054992ba23666756379950082cd41adb00 SHA1 09885c9b0902caa4570de950d76284943232fb6d SHA256 3dd483ee568c31655361474aa54a28cf11575c3b1b984f0b7a6980e083a8e44b +DIST otp_src_R11B-3.tar.gz 11420612 RMD160 1ba0cc072d6f33e5f12149ae36e24438a9d70199 SHA1 069dc055b5b610845ac8e3d5e37462fb9b964907 SHA256 7024ca196a5e4a2d80363de1af78051b36de47833e848b812656d552baa5dde2 EBUILD erlang-10.2.10.ebuild 3442 RMD160 06de455ce3fbc6e3ffa49d67a542d80b317adda1 SHA1 492a713c9285c68096b9d4a9a0ac37977d258873 SHA256 d0e318c82515fc8fa51c850cdff342f27773f33f3bd8f776a7b03f06849f9d86 MD5 3770dcd9efa720053285277e435af897 erlang-10.2.10.ebuild 3442 RMD160 06de455ce3fbc6e3ffa49d67a542d80b317adda1 erlang-10.2.10.ebuild 3442 @@ -39,10 +46,14 @@ 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 -MISC ChangeLog 10033 RMD160 382e206ca8055e15c44aa05cc54d37bda6583c75 SHA1 65d7dd841983a99a5b9d8f0d7390868a51ee9b91 SHA256 d9315c59e19bad38d1409918bd97cbe01a9fe1e638f5be7302136bf31250a31a -MD5 7f33b1479ad0fd343918da1bbb0451bb ChangeLog 10033 -RMD160 382e206ca8055e15c44aa05cc54d37bda6583c75 ChangeLog 10033 -SHA256 d9315c59e19bad38d1409918bd97cbe01a9fe1e638f5be7302136bf31250a31a ChangeLog 10033 +EBUILD erlang-11.2.3.ebuild 4750 RMD160 2cb6b21ea847476237d4a88084e6c1a98e4778c8 SHA1 e9bed47e7634230dccd625c6caa99692ac89282c SHA256 9445a726f1d2eae64e442e53be6b278136faefc3dd9e4895dfe5429c4cd8baf8 +MD5 a7ec212aafcc355e3007562960270a2e erlang-11.2.3.ebuild 4750 +RMD160 2cb6b21ea847476237d4a88084e6c1a98e4778c8 erlang-11.2.3.ebuild 4750 +SHA256 9445a726f1d2eae64e442e53be6b278136faefc3dd9e4895dfe5429c4cd8baf8 erlang-11.2.3.ebuild 4750 +MISC ChangeLog 10307 RMD160 e265c27c6264501644e713cfe73534f88ffc0ad1 SHA1 0b68406a69a330b155b00607bba0e2503d08a613 SHA256 b42a68806f3316382f1c7a453d220603f4dbd9f6f739fa82fc3ee627bba3cf04 +MD5 2b458ba4eb359e5435fab0b9a7356519 ChangeLog 10307 +RMD160 e265c27c6264501644e713cfe73534f88ffc0ad1 ChangeLog 10307 +SHA256 b42a68806f3316382f1c7a453d220603f4dbd9f6f739fa82fc3ee627bba3cf04 ChangeLog 10307 MISC metadata.xml 402 RMD160 3d4e0e7953d95f43de89f62eacb37969caa29336 SHA1 2a45564353e8d0c2b9555294a6a269e56e0b6056 SHA256 c713a207afd5d65ef21d1c1e5fd3b867ce063dd9e46fc53db0734ad19f59ffe7 MD5 aea374917adc11a2d42b0b9d1bba3598 metadata.xml 402 RMD160 3d4e0e7953d95f43de89f62eacb37969caa29336 metadata.xml 402 @@ -56,10 +67,13 @@ SHA256 3fd426daec26afe9200caae2e6721a80fce6acc5d1c11f85817230dd78949248 files/di MD5 5f903efdd3245f02ca8ff7ae339abb1c files/digest-erlang-11.2.2-r1 768 RMD160 7336169350690cbdd0b6971d80e741593134cafb files/digest-erlang-11.2.2-r1 768 SHA256 4f2b1667397c5abd23d28c6b9927ff68d2774a3bb814bc7cd5341c6e48061166 files/digest-erlang-11.2.2-r1 768 +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 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) +Version: GnuPG v1.4.6 (GNU/Linux) -iD4DBQFFwKhA6J2i8a8J4okRAu8YAKCvgmwZ4eNRAAQdWpHwjVa2xqSY+QCWP5X/ -lQcoKhBcLDOlnPQFbI75Kg== -=H89q +iD8DBQFF24UONQqtfCuFneMRAjosAJ9TW5LJnxLI9Fb9KY9N8JfY7FevvgCdHXcx +5T2AezX88OF+mljdxC/D7vE= +=+8U+ -----END PGP SIGNATURE----- diff --git a/dev-lang/erlang/erlang-11.2.3.ebuild b/dev-lang/erlang/erlang-11.2.3.ebuild new file mode 100644 index 000000000000..f81ce4764ee1 --- /dev/null +++ b/dev-lang/erlang/erlang-11.2.3.ebuild @@ -0,0 +1,156 @@ +# 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.ebuild,v 1.1 2007/02/20 23:33:08 opfer Exp $ + +inherit elisp-common eutils flag-o-matic multilib versionator + +# NOTE: When bumping you need to adjust the *_VER strings in +# src_install() to honour newer versions in the package (they +# are maintained separately upstream). You even 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 )" +# Not yet available for 11.2.3 +# http://developer.sipphone.com/ejabberd/erlang_epoll_patch/otp_src_${MY_PV}_epoll.patch" + +LICENSE="EPL" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" +IUSE="doc emacs hipe java odbc 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}" + 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) \ + || die "econf failed" + make || 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 b/dev-lang/erlang/files/digest-erlang-11.2.3 new file mode 100644 index 000000000000..ac72be2ef9bb --- /dev/null +++ b/dev-lang/erlang/files/digest-erlang-11.2.3 @@ -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 diff --git a/dev-lang/erlang/files/erl_process_dump_R11B-3.patch b/dev-lang/erlang/files/erl_process_dump_R11B-3.patch new file mode 100644 index 000000000000..2b1b44b3ee4e --- /dev/null +++ b/dev-lang/erlang/files/erl_process_dump_R11B-3.patch @@ -0,0 +1,24 @@ +--- erts/emulator/beam/erl_process_dump.c.orig 2007-02-19 22:20:55.000000000 +0100 ++++ erts/emulator/beam/erl_process_dump.c 2007-02-19 22:13:34.000000000 +0100 +@@ -399,9 +399,11 @@ + static void + dump_externally(int to, void *to_arg, Eterm term) + { +- byte sbuf[1024]; /* encode and hope for the best ... */ +- byte* s; +- byte* p; ++ byte *sbuf, *s, *p; ++ unsigned size; ++ ++ size = encode_size_struct(term, TERM_TO_BINARY_DFLAGS); ++ sbuf = (byte *) erts_alloc(ERTS_ALC_T_TMP, size); + + s = p = sbuf; + erts_to_external_format(NULL, term, &p, NULL, NULL); +@@ -409,4 +411,6 @@ + while (s < p) { + erts_print(to, to_arg, "%02X", *s++); + } ++ ++ erts_free(ERTS_ALC_T_TMP, (void *) sbuf); + } -- 2.26.2