version bump

Package-Manager: portage-2.1.2.2

4 files changed, 186 insertions, 8 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index a3b56e2dfffb..125d2e00cdae 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,12 @@
 # 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.57 2007/02/24 11:30:28 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.58 2007/04/06 18:53:01 opfer Exp $
+
+*erlang-11.2.4 (06 Apr 2007)
+
+  06 Apr 2007; Christian Faulhammer <opfer@gentoo.org>
+  +erlang-11.2.4.ebuild:
+  version bump
 
 *erlang-11.2.3-r1 (24 Feb 2007)
 
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 50c0d2056dcf..3e92fdd4e7ac 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -25,15 +25,18 @@ DIST otp_doc_html_R10B-10.tar.gz 4655081 RMD160 d11108d871ab7f164c7e4dd1000cd8cd
 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_html_R11B-3.tar.gz 4852262 RMD160 ed61cb47f1632b5e627a213beaa17652da5ab99c SHA1 5efe290641c06d9150a8e8505bae5d1e037db9c6 SHA256 01f1625b4d004b2b30c298d12e286ddbf512d316207fb8859ca598f98c553fb2
+DIST otp_doc_html_R11B-4.tar.gz 4902864 RMD160 36d8ed3e0523f651f57caa8588f12f0500344f0e SHA1 12f74f4553fa62dcb94d1a89b91551d57d744505 SHA256 fa1f313a0d3f79239ee2930159288419c6c4348d095cf58557ff799712d3a60f
 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_doc_man_R11B-3.tar.gz 694238 RMD160 d0f016d2388fad5721280b07634fd49c115b0153 SHA1 04c7252efd4bdf56e2372601a46123089ae58dbd SHA256 ec3ff0f2979ba91d485b37a232ad7d2186829f2948a9f7adcd6067890e55f928
+DIST otp_doc_man_R11B-4.tar.gz 712928 RMD160 ba006631a99757c65ff4955650485e213d6904b9 SHA1 9b6dda8bd06d869f58cc5f6d83c96e4b6549a7d6 SHA256 5852d7d9b7f09f3dda0261fe51c52025eacbdae258a984994b1a2407a065450e
 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
+DIST otp_src_R11B-4.tar.gz 11720279 RMD160 53969dd0f1637e9ac784f38d6ec9c01b7986a9cd SHA1 10e37b6efe6e273f4593ea3764daeecaa17152e5 SHA256 6928f44b67982aa8e00a2b053ecc78437fc70e19a2b0131c8f1ee86f02009337
 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
@@ -54,10 +57,14 @@ EBUILD erlang-11.2.3.ebuild 4805 RMD160 0406a1dd401f7ff08af37112901ac10617c17437
 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 10676 RMD160 a00a03fbad89239449c8c173b6d2d64c8ba2520f SHA1 9d81d2d3cac483f874eaf4ddf988d454090cb1c6 SHA256 7a4f360f462f581f05e869c61a62dd9ab1589549eba18806ef9204fc556c2c25
-MD5 2297727c45b18f8e06a6f60dd5323423 ChangeLog 10676
-RMD160 a00a03fbad89239449c8c173b6d2d64c8ba2520f ChangeLog 10676
-SHA256 7a4f360f462f581f05e869c61a62dd9ab1589549eba18806ef9204fc556c2c25 ChangeLog 10676
+EBUILD erlang-11.2.4.ebuild 4539 RMD160 7e217a2ae607bf8dd9945244b3654622338d71a8 SHA1 75ac70c18fade33f48c0336719f463b7ec2833b3 SHA256 17e3b5de876875836fc1d5dc63f1ea2f919e35216524afdb46134579ee5374d2
+MD5 f5bfdb16fc5fd4c5921c1f42c13de603 erlang-11.2.4.ebuild 4539
+RMD160 7e217a2ae607bf8dd9945244b3654622338d71a8 erlang-11.2.4.ebuild 4539
+SHA256 17e3b5de876875836fc1d5dc63f1ea2f919e35216524afdb46134579ee5374d2 erlang-11.2.4.ebuild 4539
+MISC ChangeLog 10802 RMD160 3e8f35b0e8e2eeca4f4caf2d4465c6958c83d195 SHA1 d67094f5a274424178fa39c20445eae614243b85 SHA256 dffc2a28bc1e53db50ced6b6807acb511499dc6ab30073f5a8d54adc4ade6fb5
+MD5 b9e773380aa92030cba59131586c386e ChangeLog 10802
+RMD160 3e8f35b0e8e2eeca4f4caf2d4465c6958c83d195 ChangeLog 10802
+SHA256 dffc2a28bc1e53db50ced6b6807acb511499dc6ab30073f5a8d54adc4ade6fb5 ChangeLog 10802
 MISC metadata.xml 402 RMD160 3d4e0e7953d95f43de89f62eacb37969caa29336 SHA1 2a45564353e8d0c2b9555294a6a269e56e0b6056 SHA256 c713a207afd5d65ef21d1c1e5fd3b867ce063dd9e46fc53db0734ad19f59ffe7
 MD5 aea374917adc11a2d42b0b9d1bba3598 metadata.xml 402
 RMD160 3d4e0e7953d95f43de89f62eacb37969caa29336 metadata.xml 402
