Beta version bump for bug 325073, still has --as-needed issues

Package-Manager: portage-2.1.8.3/cvs/Linux i686

3 files changed, 184 insertions, 6 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index 191a3aba0ce1..41497477cb68 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/erlang
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.192 2010/06/27 08:04:46 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.193 2010/06/28 11:16:25 fauli Exp $
+
+*erlang-14.1 (28 Jun 2010)
+
+  28 Jun 2010; Christian Faulhammer <fauli@gentoo.org> +erlang-14.1.ebuild:
+  Beta version bump for bug 325073, still has --as-needed issues
 
   27 Jun 2010; Christian Faulhammer <fauli@gentoo.org>
   -erlang-13.2.2.ebuild, -erlang-13.2.3.ebuild:
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index d61f6e124469..a67768e36443 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -3,15 +3,19 @@ Hash: SHA1
 
 AUX 50erlang-gentoo.el 134 RMD160 a453ad18f47d20e5ea5ecd1f4e4054d00eab5c35 SHA1 7c17979f533654ef05bbfcc8ae30554e7843923b SHA256 97e1da82cae31a554134d7370739520e4c67b2544e5a13f887651a62e710b4d4
 DIST otp_doc_html_R13B04.tar.gz 27440785 RMD160 7257fad19ecfeee69b1c7021692374d1e29aba79 SHA1 dc0e68cb1dd6f45cbd5ea792260b16f91eaa0e2f SHA256 fdad0db55ab9339703e7cd61626b5cca95f187084d1dabf07ac97f528b4f47aa
+DIST otp_doc_html_R14A.tar.gz 27687699 RMD160 b59262b97dd5d42c660413c18f396230d424e644 SHA1 478a80fb4ed9747efbdb2925ff46ee2809ba5340 SHA256 31cef233a9a368b5d70cb965828a221f4f911ebaddfe85f0ee84f1118c9cfabd
 DIST otp_doc_man_R13B04.tar.gz 1033584 RMD160 3046e54a71bf6e114c9208f263caef831782d090 SHA1 660e52302d270138f8e9f2f2b6a562026998012c SHA256 3646198b64bbea0f3760987d20d3392b0b5b2955394a917b92a2c6664a310dd6
+DIST otp_doc_man_R14A.tar.gz 1062020 RMD160 699afefd28ffa12938dcdde6f98aa23290adf7b3 SHA1 320c95a73fe4ec8e42d2ea29de5562a1be8c1c50 SHA256 18a9445fcdefe9828796397cb863afe03519b5874df515bf2ad3e451d70395dc
 DIST otp_src_R13B04.tar.gz 59060560 RMD160 5546431e710814da2089d70d5d02c658a1a2f79b SHA1 fe785833a8029cbb3aee188bdb417f4da33fbd06 SHA256 e2694383b3857f5edfc242b8c3acbfba4683e448387fa124d8e587cba234af43
+DIST otp_src_R14A.tar.gz 59641065 RMD160 9b2ad4e2d0c007a4776ea8e5cc8d344107e51dd5 SHA1 286bad025985f5c6b9761cf05c0b6b68f7cb1874 SHA256 e3446a14ad60b997e27cff99b4eeedb28b840c0bd5a9da9ee57d05aacc2d169c
 EBUILD erlang-13.2.4.ebuild 4944 RMD160 ff7e9d338d7ee11ca70f8a1793a0019fd38bf6fa SHA1 0a4234d2f0237ebd2b2c5336420ec759295b7694 SHA256 bdea59dba0cccbec5ce79d663063f30c21292c94056989c7d6780607c404f8ee
-MISC ChangeLog 30640 RMD160 2447a76acbc31ce02bf3728cf4d0a76400c6bd84 SHA1 2e8af361bc4f9daac177ba0aa55c9a220d4051bc SHA256 f47b52d5d4f2a9cfea337bbf7081af91be47ef069e46d912bdf5a8de44bd43b7
+EBUILD erlang-14.1.ebuild 4945 RMD160 c36a42ef825f1050d2dbfec488b82074dff1cef8 SHA1 2ba104aa8626a01e2a93984c4e0e40da00d198ea SHA256 d91be4db673edc04da3120c9ce62d69068865f7b2879f41478ce872372bdb60d
+MISC ChangeLog 30810 RMD160 d8200fd27ec0eebd262c1063c42446f47298a12b SHA1 5b8b6532fa5ff905532e56ade1c6a32ed40d2192 SHA256 9b1ce0e3d9058853bca6d65ef27f96d08cbc348f2784bc60e4b9177dc16af5e5
 MISC metadata.xml 693 RMD160 6c8d43bd35549421b055b468c45f1f2e5d39357d SHA1 7c778bbc7faf1dfdc11a6155e1c525e42d63ebb5 SHA256 ee0ac0699562802a5191deaef78770c25a342875a3b363ea95a0b92da6f107e3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwnBlYACgkQNQqtfCuFneOprgCfdkZS0PqwMSe6DYSKQdaH4rV4
