readd 11.2.5, so ejabberd is not broken anymore

Package-Manager: portage-2.1.3.19
RepoMan-Options: --force

6 files changed, 238 insertions, 8 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index ddf5dcdb3318..7ffafb994a0e 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,11 @@
 # 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.97 2008/01/23 07:41:58 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.98 2008/01/25 07:17:49 opfer Exp $
+
+  25 Jan 2008; Christian Faulhammer <opfer@gentoo.org>
+  +files/erlang-11.2.5-hipe.patch,
+  +files/erlang-11.2.5-odbc-support-amd64.patch, +erlang-11.2.5-r3.ebuild:
+  readd 11.2.5, so ejabberd is not broken anymore
 
   23 Jan 2008; Christian Faulhammer <opfer@gentoo.org> metadata.xml:
   removing emacs team and adding myself alone
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index a40ba61c8a2c..f0f7b6a29f3b 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -17,32 +17,50 @@ AUX erlang-11.2.5-gethostbyname.patch 755 RMD160 49fc401143ec996cabc7a06c57794ef
 MD5 40674d039d403ee17908fe7a1952f249 files/erlang-11.2.5-gethostbyname.patch 755
 RMD160 49fc401143ec996cabc7a06c57794ef4ca7a662a files/erlang-11.2.5-gethostbyname.patch 755
 SHA256 8746bf418163a2ee3491b18bd57f3a4c8d0bf80008f4470b1aeee67d768afd55 files/erlang-11.2.5-gethostbyname.patch 755
+AUX erlang-11.2.5-hipe.patch 427 RMD160 041b00940a422ac8127c4d8e42138d0e00100231 SHA1 3db901cc1509e2613026be8ffc0108beef7ff679 SHA256 4bc7618ce202d96c3e446ccdf015a6ba55a0ac496c07d9d0a79249c37b4da7e4
+MD5 7c57ef6b45a064e3bba81881eea3a06c files/erlang-11.2.5-hipe.patch 427
+RMD160 041b00940a422ac8127c4d8e42138d0e00100231 files/erlang-11.2.5-hipe.patch 427
+SHA256 4bc7618ce202d96c3e446ccdf015a6ba55a0ac496c07d9d0a79249c37b4da7e4 files/erlang-11.2.5-hipe.patch 427
+AUX erlang-11.2.5-odbc-support-amd64.patch 580 RMD160 4497e87800977b9b75c475b95b3eefb1a188211e SHA1 910cf667b32000f367764d4437a8e41d89b7fc80 SHA256 a3af727f81fdaf71fb347a16db3c6ff66c74a7dba52ce613da77efaa6d4b8e76
+MD5 5abba3a4245591e511db42fd566d7426 files/erlang-11.2.5-odbc-support-amd64.patch 580
+RMD160 4497e87800977b9b75c475b95b3eefb1a188211e files/erlang-11.2.5-odbc-support-amd64.patch 580
+SHA256 a3af727f81fdaf71fb347a16db3c6ff66c74a7dba52ce613da77efaa6d4b8e76 files/erlang-11.2.5-odbc-support-amd64.patch 580
 AUX erlang-12.2.0-binary-append.patch 963 RMD160 d8daead04f023743691789f817b9013d071832de SHA1 15069dd0457fa275823be368b521dc4ae40e8710 SHA256 d3f449892e853d264904f1a55e120055798d53a4cc045e15e274593464b9384c
 MD5 9cc5d03b261e384b93d6ec0c6a37d403 files/erlang-12.2.0-binary-append.patch 963
 RMD160 d8daead04f023743691789f817b9013d071832de files/erlang-12.2.0-binary-append.patch 963
 SHA256 d3f449892e853d264904f1a55e120055798d53a4cc045e15e274593464b9384c files/erlang-12.2.0-binary-append.patch 963
