Merge pull request #278 from tamiko/bump_p4est

Bump sci-libs/libsc and sci-libs/p4est

11 files changed, 25 insertions, 86 deletions

diff --git a/sci-libs/libsc/ChangeLog b/sci-libs/libsc/ChangeLog
index 8e4aa1e6e..db89785ac 100644
--- a/sci-libs/libsc/ChangeLog
+++ b/sci-libs/libsc/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*libsc-1.1 (13 Oct 2014)
+
+  13 Oct 2014; Matthias Maier <tamiko@gentoo.org> +libsc-1.1.ebuild,
+  -libsc-0.7.3.ebuild, libsc-1.0.ebuild, metadata.xml:
+  sci-libs/libsc: Drop old; version bump; update metadata.xml
+
 *libsc-1.0 (22 Jul 2014)
 
   22 Jul 2014; Matthias Maier <tamiko@gentoo.org> +libsc-1.0.ebuild,
diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest
index 13d2d0b09..475f0dc52 100644
--- a/sci-libs/libsc/Manifest
+++ b/sci-libs/libsc/Manifest
@@ -1,2 +1,2 @@
-DIST libsc-0.7.3.tar.gz 683970 SHA256 e54e52dadda8d0ceda4205962e5b7f262f0bd30d2eadc8f63e04ec1bec95715c SHA512 66c4024dbe8b5d87d2559731ef7a4548f18626b8f7533aad86b09ea19c6516107f29aba29c1d236bbf6d982ea624340755dbe4f2ff8a2d88b25c8f0514c8cc53 WHIRLPOOL 6fe56373329cffadfffb5dc1d67b487db1a041fa6950a61555c2dfdc1571718259ea4106ecc0ee81f62e517bf65add55b17a93fa4da60cd4e019f790b25f6ef7
 DIST libsc-1.0.tar.gz 257930 SHA256 a9f8a0f342a4a92c4031735e044e7ee73d9fd7e6df3e50a51c4c5016e27ed1ba SHA512 bf5af600e9cbd4038b1bd40c88776b21be5d474e34f9aacf287b890d262a22dc50ca27982c2eb9adba9735c8d9bb1fc31de2a27b24cdab534e3b2f610d76db7d WHIRLPOOL 56f89fcaf90bc8d4f872cee4fe150f692933b39376758c42b67d2e42659c19a9332a1d5e6d2d81c011dade0c6ab40c526c69ce2168fe41060f5d4be1a6595b1b
