clean up

Package-Manager: portage-2.1.3.19

6 files changed, 20 insertions, 230 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index efea1658dadf..08b6e243fa13 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.95 2008/01/22 19:27:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.96 2008/01/23 06:50:56 opfer Exp $
+
+  23 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:
+  clean up
 
   22 Jan 2008; Raúl Porcel <armin76@gentoo.org> erlang-12.2.0.ebuild:
   alpha/sparc stable wrt #206882
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 3fa89641ad8b..7e05d0563a35 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50erlang-gentoo.el 134 RMD160 a453ad18f47d20e5ea5ecd1f4e4054d00eab5c35 SHA1 7c17979f533654ef05bbfcc8ae30554e7843923b SHA256 97e1da82cae31a554134d7370739520e4c67b2544e5a13f887651a62e710b4d4
 MD5 61ec30d48601463399b98166b39148fb files/50erlang-gentoo.el 134
 RMD160 a453ad18f47d20e5ea5ecd1f4e4054d00eab5c35 files/50erlang-gentoo.el 134
@@ -14,43 +17,32 @@ 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 415 RMD160 d9c35d8b1e6872343462b7b08a58c0cab121782f SHA1 7c09a73b80eb15e19fd8fcb9f2f5262439bbfcb4 SHA256 7e0149f7cca79a265f91d4fc850ad088d85bcd94f51706a4fca15a496d5466c9
-MD5 f0ffd3d3ce7c078180882150f0d5cd64 files/erlang-11.2.5-hipe.patch 415
-RMD160 d9c35d8b1e6872343462b7b08a58c0cab121782f files/erlang-11.2.5-hipe.patch 415
-SHA256 7e0149f7cca79a265f91d4fc850ad088d85bcd94f51706a4fca15a496d5466c9 files/erlang-11.2.5-hipe.patch 415
-AUX erlang-11.2.5-odbc-support-amd64.patch 563 RMD160 bd3c94439424b19b433cbfda4be298e65aaf5b39 SHA1 9c9bd50f1afd5eaad21bf94d731e40ff1228d1b5 SHA256 986fc7a86439c73dd255323b64cdc72756048bd164aa26adb55aada9b8c67f51
-MD5 3821045de4135b6b24ff999f519e8a69 files/erlang-11.2.5-odbc-support-amd64.patch 563
-RMD160 bd3c94439424b19b433cbfda4be298e65aaf5b39 files/erlang-11.2.5-odbc-support-amd64.patch 563
-SHA256 986fc7a86439c73dd255323b64cdc72756048bd164aa26adb55aada9b8c67f51 files/erlang-11.2.5-odbc-support-amd64.patch 563
 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 5038 RMD160 52a674885666d38cd9326bd41d9a7e2c443ffde8 SHA1 cf90d1b58b0b587455f21be8e0f69ec742caaf03 SHA256 7726e9207d8c32433511ef538dc48d24b805b0e5a22fb044fe1576c04afbb2d0
-MD5 d95b5743105cee53b243096088b208bd erlang-11.2.5-r3.ebuild 5038
-RMD160 52a674885666d38cd9326bd41d9a7e2c443ffde8 erlang-11.2.5-r3.ebuild 5038
-SHA256 7726e9207d8c32433511ef538dc48d24b805b0e5a22fb044fe1576c04afbb2d0 erlang-11.2.5-r3.ebuild 5038
 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 16791 RMD160 a841b8a1e794c06f523e708abab881cf5a97f910 SHA1 5bee5cb90ec31341b1da03c66c6021cf0359d51e SHA256 d3af2e1551f10409b8744747a992bc479811682e323c9e7d70d006a52a0ee128
-MD5 c0f43f759bc61d3a6cb65c2440d03fe4 ChangeLog 16791
-RMD160 a841b8a1e794c06f523e708abab881cf5a97f910 ChangeLog 16791
-SHA256 d3af2e1551f10409b8744747a992bc479811682e323c9e7d70d006a52a0ee128 ChangeLog 16791
+MISC ChangeLog 16966 RMD160 4246e5e44f3ceaeecc5cdca938946495d85c97a9 SHA1 69e2018c52af79514d95f2518a6997320ab86160 SHA256 edf7328aed1a8f2443cf844e398dbc871891f28acbcf091f96231e3b8ee84862
+MD5 1e24601fcd248d040b31ecb4596c66e8 ChangeLog 16966
+RMD160 4246e5e44f3ceaeecc5cdca938946495d85c97a9 ChangeLog 16966
+SHA256 edf7328aed1a8f2443cf844e398dbc871891f28acbcf091f96231e3b8ee84862 ChangeLog 16966
 MISC metadata.xml 402 RMD160 3d4e0e7953d95f43de89f62eacb37969caa29336 SHA1 2a45564353e8d0c2b9555294a6a269e56e0b6056 SHA256 c713a207afd5d65ef21d1c1e5fd3b867ce063dd9e46fc53db0734ad19f59ffe7
 MD5 aea374917adc11a2d42b0b9d1bba3598 metadata.xml 402
 RMD160 3d4e0e7953d95f43de89f62eacb37969caa29336 metadata.xml 402
 SHA256 c713a207afd5d65ef21d1c1e5fd3b867ce063dd9e46fc53db0734ad19f59ffe7 metadata.xml 402
-MD5 1bab88718439744f53d32f7d72c73616 files/digest-erlang-11.2.5-r3 768
-RMD160 8083c995b3c8a3d87af4ffbeedfbb2c7848ca23d files/digest-erlang-11.2.5-r3 768
-SHA256 ddcd6020ee9b5c4ec63c6532dde43970e1701b576a2c6662bd7177e2c971d3f4 files/digest-erlang-11.2.5-r3 768
 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)
+
+iD8DBQFHluP9NQqtfCuFneMRAge6AJsGRrP6s9xNMCTlm6xh+7p+LOBWsgCgk7ct
+YaYFVI4Gk92lDF8MYuJSy1o=
+=Q+Q+
+-----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
deleted file mode 100644
index b4a76d85c49c..000000000000
--- a/dev-lang/erlang/erlang-11.2.5-r3.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# 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.6 2007/12/21 13:18:40 nixnut 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
deleted file mode 100644
index 77aa33e4a391..000000000000
--- a/dev-lang/erlang/files/digest-erlang-11.2.5-r3
+++ /dev/null
@@ -1,9 +0,0 @@
-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
deleted file mode 100644
index d9399e024d9a..000000000000
--- a/dev-lang/erlang/files/erlang-11.2.5-hipe.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 1b5405e9c41d..000000000000
--- a/dev-lang/erlang/files/erlang-11.2.5-odbc-support-amd64.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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