+DIST otp_doc_html_R11B-5.tar.gz 4968176 RMD160 73f8056b66f3bc6ec6b93c3c3dbfdf47074f8974 SHA1 a44439ec924c35896b3cdb534f5001daf6e2e8dd SHA256 7dea67980b958ffebf7a94f3d94bd9c874e041f4f5ee574c56aab62c54a71d28
 DIST otp_doc_html_R12B-0.tar.gz 5859638 RMD160 08bedd6ad8a2d5581e59435e3bb3f6d2c225ed5d SHA1 5e2166519f7d9cbda4092d163d03a59f300368bb SHA256 49f74badd49840e2a2316138e69fed6e188abc92d57c2edfe9e581ed54c4064c
+DIST otp_doc_man_R11B-5.tar.gz 725858 RMD160 62d200be6143183a17f5263b7341ec40afe298c7 SHA1 3809faa63ac3420fd03291443bf0a73075a4781f SHA256 ab364af6e9db473d2bc5c0646a9b70989b858953ca9c053b78a509960a4f9caa
 DIST otp_doc_man_R12B-0.tar.gz 757429 RMD160 a7b58d95c2804866e3a1f5984f7a0ee914b04a56 SHA1 deba073069d7a8ae6d6c94c17e1eb45b5ec0f647 SHA256 028556cc1a7f36f483c16e4fd7838c797edec02890fea48a1a877cf01679de1a
+DIST otp_src_R11B-5.tar.gz 38332865 RMD160 67eac12a891df0e8d46b383ea0997f9de3aa6ac6 SHA1 c03569f0387b04b0afcc5f59983792676fd4382b SHA256 d41fdfba40f86a50e04b7226ae5cc4581072fad26d14be5e1ca06603813bb175
 DIST otp_src_R12B-0.tar.gz 41074760 RMD160 cb07ea37f2b56e1ea2fc07c9063b647df7635b2b SHA1 e2c6e18d22e34a799fc6bc25fa2d25eedb30bccc SHA256 8415e7a4ab0e0f70df8d5e2f19e742ef8f6c0d1bdf91aa62968332cf3d92be57
+EBUILD erlang-11.2.5-r3.ebuild 5037 RMD160 a96f238d6a570585d39c9a3fa9be0bcc64a92ff7 SHA1 614bc899be2e4070e230deda09591cb5220df788 SHA256 1e8c280320d56a88b7e986ea2e98fc5639455dee089f31088feb1624e5a5a2bf
+MD5 cbc2bf1bec2fe6353fc5fb414ecc6ee9 erlang-11.2.5-r3.ebuild 5037
+RMD160 a96f238d6a570585d39c9a3fa9be0bcc64a92ff7 erlang-11.2.5-r3.ebuild 5037
+SHA256 1e8c280320d56a88b7e986ea2e98fc5639455dee089f31088feb1624e5a5a2bf erlang-11.2.5-r3.ebuild 5037
 EBUILD erlang-12.2.0.ebuild 5156 RMD160 a4c295ffb1aa8eae06eb4bcebd5bc56c2ed6c1d6 SHA1 126da76ccd7cc13dcf559de675c37172c088359f SHA256 b57b23ecd09ff24210cb3875da99e62a6c5c328ec7f24ba57ac27c15c8a0a2fe
 MD5 272843a16f7b35fa3d6b0f563d34aca3 erlang-12.2.0.ebuild 5156
 RMD160 a4c295ffb1aa8eae06eb4bcebd5bc56c2ed6c1d6 erlang-12.2.0.ebuild 5156
 SHA256 b57b23ecd09ff24210cb3875da99e62a6c5c328ec7f24ba57ac27c15c8a0a2fe erlang-12.2.0.ebuild 5156
