public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sci-misc/elmer-gui/
@ 2013-12-03 14:53 Justin Lecher
  0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2013-12-03 14:53 UTC (permalink / raw
  To: gentoo-commits

commit:     2c28538f81272fcb18ba2d260f0e948c2ebf03de
Author:     Christophe Paccolat <chr.paccolat <AT> mycable <DOT> ch>
AuthorDate: Mon Dec  3 15:16:16 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 07:25:45 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2c28538f

sci-misc/elmer-gui: Make x11-libs/qwt an optional dependency

---
 sci-misc/elmer-gui/elmer-gui-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-misc/elmer-gui/elmer-gui-9999.ebuild b/sci-misc/elmer-gui/elmer-gui-9999.ebuild
index 2d006c9..78ebce6 100644
--- a/sci-misc/elmer-gui/elmer-gui-9999.ebuild
+++ b/sci-misc/elmer-gui/elmer-gui-9999.ebuild
@@ -34,7 +34,7 @@ DEPEND="=sci-libs/elmer-eio-${PV}
 		vtk? ( >=sci-libs/vtk-5.0.0[qt4,python?] )
 		opencascade? ( >=sci-libs/opencascade-6.3 )
 		python? ( <=dev-python/pythonqt-1.1 )
-		x11-libs/qwt:5
+		qwt? ( x11-libs/qwt:5 )
 		|| ( >=x11-libs/qt-core-4.3:4
 			 ( x11-libs/qt-core:5
 			   x11-libs/qt-xml:5


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

* [gentoo-commits] proj/sci:master commit in: sci-misc/elmer-gui/
@ 2013-12-03 14:53 Justin Lecher
  0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2013-12-03 14:53 UTC (permalink / raw
  To: gentoo-commits

commit:     d785076fdcffe8e022825cad29716c5cdb775ef5
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  3 14:05:15 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 14:05:15 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d785076f

sci-misc/elmer-gui: Bump EAPI; fix DESCRIPTION; drop keywords from live ebuild; fix whitespacing

Package-Manager: portage-2.2.7
RepoMan-Options: --force

---
 sci-misc/elmer-gui/ChangeLog             |  8 ++++
 sci-misc/elmer-gui/elmer-gui-9999.ebuild | 68 ++++++++++++++++----------------
 sci-misc/elmer-gui/metadata.xml          | 15 +------
 3 files changed, 42 insertions(+), 49 deletions(-)

diff --git a/sci-misc/elmer-gui/ChangeLog b/sci-misc/elmer-gui/ChangeLog
new file mode 100644
index 0000000..33555f3
--- /dev/null
+++ b/sci-misc/elmer-gui/ChangeLog
@@ -0,0 +1,8 @@
+# ChangeLog for sci-misc/elmer-gui
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  03 Dec 2013; Justin Lecher <jlec@gentoo.org> elmer-gui-9999.ebuild,
+  metadata.xml:
+  Bump EAPI; fix DESCRIPTION; drop keywords from live ebuild; fix whitespacing
+

diff --git a/sci-misc/elmer-gui/elmer-gui-9999.ebuild b/sci-misc/elmer-gui/elmer-gui-9999.ebuild
index 78ebce6..698fecd 100644
--- a/sci-misc/elmer-gui/elmer-gui-9999.ebuild
+++ b/sci-misc/elmer-gui/elmer-gui-9999.ebuild
@@ -1,55 +1,53 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=5
 
-inherit autotools eutils qt4-r2 subversion python versionator
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit autotools eutils qt4-r2 subversion python-single-r1 versionator
 
 ELMER_ROOT="elmerfem"
 MY_PN=ElmerGUI
 
 DESCRIPTION="Elmer is a collection of finite element programs, libraries, and visualization tools, New Elmer pre-processor"
 HOMEPAGE="http://www.csc.fi/english/pages/elmer"
-#SRC_URI="http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV}/${MY_PN}/?view=tar -> ${P}.tar.gz"
 SRC_URI=""
-RESTRICT="mirror"
 ESVN_REPO_URI="https://elmerfem.svn.sourceforge.net/svnroot/elmerfem/trunk/${MY_PN}"
 ESVN_PROJECT="${MY_PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug bundled_netgen matc opencascade python qwt vtk"
+KEYWORDS=""
+IUSE="debug +bundled_netgen matc opencascade python qwt vtk"
 
 REQUIRED_USE="opencascade? ( vtk )"
 
-DEPEND="=sci-libs/elmer-eio-${PV}
-		!bundled_netgen? ( sci-mathematics/netgen )
-		virtual/glu
-		|| ( =sci-misc/elmer-post-${PV}
-			 >=sci-libs/vtk-5.0.0[qt4,python?]
-		)
-		matc? ( =sci-libs/matc-${PV} )
-		vtk? ( >=sci-libs/vtk-5.0.0[qt4,python?] )
-		opencascade? ( >=sci-libs/opencascade-6.3 )
-		python? ( <=dev-python/pythonqt-1.1 )
-		qwt? ( x11-libs/qwt:5 )
-		|| ( >=x11-libs/qt-core-4.3:4
-			 ( x11-libs/qt-core:5
-			   x11-libs/qt-xml:5
-			 )
+DEPEND="
+	~sci-libs/elmer-eio-${PV}
+	!bundled_netgen? ( sci-mathematics/netgen )
+	virtual/glu
+	|| (
+		~sci-misc/elmer-post-${PV}
+		>=sci-libs/vtk-5.0.0[qt4,python?]
 		)
-		>=x11-libs/qt-opengl-4.3
-		>=x11-libs/qt-script-4.3"
+	matc? ( ~sci-libs/matc-${PV} )
+	vtk? ( >=sci-libs/vtk-5.0.0[qt4,python?] )
+	opencascade? ( >=sci-libs/opencascade-6.3 )
+	python? ( dev-python/pythonqt )
+	qwt? ( x11-libs/qwt:5 )
+	>=dev-qt/qtcore-4.3:4
+	>=x11-libs/qt-opengl-4.3:4
+	>=x11-libs/qt-script-4.3:4"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
 	# Do not build bundled matc and PythonQt
-	sed -i \
+	sed \
 		-e 's/matc//' \
 		-e 's/PythonQt//' \
-		${MY_PN}.pro || die
+		-i ${MY_PN}.pro || die
 
 	# Ideally we would avoid buildling thirdparty code
 	# and use a separate package but this currently fails
@@ -58,19 +56,19 @@ src_prepare() {
 	# sci-mathematics/netgen
 	if use !bundled_netgen; then
 		   sed -i 's/netgen//' ${MY_PN}.pro || die
-		   sed -i \
-			   -e "s:INCLUDEPATH += ../netgen/libsrc/interface:INCLUDEPATH += ${EPREFIX}/usr/include:g" \
-			   -e "s:LIBPATH += ../netgen/ngcore:LIBPATH += ${EPREFIX}/usr/$(get_libdir):g" \
-			   -e "s:LIBS += -lng:LIBS += -lnglib:g" \
-			   Application/Application.pro || die
+		   sed \
+				-e "s:INCLUDEPATH += ../netgen/libsrc/interface:INCLUDEPATH += ${EPREFIX}/usr/include:g" \
+				-e "s:LIBPATH += ../netgen/ngcore:LIBPATH += ${EPREFIX}/usr/$(get_libdir):g" \
+				-e "s:LIBS += -lng:LIBS += -lnglib:g" \
+				-i Application/Application.pro || die
 
-		   eerror "${PN} currently fails to build against sci-mathematics/netgen."
+			eerror "${PN} currently fails to build against sci-mathematics/netgen."
 	fi
 
 	# Fix install path
-	sed -i \
-		 -e 's|unix: ELMER_HOME = /usr/local|unix: ELMER_HOME = /usr|g' \
-		 ${MY_PN}.pri || die
+	sed \
+		-e 's|unix: ELMER_HOME = /usr/local|unix: ELMER_HOME = /usr|g' \
+		-i ${MY_PN}.pri || die
 
 	if use amd64; then
 		   sed -i 's/32/64/' ${MY_PN}.pri || die

diff --git a/sci-misc/elmer-gui/metadata.xml b/sci-misc/elmer-gui/metadata.xml
index 0a4f88a..897aa2e 100644
--- a/sci-misc/elmer-gui/metadata.xml
+++ b/sci-misc/elmer-gui/metadata.xml
@@ -1,18 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <upstream>
-                <bugs-to>mailto:chr.paccolat@mycable.ch</bugs-to>
-                <changelog></changelog>
-                <doc>http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3</doc>
-        </upstream>
-        <maintainer><email>chr.paccolat@mycable.ch</email></maintainer>
-        <use>
-          <flag name="matc">Add support to evaluate mathematical expression in input files / postprocessor </flag>
-          <flag name="opencascade">Use OpenCASCADE to import CAD files</flag>
-          <flag name="python">Add support for python scripting in the pre-processor</flag>
-          <flag name="qwt">Pull-in QWT to enable the convergence monitor</flag>
-          <flag name="vtk">Add support for the VTK post-processor backend (visualization)</flag>
-        </use>
+  <herd>sci</herd>
 </pkgmetadata>
-


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

* [gentoo-commits] proj/sci:master commit in: sci-misc/elmer-gui/
@ 2014-09-15 19:14 Jauhien Piatlicki
  0 siblings, 0 replies; 5+ messages in thread
From: Jauhien Piatlicki @ 2014-09-15 19:14 UTC (permalink / raw
  To: gentoo-commits

commit:     a1f8c662eceb974c6d81e0826876acd712bc574c
Author:     Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 15 19:13:31 2014 +0000
Commit:     Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
CommitDate: Mon Sep 15 19:13:31 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a1f8c662

sci-misc/elmer-gui: silence repoman: add USE descriptions

---
 sci-misc/elmer-gui/ChangeLog    | 5 ++++-
 sci-misc/elmer-gui/metadata.xml | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/sci-misc/elmer-gui/ChangeLog b/sci-misc/elmer-gui/ChangeLog
index 33555f3..0526478 100644
--- a/sci-misc/elmer-gui/ChangeLog
+++ b/sci-misc/elmer-gui/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-misc/elmer-gui
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Sep 2014; Jauhien Piatlicki <jauhien@gentoo.org> metadata.xml:
+  silence repoman: add USE descriptions
+
   03 Dec 2013; Justin Lecher <jlec@gentoo.org> elmer-gui-9999.ebuild,
   metadata.xml:
   Bump EAPI; fix DESCRIPTION; drop keywords from live ebuild; fix whitespacing

diff --git a/sci-misc/elmer-gui/metadata.xml b/sci-misc/elmer-gui/metadata.xml
index 897aa2e..1632567 100644
--- a/sci-misc/elmer-gui/metadata.xml
+++ b/sci-misc/elmer-gui/metadata.xml
@@ -2,4 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci</herd>
+  <use>
+    <flag name="bundled_netgen"> Use bundled version of <pkg>sci-mathematics/netgen</pkg></flag>
+    <flag name="matc"> Enables <pkg>sci-libs/matc</pkg> support</flag>
+    <flag name="opencascade"> Enable <pkg>sci-libs/opencascade</pkg>
+    support</flag>
+    <flag name="qwt"> Enables <pkg>x11-libs/qwt</pkg> support</flag>
+    <flag name="vtk"> Enables <pkg>sci-libs/vtk</pkg> support</flag>
+    </use>
 </pkgmetadata>


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

* [gentoo-commits] proj/sci:master commit in: sci-misc/elmer-gui/
@ 2014-09-16 17:50 Christoph Junghans
  0 siblings, 0 replies; 5+ messages in thread
From: Christoph Junghans @ 2014-09-16 17:50 UTC (permalink / raw
  To: gentoo-commits

commit:     a587b08fc957debd72177f194e82f30f746e00c8
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 16 17:49:38 2014 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Tue Sep 16 17:49:38 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a587b08f

clean up

Package-Manager: portage-2.2.8-r1

---
 sci-misc/elmer-gui/ChangeLog             | 4 +++-
 sci-misc/elmer-gui/elmer-gui-9999.ebuild | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sci-misc/elmer-gui/ChangeLog b/sci-misc/elmer-gui/ChangeLog
index 0526478..95192f3 100644
--- a/sci-misc/elmer-gui/ChangeLog
+++ b/sci-misc/elmer-gui/ChangeLog
@@ -2,10 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Sep 2014; Christoph Junghans <ottxor@gentoo.org> elmer-gui-9999.ebuild:
+  clean up
+
   15 Sep 2014; Jauhien Piatlicki <jauhien@gentoo.org> metadata.xml:
   silence repoman: add USE descriptions
 
   03 Dec 2013; Justin Lecher <jlec@gentoo.org> elmer-gui-9999.ebuild,
   metadata.xml:
   Bump EAPI; fix DESCRIPTION; drop keywords from live ebuild; fix whitespacing
-

diff --git a/sci-misc/elmer-gui/elmer-gui-9999.ebuild b/sci-misc/elmer-gui/elmer-gui-9999.ebuild
index fec4f89..c1ff972 100644
--- a/sci-misc/elmer-gui/elmer-gui-9999.ebuild
+++ b/sci-misc/elmer-gui/elmer-gui-9999.ebuild
@@ -11,7 +11,7 @@ inherit autotools eutils qt4-r2 subversion python-single-r1 versionator
 ELMER_ROOT="elmerfem"
 MY_PN=ElmerGUI
 
-DESCRIPTION="Elmer is a collection of finite element programs, libraries, and visualization tools, New Elmer pre-processor"
+DESCRIPTION="a collection of finite element programs, libraries, and visualization tools, New Elmer pre-processor"
 HOMEPAGE="http://www.csc.fi/english/pages/elmer"
 SRC_URI=""
 ESVN_REPO_URI="https://elmerfem.svn.sourceforge.net/svnroot/elmerfem/trunk/${MY_PN}"
@@ -38,8 +38,8 @@ DEPEND="
 	python? ( dev-python/pythonqt )
 	qwt? ( x11-libs/qwt:5 )
 	>=dev-qt/qtcore-4.3:4
-	>=x11-libs/qt-opengl-4.3:4
-	>=x11-libs/qt-script-4.3:4"
+	>=dev-qt/qtopengl-4.3:4
+	>=dev-qt/qtscript-4.3:4"
 RDEPEND="${DEPEND}"
 
 src_prepare() {


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

* [gentoo-commits] proj/sci:master commit in: sci-misc/elmer-gui/
@ 2015-09-21 19:44 Justin Lecher
  0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2015-09-21 19:44 UTC (permalink / raw
  To: gentoo-commits

commit:     7c9c301ddf19a397c496bc8c777ca867f15647e8
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 19:24:11 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 19:24:11 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=7c9c301d

sci-misc/elmer-gui: Add subslot operators

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-misc/elmer-gui/elmer-gui-9999.ebuild | 6 +++---
 sci-misc/elmer-gui/metadata.xml          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-misc/elmer-gui/elmer-gui-9999.ebuild b/sci-misc/elmer-gui/elmer-gui-9999.ebuild
index 2481960..b33a150 100644
--- a/sci-misc/elmer-gui/elmer-gui-9999.ebuild
+++ b/sci-misc/elmer-gui/elmer-gui-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
 # $Id$
 
@@ -34,8 +34,8 @@ DEPEND="
 		)
 	matc? ( ~sci-libs/matc-${PV} )
 	vtk? ( >=sci-libs/vtk-5.0.0[qt4,python?] )
-	opencascade? ( >=sci-libs/opencascade-6.3 )
-	python? ( dev-python/pythonqt )
+	opencascade? ( >=sci-libs/opencascade-6.3:* )
+	python? ( dev-python/pythonqt[${PYTHON_USEDEP}] )
 	qwt? ( x11-libs/qwt:5 )
 	>=dev-qt/qtcore-4.3:4
 	>=dev-qt/qtopengl-4.3:4

diff --git a/sci-misc/elmer-gui/metadata.xml b/sci-misc/elmer-gui/metadata.xml
index 1632567..d91d5d8 100644
--- a/sci-misc/elmer-gui/metadata.xml
+++ b/sci-misc/elmer-gui/metadata.xml
@@ -9,5 +9,5 @@
     support</flag>
     <flag name="qwt"> Enables <pkg>x11-libs/qwt</pkg> support</flag>
     <flag name="vtk"> Enables <pkg>sci-libs/vtk</pkg> support</flag>
-    </use>
+  </use>
 </pkgmetadata>


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

end of thread, other threads:[~2015-09-21 19:44 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-21 19:44 [gentoo-commits] proj/sci:master commit in: sci-misc/elmer-gui/ Justin Lecher
  -- strict thread matches above, loose matches on Subject: below --
2014-09-16 17:50 Christoph Junghans
2014-09-15 19:14 Jauhien Piatlicki
2013-12-03 14:53 Justin Lecher
2013-12-03 14:53 Justin Lecher

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