port Prefix changes, add some dies

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

3 files changed, 23 insertions, 18 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index 643d198086a4..15c517c074c5 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,9 @@
 # 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.182 2010/03/04 08:46:17 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.183 2010/03/04 09:22:40 fauli Exp $
+
+  04 Mar 2010; Christian Faulhammer <fauli@gentoo.org> erlang-13.2.4.ebuild:
+  port Prefix changes, add some dies
 
   04 Mar 2010; Christian Faulhammer <fauli@gentoo.org> erlang-13.2.3.ebuild:
   port Prefix changes
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index bc2c5605726b..50d1a949f973 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -13,13 +13,13 @@ DIST otp_src_R13B03.tar.gz 57524485 RMD160 7cf3d1cf6cdf73ff19f5a416396c4024e641e
 DIST otp_src_R13B04.tar.gz 59060560 RMD160 5546431e710814da2089d70d5d02c658a1a2f79b SHA1 fe785833a8029cbb3aee188bdb417f4da33fbd06 SHA256 e2694383b3857f5edfc242b8c3acbfba4683e448387fa124d8e587cba234af43
 EBUILD erlang-13.2.2.ebuild 4676 RMD160 22fa4ae057a1d4d89a103719545eb968161428a2 SHA1 c1ec334fe80f65f7fc799092a31b75ecb2761295 SHA256 57ed621d933ea68e993b7046875ff963ab6e3bac98c4ae26db29cdac9d409794
 EBUILD erlang-13.2.3.ebuild 4881 RMD160 c5ed3f71e5cf8a80bdcc997d553f16e5db77c3d5 SHA1 fbbf34a9c2b749a2a937c31fdf713692fe371ca6 SHA256 f61dd1abf4109c20daffd722bb47ed6dc4f70126033f946e991232636dbd5969
-EBUILD erlang-13.2.4.ebuild 4673 RMD160 f196ed75d86d4498add5ad09a9ddb0d66bb09393 SHA1 d71215f17d6fc762aae43d7d24ed68ae32c827c4 SHA256 7f6efb4a8d16b85fdac18b2f2a866a5df5748364ad3aa30a26da1346e586312a
-MISC ChangeLog 29532 RMD160 c951d96f4fb190917815c2c1c84f2f59ed9cd06a SHA1 cc65fb607b6b1cfd84936259c83480438bcc8ac7 SHA256 63d44108395ee5e10e0234dfee882d058d4fc8130a2443675dfff0ebd135809c
+EBUILD erlang-13.2.4.ebuild 4907 RMD160 5e72c45a6589bd3eca676990f4a367493477e602 SHA1 466ed2f47290b56a3fe175cb1697d6579d981051 SHA256 94971b44f9eafa37c393d01fb729c7ec125a1933c49bd84e92276a611705d800
+MISC ChangeLog 29647 RMD160 e5741ea195cf7084eb39279de4ccf19a0941a0d0 SHA1 27f0578dc5686b1d6cc7b224c1d187b11efea020 SHA256 22eea108f9e36972e7e43d0aede545b9ceeb9b5efbd103ba6deaa99c4030f448
 MISC metadata.xml 693 RMD160 6c8d43bd35549421b055b468c45f1f2e5d39357d SHA1 7c778bbc7faf1dfdc11a6155e1c525e42d63ebb5 SHA256 ee0ac0699562802a5191deaef78770c25a342875a3b363ea95a0b92da6f107e3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuPc20ACgkQNQqtfCuFneOhiwCeK0S+O8Em/2hSGrDq3ZTfcMzc
-/IwAoJbATls8X9svB08zx11Ij0mKpq1p
-=nctG
+iEYEARECAAYFAkuPe+YACgkQNQqtfCuFneNGtwCdFVCzGIc7lO7p3z17PJJHM+n+
+9psAn3kQ0QmNs8ysDN57j9TTb1Zy/0TO
+=VL1P
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-13.2.4.ebuild b/dev-lang/erlang/erlang-13.2.4.ebuild
index 74d308987c81..12e4d917faad 100644
--- a/dev-lang/erlang/erlang-13.2.4.ebuild
+++ b/dev-lang/erlang/erlang-13.2.4.ebuild
@@ -1,8 +1,8 @@
 # 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-13.2.4.ebuild,v 1.1 2010/03/02 08:47:18 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-13.2.4.ebuild,v 1.2 2010/03/04 09:22:40 fauli Exp $
 
-EAPI=2
+EAPI=3
 WX_GTK_VER="2.8"
 
 inherit autotools elisp-common eutils multilib versionator wxwidgets
@@ -29,7 +29,7 @@ SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz
 
 LICENSE="EPL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+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
@@ -75,7 +75,7 @@ src_configure() {
 		--enable-threads \
 		$(use_enable sctp) \
 		$(use_enable hipe) \
-		$(use_with ssl) \
+		$(use_with ssl ssl "${EPREFIX}"/usr) \
 		$(use_enable ssl dynamic-ssl-lib) \
 		$(use_enable kpoll kernel-poll) \
 		$(use_enable smp smp-support) \
@@ -115,24 +115,24 @@ src_install() {
 	use smp && dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
 
 	## 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"
+	sed "s:${D}::g" "${D}${ERL_LIBDIR}/bin/erl" || die
+	sed "s:${D}::g" "${D}${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 "${D}/${ERL_LIBDIR}/Install"
+	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} "${D}/${ERL_LIBDIR}"/man/man${file##*.}/
+		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=\"${ERL_LIBDIR}/man\"" > "${D}/etc/env.d/90erlang"
+	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 \
@@ -142,13 +142,15 @@ src_install() {
 	if use emacs ; then
 		pushd "${S}"
 		elisp-install erlang lib/tools/emacs/*.{el,elc}
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+		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:' \
-		"${D}/${ERL_LIBDIR}/bin/erl"
+		"${ED}/${ERL_LIBDIR}/bin/erl"
 }
 
 pkg_postinst() {