public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sci-libs/p4est/
@ 2013-07-26 16:14 Nicolas Bock
  0 siblings, 0 replies; 17+ messages in thread
From: Nicolas Bock @ 2013-07-26 16:14 UTC (permalink / raw
  To: gentoo-commits

commit:     e58d7c3c4d407a6fb757ce8df115986570cba392
Author:     Matthias Maier <tamiko <AT> kyomu <DOT> 43-1 <DOT> org>
AuthorDate: Thu Jul 25 18:42:30 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Thu Jul 25 18:43:01 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e58d7c3c

Rewrite the ebuild

  - uses autotools-utils, now
  - introduce a static-libs use flag
  - introduce doc and examples use flags that install corresponding files
    directly from the tarball

---
 sci-libs/p4est/p4est-0.3.4.1.ebuild | 62 ++++++++++++++++++++++++++-----------
 1 file changed, 44 insertions(+), 18 deletions(-)

diff --git a/sci-libs/p4est/p4est-0.3.4.1.ebuild b/sci-libs/p4est/p4est-0.3.4.1.ebuild
index ff11185..c4ed5f3 100644
--- a/sci-libs/p4est/p4est-0.3.4.1.ebuild
+++ b/sci-libs/p4est/p4est-0.3.4.1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 WANT_AUTOMAKE="1.11"
 
-inherit autotools eutils
+inherit autotools-utils toolchain-funcs eutils multilib
 
 DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
 HOMEPAGE="http://www.p4est.org/"
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-2+"
 SLOT="0"
 
-IUSE="mpi"
+IUSE="debug doc examples mpi static-libs"
 
 DEPEND="
 	dev-lang/lua
@@ -27,24 +27,50 @@ DEPEND="
 	virtual/lapack
 	mpi? ( virtual/mpi )"
 
-RDEPEND="${DEPEND}
+RDEPEND="
+    ${DEPEND}
     virtual/pkgconfig"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-fix-install-locations.patch
-    eautoreconf || die "eautoreconf failed"
-}
+DOCS=(AUTHORS ChangeLog COPYING NEWS README)
 
 src_configure() {
-	blas=$(pkg-config --libs-only-l blas)
-	lapack=$(pkg-config --libs-only-l lapack | cut -d' ' -f1)
-
-	econf \
-		--prefix="${EPREFIX}/usr" \
-		--exec-prefix="${EPREFIX}/usr" \
-		--enable-shared \
-		--with-blas=${blas:2} \
-		--with-lapack=${lapack:2} \
-		$(use_enable mpi) \
-		|| die "econf failed"
+	local myeconfargs=(
+        $(use_enable debug)
+		--enable-shared
+		$(use_enable static-libs static)
+		--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 doc
+	then
+		cp -r "${S}"/doc/* "${D}${EPREFIX}"/usr/share/doc/${PF}/
+	fi
+
+	if use examples
+	then
+		mkdir -p "${D}${EPREFIX}"/usr/share/${PN}/examples
+		cp -r "${S}"/example/* "${D}${EPREFIX}"/usr/share/${PN}/examples
+	else
+		# Remove the compiled example binaries in case of -examples:
+		rm -r "${D}${EPREFIX}"/usr/bin
+	fi
+
+	if ! use static-libs
+	then
+		# *sigh* The build system apparently ignores --enable/disable-static
+		rm "${D}${EPREFIX}"/$(get_libdir)/*.a
+	fi
+
+	# Fix up some wrong installation pathes:
+	mkdir -p "${D}${EPREFIX}"/usr/share/p4est
+	mv "${D}${EPREFIX}"/usr/share/data "${D}${EPREFIX}"/usr/share/p4est/data
+	mv "${D}${EPREFIX}"/etc/* "${D}${EPREFIX}"/usr/share/p4est
+	rmdir "${D}${EPREFIX}"/etc/
 }
+


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/p4est/
@ 2013-07-26 16:14 Nicolas Bock
  0 siblings, 0 replies; 17+ messages in thread
From: Nicolas Bock @ 2013-07-26 16:14 UTC (permalink / raw
  To: gentoo-commits

commit:     b1a667160d016163435dc1deb6b7484fbd7d341a
Author:     Matthias Maier <tamiko <AT> kyomu <DOT> 43-1 <DOT> org>
AuthorDate: Thu Jul 25 20:17:01 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Thu Jul 25 20:17:24 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b1a66716

Bugfix: Reintroduce mpi support

---
 sci-libs/p4est/p4est-0.3.4.1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sci-libs/p4est/p4est-0.3.4.1.ebuild b/sci-libs/p4est/p4est-0.3.4.1.ebuild
index bb0f67f..0abf319 100644
--- a/sci-libs/p4est/p4est-0.3.4.1.ebuild
+++ b/sci-libs/p4est/p4est-0.3.4.1.ebuild
@@ -34,6 +34,8 @@ DOCS=(AUTHORS ChangeLog NEWS README)
 src_configure() {
 	local myeconfargs=(
         $(use_enable debug)
+		$(use_enable mpi)
+		$(use_enable mpi mpiio)
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
 	)


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/p4est/
@ 2013-07-26 16:14 Nicolas Bock
  0 siblings, 0 replies; 17+ messages in thread
From: Nicolas Bock @ 2013-07-26 16:14 UTC (permalink / raw
  To: gentoo-commits

commit:     e8a5d77d80cc2375dfaa79a7d65868bd2e0ece02
Author:     Matthias Maier <tamiko <AT> kyomu <DOT> 43-1 <DOT> org>
AuthorDate: Thu Jul 25 20:09:09 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Thu Jul 25 20:09:47 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e8a5d77d

The restriction on a specific AUTOMAKE version is not necessary

---
 sci-libs/p4est/p4est-0.3.4.1.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sci-libs/p4est/p4est-0.3.4.1.ebuild b/sci-libs/p4est/p4est-0.3.4.1.ebuild
index 7e61af7..bb0f67f 100644
--- a/sci-libs/p4est/p4est-0.3.4.1.ebuild
+++ b/sci-libs/p4est/p4est-0.3.4.1.ebuild
@@ -4,8 +4,6 @@
 
 EAPI=5
 
-WANT_AUTOMAKE="1.11"
-
 inherit autotools-utils toolchain-funcs eutils multilib
 
 DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/p4est/
@ 2013-07-26 16:14 Nicolas Bock
  0 siblings, 0 replies; 17+ messages in thread
From: Nicolas Bock @ 2013-07-26 16:14 UTC (permalink / raw
  To: gentoo-commits

commit:     4b110f4b651290f01d9435c2aceda605fabd6ae2
Author:     Matthias Maier <tamiko <AT> kyomu <DOT> 43-1 <DOT> org>
AuthorDate: Thu Jul 25 21:42:59 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Thu Jul 25 21:42:59 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4b110f4b

Improve the ebuild a bit more

 - Get RDEPEND/DEPEND right
 - omit superfluous "${S}"

---
 sci-libs/p4est/p4est-0.3.4.1.ebuild | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sci-libs/p4est/p4est-0.3.4.1.ebuild b/sci-libs/p4est/p4est-0.3.4.1.ebuild
index 0abf319..8e32b0e 100644
--- a/sci-libs/p4est/p4est-0.3.4.1.ebuild
+++ b/sci-libs/p4est/p4est-0.3.4.1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 
 IUSE="debug doc examples mpi static-libs"
 
-DEPEND="
+RDEPEND="
 	dev-lang/lua
 	sys-apps/util-linux
 	sys-libs/zlib
@@ -25,8 +25,8 @@ DEPEND="
 	virtual/lapack
 	mpi? ( virtual/mpi )"
 
-RDEPEND="
-    ${DEPEND}
+DEPEND="
+    ${RDEPEND}
     virtual/pkgconfig"
 
 DOCS=(AUTHORS ChangeLog NEWS README)
@@ -45,15 +45,15 @@ src_configure() {
 src_install() {
 	autotools-utils_src_install
 
-	use doc && dodoc -r "${S}"/doc/*
+	use doc && dodoc -r doc/*
 
 	if use examples
 	then
 		insinto /usr/share/${PN}/examples
-		doins -r "${S}"/example/*
+		doins -r example/*
 	else
 		# Remove the compiled example binaries in case of -examples:
-		rm -r "${ED}"/usr/bin
+		rm -r "${ED}"/usr/bin || die "rm failed"
 	fi
 
 	# *sigh* The build system apparently ignores --disable-static


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/p4est/
@ 2013-07-26 16:14 Nicolas Bock
  0 siblings, 0 replies; 17+ messages in thread
From: Nicolas Bock @ 2013-07-26 16:14 UTC (permalink / raw
  To: gentoo-commits

commit:     febd5efaa3f7ce640ee03a7f34058a294d57acfb
Author:     Matthias Maier <tamiko <AT> kyomu <DOT> 43-1 <DOT> org>
AuthorDate: Thu Jul 25 19:48:12 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Thu Jul 25 19:52:28 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=febd5efa

Cleanup as discussed

---
 sci-libs/p4est/metadata.xml         |  2 --
 sci-libs/p4est/p4est-0.3.4.1.ebuild | 31 +++++++++++--------------------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/sci-libs/p4est/metadata.xml b/sci-libs/p4est/metadata.xml
index f4d5bcb..592c6fc 100644
--- a/sci-libs/p4est/metadata.xml
+++ b/sci-libs/p4est/metadata.xml
@@ -12,6 +12,4 @@
   designed to work in parallel and scale to hundreds of thousands of
   processor cores.
 </longdescription>
-<use>
-</use>
 </pkgmetadata>

diff --git a/sci-libs/p4est/p4est-0.3.4.1.ebuild b/sci-libs/p4est/p4est-0.3.4.1.ebuild
index c4ed5f3..7e61af7 100644
--- a/sci-libs/p4est/p4est-0.3.4.1.ebuild
+++ b/sci-libs/p4est/p4est-0.3.4.1.ebuild
@@ -31,13 +31,11 @@ RDEPEND="
     ${DEPEND}
     virtual/pkgconfig"
 
-DOCS=(AUTHORS ChangeLog COPYING NEWS README)
+DOCS=(AUTHORS ChangeLog NEWS README)
 
 src_configure() {
 	local myeconfargs=(
         $(use_enable debug)
-		--enable-shared
-		$(use_enable static-libs static)
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
 	)
@@ -47,30 +45,23 @@ src_configure() {
 src_install() {
 	autotools-utils_src_install
 
-	if use doc
-	then
-		cp -r "${S}"/doc/* "${D}${EPREFIX}"/usr/share/doc/${PF}/
-	fi
+	use doc && dodoc -r "${S}"/doc/*
 
 	if use examples
 	then
-		mkdir -p "${D}${EPREFIX}"/usr/share/${PN}/examples
-		cp -r "${S}"/example/* "${D}${EPREFIX}"/usr/share/${PN}/examples
+		insinto /usr/share/${PN}/examples
+		doins -r "${S}"/example/*
 	else
 		# Remove the compiled example binaries in case of -examples:
-		rm -r "${D}${EPREFIX}"/usr/bin
+		rm -r "${ED}"/usr/bin
 	fi
 
-	if ! use static-libs
-	then
-		# *sigh* The build system apparently ignores --enable/disable-static
-		rm "${D}${EPREFIX}"/$(get_libdir)/*.a
-	fi
+	# *sigh* The build system apparently ignores --disable-static
+	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a
 
 	# Fix up some wrong installation pathes:
-	mkdir -p "${D}${EPREFIX}"/usr/share/p4est
-	mv "${D}${EPREFIX}"/usr/share/data "${D}${EPREFIX}"/usr/share/p4est/data
-	mv "${D}${EPREFIX}"/etc/* "${D}${EPREFIX}"/usr/share/p4est
-	rmdir "${D}${EPREFIX}"/etc/
+	dodir /usr/share/p4est
+	mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data
+	mv "${ED}"/etc/* "${ED}"/usr/share/p4est
+	rmdir "${ED}"/etc/
 }
-


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/p4est/
@ 2013-07-26 16:14 Nicolas Bock
  0 siblings, 0 replies; 17+ messages in thread
From: Nicolas Bock @ 2013-07-26 16:14 UTC (permalink / raw
  To: gentoo-commits

commit:     457ce851ca940cc896a8e6ff8fd8fa3ca28507b8
Author:     Matthias Maier <tamiko <AT> kyomu <DOT> 43-1 <DOT> org>
AuthorDate: Thu Jul 25 22:27:55 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Thu Jul 25 22:32:35 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=457ce851

p4est configured with --enable-mpiio does indeed depend on virtual/mpi[romio]

---
 sci-libs/p4est/p4est-0.3.4.1.ebuild | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sci-libs/p4est/p4est-0.3.4.1.ebuild b/sci-libs/p4est/p4est-0.3.4.1.ebuild
index 1694e4a..018e368 100644
--- a/sci-libs/p4est/p4est-0.3.4.1.ebuild
+++ b/sci-libs/p4est/p4est-0.3.4.1.ebuild
@@ -17,7 +17,8 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-2+"
 SLOT="0"
 
-IUSE="debug doc examples mpi static-libs"
+IUSE="debug doc examples mpi romio static-libs"
+REQUIRED_USE="romio? ( mpi )"
 
 RDEPEND="
 	dev-lang/lua
@@ -25,7 +26,7 @@ RDEPEND="
 	sys-libs/zlib
 	virtual/blas
 	virtual/lapack
-	mpi? ( virtual/mpi )"
+	mpi? ( virtual/mpi[romio?] )"
 
 DEPEND="
     ${RDEPEND}
@@ -40,7 +41,7 @@ src_configure() {
 	local myeconfargs=(
         $(use_enable debug)
 		$(use_enable mpi)
-		$(use_enable mpi mpiio)
+		$(use_enable romio mpiio)
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
 	)


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/p4est/
@ 2013-07-26 16:14 Nicolas Bock
  0 siblings, 0 replies; 17+ messages in thread
From: Nicolas Bock @ 2013-07-26 16:14 UTC (permalink / raw
  To: gentoo-commits

commit:     39fb725358d83eb1bb361c271c552c494a4d945c
Author:     Matthias Maier <tamiko <AT> kyomu <DOT> 43-1 <DOT> org>
AuthorDate: Thu Jul 25 22:35:51 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Thu Jul 25 22:40:46 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=39fb7253

Install the examples properly to usr/share/doc/${PF}/examples

---
 sci-libs/p4est/p4est-0.3.4.1.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sci-libs/p4est/p4est-0.3.4.1.ebuild b/sci-libs/p4est/p4est-0.3.4.1.ebuild
index 018e368..9df1e73 100644
--- a/sci-libs/p4est/p4est-0.3.4.1.ebuild
+++ b/sci-libs/p4est/p4est-0.3.4.1.ebuild
@@ -55,8 +55,9 @@ src_install() {
 
 	if use examples
 	then
-		insinto /usr/share/${PN}/examples
-		doins -r example/*
+		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"


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/p4est/
@ 2013-10-18 16:19 Christoph Junghans
  0 siblings, 0 replies; 17+ messages in thread
From: Christoph Junghans @ 2013-10-18 16:19 UTC (permalink / raw
  To: gentoo-commits

commit:     b194655f48fac3a35acc301ccb11f49a54932f30
Author:     layman <layman <AT> localhost>
AuthorDate: Tue Oct  8 20:31:42 2013 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Tue Oct  8 20:33:11 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b194655f

Bump p4est to version 0.3.4.2

This commit bumps p4est to version 0.3.4.2. Also add a use flag
"vtk-binary" to toggle the output format for vtk files.

---
 sci-libs/p4est/metadata.xml                                   | 3 +++
 sci-libs/p4est/{p4est-0.3.4.1.ebuild => p4est-0.3.4.2.ebuild} | 8 +++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/sci-libs/p4est/metadata.xml b/sci-libs/p4est/metadata.xml
index 592c6fc..59e8e1d 100644
--- a/sci-libs/p4est/metadata.xml
+++ b/sci-libs/p4est/metadata.xml
@@ -12,4 +12,7 @@
   designed to work in parallel and scale to hundreds of thousands of
   processor cores.
 </longdescription>
+<use>
+  <flag name="vtk-binary">Enable binary vtk output. If disabled vtk files will be written in ASCII text format.</flag>
+</use>
 </pkgmetadata>

diff --git a/sci-libs/p4est/p4est-0.3.4.1.ebuild b/sci-libs/p4est/p4est-0.3.4.2.ebuild
similarity index 89%
rename from sci-libs/p4est/p4est-0.3.4.1.ebuild
rename to sci-libs/p4est/p4est-0.3.4.2.ebuild
index 9df1e73..9db1430 100644
--- a/sci-libs/p4est/p4est-0.3.4.1.ebuild
+++ b/sci-libs/p4est/p4est-0.3.4.2.ebuild
@@ -10,20 +10,19 @@ inherit autotools-utils toolchain-funcs eutils multilib
 
 DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
 HOMEPAGE="http://www.p4est.org/"
-SRC_URI="http://burstedde.ins.uni-bonn.de/release/p4est-${PV}.tar.gz"
+SRC_URI="http://p4est.org/tarball/p4est-${PV}.tar.gz"
 
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 LICENSE="GPL-2+"
 SLOT="0"
 
-IUSE="debug doc examples mpi romio static-libs"
+IUSE="debug doc examples mpi romio static-libs +vtk-binary"
 REQUIRED_USE="romio? ( mpi )"
 
 RDEPEND="
 	dev-lang/lua
 	sys-apps/util-linux
-	sys-libs/zlib
 	virtual/blas
 	virtual/lapack
 	mpi? ( virtual/mpi[romio?] )"
@@ -35,6 +34,8 @@ DEPEND="
 DOCS=(AUTHORS ChangeLog NEWS README)
 
 PATCHES=( "${FILESDIR}/${PN}-libtool-fix.patch" )
+
+AT_M4DIR="${WORKDIR}/${P}/sc/config"
 AUTOTOOLS_AUTORECONF=true
 
 src_configure() {
@@ -42,6 +43,7 @@ src_configure() {
         $(use_enable debug)
 		$(use_enable mpi)
 		$(use_enable romio mpiio)
+		$(use_enable vtk-binary)
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
 	)


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/p4est/
@ 2014-07-24 21:51 Jens-Malte Gottfried
  0 siblings, 0 replies; 17+ messages in thread
From: Jens-Malte Gottfried @ 2014-07-24 21:51 UTC (permalink / raw
  To: gentoo-commits

commit:     0bc545c58e75f28da63c65f20d1457c4be538d26
Author:     Matthias Maier <tamiko <AT> kyomu <DOT> 43-1 <DOT> org>
AuthorDate: Wed Jul 23 08:22:27 2014 +0000
Commit:     Jens-Malte Gottfried <jmg <AT> godefridus <DOT> de>
CommitDate: Wed Jul 23 08:22:27 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0bc545c5

Bump to version 1.0, whitespace fixes

Package-Manager: portage-2.2.8-r1
RepoMan-Options: --force

---
 sci-libs/p4est/ChangeLog        |  6 +++
 sci-libs/p4est/metadata.xml     | 29 ++++++------
 sci-libs/p4est/p4est-1.0.ebuild | 99 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 120 insertions(+), 14 deletions(-)

diff --git a/sci-libs/p4est/ChangeLog b/sci-libs/p4est/ChangeLog
index 5211973..c0f6e65 100644
--- a/sci-libs/p4est/ChangeLog
+++ b/sci-libs/p4est/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*p4est-1.0 (23 Jul 2014)
+
+  23 Jul 2014; Matthias Maier <tamiko@gentoo.org> +p4est-1.0.ebuild,
+  metadata.xml:
+  Bump to version 1.0, whitespace fixes
+
 *p4est-0.3.5 (02 Mar 2014)
 
   02 Mar 2014; Matthias Maier <tamiko+GENTOO@kyomu.43-1.org>

diff --git a/sci-libs/p4est/metadata.xml b/sci-libs/p4est/metadata.xml
index 59e8e1d..e1b5e18 100644
--- a/sci-libs/p4est/metadata.xml
+++ b/sci-libs/p4est/metadata.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>tamiko+GENTOO@kyomu.43-1.org</email>
-  <name>Matthias Maier</name>
-</maintainer>
-<longdescription lang="en">
-  The p4est software library enables the dynamic management of a collection
-  of adaptive octrees, conveniently called a forest of octrees. p4est is
-  designed to work in parallel and scale to hundreds of thousands of
-  processor cores.
-</longdescription>
-<use>
-  <flag name="vtk-binary">Enable binary vtk output. If disabled vtk files will be written in ASCII text format.</flag>
-</use>
+	<herd>sci</herd>
+	<maintainer>
+		<email>tamiko+GENTOO@kyomu.43-1.org</email>
+		<name>Matthias Maier</name>
+	</maintainer>
+	<longdescription lang="en">
+The p4est software library enables the dynamic management of a collection
+of adaptive octrees, conveniently called a forest of octrees. p4est is
+designed to work in parallel and scale to hundreds of thousands of
+processor cores.
+	</longdescription>
+	<use>
+		<flag name="vtk-binary">Enable binary vtk output. If disabled vtk files will be written in ASCII text format.</flag>
+		<flag name="romio">Build with support for the ROMIO MPI-IO component</flag>
+	</use>
 </pkgmetadata>

diff --git a/sci-libs/p4est/p4est-1.0.ebuild b/sci-libs/p4est/p4est-1.0.ebuild
new file mode 100644
index 0000000..8395e14
--- /dev/null
+++ b/sci-libs/p4est/p4est-1.0.ebuild
@@ -0,0 +1,99 @@
+# 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="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
+HOMEPAGE="http://www.p4est.org/"
+SRC_URI="
+	https://github.com/cburstedde/p4est/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/cburstedde/libsc/archive/v${PV}.tar.gz -> libsc-${PV}.tar.gz"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+IUSE="debug doc examples mpi romio static-libs +vtk-binary"
+REQUIRED_USE="romio? ( mpi )"
+
+RDEPEND="
+	>=sci-libs/libsc-1.0
+	dev-lang/lua
+	sys-apps/util-linux
+	virtual/blas
+	virtual/lapack
+	mpi? ( virtual/mpi[romio?] )"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+
+AT_M4DIR="${WORKDIR}/${P}/config ${WORKDIR}/${P}/sc/config"
+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"
+
+	# Inject a version number into the build system
+	echo "${PV}" > ${S}/.tarball-version
+
+	autotools-utils_src_prepare
+
+	sed -i \
+		"s/P4EST_SC_DIR\/etc/P4EST_SC_DIR\/share\/libsc/" \
+		"${S}"/configure || die "sed failed"
+
+	sed -i \
+		"s/libsc\.la/libsc\.so/" \
+		"${S}"/configure || die "sed failed"
+
+}
+
+src_configure() {
+	T_SC_DIR/
+	# Somehow --with-sc=$EPREFIX/usr does not work...
+	LDFLAGS="${LDFLAGS} -lsc"
+
+	local myeconfargs=(
+        $(use_enable debug)
+		$(use_enable mpi)
+		$(use_enable romio mpiio)
+		$(use_enable vtk-binary)
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+		--with-sc="${EPREFIX}/usr"
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	use doc && dodoc -r doc/*
+
+	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/p4est
+	mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data
+	mv "${ED}"/etc/* "${ED}"/usr/share/p4est
+	rmdir "${ED}"/etc/
+}


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/p4est/
@ 2014-10-16 15:50 Christoph Junghans
  0 siblings, 0 replies; 17+ messages in thread
From: Christoph Junghans @ 2014-10-16 15:50 UTC (permalink / raw
  To: gentoo-commits

commit:     834118136ec08754119d4e098b94edfddb29dc9c
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 13 23:47:42 2014 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Oct 13 23:47:42 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=83411813

sci-libs/p4est: Fix build dependencies

Package-Manager: portage-2.2.8-r2

---
 sci-libs/p4est/ChangeLog        | 3 +++
 sci-libs/p4est/p4est-1.0.ebuild | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/sci-libs/p4est/ChangeLog b/sci-libs/p4est/ChangeLog
index 97f8b73..6150066 100644
--- a/sci-libs/p4est/ChangeLog
+++ b/sci-libs/p4est/ChangeLog
@@ -2,6 +2,9 @@
 # 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,

diff --git a/sci-libs/p4est/p4est-1.0.ebuild b/sci-libs/p4est/p4est-1.0.ebuild
index 27e2e9e..4c6946d 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 )


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/p4est/
@ 2014-10-16 15:50 Christoph Junghans
  0 siblings, 0 replies; 17+ messages in thread
From: Christoph Junghans @ 2014-10-16 15:50 UTC (permalink / raw
  To: gentoo-commits

commit:     15fb91e82b2c094aa7c26913f05af29a74fd72ae
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 13 23:10:45 2014 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Oct 13 23:10:45 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=15fb91e8

sci-libs/p4est: Version bump; update metadata.xml

Package-Manager: portage-2.2.8-r2

---
 sci-libs/p4est/ChangeLog        | 6 ++++++
 sci-libs/p4est/metadata.xml     | 2 +-
 sci-libs/p4est/p4est-1.0.ebuild | 3 +--
 sci-libs/p4est/p4est-1.1.ebuild | 1 +
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/sci-libs/p4est/ChangeLog b/sci-libs/p4est/ChangeLog
index 5a3314d..97f8b73 100644
--- a/sci-libs/p4est/ChangeLog
+++ b/sci-libs/p4est/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*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/metadata.xml b/sci-libs/p4est/metadata.xml
index e1b5e18..c8a9acb 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 4160e78..27e2e9e 100644
--- a/sci-libs/p4est/p4est-1.0.ebuild
+++ b/sci-libs/p4est/p4est-1.0.ebuild
@@ -42,7 +42,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 +60,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 0000000..89804b2
--- /dev/null
+++ b/sci-libs/p4est/p4est-1.1.ebuild
@@ -0,0 +1 @@
+p4est-1.0.ebuild
\ No newline at end of file


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/p4est/
@ 2015-06-06 10:23 Justin Lecher
  0 siblings, 0 replies; 17+ messages in thread
From: Justin Lecher @ 2015-06-06 10:23 UTC (permalink / raw
  To: gentoo-commits

commit:     4c0d123286ca25a2708560dcc7dcc5d954e5db33
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  6 10:22:43 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jun  6 10:22:43 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=4c0d1232

sci-libs/p4est: Add SLOT operators

Package-Manager: portage-2.2.20

 sci-libs/p4est/ChangeLog        | 3 +++
 sci-libs/p4est/p4est-1.0.ebuild | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-libs/p4est/ChangeLog b/sci-libs/p4est/ChangeLog
index 8cf39f4..42e91d0 100644
--- a/sci-libs/p4est/ChangeLog
+++ b/sci-libs/p4est/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jun 2015; Justin Lecher <jlec@gentoo.org> p4est-1.0.ebuild:
+  sci-libs/p4est: Add SLOT operators
+
   06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   sci-libs/p4est: Add github to remote-id in metadata.xml
 

diff --git a/sci-libs/p4est/p4est-1.0.ebuild b/sci-libs/p4est/p4est-1.0.ebuild
index 4c6946d..e753ed7 100644
--- a/sci-libs/p4est/p4est-1.0.ebuild
+++ b/sci-libs/p4est/p4est-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -24,7 +24,7 @@ REQUIRED_USE="romio? ( mpi )"
 
 RDEPEND="
 	>=sci-libs/libsc-1.0[mpi,romio]
-	dev-lang/lua
+	dev-lang/lua:*
 	sys-apps/util-linux
 	virtual/blas
 	virtual/lapack


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/p4est/
@ 2015-06-06 10:23 Justin Lecher
  0 siblings, 0 replies; 17+ messages in thread
From: Justin Lecher @ 2015-06-06 10:23 UTC (permalink / raw
  To: gentoo-commits

commit:     afc4750f55621a8e2e6e000e04c2edb06dab9d33
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  6 10:21:24 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jun  6 10:21:24 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=afc4750f

sci-libs/p4est: Add github to remote-id in metadata.xml

Package-Manager: portage-2.2.20

 sci-libs/p4est/ChangeLog    | 5 ++++-
 sci-libs/p4est/metadata.xml | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/sci-libs/p4est/ChangeLog b/sci-libs/p4est/ChangeLog
index 6150066..8cf39f4 100644
--- a/sci-libs/p4est/ChangeLog
+++ b/sci-libs/p4est/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-libs/p4est
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  sci-libs/p4est: Add github to remote-id in metadata.xml
+
   13 Oct 2014; Matthias Maier <tamiko@gentoo.org> p4est-1.0.ebuild:
   sci-libs/p4est: Fix build dependencies
 

diff --git a/sci-libs/p4est/metadata.xml b/sci-libs/p4est/metadata.xml
index c8a9acb..85fc0a1 100644
--- a/sci-libs/p4est/metadata.xml
+++ b/sci-libs/p4est/metadata.xml
@@ -16,4 +16,7 @@ processor cores.
 		<flag name="vtk-binary">Enable binary vtk output. If disabled vtk files will be written in ASCII text format.</flag>
 		<flag name="romio">Build with support for the ROMIO MPI-IO component</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">cburstedde/libsc</remote-id>
+	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/p4est/
@ 2016-09-02 22:08 Christoph Junghans
  0 siblings, 0 replies; 17+ messages in thread
From: Christoph Junghans @ 2016-09-02 22:08 UTC (permalink / raw
  To: gentoo-commits

commit:     c2a638225d8afb354709417daf85a187449270e3
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 20:26:19 2016 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 20:26:19 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=c2a63822

sci-libs/p4est: add live ebuild

Package-Manager: portage-2.2.28

 sci-libs/p4est/p4est-9999.ebuild | 108 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 108 insertions(+)

diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild
new file mode 100644
index 0000000..05f4f1b
--- /dev/null
+++ b/sci-libs/p4est/p4est-9999.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WANT_AUTOMAKE=1.11
+
+inherit autotools-utils toolchain-funcs eutils multilib
+
+DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
+HOMEPAGE="http://www.p4est.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/cburstedde/p4est.git"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="
+		https://github.com/cburstedde/p4est/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/cburstedde/libsc/archive/v${PV}.tar.gz -> libsc-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+IUSE="debug doc examples mpi romio static-libs +vtk-binary"
+REQUIRED_USE="romio? ( mpi )"
+
+RDEPEND="
+	>=sci-libs/libsc-1.0[mpi,romio]
+	dev-lang/lua:*
+	sys-apps/util-linux
+	virtual/blas
+	virtual/lapack
+	mpi? ( virtual/mpi[romio?] )"
+
+DEPEND="
+	${RDEPEND}
+	sys-devel/automake:1.11
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+
+AT_M4DIR="${WORKDIR}/${P}/config ${WORKDIR}/${P}/sc/config"
+AUTOTOOLS_AUTORECONF=true
+
+src_prepare() {
+	# Inject libsc to get  all parts of the build system...
+	if ! [[ ${PV} = *9999* ]]; then
+		rmdir "${S}/sc" || die "rmdir failed"
+		mv "${WORKDIR}/libsc-${PV}" "${S}/sc" || die "mv failed"
+	fi
+
+	# Inject a version number into the build system
+	echo "${PV}" > ${S}/.tarball-version
+
+	autotools-utils_src_prepare
+
+	sed -i \
+		"s/P4EST_SC_DIR\/etc/P4EST_SC_DIR\/share\/libsc/" \
+		"${S}"/configure || die "sed failed"
+
+	sed -i \
+		"s/libsc\.la/libsc\.so/" \
+		"${S}"/configure || die "sed failed"
+
+}
+
+src_configure() {
+	# avoid underlinkage
+	LDFLAGS="${LDFLAGS} -lsc"
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable mpi)
+		$(use_enable romio mpiio)
+		$(use_enable vtk-binary)
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+		--with-sc="${EPREFIX}/usr"
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	use doc && dodoc -r doc/*
+
+	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/p4est
+	mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data || die "mv failed"
+	mv "${ED}"/etc/* "${ED}"/usr/share/p4est || die "mv failed"
+	rmdir "${ED}"/etc/ || die "rmdir failed"
+}


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/p4est/
@ 2016-09-02 22:08 Christoph Junghans
  0 siblings, 0 replies; 17+ messages in thread
From: Christoph Junghans @ 2016-09-02 22:08 UTC (permalink / raw
  To: gentoo-commits

commit:     f6af5d93e2ecbed116c5a9aa35c86261d5ab67b1
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 21:05:06 2016 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 21:07:58 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=f6af5d93

sci-libs/p4est: add openmp and threads use flags

Package-Manager: portage-2.2.28

 sci-libs/p4est/p4est-9999.ebuild | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild
index 05f4f1b..33c371d 100644
--- a/sci-libs/p4est/p4est-9999.ebuild
+++ b/sci-libs/p4est/p4est-9999.ebuild
@@ -26,16 +26,17 @@ fi
 LICENSE="GPL-2+"
 SLOT="0"
 
-IUSE="debug doc examples mpi romio static-libs +vtk-binary"
+# TODO petsc
+IUSE="debug doc examples mpi openmp romio static-libs threads +vtk-binary"
 REQUIRED_USE="romio? ( mpi )"
 
 RDEPEND="
-	>=sci-libs/libsc-1.0[mpi,romio]
+	>=sci-libs/libsc-1.0[mpi=,openmp=,romio=,threads=]
 	dev-lang/lua:*
 	sys-apps/util-linux
 	virtual/blas
 	virtual/lapack
-	mpi? ( virtual/mpi[romio?] )"
+	mpi? ( virtual/mpi[romio=] )"
 
 DEPEND="
 	${RDEPEND}
@@ -47,6 +48,13 @@ DOCS=( AUTHORS NEWS README )
 AT_M4DIR="${WORKDIR}/${P}/config ${WORKDIR}/${P}/sc/config"
 AUTOTOOLS_AUTORECONF=true
 
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
+		tc-has-openmp || \
+			die "Please select an openmp capable compiler like gcc[openmp]"
+	fi
+}
+
 src_prepare() {
 	# Inject libsc to get  all parts of the build system...
 	if ! [[ ${PV} = *9999* ]]; then
@@ -76,10 +84,13 @@ src_configure() {
 	local myeconfargs=(
 		$(use_enable debug)
 		$(use_enable mpi)
+		$(use_enable openmp)
 		$(use_enable romio mpiio)
 		$(use_enable vtk-binary)
+		$(use_enable threads pthread)
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+		$(use_with petsc)
 		--with-sc="${EPREFIX}/usr"
 	)
 	autotools-utils_src_configure


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/p4est/
@ 2016-09-02 22:08 Christoph Junghans
  0 siblings, 0 replies; 17+ messages in thread
From: Christoph Junghans @ 2016-09-02 22:08 UTC (permalink / raw
  To: gentoo-commits

commit:     91925c9fbffe1047848e472a91866e20ce041f6d
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  2 13:28:59 2016 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Fri Sep  2 13:29:04 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=91925c9f

sci-libs/p4est: use "develop" branch for live build

Package-Manager: portage-2.2.28

 sci-libs/p4est/p4est-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild
index 0589aa2..12c4037 100644
--- a/sci-libs/p4est/p4est-9999.ebuild
+++ b/sci-libs/p4est/p4est-9999.ebuild
@@ -14,6 +14,7 @@ HOMEPAGE="http://www.p4est.org/"
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://github.com/cburstedde/p4est.git"
+	EGIT_BRANCH="develop"
 	SRC_URI=""
 	KEYWORDS=""
 else


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/p4est/
@ 2016-09-02 22:08 Christoph Junghans
  0 siblings, 0 replies; 17+ messages in thread
From: Christoph Junghans @ 2016-09-02 22:08 UTC (permalink / raw
  To: gentoo-commits

commit:     39105315dfff4d9575156cb7271e4cbe4eb928bf
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 21:08:50 2016 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 21:09:04 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=39105315

sci-libs/p4est: *ouch*

Package-Manager: portage-2.2.28

 sci-libs/p4est/p4est-9999.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild
index 33c371d..0589aa2 100644
--- a/sci-libs/p4est/p4est-9999.ebuild
+++ b/sci-libs/p4est/p4est-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -90,7 +90,6 @@ src_configure() {
 		$(use_enable threads pthread)
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
-		$(use_with petsc)
 		--with-sc="${EPREFIX}/usr"
 	)
 	autotools-utils_src_configure


^ permalink raw reply related	[flat|nested] 17+ messages in thread
end of thread, other threads:[~2016-09-02 22:09 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-02 22:08 [gentoo-commits] proj/sci:master commit in: sci-libs/p4est/ Christoph Junghans
  -- strict thread matches above, loose matches on Subject: below --
2016-09-02 22:08 Christoph Junghans
2016-09-02 22:08 Christoph Junghans
2016-09-02 22:08 Christoph Junghans
2015-06-06 10:23 Justin Lecher
2015-06-06 10:23 Justin Lecher
2014-10-16 15:50 Christoph Junghans
2014-10-16 15:50 Christoph Junghans
2014-07-24 21:51 Jens-Malte Gottfried
2013-10-18 16:19 Christoph Junghans
2013-07-26 16:14 Nicolas Bock
2013-07-26 16:14 Nicolas Bock
2013-07-26 16:14 Nicolas Bock
2013-07-26 16:14 Nicolas Bock
2013-07-26 16:14 Nicolas Bock
2013-07-26 16:14 Nicolas Bock
2013-07-26 16:14 Nicolas Bock

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox