[gentoo-commits] proj/sci:master commit in: sci-physics/espresso/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/sci:master commit in: sci-physics/espresso/
@ 2011-04-20 13:37 Christoph Junghans
  0 siblings, 0 replies; 19+ messages in thread
From: Christoph Junghans @ 2011-04-20 13:37 UTC (permalink / raw
  To: gentoo-commits

commit:     2ecc4545403408dd291f6571c8a945c7289538e8
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 13:37:12 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Wed Apr 20 13:37:12 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2ecc4545

[sci-physics/espresso] added live ebuild

(Portage version: 2.1.9.42/git/Linux i686, signed Manifest commit with key C2000586)

---
 sci-physics/espresso/ChangeLog                     |    8 +++-
 ...espresso-2.2.0b.ebuild => espresso-9999.ebuild} |   53 +++++++++-----------
 2 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/sci-physics/espresso/ChangeLog b/sci-physics/espresso/ChangeLog
index b1050df..75a9079 100644
--- a/sci-physics/espresso/ChangeLog
+++ b/sci-physics/espresso/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sci-physics/espresso
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*espresso-3.0.0 (20 Apr 2011)
+
+  20 Apr 2011; Christoph Junghans <ottxor@gentoo.org> -espresso-2.2.0b.ebuild,
+  +espresso-9999.ebuild:
+  version bump
+
 *espresso-2.2.0b (29 Jul 2010)
 
   29 Jul 2010; Christoph Junghans <kleiner_otti@gmx.de>

diff --git a/sci-physics/espresso/espresso-2.2.0b.ebuild b/sci-physics/espresso/espresso-9999.ebuild
similarity index 59%
rename from sci-physics/espresso/espresso-2.2.0b.ebuild
rename to sci-physics/espresso/espresso-9999.ebuild
index 5130e42..3177b12 100644
--- a/sci-physics/espresso/espresso-2.2.0b.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -1,18 +1,21 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.0.0.ebuild,v 1.1 2011/04/20 13:03:00 ottxor Exp $
 
-EAPI="3"
+EAPI="4"
 
-inherit autotools savedconfig
+inherit autotools-utils git savedconfig
 
 DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
 HOMEPAGE="http://www.espressomd.org"
-SRC_URI="http://espressomd.org/mediawiki/images/f/f3/Espresso-${PV}.tar.gz"
+SRC_URI=""
 
-LICENSE="GPL-2"
+EGIT_REPO_URI="git://git.savannah.nongnu.org/espressomd.git"
+EGIT_BRANCH="master"
+
+LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86"
 IUSE="X doc examples fftw mpi packages test -tk"
 
 RDEPEND="dev-lang/tcl
@@ -22,60 +25,52 @@ RDEPEND="dev-lang/tcl
 	tk? ( >=dev-lang/tk-8.4.18-r1 )"
 
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen
+	doc? ( app-doc/doxygen[-nodot]
 		virtual/latex-base )"
 
