version bump: A bugfix release. Ebuild has been cleaned up a bit: some die statements, added support for USE=sctp (see bug 223555 by Maxim Treskin <zerthurd AT gmail DOT com>)

Package-Manager: portage-2.1.4.4

3 files changed, 173 insertions, 5 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index a80a040f2e82..dcbeda0e7f90 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/erlang
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.120 2008/05/29 10:05:24 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.121 2008/06/12 14:58:24 opfer Exp $
+
+*erlang-12.2.3 (12 Jun 2008)
+
+  12 Jun 2008; Christian Faulhammer <opfer@gentoo.org>
+  +erlang-12.2.3.ebuild:
+  version bump: A bugfix release. Ebuild has been cleaned up a bit: some die
+  statements, added support for USE=sctp (see bug 223555 by Maxim Treskin
+  <zerthurd AT gmail DOT com>)
 
   29 May 2008; Christian Faulhammer <opfer@gentoo.org>
   -files/erlang-10.2.6-export-TARGET.patch,
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index d0bc05bdb4ef..55d802209021 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -4,15 +4,19 @@ Hash: SHA1
 AUX 50erlang-gentoo.el 134 RMD160 a453ad18f47d20e5ea5ecd1f4e4054d00eab5c35 SHA1 7c17979f533654ef05bbfcc8ae30554e7843923b SHA256 97e1da82cae31a554134d7370739520e4c67b2544e5a13f887651a62e710b4d4
 AUX erlang-12.2.2-as-needed.patch 681 RMD160 4e296989aa03a874871bcd1be558b9b6036722ae SHA1 7d8279e19941cc381b4fa48df75596aad3a5adbe SHA256 02a58d742d273754b584e2adb6d8e97170dda98a434676b979dcbccd817eca46
 DIST otp_doc_html_R12B-2.tar.gz 5616891 RMD160 ddceb9b20aa485d8aab9c4f43e0f33fc8ba7eb8d SHA1 9fbb1f8e514ab340fff437e794243b4d530ed682 SHA256 f169acca450eb84d58377b1fabee18268ea9cf1a59393c0b970fefdb894b771e
+DIST otp_doc_html_R12B-3.tar.gz 5655205 RMD160 8295d4e94952bad6458f2038415c474e687631cb SHA1 194003607113c84aef5b5daad7ca8b8901d1d80a SHA256 4690829f270a40d6c1849a34e9854ba4f55e1ec1a1e91dbc09e6a0a0a7228005
 DIST otp_doc_man_R12B-2.tar.gz 777982 RMD160 963eb8247ae2df39ce4f998d72893e9ff2d646a0 SHA1 c32be18cc121412af97d948e1262a185206cadcb SHA256 712140af4b49cf696f6968244e13a753cb6f53c09e46fedb8d93407bf21c95c4
+DIST otp_doc_man_R12B-3.tar.gz 809746 RMD160 7e0c27391f42b1e58c7bb1472594e9fe6f7ac414 SHA1 8ea4c9fa7d941c339c73bb417f88ee939d6989eb SHA256 08e3ed5a285eabe94fef6726bd591e02c42a8425ddcdb6a6d3f38f4a2d517e62
 DIST otp_src_R12B-2.tar.gz 41190987 RMD160 14702b907c1a2cce2403e2c24db8187904039697 SHA1 a38adf0498a6d0f5038899d9f4a8accc935e7ffd SHA256 ba84af52b5ff10029a9f68c03d53c350d359ca1ed9247ac609765746692a89c1
+DIST otp_src_R12B-3.tar.gz 42195557 RMD160 e7b5da985b939e51ef4e2d19fb96cff1781ce263 SHA1 ea5f202cc35ed6ef2796727b95d62c9bbe6ad5e5 SHA256 a8ed977d468454ca8d849ee5fa08ac3d521d76f23649bef531b76bdfa73f8eb2
 EBUILD erlang-12.2.2.ebuild 4731 RMD160 9b4f5982f518e7deba8f8d02e0e3537248a8bad9 SHA1 61e28e980870c65d60279b6cb4db20e41997832a SHA256 e5bfb4cd35ab21c02a34263b8dcc78074e21beafaeb2fac1be6771d2803deffc
