merge

8 files changed, 67 insertions, 236 deletions

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index e4057d20e..2ad39a94c 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -1,7 +1,25 @@
 # ChangeLog for sys-cluster/charm
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jan 2014; Nicolas Bock <nicolasbock@gentoo.org> charm-6.6.0_rc1-r1.ebuild:
+  sys-cluster/charm-6.6.0_rc1-r1: After ongoing problems with charm's git
+  repository, I packaged the rc as a tar file and serve it from my personal dev
+  webpage.
+
+  03 Jan 2014; Nicolas Bock <nicolasbock@gentoo.org> charm-6.6.0_rc1-r1.ebuild:
+  sys-cluster/charm-6.6.0_rc1-r1: Add non-shallow option to git to avoid
+  breakage of checked out repository.
+
+*charm-6.6.0_rc1-r1 (02 Jan 2014)
+
+  02 Jan 2014; Nicolas Bock <nicolasbock@gentoo.org> +charm-6.6.0_rc1-r1.ebuild:
+  sys-cluster/charm-6.6.0_rc1-r1: Cleanup of python deps.
+
+  02 Jan 2014; Nicolas Bock <nicolasbock@gentoo.org> -Manifest,
+  -charm-6.5.1-r2.ebuild, -charm-6.5.1-r3.ebuild:
+  sys-cluster/charm: Removing versions moved to x86.
+
   13 Dec 2013; Nicolas Bock <nicolasbock@gentoo.org> metadata.xml:
   sys-cluster/charm: Updated maintainer email to gentoo.org.
 
diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest
index 0a0377625..b087e47f1 100644
--- a/sys-cluster/charm/Manifest
+++ b/sys-cluster/charm/Manifest
@@ -1 +1 @@
-DIST charm-6.5.1.tar.gz 19265741 SHA256 68aa43e2a6e476e116a7e80e385c25c6ac6497807348025505ba8bfa256ed34a SHA512 1a25c76f3699e30d0614e85f39ea0f594896cbc299b0e670c52fcea176171e8834ea7f9ba3ba0c1957598b0f1cbfa6a4ed9279ae0c030fa32faa6acca879b694 WHIRLPOOL 0def514af09c137b951842250fe112c68e573e8eff7d5911a71ccbe55cc38b319f1d9c4587e706777f748b0c1ef69b63c4161bbf663b05984a566ff325fa49c3
+DIST charm-6.6.0_rc1.tar.bz2 18258944 SHA256 8501922707d6c4fb54edfbc06c56e6f614c5b68a8c03934f00c903a1bb74d205 SHA512 f812c15e08a9c8dbf886cbfa6498fc0594960187d498b4006881578e129a80a80d34ed3c8d1e39112ab99240221fc5da9b812d33a76bbbcdb4df5cbe09e645df WHIRLPOOL 12ffd3d8fc820f2f6a1f9b0d64d8cc2addbecbeb88b9ca82d026d6e65a01828331f763c73d9c8da788006f80c882fa0227cb0de1af2efc9b5a3c1a18605e052e
diff --git a/sys-cluster/charm/charm-6.5.1-r2.ebuild b/sys-cluster/charm/charm-6.5.1-r2.ebuild
deleted file mode 100644
index 4d1523ea2..000000000
--- a/sys-cluster/charm/charm-6.5.1-r2.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.5.0.ebuild,v 1.1 2013/06/26 23:58:38 ottxor Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs python-single-r1
-
-DESCRIPTION="Message-passing parallel language and runtime system"
-HOMEPAGE="http://charm.cs.uiuc.edu/"
-SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz"
-
-LICENSE="charm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mlogft mpi numa smp static-libs syncft tcp"
-
-RDEPEND="mpi? ( virtual/mpi )"
-DEPEND="
-	${RDEPEND}
-	doc? (
-		>=app-text/poppler-0.12.3-r3[utils]
-		dev-tex/latex2html
-		virtual/tex-base
-		>=dev-python/beautifulsoup-4[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		media-libs/netpbm
-		${PYTHON_DEPS}
-	)"
-
-REQUIRED_USE="
-	doc? ( ${PYTHON_REQUIRED_USE} )
-	cmkopt? ( !charmdebug !charmtracing )
-	charmproduction? ( !charmdebug !charmtracing )"
-
-FORTRAN_STANDARD="90"
-
-get_opts() {
-	local CHARM_OPTS
-
-	# TCP instead of default UDP for socket comunication
-	# protocol
-	CHARM_OPTS+="$(usex tcp ' tcp' '')"
-
-	# enable direct SMP support using shared memory
-	CHARM_OPTS+="$(usex smp ' smp' '')"
-
-	CHARM_OPTS+="$(usex mlogft ' mlogft' '')"
-	CHARM_OPTS+="$(usex syncft ' syncft' '')"
-
-	# Build shared libraries by default.
-	CHARM_OPTS+=" --build-shared"
-
-	if use charmproduction; then
-		CHARM_OPTS+=" --with-production"
-	else
-		if use charmdebug; then
-			CHARM_OPTS+=" --enable-charmdebug"
-		fi
-
-		if use charmtracing; then
-			CHARM_OPTS+=" --enable-tracing --enable-tracing-commthread"
-		fi
-	fi
-
-	CHARM_OPTS+="$(usex numa ' --with-numa' '')"
-	echo $CHARM_OPTS
-}
-
-src_prepare() {
-	sed \
-		-e "/CMK_CF90/s:f90:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
-		-e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \
-		-e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \
-		-e '/CMK_F90_MODINC/s:-p:-I:g' \
-		-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
-		-i src/arch/$(usex mpi "mpi" "net")-linux*/*sh || die
-
-	sed \
-		-e "s:-o conv-cpm:${LDFLAGS} &:g" \
-		-e "s:-o charmxi:${LDFLAGS} &:g" \
-		-e "s:-o charmrun-silent:${LDFLAGS} &:g" \
-		-e "s:-o charmrun-notify:${LDFLAGS} &:g" \
-		-e "s:-o charmrun:${LDFLAGS} &:g" \
-		-e "s:-o charmd_faceless:${LDFLAGS} &:g" \
-		-e "s:-o charmd:${LDFLAGS} &:g" \
-		-i \
-		src/scripts/Makefile \
-		src/arch/net/charmrun/Makefile || die
-
-	# CMK optimization
-	use cmkopt && append-cppflags -DCMK_OPTIMIZE=1
-
-	# Fix QA notice. Filed report with upstream.
-	append-cflags -DALLOCA_H
-
-	epatch "${FILESDIR}/charm-6.5.1-cleanup-config.patch"
-	epatch "${FILESDIR}/charm-6.5.1-CkReductionMgr.patch"
-	epatch "${FILESDIR}/charm-6.5.1-fix-string-parsing.patch"
-	epatch "${FILESDIR}/charm-6.5.1-fix-navmenuGenerator.patch"
-	epatch "${FILESDIR}/charm-6.5.1-static-library-fix.patch"
-}
-
-src_compile() {
-	local mybuildoptions="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') $(get_opts) ${MAKEOPTS} -j1 ${CFLAGS}"
-
-	# Build charmm++ first.
-	einfo "running ./build charm++ ${mybuildoptions}"
-	./build charm++ ${mybuildoptions} || die "Failed to build charm++"
-
-	# make pdf/html docs
-	if use doc; then
-		python-single-r1_pkg_setup
-		python_fix_shebang "${S}/doc"
-		einfo "forcing ${EPYTHON}"
-		emake -j1 -C doc/charm++
-	fi
-}
-
-src_test() {
-	make -C tests/charm++ test TESTOPTS="++local" || die
-}
-
-src_install() {
-	# Make charmc play well with gentoo before we move it into /usr/bin. This
-	# patch cannot be applied during src_prepare() because the charmc wrapper
-	# is used during building.
-	epatch "${FILESDIR}/charm-6.5.1-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"
-
-	# In the following, some of the files are symlinks to ../tmp which we need
-	# to dereference first (see bug 432834).
-
-	local i
-
-	# Install binaries.
-	for i in bin/*; do
-		if [[ -L ${i} ]]; then
-			i=$(readlink -e "${i}") || die
-		fi
-		dobin "${i}"
-	done
-
-	# Install headers.
-	insinto /usr/include/${P}
-	for i in include/*; do
-		if [[ -L ${i} ]]; then
-			i=$(readlink -e "${i}") || die
-		fi
-		doins "${i}"
-	done
-
-	# Install static libs. Charm has a lot of .o "libs" that it requires at
-	# runtime.
-	if use static-libs; then
-		for i in lib/*.{a,o}; do
-			if [[ -L ${i} ]]; then
-				i=$(readlink -e "${i}") || die
-			fi
-			dolib "${i}"
-		done
-	fi
-
-	# Install shared libs.
-	for i in lib_so/*; do
-		if [[ -L ${i} ]]; then
-			i=$(readlink -e "${i}") || die
-		fi
-		dolib.so "${i}"
-	done
-
-	# Basic docs.
-	dodoc CHANGES README
-
-	# Install examples.
-	if use examples; then
-		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++/*
-	fi
-
-	# Install pdf/html docs
-	if use doc; then
-		cd "${S}/doc/charm++"
-		# Install pdfs.
-		insinto /usr/share/doc/${PF}/pdf
-		doins  *.pdf
-		# Install html.
-		docinto html
-		dohtml -r manual/*
-	fi
-}
-
-pkg_postinst() {
-	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'."
-}
diff --git a/sys-cluster/charm/charm-6.5.1-r3.ebuild b/sys-cluster/charm/charm-6.6.0_rc1-r1.ebuild
index 3f11990e6..bb27d7ef2 100644
--- a/sys-cluster/charm/charm-6.5.1-r3.ebuild
+++ b/sys-cluster/charm/charm-6.6.0_rc1-r1.ebuild
@@ -1,14 +1,17 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.5.0.ebuild,v 1.1 2013/06/26 23:58:38 ottxor Exp $
 
 EAPI=5
 
-inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs
+FORTRAN_STANDARD="90"
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit eutils flag-o-matic fortran-2 multilib python-any-r1 toolchain-funcs
 
 DESCRIPTION="Message-passing parallel language and runtime system"
 HOMEPAGE="http://charm.cs.uiuc.edu/"
-SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~nicolasbock/charm-${PV}.tar.bz2"
 
 LICENSE="charm"
 SLOT="0"
@@ -22,9 +25,12 @@ DEPEND="
 		>=app-text/poppler-0.12.3-r3[utils]
 		dev-tex/latex2html
 		virtual/tex-base
-		>=dev-python/beautifulsoup-4
-		dev-python/lxml
+		$(python_gen_any_dep '
+			>=dev-python/beautifulsoup-4[${PYTHON_USEDEP}]
+			dev-python/lxml[${PYTHON_USEDEP}]
+		')
 		media-libs/netpbm
+		${PYTHON_DEPS}
 	)"
 
 REQUIRED_USE="
@@ -32,7 +38,9 @@ REQUIRED_USE="
 	cmkopt? ( !charmdebug !charmtracing )
 	charmproduction? ( !charmdebug !charmtracing )"
 
-FORTRAN_STANDARD="90"
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
 
 get_opts() {
 	local CHARM_OPTS
@@ -68,12 +76,20 @@ get_opts() {
 
 src_prepare() {
 	sed \
-		-e "/CMK_CF90/s:f90:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-e "/CMK_CF77/s:[fg]77:$(usex mpi "mpif90" "$(tc-getF77)"):g" \
+		-e "/CMK_CF90/s:f95:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-e "/CMK_CF90/s:\`which f90.*$::g" \
 		-e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \
 		-e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \
 		-e '/CMK_F90_MODINC/s:-p:-I:g' \
 		-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
-		-i src/arch/$(usex mpi "mpi" "net")-linux*/*sh || die
+		-i src/arch/$(usex mpi "mpi" "net")*-linux*/*sh || die
+	sed \
+		-e "/CMK_CF90/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-e "/F90DIR/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-e "/f95target/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-e "/f95version/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-i src/arch/common/*.sh || die
 
 	sed \
 		-e "s:-o conv-cpm:${LDFLAGS} &:g" \
@@ -85,7 +101,7 @@ src_prepare() {
 		-e "s:-o charmd:${LDFLAGS} &:g" \
 		-i \
 		src/scripts/Makefile \
-		src/arch/net/charmrun/Makefile || die
+		src/util/charmrun-src/Makefile || die
 
 	# CMK optimization
 	use cmkopt && append-cppflags -DCMK_OPTIMIZE=1
@@ -93,20 +109,20 @@ src_prepare() {
 	# Fix QA notice. Filed report with upstream.
 	append-cflags -DALLOCA_H
 
-	epatch "${FILESDIR}/charm-6.5.1-cleanup-config.patch"
-	epatch "${FILESDIR}/charm-6.5.1-CkReductionMgr.patch"
-	epatch "${FILESDIR}/charm-6.5.1-fix-string-parsing.patch"
 	epatch "${FILESDIR}/charm-6.5.1-fix-navmenuGenerator.patch"
 	epatch "${FILESDIR}/charm-6.5.1-fix-markupSanitizer.patch"
-	epatch "${FILESDIR}/charm-6.5.1-static-library-fix.patch"
+	epatch "${FILESDIR}/charm-6.6.0-static-library-fix.patch"
 }
 
 src_compile() {
-	local mybuildoptions="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') $(get_opts) ${MAKEOPTS} -j1 ${CFLAGS}"
+	local build_version="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '')"
+	local build_options="$(get_opts)"
+	local build_charmc_options="${MAKEOPTS} -j1"
+	local build_commandline="${build_version} ${build_options} ${build_charmc_options}"
 
 	# Build charmm++ first.
-	einfo "running ./build charm++ ${mybuildoptions}"
-	./build charm++ ${mybuildoptions} || die "Failed to build charm++"
+	einfo "running ./build charm++ ${build_commandline}"
+	./build charm++ ${build_commandline} || die "Failed to build charm++"
 
 	# make pdf/html docs
 	if use doc; then
diff --git a/sys-cluster/lustre/ChangeLog b/sys-cluster/lustre/ChangeLog
index 37ee2bd6a..ea473e4f6 100644
--- a/sys-cluster/lustre/ChangeLog
+++ b/sys-cluster/lustre/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sys-cluster/lustre
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jan 2014; Justin Lecher <jlec@gentoo.org> lustre-9999.ebuild:
+  Switch from git-2 to git-r3
+
   19 Dec 2013; Alexey Shvetsov <alexxy@gentoo.org>
   files/0001-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch,
   files/0002-LU-3373-ldiskfs-ldiskfs-patches-for-3.11.1-fc19.patch,
diff --git a/sys-cluster/lustre/lustre-9999.ebuild b/sys-cluster/lustre/lustre-9999.ebuild
index 123c81cef..a7fbbedfb 100644
--- a/sys-cluster/lustre/lustre-9999.ebuild
+++ b/sys-cluster/lustre/lustre-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -7,12 +7,12 @@ EAPI=5
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.10"
 
-inherit git-2 autotools linux-mod toolchain-funcs udev flag-o-matic
+inherit git-r3 autotools linux-mod toolchain-funcs udev flag-o-matic
 
 DESCRIPTION="Lustre is a parallel distributed file system"
 HOMEPAGE="http://wiki.whamcloud.com/"
-EGIT_REPO_URI="git://git.whamcloud.com/fs/lustre-release.git"
 SRC_URI=""
+EGIT_REPO_URI="git://git.whamcloud.com/fs/lustre-release.git"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-cluster/nullmpi/ChangeLog b/sys-cluster/nullmpi/ChangeLog
index 9cf343940..d83a7c9fd 100644
--- a/sys-cluster/nullmpi/ChangeLog
+++ b/sys-cluster/nullmpi/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sys-cluster/nullmpi
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jan 2014; Justin Lecher <jlec@gentoo.org> nullmpi-9999.ebuild:
+  Switch from git-2 to git-r3
+
   14 Jun 2013; Justin Lecher <jlec@gentoo.org> nullmpi-0.7.ebuild,
   nullmpi-9999.ebuild, metadata.xml:
   Drop KEYWORDS of live ebuilds
diff --git a/sys-cluster/nullmpi/nullmpi-9999.ebuild b/sys-cluster/nullmpi/nullmpi-9999.ebuild
index 3ac08ccff..25cc1b66e 100644
--- a/sys-cluster/nullmpi/nullmpi-9999.ebuild
+++ b/sys-cluster/nullmpi/nullmpi-9999.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=5
 
-inherit autotools-utils git-2
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils git-r3
 
 DESCRIPTION="MPI substitute library"
 HOMEPAGE="http://wissrech.ins.uni-bonn.de/research/projects/nullmpi/"
 SRC_URI=""
 EGIT_REPO_URI="git://github.com/olenz/NullMPI.git"
-EGIT_BRANCH="master"
-EGIT_BOOTSTRAP="eautoreconf"
 
 LICENSE="GPL-1"
 SLOT="0"