clean up

Package-Manager: portage-2.1.4.4

5 files changed, 17 insertions, 350 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index 01c1310fb96e..edf3b9a467d7 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.134 2008/08/24 11:22:34 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.135 2008/08/25 08:16:26 opfer Exp $
+
+  25 Aug 2008; Christian Faulhammer <opfer@gentoo.org>
+  -files/erlang-12.2.2-as-needed.patch, -erlang-12.2.2.ebuild,
+  -erlang-12.2.3.ebuild:
+  clean up
 
   24 Aug 2008; Markus Rothe <corsair@gentoo.org> erlang-12.2.3-r1.ebuild:
   Stable on ppc64; bug #231553
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 9cedd5112551..c8fa0e978c5a 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,15 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50erlang-gentoo.el 134 RMD160 a453ad18f47d20e5ea5ecd1f4e4054d00eab5c35 SHA1 7c17979f533654ef05bbfcc8ae30554e7843923b SHA256 97e1da82cae31a554134d7370739520e4c67b2544e5a13f887651a62e710b4d4
-AUX erlang-12.2.2-as-needed.patch 681 RMD160 4e296989aa03a874871bcd1be558b9b6036722ae SHA1 7d8279e19941cc381b4fa48df75596aad3a5adbe SHA256 02a58d742d273754b584e2adb6d8e97170dda98a434676b979dcbccd817eca46
 AUX erlang-12.2.3-gethostbyname.patch 609 RMD160 37e053888f38ddcb061993d9317e144e2240f7f7 SHA1 85e5eb8b2f5bfc24644b90118ac7f10d95489933 SHA256 c24b981761f39492a150dd1fee2fb10c17869873ea2cbd679090008775960bfa
 AUX erlang-12.2.3-glibc28.patch 431 RMD160 0f776b37e3d072f3a8dca72f5eb1cd0893ae522f SHA1 12bdfe823e9bae3ac40d2ee8a951b183b4b85ac8 SHA256 628038216ff9f66aad5100fa8663bc4ca229b33bd9ba952b95c64b43af1635d6
-DIST otp_doc_html_R12B-2.tar.gz 5616891 RMD160 ddceb9b20aa485d8aab9c4f43e0f33fc8ba7eb8d SHA1 9fbb1f8e514ab340fff437e794243b4d530ed682 SHA256 f169acca450eb84d58377b1fabee18268ea9cf1a59393c0b970fefdb894b771e
 DIST otp_doc_html_R12B-3.tar.gz 5655205 RMD160 8295d4e94952bad6458f2038415c474e687631cb SHA1 194003607113c84aef5b5daad7ca8b8901d1d80a SHA256 4690829f270a40d6c1849a34e9854ba4f55e1ec1a1e91dbc09e6a0a0a7228005
-DIST otp_doc_man_R12B-2.tar.gz 777982 RMD160 963eb8247ae2df39ce4f998d72893e9ff2d646a0 SHA1 c32be18cc121412af97d948e1262a185206cadcb SHA256 712140af4b49cf696f6968244e13a753cb6f53c09e46fedb8d93407bf21c95c4
 DIST otp_doc_man_R12B-3.tar.gz 809746 RMD160 7e0c27391f42b1e58c7bb1472594e9fe6f7ac414 SHA1 8ea4c9fa7d941c339c73bb417f88ee939d6989eb SHA256 08e3ed5a285eabe94fef6726bd591e02c42a8425ddcdb6a6d3f38f4a2d517e62
-DIST otp_src_R12B-2.tar.gz 41190987 RMD160 14702b907c1a2cce2403e2c24db8187904039697 SHA1 a38adf0498a6d0f5038899d9f4a8accc935e7ffd SHA256 ba84af52b5ff10029a9f68c03d53c350d359ca1ed9247ac609765746692a89c1
 DIST otp_src_R12B-3.tar.gz 42195557 RMD160 e7b5da985b939e51ef4e2d19fb96cff1781ce263 SHA1 ea5f202cc35ed6ef2796727b95d62c9bbe6ad5e5 SHA256 a8ed977d468454ca8d849ee5fa08ac3d521d76f23649bef531b76bdfa73f8eb2
-EBUILD erlang-12.2.2.ebuild 4731 RMD160 9b4f5982f518e7deba8f8d02e0e3537248a8bad9 SHA1 61e28e980870c65d60279b6cb4db20e41997832a SHA256 e5bfb4cd35ab21c02a34263b8dcc78074e21beafaeb2fac1be6771d2803deffc
 EBUILD erlang-12.2.3-r1.ebuild 4866 RMD160 574c1afd7c46d39c6713908fed37f5a94cf84f5f SHA1 95cab1e148240b51f9ee265d3a31b9dcb782d511 SHA256 df78ae8f19cc8c6a8d67d6d2350eca1d68b30f7ec4244891b507ac527ab5c12e