-#S="${WORKDIR}/${PN}-${PV:0:5}"
-
 src_prepare() {
-	ln -s Makefile-am.am Makefile.am
+	sed -i 's/^CFLAGS/#&/' configure.ac
+	autotools-utils_src_prepare
 	eautoreconf
 	restore_config myconfig.h
 }
 
 src_configure() {
-	econf \
-		--disable-processor-optimization \
+	myeconfargs=(
 		$(use_with fftw) \
 		$(use_with mpi) \
 		$(use_with tk) \
 		$(use_with X x)
+	)
+	autotools-utils_src_configure
 }
 
 src_compile() {
-	emake || die "emake failed"
+	autotools-utils_src_compile
 	if use doc; then
-		emake doc || die "emake doc failed"
+		autotools-utils_src_compile doc || die "emake doc failed"
 	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Installing failed"
+	autotools-utils_src_install
 
-	dodoc INSTALL README RELEASE_NOTES
+	dodoc AUTHORS NEWS README ChangeLog
 
 	insinto /usr/share/${PN}
-	doins myconfig-sample.h
+	doins ${AUTOTOOLS_BUILD_DIR}/myconfig-sample.h
 
-	if [ -f myconfig.h ]; then
-		save_config myconfig.h
-	else
-		save_config config/myconfig.h
-	fi
+	save_config ${AUTOTOOLS_BUILD_DIR}/src/myconfig-final.h
 
 	if use doc; then
-		newdoc doc/ug/ug.pdf user_guide.pdf
-		dohtml -r doc/dg/html/*
-		newdoc doc/tutorials/tut2/tut2.pdf tutorial.pdf
+		newdoc ${AUTOTOOLS_BUILD_DIR}/doc/ug/ug.pdf user_guide.pdf
+		dohtml -r ${AUTOTOOLS_BUILD_DIR}/doc/dg/html/*
+		newdoc ${AUTOTOOLS_BUILD_DIR}/doc/tutorials/tut2/tut2.pdf tutorial.pdf
 	fi
 
 	if use examples; then
 		insinto /usr/share/${PN}/examples
 		doins -r samples/*
-		#the testsuite are also good examples
-		rm testsuite/Makefile* testsuite/test.sh.in
-		insinto /usr/share/${PN}/testsuite
-		doins testsuite/*
 	fi
 
 	if use packages; then



^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/espresso/
@ 2011-04-20 21:29 Christoph Junghans
  0 siblings, 0 replies; 19+ messages in thread
From: Christoph Junghans @ 2011-04-20 21:29 UTC (permalink / raw
  To: gentoo-commits

commit:     7b5c4da6e75db00876dae8e800ee89dc94be77ae
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 21:29:18 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Wed Apr 20 21:29:18 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7b5c4da6

[sci-physics/espresso] live ebuild update

(Portage version: 2.1.9.42/git/Linux i686, signed Manifest commit with key C2000586)

---
 sci-physics/espresso/espresso-9999.ebuild |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index 3177b12..caaf854 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -29,7 +29,6 @@ DEPEND="${RDEPEND}
 		virtual/latex-base )"
 
 src_prepare() {
-	sed -i 's/^CFLAGS/#&/' configure.ac
 	autotools-utils_src_prepare
 	eautoreconf
 	restore_config myconfig.h



^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/espresso/
@ 2011-04-26 21:23 Christoph Junghans
  0 siblings, 0 replies; 19+ messages in thread
From: Christoph Junghans @ 2011-04-26 21:23 UTC (permalink / raw
  To: gentoo-commits

commit:     380b480785c38e8ec3e82cb3ece9b8cac62cbcd7
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 26 21:23:06 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Tue Apr 26 21:23:26 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=380b4807

[sci-physics/espresso] live ebuild update

(Portage version: 2.1.9.42/git/Linux i686, signed Manifest commit with key C2000586)

---
 sci-physics/espresso/espresso-9999.ebuild |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index caaf854..55908dd 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -4,19 +4,26 @@
 
 EAPI="4"
 
-inherit autotools-utils git savedconfig
+inherit autotools-utils savedconfig
 
 DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
 HOMEPAGE="http://www.espressomd.org"
-SRC_URI=""
 
-EGIT_REPO_URI="git://git.savannah.nongnu.org/espressomd.git"
-EGIT_BRANCH="master"
+if [ "${PV%9999}" != "${PV}" ]; then
+	EGIT_REPO_URI="git://git.savannah.nongnu.org/espressomd.git"
+	EGIT_BRANCH="master"
+	inherit git
+else
+	SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz"
+fi
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE="X doc examples fftw mpi packages test -tk"
+REQUIRED_USE="tk? ( X )"
+
+RESTRICT="tk? ( test )"
 
 RDEPEND="dev-lang/tcl
 	X? ( x11-libs/libX11 )
@@ -62,9 +69,11 @@ src_install() {
 	save_config ${AUTOTOOLS_BUILD_DIR}/src/myconfig-final.h
 
 	if use doc; then
-		newdoc ${AUTOTOOLS_BUILD_DIR}/doc/ug/ug.pdf user_guide.pdf
+		local where="."
+		[ "${PV%9999}" != "${PV}" ] && where="${AUTOTOOLS_BUILD_DIR}"
+		newdoc ${where}/doc/ug/ug.pdf user_guide.pdf
 		dohtml -r ${AUTOTOOLS_BUILD_DIR}/doc/dg/html/*
-		newdoc ${AUTOTOOLS_BUILD_DIR}/doc/tutorials/tut2/tut2.pdf tutorial.pdf
+		newdoc ${where}/doc/tutorials/tut2/tut2.pdf tutorial.pdf
 	fi
 
 	if use examples; then



^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/espresso/
@ 2011-06-25 12:58 Christoph Junghans
  0 siblings, 0 replies; 19+ messages in thread
From: Christoph Junghans @ 2011-06-25 12:58 UTC (permalink / raw
  To: gentoo-commits

commit:     a76de66aa2deb416f0df5bd7650592614ae35d92
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 11:55:52 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sat Jun 25 11:55:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a76de66a

[sci-physics/espresso] migrate to git-2

(Portage version: 2.1.9.42/git/Linux i686, signed Manifest commit with key C2000586)

---
 sci-physics/espresso/ChangeLog            |    3 +++
 sci-physics/espresso/espresso-9999.ebuild |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/sci-physics/espresso/ChangeLog b/sci-physics/espresso/ChangeLog
index 75a9079..a8f7cc8 100644
--- a/sci-physics/espresso/ChangeLog
+++ b/sci-physics/espresso/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Jun 2011; Christoph Junghans <ottxor@gentoo.org> espresso-9999.ebuild:
+  migrate to git-2
+
 *espresso-3.0.0 (20 Apr 2011)
 
   20 Apr 2011; Christoph Junghans <ottxor@gentoo.org> -espresso-2.2.0b.ebuild,

diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index 55908dd..8993f54 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.espressomd.org"
 if [ "${PV%9999}" != "${PV}" ]; then
 	EGIT_REPO_URI="git://git.savannah.nongnu.org/espressomd.git"
 	EGIT_BRANCH="master"
-	inherit git
+	inherit git-2
 else
 	SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz"
 fi



^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/espresso/
@ 2011-06-25 17:22 Justin Lecher
  0 siblings, 0 replies; 19+ messages in thread
From: Justin Lecher @ 2011-06-25 17:22 UTC (permalink / raw
  To: gentoo-commits

commit:     075143c9a5ab5c8616c862c6403fb44a3d5f5848
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 17:01:45 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 17:01:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=075143c9

Cleaned ebuild

(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 sci-physics/espresso/ChangeLog            |    4 ++++
 sci-physics/espresso/espresso-9999.ebuild |   14 ++++++++------
 sci-physics/espresso/metadata.xml         |    4 ++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/sci-physics/espresso/ChangeLog b/sci-physics/espresso/ChangeLog
index 75a9079..28bcbb0 100644
--- a/sci-physics/espresso/ChangeLog
+++ b/sci-physics/espresso/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Jun 2011; Justin Lecher <jlec@gentoo.org> espresso-9999.ebuild,
+  metadata.xml:
+  Cleaned ebuild
+
 *espresso-3.0.0 (20 Apr 2011)
 
   20 Apr 2011; Christoph Junghans <ottxor@gentoo.org> -espresso-2.2.0b.ebuild,

diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index 55908dd..9c22425 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.0.0.ebuild,v 1.1 2011/04/20 13:03:00 ottxor Exp $
 
-EAPI="4"
+EAPI=4
 
 inherit autotools-utils savedconfig
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.espressomd.org"
 if [ "${PV%9999}" != "${PV}" ]; then
 	EGIT_REPO_URI="git://git.savannah.nongnu.org/espressomd.git"
 	EGIT_BRANCH="master"
-	inherit git
+	inherit git-2
 else
 	SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz"
 fi
@@ -25,14 +25,16 @@ REQUIRED_USE="tk? ( X )"
 
 RESTRICT="tk? ( test )"
 
-RDEPEND="dev-lang/tcl
-	X? ( x11-libs/libX11 )
+RDEPEND="
+	dev-lang/tcl
 	fftw? ( sci-libs/fftw:3.0 )
 	mpi? ( virtual/mpi )
-	tk? ( >=dev-lang/tk-8.4.18-r1 )"
+	tk? ( >=dev-lang/tk-8.4.18-r1 )
+	X? ( x11-libs/libX11 )"
 
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[-nodot]
+	doc? (
+		app-doc/doxygen[-nodot]
 		virtual/latex-base )"
 
 src_prepare() {

diff --git a/sci-physics/espresso/metadata.xml b/sci-physics/espresso/metadata.xml
index 03cc20a..cb05f9b 100644
--- a/sci-physics/espresso/metadata.xml
+++ b/sci-physics/espresso/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>sci-physics</herd>
 	<use>
-		<flag name='examples'>Installs the examples</flag>
-		<flag name='packages'>Installs extra subpackages</flag>
+		<flag name="examples">Installs the examples</flag>
+		<flag name="packages">Installs extra subpackages</flag>
 	</use>
 </pkgmetadata>



^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/espresso/
@ 2011-11-27 21:11 Christoph Junghans
  0 siblings, 0 replies; 19+ messages in thread
From: Christoph Junghans @ 2011-11-27 21:11 UTC (permalink / raw
  To: gentoo-commits

commit:     cbca231ab055584591ed3615fb930e7013bca38f
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 21:11:01 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sun Nov 27 21:11:01 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cbca231a

[sci-physics/espresso] live ebuild update

(Portage version: 2.2.0_alpha78/git/Linux i686, signed Manifest commit with key C2000586)

---
 sci-physics/espresso/espresso-9999.ebuild |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index 9c22425..6522b90 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -37,8 +37,13 @@ DEPEND="${RDEPEND}
 		app-doc/doxygen[-nodot]
 		virtual/latex-base )"
 
+DOCS=( AUTHORS NEWS README ChangeLog )
+
 src_prepare() {
 	autotools-utils_src_prepare
+	sed -i -e '/^[^S]/s/tutorials/tutorial/g' \
+		-e 's/cd tutorial/&s/' doc/Makefile.am \
+		|| die "sed of Makefile.am failed"
 	eautoreconf
 	restore_config myconfig.h
 }
@@ -55,15 +60,13 @@ src_configure() {
 
 src_compile() {
 	autotools-utils_src_compile
-	if use doc; then
-		autotools-utils_src_compile doc || die "emake doc failed"
-	fi
+	use doc && autotools-utils_src_compile doc
 }
 
 src_install() {
-	autotools-utils_src_install
+	local i
 
-	dodoc AUTHORS NEWS README ChangeLog
+	autotools-utils_src_install
 
 	insinto /usr/share/${PN}
 	doins ${AUTOTOOLS_BUILD_DIR}/myconfig-sample.h
@@ -74,8 +77,11 @@ src_install() {
 		local where="."
 		[ "${PV%9999}" != "${PV}" ] && where="${AUTOTOOLS_BUILD_DIR}"
 		newdoc ${where}/doc/ug/ug.pdf user_guide.pdf
-		dohtml -r ${AUTOTOOLS_BUILD_DIR}/doc/dg/html/*
-		newdoc ${where}/doc/tutorials/tut2/tut2.pdf tutorial.pdf
+		newdoc ${where}/doc/dg/dg.pdf developer_guide.pdf
+		dohtml -r ${AUTOTOOLS_BUILD_DIR}/doc/doxygen/html/*
+		for i in ${where}/doc/tutorials/*/[0-9]*.pdf; do
+			newdoc ${i} tutorial_${i##*/}
+		done
 	fi
 
 	if use examples; then



^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/espresso/
@ 2012-03-22  3:53 Christoph Junghans
  0 siblings, 0 replies; 19+ messages in thread
From: Christoph Junghans @ 2012-03-22  3:53 UTC (permalink / raw
  To: gentoo-commits

commit:     2450e5130da4d8e3a20d227cd80cff849440b406
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 22 03:49:44 2012 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Thu Mar 22 03:52:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2450e513

version bump

(Portage version: 2.2.0_alpha93/git/Linux i686, unsigned Manifest commit)

---
 sci-physics/espresso/ChangeLog            |    5 ++++-
 sci-physics/espresso/espresso-9999.ebuild |   20 +++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/sci-physics/espresso/ChangeLog b/sci-physics/espresso/ChangeLog
index e5ea3c7..cbb4514 100644
--- a/sci-physics/espresso/ChangeLog
+++ b/sci-physics/espresso/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-physics/espresso
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Mar 2012; Christoph Junghans <ottxor@gentoo.org> espresso-9999.ebuild:
+  version bump
+
   25 Jun 2011; Christoph Junghans <ottxor@gentoo.org> espresso-9999.ebuild:
   migrate to git-2
 

diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index 6522b90..c8ba5bd 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.0.0.ebuild,v 1.1 2011/04/20 13:03:00 ottxor Exp $
 
@@ -9,7 +9,7 @@ inherit autotools-utils savedconfig
 DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
 HOMEPAGE="http://www.espressomd.org"
 
-if [ "${PV%9999}" != "${PV}" ]; then
+if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="git://git.savannah.nongnu.org/espressomd.git"
 	EGIT_BRANCH="master"
 	inherit git-2
@@ -33,6 +33,7 @@ RDEPEND="
 	X? ( x11-libs/libX11 )"
 
 DEPEND="${RDEPEND}
+	dev-lang/python
 	doc? (
 		app-doc/doxygen[-nodot]
 		virtual/latex-base )"
@@ -41,9 +42,6 @@ DOCS=( AUTHORS NEWS README ChangeLog )
 
 src_prepare() {
 	autotools-utils_src_prepare
-	sed -i -e '/^[^S]/s/tutorials/tutorial/g' \
-		-e 's/cd tutorial/&s/' doc/Makefile.am \
-		|| die "sed of Makefile.am failed"
 	eautoreconf
 	restore_config myconfig.h
 }
@@ -60,7 +58,8 @@ src_configure() {
 
 src_compile() {
 	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile doc
+	use doc && autotools-utils_src_compile ug doxygen tutorials
+	[[ ${PV} = 9999 ]] && use doc && autotools-utils_src_compile dg
 }
 
 src_install() {
@@ -74,12 +73,11 @@ src_install() {
 	save_config ${AUTOTOOLS_BUILD_DIR}/src/myconfig-final.h
 
 	if use doc; then
-		local where="."
-		[ "${PV%9999}" != "${PV}" ] && where="${AUTOTOOLS_BUILD_DIR}"
-		newdoc ${where}/doc/ug/ug.pdf user_guide.pdf
-		newdoc ${where}/doc/dg/dg.pdf developer_guide.pdf
+		[[ ${PV} = 9999 ]] && \
+			newdoc ${AUTOTOOLS_BUILD_DIR}/doc/dg/dg.pdf developer_guide.pdf
+		newdoc ${AUTOTOOLS_BUILD_DIR}/doc/ug/ug.pdf user_guide.pdf
 		dohtml -r ${AUTOTOOLS_BUILD_DIR}/doc/doxygen/html/*
-		for i in ${where}/doc/tutorials/*/[0-9]*.pdf; do
+		for i in ${AUTOTOOLS_BUILD_DIR}/doc/tutorials/*/[0-9]*.pdf; do
 			newdoc ${i} tutorial_${i##*/}
 		done
 	fi



^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/espresso/
@ 2012-03-24 22:46 Christoph Junghans
  0 siblings, 0 replies; 19+ messages in thread
From: Christoph Junghans @ 2012-03-24 22:46 UTC (permalink / raw
  To: gentoo-commits

commit:     8f0205d3d24a59f0363763c24db1edf513e9b91e
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 24 22:42:15 2012 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sat Mar 24 22:42:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8f0205d3

Fixes bug #405455, again

(Portage version: 2.2.0_alpha95/git/Linux i686, unsigned Manifest commit)

---
 sci-physics/espresso/ChangeLog            |    3 +++
 sci-physics/espresso/espresso-9999.ebuild |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/sci-physics/espresso/ChangeLog b/sci-physics/espresso/ChangeLog
index cbb4514..412cdd4 100644
--- a/sci-physics/espresso/ChangeLog
+++ b/sci-physics/espresso/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Mar 2012; Christoph Junghans <ottxor@gentoo.org> espresso-9999.ebuild:
+  Fixes bug #405455, again
+
   22 Mar 2012; Christoph Junghans <ottxor@gentoo.org> espresso-9999.ebuild:
   version bump
 

diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index c8ba5bd..6305fa5 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-lang/python
 	doc? (
-		app-doc/doxygen[-nodot]
+		|| ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot] )
 		virtual/latex-base )"
 
 DOCS=( AUTHORS NEWS README ChangeLog )



^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/espresso/
@ 2012-05-06 21:09 Christoph Junghans
  0 siblings, 0 replies; 19+ messages in thread
From: Christoph Junghans @ 2012-05-06 21:09 UTC (permalink / raw
  To: gentoo-commits

commit:     4691d6372d4d68317555e53ea3c043b4fde26753
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sun May  6 21:09:18 2012 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sun May  6 21:09:18 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4691d637

sync with gx86

(Portage version: 2.2.0_alpha101/git/Linux i686, unsigned Manifest commit)

---
 sci-physics/espresso/ChangeLog            |    3 +++
 sci-physics/espresso/espresso-9999.ebuild |    4 +++-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/sci-physics/espresso/ChangeLog b/sci-physics/espresso/ChangeLog
index 412cdd4..c273e46 100644
--- a/sci-physics/espresso/ChangeLog
+++ b/sci-physics/espresso/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 May 2012; Christoph Junghans <ottxor@gentoo.org> espresso-9999.ebuild:
+  sync with gx86
+
   24 Mar 2012; Christoph Junghans <ottxor@gentoo.org> espresso-9999.ebuild:
   Fixes bug #405455, again
 

diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index 6305fa5..01f7b51 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
 IUSE="X doc examples fftw mpi packages test -tk"
 REQUIRED_USE="tk? ( X )"
 
@@ -29,6 +29,7 @@ RDEPEND="
 	dev-lang/tcl
 	fftw? ( sci-libs/fftw:3.0 )
 	mpi? ( virtual/mpi )
+	packages? ( dev-tcltk/tcllib )
 	tk? ( >=dev-lang/tk-8.4.18-r1 )
 	X? ( x11-libs/libX11 )"
 
@@ -36,6 +37,7 @@ DEPEND="${RDEPEND}
 	dev-lang/python
 	doc? (
 		|| ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot] )
+		dev-texlive/texlive-latexextra
 		virtual/latex-base )"
 
 DOCS=( AUTHORS NEWS README ChangeLog )



^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/espresso/
@ 2012-10-09  8:53 Christoph Junghans
  0 siblings, 0 replies; 19+ messages in thread
From: Christoph Junghans @ 2012-10-09  8:53 UTC (permalink / raw
  To: gentoo-commits

commit:     e32eea28a574de8ad3729474e3001c42b11f23a7
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  9 08:53:13 2012 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Tue Oct  9 08:53:13 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e32eea28

sync with gx86

(Portage version: 2.2.0_alpha136/git/Linux i686)

---
 sci-physics/espresso/ChangeLog            |    4 ++-
 sci-physics/espresso/espresso-9999.ebuild |   30 +++++++++++++++++++---------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/sci-physics/espresso/ChangeLog b/sci-physics/espresso/ChangeLog
index c273e46..7264eca 100644
--- a/sci-physics/espresso/ChangeLog
+++ b/sci-physics/espresso/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Oct 2012; Christoph Junghans <ottxor@gentoo.org> espresso-9999.ebuild:
+  sync with gx86
+
   06 May 2012; Christoph Junghans <ottxor@gentoo.org> espresso-9999.ebuild:
   sync with gx86
 
@@ -46,4 +49,3 @@
 
   16 May 2009; Christoph Junghans <kleiner_otti@gmx.de> ChangeLog:
   Initial commit. Ebuild written by me. bug #266648
-

diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index 01f7b51..18df79b 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.0.0.ebuild,v 1.1 2011/04/20 13:03:00 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.1.0.ebuild,v 1.5 2012/05/06 23:08:00 ottxor Exp $
 
 EAPI=4
 
@@ -46,6 +46,10 @@ src_prepare() {
 	autotools-utils_src_prepare
 	eautoreconf
 	restore_config myconfig.h
+	if [[ ${CHOST} == *-darwin* ]]; then
+		#tclline uses stty, which has different exit code on Darwin
+		sed -i '/source.*tclline/s/^/#/' "scripts/init.tcl" || die
+	fi
 }
 
 src_configure() {
@@ -60,8 +64,8 @@ src_configure() {
 
 src_compile() {
 	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile ug doxygen tutorials
-	[[ ${PV} = 9999 ]] && use doc && autotools-utils_src_compile dg
+	use doc && autotools-utils_src_compile doxygen
+	[[ ${PV} = 9999 ]] && use doc && autotools-utils_src_compile ug dg tutorials
 }
 
 src_install() {
@@ -75,13 +79,19 @@ src_install() {
 	save_config ${AUTOTOOLS_BUILD_DIR}/src/myconfig-final.h
 
 	if use doc; then
-		[[ ${PV} = 9999 ]] && \
-			newdoc ${AUTOTOOLS_BUILD_DIR}/doc/dg/dg.pdf developer_guide.pdf
-		newdoc ${AUTOTOOLS_BUILD_DIR}/doc/ug/ug.pdf user_guide.pdf
-		dohtml -r ${AUTOTOOLS_BUILD_DIR}/doc/doxygen/html/*
-		for i in ${AUTOTOOLS_BUILD_DIR}/doc/tutorials/*/[0-9]*.pdf; do
-			newdoc ${i} tutorial_${i##*/}
-		done
+		if [[ ${PV} = 9999 ]] ; then
+			newdoc "${AUTOTOOLS_BUILD_DIR}"/doc/dg/dg.pdf developer_guide.pdf
+			newdoc "${AUTOTOOLS_BUILD_DIR}"/doc/ug/ug.pdf user_guide.pdf
+			for i in "${AUTOTOOLS_BUILD_DIR}"/doc/tutorials/*/[0-9]*.pdf; do
+				newdoc "${i}" "tutorial_${i##*/}"
+			done
+		else
+			newdoc "${S}"/doc/ug/ug.pdf user_guide.pdf
+			for i in "${S}"/doc/tutorials/*/[0-9]*.pdf; do
+				newdoc "${i}" "tutorial_${i##*/}"
+			done
+		fi
+		dohtml -r "${AUTOTOOLS_BUILD_DIR}"/doc/doxygen/html/*
 	fi
 
 	if use examples; then


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/espresso/
@ 2013-03-09  2:43 Christoph Junghans
  0 siblings, 0 replies; 19+ messages in thread
From: Christoph Junghans @ 2013-03-09  2:43 UTC (permalink / raw
  To: gentoo-commits

commit:     8ffced4af673b34402a09f0479557c4a61ca2ace
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  9 02:43:18 2013 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sat Mar  9 02:43:18 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8ffced4a

sync with gx86

Package-Manager: portage-2.2.0_alpha166

---
 sci-physics/espresso/ChangeLog            |    5 ++++-
 sci-physics/espresso/espresso-9999.ebuild |   14 +++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/sci-physics/espresso/ChangeLog b/sci-physics/espresso/ChangeLog
index 7264eca..46977ce 100644
--- a/sci-physics/espresso/ChangeLog
+++ b/sci-physics/espresso/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-physics/espresso
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Mar 2013; Christoph Junghans <ottxor@gentoo.org> espresso-9999.ebuild:
+  sync with gx86
+
   09 Oct 2012; Christoph Junghans <ottxor@gentoo.org> espresso-9999.ebuild:
   sync with gx86
 

diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index 18df79b..fb3e519 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.1.0.ebuild,v 1.5 2012/05/06 23:08:00 ottxor Exp $
 
@@ -12,6 +12,7 @@ HOMEPAGE="http://www.espressomd.org"
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="git://git.savannah.nongnu.org/espressomd.git"
 	EGIT_BRANCH="master"
+	AUTOTOOLS_AUTORECONF=1
 	inherit git-2
 else
 	SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz"
@@ -42,16 +43,6 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS NEWS README ChangeLog )
 
-src_prepare() {
-	autotools-utils_src_prepare
-	eautoreconf
-	restore_config myconfig.h
-	if [[ ${CHOST} == *-darwin* ]]; then
-		#tclline uses stty, which has different exit code on Darwin
-		sed -i '/source.*tclline/s/^/#/' "scripts/init.tcl" || die
-	fi
-}
-
 src_configure() {
 	myeconfargs=(
 		$(use_with fftw) \
@@ -60,6 +51,7 @@ src_configure() {
 		$(use_with X x)
 	)
 	autotools-utils_src_configure
+	restore_config myconfig.h
 }
 
 src_compile() {


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/espresso/
@ 2013-06-14 11:21 Justin Lecher
  0 siblings, 0 replies; 19+ messages in thread
From: Justin Lecher @ 2013-06-14 11:21 UTC (permalink / raw
  To: gentoo-commits

commit:     ae2e95c19d332589c9836ddd67112bfc51178e9c
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 14 11:20:56 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 11:20:56 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ae2e95c1

sci-physics/espresso: Bump to EAPI=5 and drop KEYWORDS of live ebuilds; bump to new python eclasses

Package-Manager: portage-2.2.0_alpha179

---
 sci-physics/espresso/ChangeLog            |  4 ++++
 sci-physics/espresso/espresso-9999.ebuild | 24 ++++++++++++++----------
 sci-physics/espresso/metadata.xml         | 10 +++++-----
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/sci-physics/espresso/ChangeLog b/sci-physics/espresso/ChangeLog
index 46977ce..0065313 100644
--- a/sci-physics/espresso/ChangeLog
+++ b/sci-physics/espresso/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Jun 2013; Justin Lecher <jlec@gentoo.org> espresso-9999.ebuild,
+  metadata.xml:
+  Bump to EAPI=5 and drop KEYWORDS of live ebuilds; bump to new python eclasses
+
   09 Mar 2013; Christoph Junghans <ottxor@gentoo.org> espresso-9999.ebuild:
   sync with gx86
 

diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index fb3e519..c4d3f33 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -2,9 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.1.0.ebuild,v 1.5 2012/05/06 23:08:00 ottxor Exp $
 
-EAPI=4
+EAPI=5
 
-inherit autotools-utils savedconfig
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit autotools-utils python-single-r1 savedconfig
 
 DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
 HOMEPAGE="http://www.espressomd.org"
@@ -20,13 +22,16 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+KEYWORDS=""
 IUSE="X doc examples fftw mpi packages test -tk"
-REQUIRED_USE="tk? ( X )"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	tk? ( X )"
 
 RESTRICT="tk? ( test )"
 
-RDEPEND="
+RDEPEND="${PYTHON_DEPS}
 	dev-lang/tcl
 	fftw? ( sci-libs/fftw:3.0 )
 	mpi? ( virtual/mpi )
@@ -35,7 +40,6 @@ RDEPEND="
 	X? ( x11-libs/libX11 )"
 
 DEPEND="${RDEPEND}
-	dev-lang/python
 	doc? (
 		|| ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot] )
 		dev-texlive/texlive-latexextra
@@ -98,16 +102,16 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog
+	echo
 	elog "Please read and cite:"
 	elog "ESPResSo, Comput. Phys. Commun. 174(9) ,704, 2006."
 	elog "http://dx.doi.org/10.1016/j.cpc.2005.10.005"
-	elog
+	echo
 	elog "If you need more features, change"
 	elog "/etc/portage/savedconfig/${CATEGORY}/${PF}"
 	elog "and reemerge with USE=savedconfig"
-	elog
+	echo
 	elog "For a full feature list see:"
 	elog "/usr/share/${PN}/myconfig-sample.h"
-	elog
+	echo
 }

diff --git a/sci-physics/espresso/metadata.xml b/sci-physics/espresso/metadata.xml
index cb05f9b..ff82a58 100644
--- a/sci-physics/espresso/metadata.xml
+++ b/sci-physics/espresso/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-physics</herd>
-	<use>
-		<flag name="examples">Installs the examples</flag>
-		<flag name="packages">Installs extra subpackages</flag>
-	</use>
+  <herd>sci-physics</herd>
+  <use>
+    <flag name="examples">Installs the examples</flag>
+    <flag name="packages">Installs extra subpackages</flag>
+  </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/espresso/
@ 2013-12-11 12:43 Justin Lecher
  0 siblings, 0 replies; 19+ messages in thread
From: Justin Lecher @ 2013-12-11 12:43 UTC (permalink / raw
  To: gentoo-commits

commit:     87e5222af279ec82680837ff5213eb6b97ab0e42
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 11 12:43:24 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Dec 11 12:43:24 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=87e5222a

sci-physics/espresso: fix python handling

Package-Manager: portage-2.2.7

---
 sci-physics/espresso/ChangeLog            | 3 +++
 sci-physics/espresso/espresso-9999.ebuild | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sci-physics/espresso/ChangeLog b/sci-physics/espresso/ChangeLog
index 0065313..08d45c2 100644
--- a/sci-physics/espresso/ChangeLog
+++ b/sci-physics/espresso/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Dec 2013; Justin Lecher <jlec@gentoo.org> espresso-9999.ebuild:
+  fix python handling
+
   14 Jun 2013; Justin Lecher <jlec@gentoo.org> espresso-9999.ebuild,
   metadata.xml:
   Bump to EAPI=5 and drop KEYWORDS of live ebuilds; bump to new python eclasses

diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index c4d3f33..0d9e5d6 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.1.0.ebuild,v 1.5 2012/05/06 23:08:00 ottxor Exp $
+# $Header: $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit autotools-utils python-single-r1 savedconfig
+inherit autotools-utils python-any-r1 savedconfig
 
 DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
 HOMEPAGE="http://www.espressomd.org"
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="git://git.savannah.nongnu.org/espressomd.git"
 	EGIT_BRANCH="master"
 	AUTOTOOLS_AUTORECONF=1
-	inherit git-2
+	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz"
 fi


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/espresso/
  2014-08-19 21:51 Christoph Junghans
@ 2014-08-11 21:37 ` Christoph Junghans
  0 siblings, 0 replies; 19+ messages in thread
From: Christoph Junghans @ 2014-08-11 21:37 UTC (permalink / raw
  To: gentoo-commits

commit:     0c431c684afc39867f6749a9caf8a839efb97e67
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 11 21:36:12 2014 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Aug 11 21:36:12 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0c431c68

sync with gx86

Package-Manager: portage-2.2.8-r1

---
 sci-physics/espresso/ChangeLog            |  6 ++++-
 sci-physics/espresso/espresso-9999.ebuild | 40 ++++++++++++++++++++++---------
 sci-physics/espresso/metadata.xml         |  1 +
 3 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/sci-physics/espresso/ChangeLog b/sci-physics/espresso/ChangeLog
index 08d45c2..c1deada 100644
--- a/sci-physics/espresso/ChangeLog
+++ b/sci-physics/espresso/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-physics/espresso
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Aug 2014; Christoph Junghans <ottxor@gentoo.org> espresso-9999.ebuild,
+  metadata.xml:
+  sync with gx86
+
   11 Dec 2013; Justin Lecher <jlec@gentoo.org> espresso-9999.ebuild:
   fix python handling
 

diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index a00ef76..78cdf62 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.3.0.ebuild,v 1.1 2014/08/11 21:33:08 ottxor Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 
-inherit autotools-utils python-any-r1 savedconfig
+inherit autotools-utils python-single-r1 savedconfig
 
 DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
 HOMEPAGE="http://www.espressomd.org"
@@ -16,23 +16,30 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_BRANCH="master"
 	AUTOTOOLS_AUTORECONF=1
 	inherit git-r3
+	KEYWORDS=""
 else
 	SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
-IUSE="X doc examples fftw mpi packages test -tk"
+IUSE="X cuda doc examples +fftw mpi packages python test -tk"
 
 REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
+	python? ( ${PYTHON_REQUIRED_USE} )
 	tk? ( X )"
 
 RESTRICT="tk? ( test )"
 
-RDEPEND="${PYTHON_DEPS}
+RDEPEND="
+	python? (
+		${PYTHON_DEPS}
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
 	dev-lang/tcl
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
 	fftw? ( sci-libs/fftw:3.0 )
 	mpi? ( virtual/mpi )
 	packages? ( dev-tcltk/tcllib )
@@ -47,15 +54,26 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS NEWS README ChangeLog )
 
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	use cuda && cuda_src_prepare
+	autotools-utils_src_prepare
+}
+
 src_configure() {
 	myeconfargs=(
 		$(use_with fftw) \
+		$(use_with cuda) \
+		$(use_with python python-interface) \
 		$(use_with mpi) \
 		$(use_with tk) \
 		$(use_with X x)
 	)
-	autotools-utils_src_configure
-	restore_config myconfig.h
+	CXX=$(usex mpi "mpic++" "$(tc-getCXX)") autotools-utils_src_configure
+	restore_config myconfig.hpp
 }
 
 src_compile() {
@@ -70,9 +88,9 @@ src_install() {
 	autotools-utils_src_install
 
 	insinto /usr/share/${PN}
-	doins ${AUTOTOOLS_BUILD_DIR}/myconfig-sample.h
+	doins ${AUTOTOOLS_BUILD_DIR}/myconfig-sample.hpp
 
-	save_config ${AUTOTOOLS_BUILD_DIR}/src/myconfig-final.h
+	save_config ${AUTOTOOLS_BUILD_DIR}/src/core/myconfig-final.hpp
 
 	if use doc; then
 		if [[ ${PV} = 9999 ]] ; then

diff --git a/sci-physics/espresso/metadata.xml b/sci-physics/espresso/metadata.xml
index ff82a58..64d8bf1 100644
--- a/sci-physics/espresso/metadata.xml
+++ b/sci-physics/espresso/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
   <herd>sci-physics</herd>
   <use>
+    <flag name="cuda">Enable cuda support</flag>
     <flag name="examples">Installs the examples</flag>
     <flag name="packages">Installs extra subpackages</flag>
   </use>


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/espresso/
@ 2014-08-19 21:49 Christoph Junghans
  0 siblings, 0 replies; 19+ messages in thread
From: Christoph Junghans @ 2014-08-19 21:49 UTC (permalink / raw
  To: gentoo-commits

commit:     9ed12d99bcdcef2528d23d8b57c60e6f63f17e79
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 19 21:48:32 2014 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Tue Aug 19 21:48:32 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9ed12d99

use fftw by default

Package-Manager: portage-2.2.8-r1

---
 sci-physics/espresso/ChangeLog            | 5 ++++-
 sci-physics/espresso/espresso-9999.ebuild | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-physics/espresso/ChangeLog b/sci-physics/espresso/ChangeLog
index 08d45c2..40f0177 100644
--- a/sci-physics/espresso/ChangeLog
+++ b/sci-physics/espresso/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-physics/espresso
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Aug 2014; Christoph Junghans <ottxor@gentoo.org> espresso-9999.ebuild:
+  use fftw by default
+
   11 Dec 2013; Justin Lecher <jlec@gentoo.org> espresso-9999.ebuild:
   fix python handling
 

diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index a00ef76..4a870ee 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -23,7 +23,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="X doc examples fftw mpi packages test -tk"
+IUSE="X doc examples +fftw mpi packages test -tk"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/espresso/
@ 2014-08-19 21:51 Christoph Junghans
  2014-08-11 21:37 ` Christoph Junghans
  0 siblings, 1 reply; 19+ messages in thread
From: Christoph Junghans @ 2014-08-19 21:51 UTC (permalink / raw
  To: gentoo-commits

commit:     0c431c684afc39867f6749a9caf8a839efb97e67
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 11 21:36:12 2014 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Aug 11 21:36:12 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0c431c68

sync with gx86

Package-Manager: portage-2.2.8-r1

---
 sci-physics/espresso/ChangeLog            |  6 ++++-
 sci-physics/espresso/espresso-9999.ebuild | 40 ++++++++++++++++++++++---------
 sci-physics/espresso/metadata.xml         |  1 +
 3 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/sci-physics/espresso/ChangeLog b/sci-physics/espresso/ChangeLog
index 08d45c2..c1deada 100644
--- a/sci-physics/espresso/ChangeLog
+++ b/sci-physics/espresso/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-physics/espresso
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Aug 2014; Christoph Junghans <ottxor@gentoo.org> espresso-9999.ebuild,
+  metadata.xml:
+  sync with gx86
+
   11 Dec 2013; Justin Lecher <jlec@gentoo.org> espresso-9999.ebuild:
   fix python handling
 

diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index a00ef76..78cdf62 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.3.0.ebuild,v 1.1 2014/08/11 21:33:08 ottxor Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 
-inherit autotools-utils python-any-r1 savedconfig
+inherit autotools-utils python-single-r1 savedconfig
 
 DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
 HOMEPAGE="http://www.espressomd.org"
@@ -16,23 +16,30 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_BRANCH="master"
 	AUTOTOOLS_AUTORECONF=1
 	inherit git-r3
+	KEYWORDS=""
 else
 	SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
-IUSE="X doc examples fftw mpi packages test -tk"
+IUSE="X cuda doc examples +fftw mpi packages python test -tk"
 
 REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
+	python? ( ${PYTHON_REQUIRED_USE} )
 	tk? ( X )"
 
 RESTRICT="tk? ( test )"
 
-RDEPEND="${PYTHON_DEPS}
+RDEPEND="
+	python? (
+		${PYTHON_DEPS}
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
 	dev-lang/tcl
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
 	fftw? ( sci-libs/fftw:3.0 )
 	mpi? ( virtual/mpi )
 	packages? ( dev-tcltk/tcllib )
@@ -47,15 +54,26 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS NEWS README ChangeLog )
 
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	use cuda && cuda_src_prepare
+	autotools-utils_src_prepare
+}
+
 src_configure() {
 	myeconfargs=(
 		$(use_with fftw) \
+		$(use_with cuda) \
+		$(use_with python python-interface) \
 		$(use_with mpi) \
 		$(use_with tk) \
 		$(use_with X x)
 	)
-	autotools-utils_src_configure
-	restore_config myconfig.h
+	CXX=$(usex mpi "mpic++" "$(tc-getCXX)") autotools-utils_src_configure
+	restore_config myconfig.hpp
 }
 
 src_compile() {
@@ -70,9 +88,9 @@ src_install() {
 	autotools-utils_src_install
 
 	insinto /usr/share/${PN}
-	doins ${AUTOTOOLS_BUILD_DIR}/myconfig-sample.h
+	doins ${AUTOTOOLS_BUILD_DIR}/myconfig-sample.hpp
 
-	save_config ${AUTOTOOLS_BUILD_DIR}/src/myconfig-final.h
+	save_config ${AUTOTOOLS_BUILD_DIR}/src/core/myconfig-final.hpp
 
 	if use doc; then
 		if [[ ${PV} = 9999 ]] ; then

diff --git a/sci-physics/espresso/metadata.xml b/sci-physics/espresso/metadata.xml
index ff82a58..64d8bf1 100644
--- a/sci-physics/espresso/metadata.xml
+++ b/sci-physics/espresso/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
   <herd>sci-physics</herd>
   <use>
+    <flag name="cuda">Enable cuda support</flag>
     <flag name="examples">Installs the examples</flag>
     <flag name="packages">Installs extra subpackages</flag>
   </use>


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/espresso/
@ 2014-12-26  1:08 Christoph Junghans
  0 siblings, 0 replies; 19+ messages in thread
From: Christoph Junghans @ 2014-12-26  1:08 UTC (permalink / raw
  To: gentoo-commits

commit:     acd88a6228684ae547f9b823b426f9627f68faad
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 26 01:08:11 2014 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Fri Dec 26 01:08:11 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=acd88a62

fixed homepage and deps

Package-Manager: portage-2.2.14

---
 sci-physics/espresso/ChangeLog            | 3 +++
 sci-physics/espresso/espresso-9999.ebuild | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-physics/espresso/ChangeLog b/sci-physics/espresso/ChangeLog
index c1deada..39f0e5a 100644
--- a/sci-physics/espresso/ChangeLog
+++ b/sci-physics/espresso/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Dec 2014; Christoph Junghans <ottxor@gentoo.org> espresso-9999.ebuild:
+  fixed homepage and deps
+
   11 Aug 2014; Christoph Junghans <ottxor@gentoo.org> espresso-9999.ebuild,
   metadata.xml:
   sync with gx86

diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index 78cdf62..149a662 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit autotools-utils python-single-r1 savedconfig
 
 DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
-HOMEPAGE="http://www.espressomd.org"
+HOMEPAGE="http://espressomd.org"
 
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="git://git.savannah.nongnu.org/espressomd.git"
@@ -48,7 +48,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	doc? (
-		|| ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot] )
+		app-doc/doxygen[dot]
 		dev-texlive/texlive-latexextra
 		virtual/latex-base )"
 


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/espresso/
@ 2015-03-16 17:42 Christoph Junghans
  0 siblings, 0 replies; 19+ messages in thread
From: Christoph Junghans @ 2015-03-16 17:42 UTC (permalink / raw
  To: gentoo-commits

commit:     03fdce6b3673e0adb39d0186c680dc8e388f5033
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 16 17:41:23 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Mar 16 17:41:23 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=03fdce6b

update git location

Package-Manager: portage-2.2.14

 sci-physics/espresso/ChangeLog            | 5 ++++-
 sci-physics/espresso/espresso-9999.ebuild | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sci-physics/espresso/ChangeLog b/sci-physics/espresso/ChangeLog
index 39f0e5a..23a6056 100644
--- a/sci-physics/espresso/ChangeLog
+++ b/sci-physics/espresso/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-physics/espresso
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Mar 2015; Christoph Junghans <ottxor@gentoo.org> espresso-9999.ebuild:
+  update git location
+
   26 Dec 2014; Christoph Junghans <ottxor@gentoo.org> espresso-9999.ebuild:
   fixed homepage and deps
 

diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index 149a662..01859b6 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.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: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.3.0.ebuild,v 1.1 2014/08/11 21:33:08 ottxor Exp $
 
@@ -12,7 +12,7 @@ DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
 HOMEPAGE="http://espressomd.org"
 
 if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="git://git.savannah.nongnu.org/espressomd.git"
+	EGIT_REPO_URI="git://github.com/espressomd/espresso.git https://github.com/espressomd/espresso.git"
 	EGIT_BRANCH="master"
 	AUTOTOOLS_AUTORECONF=1
 	inherit git-r3


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/espresso/
@ 2016-07-18 21:56 Christoph Junghans
  0 siblings, 0 replies; 19+ messages in thread
From: Christoph Junghans @ 2016-07-18 21:56 UTC (permalink / raw
  To: gentoo-commits

commit:     ae54a4cb451ff5a4567093bb4ea313b4b8c016d1
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 21:56:15 2016 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 21:56:15 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=ae54a4cb

sci-physics/espresso: brocken, moved to gx86

 sci-physics/espresso/espresso-9999.ebuild | 135 ------------------------------
 sci-physics/espresso/metadata.xml         |  13 ---
 2 files changed, 148 deletions(-)

diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
deleted file mode 100644
index d407b09..0000000
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools-utils python-single-r1 savedconfig
-
-DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
-HOMEPAGE="http://espressomd.org"
-
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="git://github.com/espressomd/espresso.git https://github.com/espressomd/espresso.git"
-	EGIT_BRANCH="master"
-	AUTOTOOLS_AUTORECONF=1
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="X cuda doc examples +fftw mpi packages python test -tk"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tk? ( X )"
-
-RESTRICT="tk? ( test )"
-
-RDEPEND="
-	python? (
-		${PYTHON_DEPS}
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	dev-lang/tcl:0=
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-	fftw? ( sci-libs/fftw:3.0 )
-	mpi? ( virtual/mpi )
-	packages? ( dev-tcltk/tcllib )
-	tk? ( >=dev-lang/tk-8.4.18-r1:0= )
-	X? ( x11-libs/libX11 )"
-
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen[dot]
-		dev-texlive/texlive-latexextra
-		virtual/latex-base )"
-
-DOCS=( AUTHORS NEWS README ChangeLog )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	use cuda && cuda_src_prepare
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	myeconfargs=(
-		$(use_with fftw) \
-		$(use_with cuda) \
-		$(use_with python python-interface) \
-		$(use_with mpi) \
-		$(use_with tk) \
-		$(use_with X x)
-	)
-	CXX=$(usex mpi "mpic++" "$(tc-getCXX)") autotools-utils_src_configure
-	restore_config myconfig.hpp
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile doxygen
-	[[ ${PV} = 9999 ]] && use doc && autotools-utils_src_compile ug dg tutorials
-}
-
-src_install() {
-	local i
-
-	autotools-utils_src_install
-
-	insinto /usr/share/${PN}
-	doins ${AUTOTOOLS_BUILD_DIR}/myconfig-sample.hpp
-
-	save_config ${AUTOTOOLS_BUILD_DIR}/src/core/myconfig-final.hpp
-
-	if use doc; then
-		if [[ ${PV} = 9999 ]] ; then
-			newdoc "${AUTOTOOLS_BUILD_DIR}"/doc/dg/dg.pdf developer_guide.pdf
-			newdoc "${AUTOTOOLS_BUILD_DIR}"/doc/ug/ug.pdf user_guide.pdf
-			for i in "${AUTOTOOLS_BUILD_DIR}"/doc/tutorials/*/[0-9]*.pdf; do
-				newdoc "${i}" "tutorial_${i##*/}"
-			done
-		else
-			newdoc "${S}"/doc/ug/ug.pdf user_guide.pdf
-			for i in "${S}"/doc/tutorials/*/[0-9]*.pdf; do
-				newdoc "${i}" "tutorial_${i##*/}"
-			done
-		fi
-		dohtml -r "${AUTOTOOLS_BUILD_DIR}"/doc/doxygen/html/*
-	fi
-
-	if use examples; then
-		insinto /usr/share/${PN}/examples
-		doins -r samples/*
-	fi
-
-	if use packages; then
-		insinto /usr/share/${PN}/packages
-		doins -r packages/*
-	fi
-}
-
-pkg_postinst() {
-	echo
-	elog "Please read and cite:"
-	elog "ESPResSo, Comput. Phys. Commun. 174(9) ,704, 2006."
-	elog "http://dx.doi.org/10.1016/j.cpc.2005.10.005"
-	echo
-	elog "If you need more features, change"
-	elog "/etc/portage/savedconfig/${CATEGORY}/${PF}"
-	elog "and reemerge with USE=savedconfig"
-	echo
-	elog "For a full feature list see:"
-	elog "/usr/share/${PN}/myconfig-sample.h"
-	echo
-}

diff --git a/sci-physics/espresso/metadata.xml b/sci-physics/espresso/metadata.xml
deleted file mode 100644
index f4ead9e..0000000
--- a/sci-physics/espresso/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-physics@gentoo.org</email>
-    <name>Gentoo Physics Project</name>
-  </maintainer>
-  <use>
-    <flag name="cuda">Enable cuda support</flag>
-    <flag name="examples">Installs the examples</flag>
-    <flag name="packages">Installs extra subpackages</flag>
-  </use>
-</pkgmetadata>


^ permalink raw reply related	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2016-07-18 21:56 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-27 21:11 [gentoo-commits] proj/sci:master commit in: sci-physics/espresso/ Christoph Junghans
  -- strict thread matches above, loose matches on Subject: below --
2016-07-18 21:56 Christoph Junghans
2015-03-16 17:42 Christoph Junghans
2014-12-26  1:08 Christoph Junghans
2014-08-19 21:51 Christoph Junghans
2014-08-11 21:37 ` Christoph Junghans
2014-08-19 21:49 Christoph Junghans
2013-12-11 12:43 Justin Lecher
2013-06-14 11:21 Justin Lecher
2013-03-09  2:43 Christoph Junghans
2012-10-09  8:53 Christoph Junghans
2012-05-06 21:09 Christoph Junghans
2012-03-24 22:46 Christoph Junghans
2012-03-22  3:53 Christoph Junghans
2011-06-25 17:22 Justin Lecher
2011-06-25 12:58 Christoph Junghans
2011-04-26 21:23 Christoph Junghans
2011-04-20 21:29 Christoph Junghans
2011-04-20 13:37 Christoph Junghans

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