@@ -77,10 +84,13 @@ SHA256 510ba14d6371c731134f8e675778184fd98c14bd8873629c0b788517224afa47 files/di
 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
+MD5 4f6ec05708c37021dc7c60b20a30430c files/digest-erlang-11.2.4 768
+RMD160 664ff8e5f0d7ea7263d18da37e2ebd216f429196 files/digest-erlang-11.2.4 768
+SHA256 f15898a27c4a05cc51f2427f731936b431ab3628a07af4d39836d9b3291360ec files/digest-erlang-11.2.4 768
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFF4CGsNQqtfCuFneMRAl4vAJ41dbCYMxsGOkUcC/44mjObBO/+xgCbBw/A
-N7Esp63HQLuyrLmGZs/M/E8=
-=k3aH
+iD8DBQFGFpccNQqtfCuFneMRAlQ5AKCBi1N+Zb4gIGOgWy3MWw4c5K4dgwCfaaOG
+xrqbc0WdmjauZwzWW8o7/XY=
+=pjYg
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-11.2.4.ebuild b/dev-lang/erlang/erlang-11.2.4.ebuild
new file mode 100644
index 000000000000..8fafe360fe57
--- /dev/null
+++ b/dev-lang/erlang/erlang-11.2.4.ebuild
@@ -0,0 +1,153 @@
+# 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.4.ebuild,v 1.1 2007/04/06 18:53:01 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}"
+
+	# needed for amd64
+	epatch "${FILESDIR}/${PN}-10.2.6-export-TARGET.patch"
+	use odbc || sed -i 's: odbc : :' lib/Makefile
+
+	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)
+
+	emake INSTALL_PREFIX="${D}" install || die "install failed"
+	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-4"
+	elog
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/erlang/files/digest-erlang-11.2.4 b/dev-lang/erlang/files/digest-erlang-11.2.4
new file mode 100644
index 000000000000..8a23b314578e
--- /dev/null
+++ b/dev-lang/erlang/files/digest-erlang-11.2.4
@@ -0,0 +1,9 @@
+MD5 187cd55de8866a278ed963664819404d otp_doc_html_R11B-4.tar.gz 4902864
+RMD160 36d8ed3e0523f651f57caa8588f12f0500344f0e otp_doc_html_R11B-4.tar.gz 4902864
+SHA256 fa1f313a0d3f79239ee2930159288419c6c4348d095cf58557ff799712d3a60f otp_doc_html_R11B-4.tar.gz 4902864
+MD5 cc041ceebc4a6615073d8d7e88495610 otp_doc_man_R11B-4.tar.gz 712928
+RMD160 ba006631a99757c65ff4955650485e213d6904b9 otp_doc_man_R11B-4.tar.gz 712928
+SHA256 5852d7d9b7f09f3dda0261fe51c52025eacbdae258a984994b1a2407a065450e otp_doc_man_R11B-4.tar.gz 712928
+MD5 649e6f057e6996f92c8496161d754d8d otp_src_R11B-4.tar.gz 11720279
+RMD160 53969dd0f1637e9ac784f38d6ec9c01b7986a9cd otp_src_R11B-4.tar.gz 11720279
+SHA256 6928f44b67982aa8e00a2b053ecc78437fc70e19a2b0131c8f1ee86f02009337 otp_src_R11B-4.tar.gz 11720279