-MISC ChangeLog 20393 RMD160 854af1fcb9b256a942513072599d48a0418264c3 SHA1 58b67f91ee1ba0d987159980fb1f425c8ee1dbb5 SHA256 1498ec7e1b2e972ba371d0adde0b27ef63845765b42fc2f2dbec1a864c7e05fc
+EBUILD erlang-12.2.3.ebuild 4690 RMD160 48c2b796812da1556fff9ae0e21c9361ddd9a661 SHA1 c128cf158efa3f0ab038d9664870e649e830beff SHA256 c26a5cea23806897721d106f0462fa5bdfe30b8478bdc87de7bca810d5ebb9bd
+MISC ChangeLog 20686 RMD160 75a8b6f736e0cb7321ae043b2ff5db189a2ffec2 SHA1 685f15d87c1b230e4f4ffda9a58f90896dbfeb1e SHA256 d4bc01a8d6512d8f2f05db9f0602f4d43d04a74bd51ca37bfb340d91f3f95ffd
 MISC metadata.xml 476 RMD160 da948210972738dfbd855236cecc30b22d9cdb3e SHA1 b31a990b8d57f0c32a9cccdd2c60958c1f1a847f SHA256 393328bc46a0f98b7e1be0f6b4bd2f8e3070762e23cbca17fa32f6eecd8a2af7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkg+f/EACgkQNQqtfCuFneOHBwCcCKY3SKJFa/Hw025F1NW5PboR
-X2MAnR+Fzv8HIyfnzOybTzf4y5kQhq/a
-=fTTF
+iEYEARECAAYFAkhROaQACgkQNQqtfCuFneOi4wCcDnKIMxAvapoBckrt+6tRRuw/
+NCsAoJHta3waeKzkN2gbEAWAGymc/2Ry
+=kJoS
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-12.2.3.ebuild b/dev-lang/erlang/erlang-12.2.3.ebuild
new file mode 100644
index 000000000000..de9cc820c9a1
--- /dev/null
+++ b/dev-lang/erlang/erlang-12.2.3.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-12.2.3.ebuild,v 1.1 2008/06/12 14:58:24 opfer Exp $
+
+inherit autotools elisp-common eutils flag-o-matic multilib versionator
+
+# 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="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="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="doc emacs hipe java kpoll odbc smp sctp 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}
+	sctp? ( net-misc/lksctp-tools )
+	tk? ( dev-lang/tk )"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE=50${PN}-gentoo.el
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	use odbc || sed -i 's: odbc : :' lib/Makefile
+
+	# make sure we only link ssl dynamically
+	# will not be integrated by upstream for various reasons
+	sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure #184419
+
+	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! If you have fix, tell us."
+		ewarn
+	fi
+	eautoreconf
+}
+
+src_compile() {
+	use java || export JAVAC=false
+
+	econf \
+		--enable-threads \
+		$(use_enable sctp) \
+		$(use_enable hipe) \
+		$(use_with ssl) \
+		$(use_enable kpoll kernel-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 || 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 "install failed"
+	dodoc AUTHORS README
+
+	dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
+	dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
+	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"
+	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 "${ERL_LIBDIR}/${i##${WORKDIR}}"
+		done
+		for file in "${WORKDIR}"/man/man*/*.[1-9]; do
+			# Man page processing tools expect a capitalized "SEE ALSO" section
+			# header, has been reported upstream, should be fixed in R12
+			sed -i -e 's,\.SH See Also,\.SH SEE ALSO,g' ${file}
+			# doman sucks so we can't use it
+			cp ${file} "${D}/${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=\"${ERL_LIBDIR}/man\"" > "${D}/etc/env.d/90erlang"
+		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
+
+	# prepare erl for SMP, fixes bug #188112
+	use smp && sed -i -e 's:\(exec.*erlexec\):\1 -smp:' \
+		"${D}/${ERL_LIBDIR}/bin/erl"
+}
+
+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
+}