-MISC ChangeLog 17082 RMD160 dfbd6050cdd48f02dfb19ccea6efdf2ca65f5b7b SHA1 567b28f7ceadc17bb4d14c993cfa6a7a6f515fe8 SHA256 3e9954b132cad73ae52c0ffad461a45c3886bc3261a13ddc63043b93852b37ef
-MD5 514d760a83b78e75a43c0cf03b4e83f5 ChangeLog 17082
-RMD160 dfbd6050cdd48f02dfb19ccea6efdf2ca65f5b7b ChangeLog 17082
-SHA256 3e9954b132cad73ae52c0ffad461a45c3886bc3261a13ddc63043b93852b37ef ChangeLog 17082
+MISC ChangeLog 17298 RMD160 afb0146bcfdc9e8a5e189ee8ae8e379c6f8b9cdd SHA1 273dc837b66eaa6074ad5483cd45d8bf70381a0c SHA256 216d82134a095efdf950b156c9ca3826eef03da8b9e1990304c7082f59d99ce0
+MD5 2eb7d10bbbeee75e5af26b6ba2d28016 ChangeLog 17298
+RMD160 afb0146bcfdc9e8a5e189ee8ae8e379c6f8b9cdd ChangeLog 17298
+SHA256 216d82134a095efdf950b156c9ca3826eef03da8b9e1990304c7082f59d99ce0 ChangeLog 17298
 MISC metadata.xml 476 RMD160 da948210972738dfbd855236cecc30b22d9cdb3e SHA1 b31a990b8d57f0c32a9cccdd2c60958c1f1a847f SHA256 393328bc46a0f98b7e1be0f6b4bd2f8e3070762e23cbca17fa32f6eecd8a2af7
 MD5 18323c97ef99bdddc4c1888460d6a944 metadata.xml 476
 RMD160 da948210972738dfbd855236cecc30b22d9cdb3e metadata.xml 476
 SHA256 393328bc46a0f98b7e1be0f6b4bd2f8e3070762e23cbca17fa32f6eecd8a2af7 metadata.xml 476
