version bump

Package-Manager: portage-2.1.4.4

3 files changed, 178 insertions, 6 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index d8484fd3f967..3407a629be97 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,12 @@
 # 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.109 2008/04/01 18:16:44 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.110 2008/04/25 10:23:15 opfer Exp $
+
+*erlang-12.2.2 (25 Apr 2008)
+
+  25 Apr 2008; Christian Faulhammer <opfer@gentoo.org>
+  +erlang-12.2.2.ebuild:
+  version bump
 
   01 Apr 2008; Christian Faulhammer <opfer@gentoo.org> erlang-12.2.1.ebuild:
   shorten die message
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index fc3f6fe62a84..fb7d6350b1d4 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -9,18 +9,22 @@ AUX erlang-11.2.5-hipe.patch 427 RMD160 041b00940a422ac8127c4d8e42138d0e00100231
 AUX erlang-11.2.5-odbc-support-amd64.patch 580 RMD160 4497e87800977b9b75c475b95b3eefb1a188211e SHA1 910cf667b32000f367764d4437a8e41d89b7fc80 SHA256 a3af727f81fdaf71fb347a16db3c6ff66c74a7dba52ce613da77efaa6d4b8e76
 DIST otp_doc_html_R11B-5.tar.gz 4968176 RMD160 73f8056b66f3bc6ec6b93c3c3dbfdf47074f8974 SHA1 a44439ec924c35896b3cdb534f5001daf6e2e8dd SHA256 7dea67980b958ffebf7a94f3d94bd9c874e041f4f5ee574c56aab62c54a71d28
 DIST otp_doc_html_R12B-1.tar.gz 5899379 RMD160 329fd5103d490d9b814bab492899c51c2621ff8a SHA1 d1f86b28af9283be64e7d928ef42c6ae956f18d4 SHA256 9eb99a9d0f9b0f9a999d299829f0ba7e605f4041a422974079aacc14cec8f805
+DIST otp_doc_html_R12B-2.tar.gz 5616891 RMD160 ddceb9b20aa485d8aab9c4f43e0f33fc8ba7eb8d SHA1 9fbb1f8e514ab340fff437e794243b4d530ed682 SHA256 f169acca450eb84d58377b1fabee18268ea9cf1a59393c0b970fefdb894b771e
 DIST otp_doc_man_R11B-5.tar.gz 725858 RMD160 62d200be6143183a17f5263b7341ec40afe298c7 SHA1 3809faa63ac3420fd03291443bf0a73075a4781f SHA256 ab364af6e9db473d2bc5c0646a9b70989b858953ca9c053b78a509960a4f9caa
 DIST otp_doc_man_R12B-1.tar.gz 772833 RMD160 378a473b2b49d155b705e5ec5135f5d4a632b509 SHA1 b881d9a358b63a15858d161a6e8a22f2615e5981 SHA256 e6713b5121dd0e6b9fa9945cb4bc92452b5f5313c5f04b333a640cc7e815c0d5
+DIST otp_doc_man_R12B-2.tar.gz 777982 RMD160 963eb8247ae2df39ce4f998d72893e9ff2d646a0 SHA1 c32be18cc121412af97d948e1262a185206cadcb SHA256 712140af4b49cf696f6968244e13a753cb6f53c09e46fedb8d93407bf21c95c4
 DIST otp_src_R11B-5.tar.gz 38332865 RMD160 67eac12a891df0e8d46b383ea0997f9de3aa6ac6 SHA1 c03569f0387b04b0afcc5f59983792676fd4382b SHA256 d41fdfba40f86a50e04b7226ae5cc4581072fad26d14be5e1ca06603813bb175
 DIST otp_src_R12B-1.tar.gz 41291517 RMD160 ab969272fed56eec85175fd6ebbf71524652d766 SHA1 70ebcacdbdaae4488b1bb7651fea1e1245ebc0c0 SHA256 1f2b28d1291dcf8fe7202612779173ccce257cf4045c7d2ff7917fb9a0d5879b
+DIST otp_src_R12B-2.tar.gz 41190987 RMD160 14702b907c1a2cce2403e2c24db8187904039697 SHA1 a38adf0498a6d0f5038899d9f4a8accc935e7ffd SHA256 ba84af52b5ff10029a9f68c03d53c350d359ca1ed9247ac609765746692a89c1
 EBUILD erlang-11.2.5-r3.ebuild 5037 RMD160 a96f238d6a570585d39c9a3fa9be0bcc64a92ff7 SHA1 614bc899be2e4070e230deda09591cb5220df788 SHA256 1e8c280320d56a88b7e986ea2e98fc5639455dee089f31088feb1624e5a5a2bf
 EBUILD erlang-12.2.1.ebuild 4874 RMD160 8f26e56652375d60e469ebee8a890c15e0c635f1 SHA1 3e8b1d9bb0b8e15d8930102af44cb13a3685a7a7 SHA256 d76beb048e1e76cf34c4dd8d01b2c5f96f86683922143387f6ee0fbd1775e67e
-MISC ChangeLog 18532 RMD160 15f1e60db1ebd80e265b2b4fe34b527a8f5f1ad4 SHA1 e0c5f6e37a2d69e32c9258b0c59b1c1835815825 SHA256 51bcc51a14e2587064b62a932e9e433bb27537d3820ebba00d7665ecc6b774bf
+EBUILD erlang-12.2.2.ebuild 4879 RMD160 c83f976794d1f92f9cccdfae71956f9ccec68037 SHA1 925f442d30b94f16c5fd4f1093ade27f5bf10663 SHA256 90586185cf73157bda6154540fefa901bc4db3128226c4188f0b3f163e8526c2
+MISC ChangeLog 18658 RMD160 7f9feaf0da4a7a2be951f31b420a46ef43569c74 SHA1 047f882a41434c68465ae593a0be74b8b59cc5da SHA256 e4c9e85fd40823a9435a5c8bcfcd0abfbad5a90ace95fe8851bf99aedda0f75c
 MISC metadata.xml 476 RMD160 da948210972738dfbd855236cecc30b22d9cdb3e SHA1 b31a990b8d57f0c32a9cccdd2c60958c1f1a847f SHA256 393328bc46a0f98b7e1be0f6b4bd2f8e3070762e23cbca17fa32f6eecd8a2af7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH8nwVNQqtfCuFneMRArRPAJ4jv0M+eNcQHRvTXDVglWmeZbg2MQCeL4nX
-d1UntUN+Dxh9VTkQAfNP0C0=
-=w6UE
+iEYEARECAAYFAkgRsSYACgkQNQqtfCuFneOObwCfQ+2CfJ+PO/JKGOpmZWXxu/wa
+UScAoJC5YMS37xMEXi94LMpQmUGZsovG
+=UqCM
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-12.2.2.ebuild b/dev-lang/erlang/erlang-12.2.2.ebuild
new file mode 100644
index 000000000000..89276b242e12
--- /dev/null
+++ b/dev-lang/erlang/erlang-12.2.2.ebuild
@@ -0,0 +1,162 @@
+# 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.2.ebuild,v 1.1 2008/04/25 10:23:15 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 ~ppc64 ~sparc ~x86 ~x86-fbsd"
+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
+
+pkg_setup() {
+	if use ssl; then
+		if is-ldflag --as-needed || is-flag --as-needed; then
+			eerror "Don't use --as-needed in your LDFLAGS or CFLAGS for SSL support, this will fail."
+			die
+		fi
+	fi
+}
+
+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
+}
+
+src_compile() {
+	use java || export JAVAC=false
+
+	econf \
+		--enable-threads \
+		$(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
+		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 R12B-1"
+	elog
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}