Fix up some no-no's in the ebuild thanks to flameeyes in bug #294463

(Portage version: 2.1.7.7/cvs/Linux x86_64)

2 files changed, 136 insertions, 1 deletions

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index 9b8a0ba49cc3..4c6d91bb58fe 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/charm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.23 2009/08/31 08:53:37 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.24 2009/11/27 05:26:01 je_fro Exp $
+
+*charm-6.1.2-r2 (27 Nov 2009)
+
+  27 Nov 2009; Jeff Gardner <je_fro@gentoo.org> +charm-6.1.2-r2.ebuild:
+  Fix up some no-no's in the ebuild thanks to flameeyes in bug #294463.
 
   31 Aug 2009; Peter Alfredsen <loki_val@gentoo.org> charm-6.1.2.ebuild,
   charm-6.1.2-r1.ebuild:
diff --git a/sys-cluster/charm/charm-6.1.2-r2.ebuild b/sys-cluster/charm/charm-6.1.2-r2.ebuild
new file mode 100644
index 000000000000..a042f621b87b
--- /dev/null
+++ b/sys-cluster/charm/charm-6.1.2-r2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.1.2-r2.ebuild,v 1.1 2009/11/27 05:26:01 je_fro Exp $
+
+inherit eutils toolchain-funcs flag-o-matic multilib
+
+DESCRIPTION="Charm++ is a message-passing parallel language and runtime system."
+LICENSE="charm"
+HOMEPAGE="http://charm.cs.uiuc.edu/"
+SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}_src.tar.gz"
+S="${WORKDIR}/${P}"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cmkopt tcp smp doc"
+
+DEPEND="doc? ( virtual/poppler-utils
+		dev-tex/latex2html
+		virtual/tex-base
+		)"
+
+RDEPEND=""
+
+case ${ARCH} in
+
+	x86)
+		CHARM_ARCH="net-linux" ;;
+
+	amd64)
+		CHARM_ARCH="net-linux-amd64" ;;
+esac
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-charmrun.patch"
+
+	# TCP instead of default UDP for socket comunication
+	# protocol
+	if use tcp; then
+		CHARM_OPTS="${CHARM_OPTS} tcp"
+	fi
+
+	# enable direct SMP support using shared memory
+	if use smp; then
+		CHARM_OPTS="${CHARM_OPTS} smp"
+	fi
+
+	# CMK optimization
+	if use cmkopt; then
+		append-flags -DCMK_OPTIMIZE=1
+	fi
+
+	echo "charm opts: ${CHARM_OPTS}"
+}
+
+src_compile() {
+	# build charmm++ first
+	cd "${S}"
+	./build charm++ ${CHARM_ARCH} ${CHARM_OPTS} ${CFLAGS} || \
+		die "Failed to build charm++"
+
+	# make pdf/html docs
+	if use doc; then
+		cd "${S}"/doc
+		make doc || die "failed to create pdf/html docs"
+	fi
+}
+
+src_install() {
+	# make charmc play well with gentoo before
+	# we move it into /usr/bin
+	epatch "${FILESDIR}/${P}-charmc-gentoo.patch"
+
+	sed -e "s|gentoo-include|${P}|" \
+		-e "s|gentoo-libdir|$(get_libdir)|g" \
+		-e "s|VERSION|${P}/VERSION|" \
+		-i ./src/scripts/charmc || die "failed patching charmc script"
+
+	# install binaries
+	cd "${S}"/bin
+	dobin ./charmd ./charmd_faceless ./charmr* ./charmc ./charmxi \
+		./conv-cpm ./dep.pl || die "Failed to install binaries"
+
+	# install headers
+	cd "${S}"/include
+	insinto /usr/include/${P}
+	doins * || die "failed to install header files"
+
+	# install static libs
+	cd "${S}"/lib
+	dolib.a *.a || die "failed to install static libs"
+
+	# install shared libs
+	cd "${S}"/lib_so
+	dolib.so *.so* || die "failed to install shared libs"
+
+	# basic docs
+	cd "${S}"
+	dodoc CHANGES README  || die "Failed to install docs"
+
+	# install examples
+	find examples/ -name 'Makefile' | xargs sed \
+		-r "s:(../)+bin/charmc:/usr/bin/charmc:" -i || \
+		die "Failed to fix examples"
+	find examples/ -name 'Makefile' | xargs sed \
+		-r "s:./charmrun:./charmrun ++local:" -i || \
+		die "Failed to fix examples"
+	insinto /usr/share/doc/${PF}/examples
+	doins -r examples/charm++/*
+
+	# pdf/html docs
+	if use doc; then
+		cd "${S}"/doc
+		# install pdfs
+		insinto /usr/share/doc/${PF}/pdf
+		doins  doc/pdf/* || die "failed to install pdf docs"
+		# install html
+		docinto html
+		dohtml -r doc/html/* || die "failed to install html docs"
+	fi
+}
+
+pkg_postinst() {
+	echo
+	einfo "Please test your charm installation by copying the"
+	einfo "content of /usr/share/doc/${PF}/examples to a"
+	einfo "temporary location and run 'make test'."
+	echo
+}