+MD5 ef743a3246f9d7ec66364da643336263 files/digest-erlang-11.2.5-r3 777
+RMD160 1f5e1f2c228cc200454020a908591045586d3a12 files/digest-erlang-11.2.5-r3 777
+SHA256 79e8a087b8bed1f07c43ca86bf9239f8134338cec02abb54f9683dfd471f0d06 files/digest-erlang-11.2.5-r3 777
 MD5 6732a33d077966a4d033196fa1691e78 files/digest-erlang-12.2.0 768
 RMD160 92b195e6cbc555670840bb9c04ad3f9dea2aeb99 files/digest-erlang-12.2.0 768
 SHA256 611b9615089852c52283134192a874c71df49780b5456e0f1a59e55176a337b7 files/digest-erlang-12.2.0 768
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHlu/yNQqtfCuFneMRAkG9AKCC01cnQEYuuiZVKVNGzLG1vpE5DgCfb90D
-3fyPpq8svtMaUdfxyHVF9fQ=
-=thvc
+iD8DBQFHmY1RNQqtfCuFneMRAkj7AJ45Uz34KPcNdD+HTtb1TyP5oPaMoQCZAa9N
+xwTDAKIeWXIstudl0LaBXFs=
+=4jTs
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-11.2.5-r3.ebuild b/dev-lang/erlang/erlang-11.2.5-r3.ebuild
new file mode 100644
index 000000000000..11d9dff662d2
--- /dev/null
+++ b/dev-lang/erlang/erlang-11.2.5-r3.ebuild
@@ -0,0 +1,169 @@
+# 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.5-r3.ebuild,v 1.8 2008/01/25 07:17:49 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
+
+src_unpack() {
+
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-build.patch #184419
+
+	# needed for amd64
+	epatch "${FILESDIR}/${PN}-10.2.6-export-TARGET.patch"
+
+	# needed for FreeBSD
+	epatch "${FILESDIR}/${P}-gethostbyname.patch"
+
+	# odbc is disabled in the amd64 code, but it works
+	if use amd64 && use odbc; then
+		epatch "${FILESDIR}/${P}-odbc-support-amd64.patch"
+	fi
+
+	# needed for building with hipe and recent coreutils
+	use hipe && epatch "${FILESDIR}"/${P}-hipe.patch
+
+	use odbc || sed -i 's: odbc : :' lib/Makefile
+
+	# make sure we only link ssl dynamically
+	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!"
+		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 -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 and tell the maintainers."
+	elog
+	elog "Gentoo's versioning scheme differs from the author's, so please refer to this version as R11B-5"
+	elog
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/erlang/files/digest-erlang-11.2.5-r3 b/dev-lang/erlang/files/digest-erlang-11.2.5-r3
new file mode 100644
index 000000000000..11cf052b1e4f
--- /dev/null
+++ b/dev-lang/erlang/files/digest-erlang-11.2.5-r3
@@ -0,0 +1,9 @@
+MD5 6a40146d855f98d024682cd24e9bb5bc otp_doc_html_R11B-5.tar.gz 4968176

+RMD160 73f8056b66f3bc6ec6b93c3c3dbfdf47074f8974 otp_doc_html_R11B-5.tar.gz 4968176

+SHA256 7dea67980b958ffebf7a94f3d94bd9c874e041f4f5ee574c56aab62c54a71d28 otp_doc_html_R11B-5.tar.gz 4968176

+MD5 5c387162ae6d255f525d72a91481d135 otp_doc_man_R11B-5.tar.gz 725858

+RMD160 62d200be6143183a17f5263b7341ec40afe298c7 otp_doc_man_R11B-5.tar.gz 725858

+SHA256 ab364af6e9db473d2bc5c0646a9b70989b858953ca9c053b78a509960a4f9caa otp_doc_man_R11B-5.tar.gz 725858

+MD5 96acec41da87d6ee0ef18e1aab36ffdd otp_src_R11B-5.tar.gz 38332865

+RMD160 67eac12a891df0e8d46b383ea0997f9de3aa6ac6 otp_src_R11B-5.tar.gz 38332865

+SHA256 d41fdfba40f86a50e04b7226ae5cc4581072fad26d14be5e1ca06603813bb175 otp_src_R11B-5.tar.gz 38332865

diff --git a/dev-lang/erlang/files/erlang-11.2.5-hipe.patch b/dev-lang/erlang/files/erlang-11.2.5-hipe.patch
new file mode 100644
index 000000000000..08cbbfec8c71
--- /dev/null
+++ b/dev-lang/erlang/files/erlang-11.2.5-hipe.patch
@@ -0,0 +1,12 @@
+Fix duplicate entry in makefile

+

+--- otp_src_R11B-5.orig/lib/hipe/regalloc/Makefile	2007-09-12 12:45:03.000000000 -0600

++++ otp_src_R11B-5/lib/hipe/regalloc/Makefile	2007-09-12 12:46:01.000000000 -0600

+@@ -43,7 +43,6 @@

+ 	  hipe_temp_map \

+ 	  hipe_optimistic_regalloc \

+ 	  hipe_coalescing_regalloc \

+-	  hipe_optimistic_regalloc \

+ 	  hipe_graph_coloring_regalloc \

+ 	  hipe_regalloc_loop \

+ 	  hipe_ls_regalloc \
\ No newline at end of file
diff --git a/dev-lang/erlang/files/erlang-11.2.5-odbc-support-amd64.patch b/dev-lang/erlang/files/erlang-11.2.5-odbc-support-amd64.patch
new file mode 100644
index 000000000000..3a71c32bc04c
--- /dev/null
+++ b/dev-lang/erlang/files/erlang-11.2.5-odbc-support-amd64.patch
@@ -0,0 +1,17 @@
+diff -urN otp_src_R11B-5/lib/odbc/c_src/Makefile.in otp_src_R11B-5.odbc/lib/odbc/c_src/Makefile.in

+--- otp_src_R11B-5/lib/odbc/c_src/Makefile.in	2006-05-03 11:18:45.000000000 +0300

++++ otp_src_R11B-5.odbc/lib/odbc/c_src/Makefile.in	2007-11-07 00:24:36.000000000 +0200

+@@ -57,11 +57,11 @@

+ WIN32_TARGET = $(WIN_BIN_DIR)/odbcserver.exe

+ EXE_TARGET = $(WIN32_TARGET)

+ else

+-ifneq ($(BITS64),yes)

++#ifneq ($(BITS64),yes)

+ EI_LIB = -lerl_interface -lei

+ UNIX_TARGET = $(BIN_DIR)/odbcserver

+ EXE_TARGET = $(UNIX_TARGET)

+-endif

++#endif

+ endif

+ 

+ C_FILES = odbcserver.c