+DIST libsc-1.1.tar.gz 263643 SHA256 99c3fb3b7d6514ccaa667bdc848a7308c00f05bf6fdc0561ce286db9644ee03e SHA512 a3d8bea406a1987e68e88dd587aebe28c796f2a5bddfc381b34b5eb1448e0ac23889cc6f97fc1e4010289f83996180db42cbb001d0518360349b993dd37d4579 WHIRLPOOL b6c123cd245e4beb4cd6479e9d781d86784fab6975edc20562c14b5ecc59dbc824aca10fb02e4fa7612f0b2743fd7c7d3799f203546c5859896812a21e1362df
diff --git a/sci-libs/libsc/libsc-0.7.3.ebuild b/sci-libs/libsc/libsc-0.7.3.ebuild
deleted file mode 100644
index 3b7a47764..000000000
--- a/sci-libs/libsc/libsc-0.7.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-WANT_AUTOMAKE=1.11
-
-inherit autotools-utils toolchain-funcs eutils multilib
-
-DESCRIPTION="The SC Library provides support for parallel scientific applications."
-HOMEPAGE="http://www.p4est.org/"
-SRC_URI="https://github.com/cburstedde/libsc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-IUSE="debug examples mpi romio static-libs"
-REQUIRED_USE="romio? ( mpi )"
-
-RDEPEND="
-	!<sci-libs/p4est-0.3.5
-	dev-lang/lua
-	sys-apps/util-linux
-	virtual/blas
-	virtual/lapack
-	mpi? ( virtual/mpi[romio?] )"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=(AUTHORS NEWS README)
-
-AUTOTOOLS_AUTORECONF=true
-
-src_prepare() {
-	# Use libtool's -release option so that we end up with a valid SONAME
-	# and library version symlinks:
-	sed -i \
-		"s/^\(src_libsc_la_CPPFLAGS.*\)\$/\1\nsrc_libsc_la_LDFLAGS = -release ${PV}/" \
-		"${S}"/src/Makefile.am || die "sed failed"
-
-	# Inject a version number into the build system
-	echo "${PV}" > ${S}/.tarball-version
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable mpi)
-		$(use_enable romio mpiio)
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use examples
-	then
-		docinto examples
-		dodoc -r example/*
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-		# Remove the compiled example binaries in case of -examples:
-		rm -r "${ED}"/usr/bin || die "rm failed"
-	fi
-
-	# Fix up some wrong installation paths:
-	dodir /usr/share/libsc
-	mv "${ED}"/etc/* "${ED}"/usr/share/libsc
-	rmdir "${ED}"/etc/
-}
diff --git a/sci-libs/libsc/libsc-1.0.ebuild b/sci-libs/libsc/libsc-1.0.ebuild
index c09283657..c0cb21288 100644
--- a/sci-libs/libsc/libsc-1.0.ebuild
+++ b/sci-libs/libsc/libsc-1.0.ebuild
@@ -20,7 +20,6 @@ IUSE="debug examples mpi romio static-libs"
 REQUIRED_USE="romio? ( mpi )"
 
 RDEPEND="
-	!<sci-libs/p4est-1.0
 	dev-lang/lua
 	sys-apps/util-linux
 	virtual/blas
diff --git a/sci-libs/libsc/libsc-1.1.ebuild b/sci-libs/libsc/libsc-1.1.ebuild
new file mode 120000
index 000000000..2541d9df3
--- /dev/null
+++ b/sci-libs/libsc/libsc-1.1.ebuild
@@ -0,0 +1 @@
+libsc-1.0.ebuild
\ No newline at end of file
diff --git a/sci-libs/libsc/metadata.xml b/sci-libs/libsc/metadata.xml
index dc3261554..6d4eba7c1 100644
--- a/sci-libs/libsc/metadata.xml
+++ b/sci-libs/libsc/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>sci</herd>
 	<maintainer>
-		<email>tamiko+GENTOO@kyomu.43-1.org</email>
+		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
 	<longdescription lang="en">
diff --git a/sci-libs/p4est/ChangeLog b/sci-libs/p4est/ChangeLog
index 5a3314dc1..61500661e 100644
--- a/sci-libs/p4est/ChangeLog
+++ b/sci-libs/p4est/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Oct 2014; Matthias Maier <tamiko@gentoo.org> p4est-1.0.ebuild:
+  sci-libs/p4est: Fix build dependencies
+
+*p4est-1.1 (13 Oct 2014)
+
+  13 Oct 2014; Matthias Maier <tamiko@gentoo.org> +p4est-1.1.ebuild,
+  metadata.xml, p4est-1.0.ebuild:
+  sci-libs/p4est: Version bump; update metadata.xml
+
   17 Sep 2014; Christoph Junghans <ottxor@gentoo.org>
   -files/p4est-0.3.4.2-libtool-fix.patch,
   -files/p4est-0.3.5-add_missing_autotools_files.patch, -p4est-0.3.4.2.ebuild,
diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
index 4bdd067b2..13859d759 100644
--- a/sci-libs/p4est/Manifest
+++ b/sci-libs/p4est/Manifest
@@ -1,2 +1,4 @@
 DIST libsc-1.0.tar.gz 257930 SHA256 a9f8a0f342a4a92c4031735e044e7ee73d9fd7e6df3e50a51c4c5016e27ed1ba SHA512 bf5af600e9cbd4038b1bd40c88776b21be5d474e34f9aacf287b890d262a22dc50ca27982c2eb9adba9735c8d9bb1fc31de2a27b24cdab534e3b2f610d76db7d WHIRLPOOL 56f89fcaf90bc8d4f872cee4fe150f692933b39376758c42b67d2e42659c19a9332a1d5e6d2d81c011dade0c6ab40c526c69ce2168fe41060f5d4be1a6595b1b
+DIST libsc-1.1.tar.gz 263643 SHA256 99c3fb3b7d6514ccaa667bdc848a7308c00f05bf6fdc0561ce286db9644ee03e SHA512 a3d8bea406a1987e68e88dd587aebe28c796f2a5bddfc381b34b5eb1448e0ac23889cc6f97fc1e4010289f83996180db42cbb001d0518360349b993dd37d4579 WHIRLPOOL b6c123cd245e4beb4cd6479e9d781d86784fab6975edc20562c14b5ecc59dbc824aca10fb02e4fa7612f0b2743fd7c7d3799f203546c5859896812a21e1362df
 DIST p4est-1.0.tar.gz 695027 SHA256 d669b0487eb0d2765c77adcab551c447f2cfa49d60a5a9016eaf48526ece74b6 SHA512 781240bbca2779f4076c310575ad99e8b526ecf6a3da8b7b5f096615bbfb570dd0556e607797715b69c95c6dd73baf837f1c632be763efae835941107f1fe3df WHIRLPOOL 690e350c3960b48cf5ac6bbc9aeff49557da25a69e152b7dca8fdb91b424f1669e9cf603903fb3f4de01078b964c63f7811b63000cacc5d56845ba96f6c516bf
+DIST p4est-1.1.tar.gz 1241423 SHA256 14a4ba6c5883ece611c90fae29bc60a454c20db43df646b232bd5aa552acd5cf SHA512 11eb576a16a4cc959eff8894d6cb11d8bae092951be9cf9d71b538825bdf675af7fd77d79505b9e896ec1810c1f8e9391447a79263c6d2e33fef780e97d07f29 WHIRLPOOL 38253d7dd01d5406c5e7e773afdabcac85d49bedd86d3a325c227b32e9d09ddb5397a77e8485489a2e46c582ea242d5eaad877c139504088246d2b8d31b86c63
diff --git a/sci-libs/p4est/metadata.xml b/sci-libs/p4est/metadata.xml
index e1b5e1816..c8a9acb72 100644
--- a/sci-libs/p4est/metadata.xml
+++ b/sci-libs/p4est/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>sci</herd>
 	<maintainer>
-		<email>tamiko+GENTOO@kyomu.43-1.org</email>
+		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
 	<longdescription lang="en">
diff --git a/sci-libs/p4est/p4est-1.0.ebuild b/sci-libs/p4est/p4est-1.0.ebuild
index 4160e782b..4c6946d94 100644
--- a/sci-libs/p4est/p4est-1.0.ebuild
+++ b/sci-libs/p4est/p4est-1.0.ebuild
@@ -23,7 +23,7 @@ IUSE="debug doc examples mpi romio static-libs +vtk-binary"
 REQUIRED_USE="romio? ( mpi )"
 
 RDEPEND="
-	>=sci-libs/libsc-1.0
+	>=sci-libs/libsc-1.0[mpi,romio]
 	dev-lang/lua
 	sys-apps/util-linux
 	virtual/blas
@@ -32,6 +32,7 @@ RDEPEND="
 
 DEPEND="
 	${RDEPEND}
+	sys-devel/automake:1.11
 	virtual/pkgconfig"
 
 DOCS=( AUTHORS NEWS README )
@@ -42,7 +43,7 @@ AUTOTOOLS_AUTORECONF=true
 src_prepare() {
 	# Inject libsc to get  all parts of the build system...
 	rmdir "${S}/sc" || die "rmdir failed"
-	mv "${WORKDIR}/libsc-1.0" "${S}/sc" || die "mv failed"
+	mv "${WORKDIR}/libsc-${PV}" "${S}/sc" || die "mv failed"
 
 	# Inject a version number into the build system
 	echo "${PV}" > ${S}/.tarball-version
@@ -60,7 +61,6 @@ src_prepare() {
 }
 
 src_configure() {
-	T_SC_DIR/
 	# Somehow --with-sc=$EPREFIX/usr does not work...
 	LDFLAGS="${LDFLAGS} -lsc"
 
diff --git a/sci-libs/p4est/p4est-1.1.ebuild b/sci-libs/p4est/p4est-1.1.ebuild
new file mode 120000
index 000000000..89804b22a
--- /dev/null
+++ b/sci-libs/p4est/p4est-1.1.ebuild
@@ -0,0 +1 @@
+p4est-1.0.ebuild
\ No newline at end of file