-EBUILD erlang-12.2.3.ebuild 4994 RMD160 aeaf3d5caa410dd7d059882abcf798c2766c58d6 SHA1 d412a44055c506a9f4788855d5c8a42f3989be47 SHA256 1791478fe830272629531ae3ced2a36913eaa51050f1815e2de0d9cd8ad37da9
-MISC ChangeLog 22330 RMD160 8e06248024e689861d66411a37c95b04e0099d6d SHA1 553f03c95ed65c7253e199b4208f675b763b1a03 SHA256 0950ab6a46dc52c6e1381b4c767dd3b870be31129126b4fe89f8e8503f696f39
+MISC ChangeLog 22483 RMD160 bf1139177e342007b224ad095234cbb61692eaf5 SHA1 79c15359ebf5a8f165bc05643ef42e760b140850 SHA256 11f0d23e232445ed7574d7573beff1e72e528a0b62e9941b31b517f0fd7f88be
 MISC metadata.xml 756 RMD160 a8696744a014686725d3d4564f72fda756c9ed30 SHA1 401ad27309457ecfdebfbb9afbfe7884355b2943 SHA256 9e43ae1a447628dd51dd7077cef97bf984fff99a97a87d466a30fe0a1e00b5a5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiyapAACgkQNQqtfCuFneMmJwCdEn/0OXmaNDOX99kKpE3UlQKv
+tkgAn3hhxcfQ1HBRZn/LFFQ6a9Duy/E3
+=OgAk
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-12.2.2.ebuild b/dev-lang/erlang/erlang-12.2.2.ebuild
deleted file mode 100644
index 18f4101c9ff6..000000000000
--- a/dev-lang/erlang/erlang-12.2.2.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-12.2.2.ebuild,v 1.9 2008/05/28 19:47:35 pva Exp $
-
-inherit autotools elisp-common eutils flag-o-matic multilib versionator
-
-# 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.
-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}"
-
-	use odbc || sed -i 's: odbc : :' lib/Makefile
-
-	# fix builds with --as-needed LDFLAGS, bug 203157
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-
-	# make sure we only link ssl dynamically
-	# will not be integrated by upstream for various reasons
-	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! If you have fix, tell us."
-		ewarn
-	fi
-	eautoreconf
-}
-
-src_compile() {
-	use java || export JAVAC=false
-
-	econf \
-		--enable-threads \
-		$(use_enable hipe) \
-		$(use_with ssl) \
-		$(use_enable kpoll kernel-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 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/erlang-12.2.3.ebuild b/dev-lang/erlang/erlang-12.2.3.ebuild
deleted file mode 100644
index 977fe218ded3..000000000000
--- a/dev-lang/erlang/erlang-12.2.3.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-12.2.3.ebuild,v 1.8 2008/07/21 12:33:36 aballier Exp $
-
-inherit autotools elisp-common eutils flag-o-matic multilib versionator
-
-# 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.
-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 sctp 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}
-	sctp? ( net-misc/lksctp-tools )
-	tk? ( dev-lang/tk )"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE=50${PN}-gentoo.el
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	use odbc || sed -i 's: odbc : :' lib/Makefile
-
-	# fixes bug 226063, reported and accepted upstream for R12B-4
-	epatch "${FILESDIR}"/${P}-glibc28.patch
-
-	# Fix build on Gentoo/FreeBSD, upstream once accepted it but restored previous behaviour
-	# because of failures on vanilla BSD
-	epatch "${FILESDIR}"/${P}-gethostbyname.patch
-
-	# make sure we only link ssl dynamically
-	# will not be integrated by upstream for various reasons
-	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! If you have fix, tell us."
-		ewarn
-	fi
-	eautoreconf
-}
-
-src_compile() {
-	use java || export JAVAC=false
-
-	econf \
-		--enable-threads \
-		$(use_enable sctp) \
-		$(use_enable hipe) \
-		$(use_with ssl) \
-		$(use_enable kpoll kernel-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 || 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 "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 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-12.2.2-as-needed.patch b/dev-lang/erlang/files/erlang-12.2.2-as-needed.patch
deleted file mode 100644
index 863e89c9400f..000000000000
--- a/dev-lang/erlang/files/erlang-12.2.2-as-needed.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- erts/configure.in.orig	2008-04-24 23:16:09.000000000 +0400
-+++ erts/configure.in	2008-04-24 23:17:05.000000000 +0400
-@@ -2874,8 +2874,10 @@
- 				else
- 					saveCFLAGS="$CFLAGS"
-  					saveLDFLAGS="$LDFLAGS"
-+					saveLIBS="$LIBS"
-  					CFLAGS="$CFLAGS $SSL_INCLUDE"
-- 					LDFLAGS="$LDFLAGS -L$SSL_LIBDIR -lcrypto"
-+ 					LDFLAGS="$LDFLAGS -L$SSL_LIBDIR"
-+					LIBS="-lcrypto"
-  					AC_TRY_LINK([
- 					#include <stdio.h>
-  					#include <openssl/hmac.h>],
-@@ -2887,6 +2889,7 @@
-  					[ssl_linkable=no])
-  					CFLAGS="$saveCFLAGS"
-  					LDFLAGS="$saveLDFLAGS"
-+					LIBS="$saveLIBS"
- 				fi
-  			fi
- 	 		if test "x$ssl_found" = "xyes" -a "x$ssl_linkable" = "xyes"  ; then