-IbwAnilqSm5jcEWlK0cU27yzMXR/N7dW
-=RcAf
+iEYEARECAAYFAkwohM0ACgkQNQqtfCuFnePIJwCgioFFkj2rEz95uz0zn2mSi5Gz
+HvwAoIjomvED4bQ6pLSs7OUkzV/GNVxh
+=4wgp
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-14.1.ebuild b/dev-lang/erlang/erlang-14.1.ebuild
new file mode 100644
index 000000000000..cff0decb71c4
--- /dev/null
+++ b/dev-lang/erlang/erlang-14.1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-14.1.ebuild,v 1.1 2010/06/28 11:16:25 fauli Exp $
+
+EAPI=3
+WX_GTK_VER="2.8"
+
+inherit autotools elisp-common eutils multilib versionator wxwidgets
+
+# 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.
+ERL_VER=($(get_version_components))
+MY_PV="R$(get_major_version)A${ERL_VER[2]}"
+
+# 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
+	http://erlang.org/download/otp_doc_man_${MY_PV}.tar.gz
+	doc? ( http://erlang.org/download/otp_doc_html_${MY_PV}.tar.gz )"
+
+LICENSE="EPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc emacs hipe java kpoll odbc smp sctp ssl tk wxwidgets"
+
+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}
+	wxwidgets? ( x11-libs/wxGTK:2.8[opengl] )
+	sctp? ( net-misc/lksctp-tools )
+	tk? ( dev-lang/tk )"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE=50${PN}-gentoo.el
+
+pkg_setup() {
+	use wxwidgets && wxwidgets_pkg_setup
+}
+
+src_prepare() {
+	use odbc || sed -i 's: odbc : :' lib/Makefile
+
+	if ! use wxwidgets; then
+		sed -i 's: wx : :' lib/Makefile
+		rm -rf lib/wx
+	fi
+
+	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 a fix, tell us though on Bugzilla."
+		ewarn
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	use java || export JAVAC=false
+
+	econf \
+		--enable-threads \
+		--enable-shared-zlib \ \
+		$(use_enable sctp) \
+		$(use_enable hipe) \
+		$(use_with ssl ssl "${EPREFIX}"/usr) \
+		$(use_enable ssl dynamic-ssl-lib) \
+		$(use_enable kpoll kernel-poll) \
+		$(use_enable smp smp-support) \
+		|| die
+}
+
+src_compile() {
+	use java || export JAVAC=false
+	emake -j1 || die
+
+	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
+	dodoc AUTHORS README.md
+
+	dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
+	dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
+	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
+	use smp && dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
+
+	## Remove ${D} from the following files
+	sed -e "s:${D}::g" -i "${ED}${ERL_LIBDIR}/bin/erl" || die
+	sed -e "s:${D}::g" -i "${ED}${ERL_LIBDIR}/bin/start" || die
+	grep -rle "${D}" "${ED}/${ERL_LIBDIR}/erts-${ERL_ERTS_VER}" | xargs sed -i -e "s:${D}::g"
+
+	## Clean up the no longer needed files
+	rm "${ED}/${ERL_LIBDIR}/Install"||die
+
+	for i in "${WORKDIR}"/man/man* ; do
+		dodir "${ERL_LIBDIR}/${i##${WORKDIR}}"
+	done
+	for file in "${WORKDIR}"/man/man*/*.[1-9]; do
+			# doman sucks so we can't use it
+		cp ${file} "${ED}/${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=\"${EPREFIX}${ERL_LIBDIR}/man\"" > "${ED}/etc/env.d/90erlang"
+
+	if use doc ; then
+		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}
+		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
+			"${FILESDIR}"/${SITEFILE} > "${T}"/${SITEFILE}
+		elisp-site-file-install "${T}"/${SITEFILE}
+		popd
+	fi
+
+	# prepare erl for SMP, fixes bug #188112
+	use smp && sed -i -e 's:\(exec.*erlexec\):\1 -smp:' \
+		"${ED}/${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
+}