clean up

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

4 files changed, 9 insertions, 202 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index 9bc365257a9e..2184f99d1cba 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,10 @@
 # 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.199 2010/11/08 00:47:30 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.200 2010/11/08 01:03:16 fauli Exp $
+
+  08 Nov 2010; Christian Faulhammer <fauli@gentoo.org> -erlang-14.1.ebuild,
+  -files/erlang-14.1-lm.patch:
+  clean up
 
 *erlang-14.2 (08 Nov 2010)
 
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index f1e2ff9d1d27..311b75203adf 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -3,25 +3,20 @@ Hash: SHA1
 
 AUX 50erlang-gentoo.el 134 RMD160 a453ad18f47d20e5ea5ecd1f4e4054d00eab5c35 SHA1 7c17979f533654ef05bbfcc8ae30554e7843923b SHA256 97e1da82cae31a554134d7370739520e4c67b2544e5a13f887651a62e710b4d4
 AUX epmd.init 515 RMD160 7f5927b020809ec9013a6f0e997fc0232489162a SHA1 dd32584a9e4971fac65881ce2e215afb570a5292 SHA256 d60df142ee0e47e9d55f543effe99b057dbf763586cadffb05a82ce74edeb494
-AUX erlang-14.1-lm.patch 617 RMD160 dddc049759b3e4a8af38755e9b5f0218a761b035 SHA1 f22b19b0b5aca97405bb9015c7c4b4448201e0a5 SHA256 fa58aeb0482b8c20f662eeb4d015cdeb5315b74fe8130a3e54fdab6e1c3fd0d7
 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_html_R14B.tar.gz 27735095 RMD160 a7a100971543cc238dfeaf010028dea7261673f5 SHA1 d752b4bdc89d64bffde41e64b118eb7c0a8f7c72 SHA256 0189a784a4ea0c192c857835b20fa97a0c9f85054ae5b9868061574f329842a5
 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_doc_man_R14B.tar.gz 1067515 RMD160 4c11c653e231edbab0f3f8a7b7fdc275911ed845 SHA1 92f9ae963cfa40c1d49b3e928c225cb8362b53c3 SHA256 4c43ef799c29ef488959ffdfb8a8fc1d1e7756c2c7dccb4cc81061de5ac40c8a
 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
 DIST otp_src_R14B.tar.gz 59800980 RMD160 69578a2019fcaab4e7c11f2d1d2d5eef21d5c5fa SHA1 811c17346415159644f16387f1267004a632c452 SHA256 b35af03c69c40c0e4758ee011f71e28ce92783368afec764ce46e6e54cb05d9f
 EBUILD erlang-13.2.4.ebuild 5164 RMD160 2d746d7d8383a0504bd4f80a24505bb20e4cbeda SHA1 ecdd965ef4c747762671a4bb6f8b44aeb1b41193 SHA256 203e4238e06787b5e988366c56c763e3656d63eb44c52038ed6ff271dace9bd7
-EBUILD erlang-14.1.ebuild 5275 RMD160 5bf059098d7ee47ca50341e09ea90de1d7235563 SHA1 5b33572124a5cfdfb5b9a555860658a2a75c73d5 SHA256 4a31cbbe02620a29e65f84087301b549988319f25b660ed9d514c6141a4f9010
 EBUILD erlang-14.2.ebuild 5461 RMD160 dd5356643ef3bab3e8ab95efc77f68fa45b3d714 SHA1 1e55b3b68cabf30821efc321a2b91e76b37261c5 SHA256 bc49bc851f3ac8776a9c0be168af516ac55c59d650e9947ae2b7ec6f554d92f1
-MISC ChangeLog 31698 RMD160 8238276bf63b9cb88fb0c8889eca17c18e87a610 SHA1 469b83ed6a649e669d0887b4f7b49defc3a6eeb9 SHA256 98c0e802d19a549e6719c6df5f5a9880b1cbbe35767d8800eb689a6e780654fa
+MISC ChangeLog 31817 RMD160 e85f4e401cb377831a912901143e80815bd55d5d SHA1 f44f6f6fa3da3a0e8fb7559ee6729979923b87df SHA256 6c65daa3835119e89d90ecc5299936b784ba27f2d62a93ba6d7df0bd3a168d3c
 MISC metadata.xml 693 RMD160 6c8d43bd35549421b055b468c45f1f2e5d39357d SHA1 7c778bbc7faf1dfdc11a6155e1c525e42d63ebb5 SHA256 ee0ac0699562802a5191deaef78770c25a342875a3b363ea95a0b92da6f107e3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzXSMUACgkQNQqtfCuFneMOcQCbB5C975zj4ifOLUnWPeTe6pK2
-OZwAoJduDba79ucklH3kdIXo9ibZx5rV
-=mEIs
+iEYEARECAAYFAkzXTG8ACgkQNQqtfCuFneOtlgCfT2hiIM7UPcCXR8Ng0TD3XMhJ
+GMsAn1jB+Ua4PdAM6izrRYoU5ghQza36
+=Y5cj
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-14.1.ebuild b/dev-lang/erlang/erlang-14.1.ebuild
deleted file mode 100644
index 3c8e402a2388..000000000000
--- a/dev-lang/erlang/erlang-14.1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# 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.6 2010/09/30 19:29:19 grobian 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 ~x64-solaris"
-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
-
-	# fixes as-needed issues and has been incorporated for 14A by upstream
-	epatch "${FILESDIR}"/${P}-lm.patch
-
-	# prevent configure from injecting -m32 by default on Darwin, bug #334155
-	sed -i -e 's/Darwin-i386/Darwin-NO/' configure.in || die
-	sed -i -e '/\<\(LD\|C\)FLAGS="-m32/s/-m32//' erts/configure.in || die
-
-	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
-}
diff --git a/dev-lang/erlang/files/erlang-14.1-lm.patch b/dev-lang/erlang/files/erlang-14.1-lm.patch
deleted file mode 100644
index 2678bc4c7543..000000000000
--- a/dev-lang/erlang/files/erlang-14.1-lm.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/325969
-
-erl_printf_format.c:(.text+0xa3e): undefined reference to `log10'
-
---- erts/etc/common/Makefile.in
-+++ erts/etc/common/Makefile.in
-@@ -98,7 +98,7 @@
- ifeq ($(TARGET),win32)
- ERTS_INTERNAL_LIBS=-L../../lib/internal/$(TARGET) -lerts_internal_r$(ERTS_LIB_TYPEMARKER) @ERTS_INTERNAL_X_LIBS@
- else
--ERTS_INTERNAL_LIBS=-L../../lib/internal/$(TARGET) -lerts_internal$(ERTS_LIB_TYPEMARKER) @ERTS_INTERNAL_X_LIBS@
-+ERTS_INTERNAL_LIBS=-L../../lib/internal/$(TARGET) -lerts_internal$(ERTS_LIB_TYPEMARKER) @ERTS_INTERNAL_X_LIBS@ -lm
- endif
- 
- # ----------------------------------------------------