[gentoo-commits] proj/sci:master commit in: sci-astronomy/scamp/

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

* [gentoo-commits] proj/sci:master commit in: sci-astronomy/scamp/
@ 2020-09-22 10:11 Aisha Tammy
  0 siblings, 0 replies; 8+ messages in thread
From: Aisha Tammy @ 2020-09-22 10:11 UTC (permalink / raw
  To: gentoo-commits

commit:     b1b7b47edc971d6d2e81ae0022ab00982c6adb13
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Tue Sep 22 10:10:58 2020 +0000
Commit:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Tue Sep 22 10:10:58 2020 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=b1b7b47e

sci-astronomy/scamp: drop package

present in ::gentoo
(actually do the delete this time)

Package-Manager: Portage-3.0.7, Repoman-3.0.1
RepoMan-Options: --force
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>

 sci-astronomy/scamp/metadata.xml      | 16 ----------
 sci-astronomy/scamp/scamp-9999.ebuild | 56 -----------------------------------
 2 files changed, 72 deletions(-)

diff --git a/sci-astronomy/scamp/metadata.xml b/sci-astronomy/scamp/metadata.xml
deleted file mode 100644
index d4357bf76..000000000
--- a/sci-astronomy/scamp/metadata.xml
+++ /dev/null
@@ -1,16 +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-astronomy@gentoo.org</email>
-		<name>Gentoo Astronomy Project</name>
-	</maintainer>
-	<longdescription lang="en">
-SCAMP computes astrometric and photometric solutions from SExtractor catalogs
-and stores them in header files. These headers files can be read by SWarp to
-coadd images.
-</longdescription>
-	<use>
-		<flag name="plplot">Build with <pkg>sci-libs/plplot</pkg> to allow diagnostic plots during processing</flag>
-	</use>
-</pkgmetadata>

diff --git a/sci-astronomy/scamp/scamp-9999.ebuild b/sci-astronomy/scamp/scamp-9999.ebuild
deleted file mode 100644
index 3e37a5471..000000000
--- a/sci-astronomy/scamp/scamp-9999.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit subversion autotools
-
-ESVN_REPO_URI="https://astromatic.net/pubsvn/software/${PN}/trunk"
-ESVN_OPTIONS="--trust-server-cert-failures=unknown-ca"
-SRC_URI=""
-KEYWORDS=""
-
-DESCRIPTION="Astrometric and photometric solutions for astronomical images"
-HOMEPAGE="http://www.astromatic.net/software/scamp"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="doc plplot threads"
-
-RDEPEND="
-	net-misc/curl:=
-	sci-libs/atlas[lapack,threads=]
-	sci-libs/fftw:3.0
-	plplot? ( sci-libs/plplot:= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	local mycblas=atlcblas myclapack=atlclapack
-	if use threads; then
-		[[ -e "${EPREFIX}"/usr/$(get_libdir)/libptcblas.so ]] && \
-			mycblas=ptcblas
-		[[ -e "${EPREFIX}"/usr/$(get_libdir)/libptclapack.so ]] && \
-			myclapack=ptclapack
-	fi
-	sed -e "s/-lcblas/-l${mycblas}/g"\
-		-e "/SEARCH_LIBS/s/ cblas,/${mycblas},/g" \
-		-e "/SEARCH_LIBS/s/lapack_atlas/${myclapack}/g" \
-		-i acx_atlas.m4 || die
-	eautoreconf
-	subversion_src_prepare
-}
-
-src_configure() {
-	econf \
-		--with-atlas-incdir="${EPREFIX}/usr/include/atlas" \
-		$(use_enable plplot) \
-		$(use_enable threads)
-}
-
-src_install () {
-	default
-	use doc && dodoc doc/*
-}
-
-


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

* [gentoo-commits] proj/sci:master commit in: sci-astronomy/scamp/
@ 2020-09-22 10:09 Aisha Tammy
  0 siblings, 0 replies; 8+ messages in thread
From: Aisha Tammy @ 2020-09-22 10:09 UTC (permalink / raw
  To: gentoo-commits

commit:     b241551a176d48b089fff356cb77bc703e1a1d8c
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Tue Sep 22 10:09:03 2020 +0000
Commit:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Tue Sep 22 10:09:03 2020 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=b241551a

sci-astronomy/scamp: drop package

present in ::gentoo

Package-Manager: Portage-3.0.7, Repoman-3.0.1
RepoMan-Options: --force
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>

 sci-astronomy/scamp/scamp-9999.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sci-astronomy/scamp/scamp-9999.ebuild b/sci-astronomy/scamp/scamp-9999.ebuild
index b5fa5eff4..3e37a5471 100644
--- a/sci-astronomy/scamp/scamp-9999.ebuild
+++ b/sci-astronomy/scamp/scamp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -52,3 +52,5 @@ src_install () {
 	default
 	use doc && dodoc doc/*
 }
+
+


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

* [gentoo-commits] proj/sci:master commit in: sci-astronomy/scamp/
@ 2016-03-14  2:17 Christoph Junghans
  0 siblings, 0 replies; 8+ messages in thread
From: Christoph Junghans @ 2016-03-14  2:17 UTC (permalink / raw
  To: gentoo-commits

commit:     df709aa96619b7ca5247a47ce9d06df914355879
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  3 19:12:53 2016 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Mar  7 21:04:09 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=df709aa9

sci-astronomy/scamp: fixed atlas detection and curl dependency

 sci-astronomy/scamp/scamp-9999.ebuild | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/sci-astronomy/scamp/scamp-9999.ebuild b/sci-astronomy/scamp/scamp-9999.ebuild
index 0964de7..8b07c7a 100644
--- a/sci-astronomy/scamp/scamp-9999.ebuild
+++ b/sci-astronomy/scamp/scamp-9999.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 IUSE="doc plplot threads"
 
 RDEPEND="
-	>=sci-astronomy/cdsclient-3.4
+	net-misc/curl:=
 	sci-libs/atlas[lapack,threads=]
 	sci-libs/fftw:3.0
 	plplot? ( sci-libs/plplot:= )"
@@ -34,13 +34,10 @@ src_prepare() {
 		[[ -e "${EPREFIX}"/usr/$(get_libdir)/libptclapack.so ]] && \
 			myclapack=ptclapack
 	fi
-	sed -i \
-		-e "s/-lcblas/-l${mycblas}/g" \
-		-e "s/AC_CHECK_LIB(cblas/AC_CHECK_LIB(${mycblas}/g" \
-		-e "s/-llapack/-l${myclapack}/g" \
-		-e "s/\(lapack_lib=\).*/\1${myclapack}/g" \
-		-e "s/AC_CHECK_LIB(lapack/AC_CHECK_LIB(${myclapack}/g" \
-		acx_atlas.m4 || die
+	sed -e "s/-lcblas/-l${mycblas}/g"\
+		-e "/SEARCH_LIBS/s/ cblas,/${mycblas},/g" \
+		-e "/SEARCH_LIBS/s/lapack_atlas/${myclapack}/g" \
+		-i acx_atlas.m4 || die
 	eautoreconf
 	subversion_src_prepare
 }


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

* [gentoo-commits] proj/sci:master commit in: sci-astronomy/scamp/
@ 2014-02-27 23:01 Sebastien Fabbro
  0 siblings, 0 replies; 8+ messages in thread
From: Sebastien Fabbro @ 2014-02-27 23:01 UTC (permalink / raw
  To: gentoo-commits

commit:     36a155d361a28d68f280bca891db00aa47c78c4a
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 27 20:38:24 2014 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Feb 27 20:38:24 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=36a155d3

sci-astronomy/scamp: EAPI-5, autotools-utils, fixed plplot flag

Package-Manager: portage-2.2.8-prefix

---
 sci-astronomy/scamp/ChangeLog             |  7 +++++--
 sci-astronomy/scamp/metadata.xml          | 10 +++++-----
 sci-astronomy/scamp/scamp-1.7.0-r2.ebuild | 24 +++++++++++++++---------
 sci-astronomy/scamp/scamp-9999.ebuild     | 26 +++++++++++++++++---------
 4 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/sci-astronomy/scamp/ChangeLog b/sci-astronomy/scamp/ChangeLog
index 8803b13..9e79b66 100644
--- a/sci-astronomy/scamp/ChangeLog
+++ b/sci-astronomy/scamp/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-astronomy/scamp
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-astronomy/scamp/ChangeLog,v 1.7 2011/08/04 18:32:22 bicatali Exp $
 
+  27 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
+  scamp-1.7.0-r2.ebuild, scamp-9999.ebuild:
+  sci-astronomy/scamp: EAPI-5, autotools-utils, fixed plplot flag
+
   14 Jun 2013; Justin Lecher <jlec@gentoo.org> scamp-9999.ebuild, metadata.xml:
   Drop KEYWORDS of live ebuilds
 
@@ -90,4 +94,3 @@
 
   19 Sep 2006; Sebastien Fabbro <seb@ist.utl.pt> +scamp-1.2.11.ebuild:
   Initial import.
-

diff --git a/sci-astronomy/scamp/metadata.xml b/sci-astronomy/scamp/metadata.xml
index a02cbff..edd8754 100644
--- a/sci-astronomy/scamp/metadata.xml
+++ b/sci-astronomy/scamp/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-astronomy</herd>
-  <longdescription lang="en">
+<herd>sci-astronomy</herd>
+<longdescription lang="en">
   SCAMP computes astrometric and photometric solutions from SExtractor catalogs
   and stores them in header files. These headers files can be read by SWarp to
   coadd images.
 </longdescription>
-  <use>
-    <flag name="plplot">Build with <pkg>sci-libs/plplot</pkg> to allow diagnostic plots during processing</flag>
-  </use>
+<use>
+  <flag name="plplot">Build with <pkg>sci-libs/plplot</pkg> to allow diagnostic plots during processing</flag>
+</use>
 </pkgmetadata>

diff --git a/sci-astronomy/scamp/scamp-1.7.0-r2.ebuild b/sci-astronomy/scamp/scamp-1.7.0-r2.ebuild
index 9c0c2e4..a0b3afa 100644
--- a/sci-astronomy/scamp/scamp-1.7.0-r2.ebuild
+++ b/sci-astronomy/scamp/scamp-1.7.0-r2.ebuild
@@ -2,8 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
-inherit eutils autotools
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit eutils autotools-utils multilib
 
 DESCRIPTION="Astrometric and photometric solutions for astronomical images"
 HOMEPAGE="http://www.astromatic.net/software/scamp"
@@ -15,9 +19,9 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc threads plplot"
 
 RDEPEND=">=sci-astronomy/cdsclient-3.4
-	sci-libs/atlas[lapack]
+	sci-libs/atlas[lapack,threads=]
 	sci-libs/fftw:3.0
-	plplot? ( sci-libs/plplot )"
+	plplot? ( sci-libs/plplot:= )"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
@@ -38,17 +42,19 @@ src_prepare() {
 		 acx_atlas.m4 || die
 	epatch "${FILESDIR}"/${P}-plplot599.patch
 	sed -i -e 's/doc//' Makefile.am || die
-	eautoreconf
+	autotools-utils_src_prepare
 }
 
 src_configure() {
-	econf \
-		--with-atlas-incdir="${EPREFIX}/usr/include/atlas" \
-		$(use_with plplot) \
+	local myeconfargs=(
+		--with-atlas-incdir="${EPREFIX}/usr/include/atlas"
+		$(use_with plplot)
 		$(use_enable threads)
+	)
+	autotools-utils_src_configure
 }
 
 src_install () {
-	default
+	autotools-utils_src_install
 	use doc && dodoc doc/*
 }

diff --git a/sci-astronomy/scamp/scamp-9999.ebuild b/sci-astronomy/scamp/scamp-9999.ebuild
index 49729d3..8ce3177 100644
--- a/sci-astronomy/scamp/scamp-9999.ebuild
+++ b/sci-astronomy/scamp/scamp-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 if [[ ${PV} == "9999" ]] ; then
 	_SVN=subversion
@@ -14,7 +14,10 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit ${_SVN} autotools
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit ${_SVN} autotools-utils multilib
 
 DESCRIPTION="Astrometric and photometric solutions for astronomical images"
 HOMEPAGE="http://www.astromatic.net/software/scamp"
@@ -23,10 +26,11 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE="doc plplot threads"
 
-RDEPEND=">=sci-astronomy/cdsclient-3.4
-	sci-libs/atlas[lapack]
+RDEPEND="
+	>=sci-astronomy/cdsclient-3.4
+	sci-libs/atlas[lapack,threads=]
 	sci-libs/fftw:3.0
-	plplot? ( sci-libs/plplot )"
+	plplot? ( sci-libs/plplot:= )"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
@@ -41,18 +45,22 @@ src_prepare() {
 		-e "s/-lcblas/-l${mycblas}/g" \
 		-e "s/AC_CHECK_LIB(cblas/AC_CHECK_LIB(${mycblas}/g" \
 		-e "s/-llapack/-l${myclapack}/g" \
+		-e "s/\(lapack_lib=\).*/\1${myclapack}/g" \
 		-e "s/AC_CHECK_LIB(lapack/AC_CHECK_LIB(${myclapack}/g" \
 		acx_atlas.m4 || die
-	eautoreconf
+	autotools-utils_src_prepare
 }
 
 src_configure() {
-	econf \
-		--with-atlas-incdir="${EPREFIX}/usr/include/atlas" \
+	local myeconfargs=(
+		--with-atlas-incdir="${EPREFIX}/usr/include/atlas"
+		$(use_enable plplot)
 		$(use_enable threads)
+	)
+	autotools-utils_src_configure
 }
 
 src_install () {
-	default
+	autotools-utils_src_install
 	use doc && dodoc doc/*
 }


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

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

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

sci-astronomy/scamp: Drop KEYWORDS of live ebuilds

Package-Manager: portage-2.2.0_alpha179

---
 sci-astronomy/scamp/ChangeLog         |  5 ++++-
 sci-astronomy/scamp/metadata.xml      | 10 +++++-----
 sci-astronomy/scamp/scamp-9999.ebuild |  3 +--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/sci-astronomy/scamp/ChangeLog b/sci-astronomy/scamp/ChangeLog
index a50a191..8803b13 100644
--- a/sci-astronomy/scamp/ChangeLog
+++ b/sci-astronomy/scamp/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-astronomy/scamp
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-astronomy/scamp/ChangeLog,v 1.7 2011/08/04 18:32:22 bicatali Exp $
 
+  14 Jun 2013; Justin Lecher <jlec@gentoo.org> scamp-9999.ebuild, metadata.xml:
+  Drop KEYWORDS of live ebuilds
+
 *scamp-9999 (04 Jul 2012)
 
   04 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> scamp-1.7.0-r2.ebuild,

diff --git a/sci-astronomy/scamp/metadata.xml b/sci-astronomy/scamp/metadata.xml
index edd8754..a02cbff 100644
--- a/sci-astronomy/scamp/metadata.xml
+++ b/sci-astronomy/scamp/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
-<longdescription lang="en">
+  <herd>sci-astronomy</herd>
+  <longdescription lang="en">
   SCAMP computes astrometric and photometric solutions from SExtractor catalogs
   and stores them in header files. These headers files can be read by SWarp to
   coadd images.
 </longdescription>
-<use>
-  <flag name="plplot">Build with <pkg>sci-libs/plplot</pkg> to allow diagnostic plots during processing</flag>
-</use>
+  <use>
+    <flag name="plplot">Build with <pkg>sci-libs/plplot</pkg> to allow diagnostic plots during processing</flag>
+  </use>
 </pkgmetadata>

diff --git a/sci-astronomy/scamp/scamp-9999.ebuild b/sci-astronomy/scamp/scamp-9999.ebuild
index d3248f5..061d6b7 100644
--- a/sci-astronomy/scamp/scamp-9999.ebuild
+++ b/sci-astronomy/scamp/scamp-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: $
 
@@ -21,7 +21,6 @@ HOMEPAGE="http://www.astromatic.net/software/scamp"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc plplot threads"
 
 RDEPEND=">=sci-astronomy/cdsclient-3.4


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

* [gentoo-commits] proj/sci:master commit in: sci-astronomy/scamp/
@ 2012-07-04 22:42 Sebastien Fabbro
  0 siblings, 0 replies; 8+ messages in thread
From: Sebastien Fabbro @ 2012-07-04 22:42 UTC (permalink / raw
  To: gentoo-commits

commit:     f3ee6dc28a12b5f8bbb4997d949930f8a74b7783
Author:     Sebastien Fabbro <sfabbro <AT> uvic <DOT> ca>
AuthorDate: Wed Jul  4 21:30:45 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Jul  4 21:30:45 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f3ee6dc2

sci-astronomy/scamp: live version

---
 sci-astronomy/scamp/ChangeLog                      |    6 +++
 sci-astronomy/scamp/scamp-1.7.0-r2.ebuild          |   15 ++++---
 .../{scamp-1.7.0-r2.ebuild => scamp-9999.ebuild}   |   42 ++++++++++++--------
 3 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/sci-astronomy/scamp/ChangeLog b/sci-astronomy/scamp/ChangeLog
index 0ce6588..a50a191 100644
--- a/sci-astronomy/scamp/ChangeLog
+++ b/sci-astronomy/scamp/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-astronomy/scamp/ChangeLog,v 1.7 2011/08/04 18:32:22 bicatali Exp $
 
+*scamp-9999 (04 Jul 2012)
+
+  04 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> scamp-1.7.0-r2.ebuild,
+  +scamp-9999.ebuild:
+  Live version, introduced prefix love
+
   15 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org> scamp-1.7.0-r2.ebuild:
   Fixed patch name
 

diff --git a/sci-astronomy/scamp/scamp-1.7.0-r2.ebuild b/sci-astronomy/scamp/scamp-1.7.0-r2.ebuild
index 69c4b2c..d99ab48 100644
--- a/sci-astronomy/scamp/scamp-1.7.0-r2.ebuild
+++ b/sci-astronomy/scamp/scamp-1.7.0-r2.ebuild
@@ -11,22 +11,23 @@ SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
 
 LICENSE="CeCILL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc threads plplot"
 
 RDEPEND=">=sci-astronomy/cdsclient-3.4
 	virtual/cblas
-	sci-libs/atlas
+	sci-libs/atlas[lapack]
 	sci-libs/fftw:3.0
 	plplot? ( sci-libs/plplot )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
 	local mycblas=atlcblas  myclapack=atlclapack
 	if use threads; then
-		[[ -e ${EPREFIX}/usr/$(get_libdir)/libptcblas.so ]] && mycblas=ptcblas
-		[[ -e ${EPREFIX}/usr/$(get_libdir)/libptclapack.so ]] && myclapack=ptclapack
+		[[ -e ${EPREFIX}/usr/$(get_libdir)/libptcblas.so ]] && \
+			mycblas=ptcblas
+		[[ -e ${EPREFIX}/usr/$(get_libdir)/libptclapack.so ]] &&
+		myclapack=ptclapack
 	fi
 	# fix the configure and not the acx_atlas.m4. the eautoreconf will
 	# produce a configure giving  a wrong install Makefile target (to fix)
@@ -35,7 +36,7 @@ src_prepare() {
 		-e "s/AC_CHECK_LIB(cblas/AC_CHECK_LIB(${mycblas}/g" \
 		-e "s/-llapack/-l${myclapack}/g" \
 		-e "s/AC_CHECK_LIB(lapack/AC_CHECK_LIB(${myclapack}/g" \
-		configure || die "sed acx_atlas.m4 failed"
+		configure || die
 	epatch "${FILESDIR}"/${P}-plplot599.patch
 }
 

diff --git a/sci-astronomy/scamp/scamp-1.7.0-r2.ebuild b/sci-astronomy/scamp/scamp-9999.ebuild
similarity index 51%
copy from sci-astronomy/scamp/scamp-1.7.0-r2.ebuild
copy to sci-astronomy/scamp/scamp-9999.ebuild
index 69c4b2c..8208cc1 100644
--- a/sci-astronomy/scamp/scamp-1.7.0-r2.ebuild
+++ b/sci-astronomy/scamp/scamp-9999.ebuild
@@ -3,50 +3,58 @@
 # $Header: $
 
 EAPI=4
-inherit eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	_SVN=subversion
+	ESVN_REPO_URI="https://astromatic.net/pubsvn/software/${PN}/trunk"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+inherit ${_SVN} autotools
 
 DESCRIPTION="Astrometric and photometric solutions for astronomical images"
 HOMEPAGE="http://www.astromatic.net/software/scamp"
-SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
 
-LICENSE="CeCILL-2"
+LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc threads plplot"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc plplot threads"
 
 RDEPEND=">=sci-astronomy/cdsclient-3.4
 	virtual/cblas
-	sci-libs/atlas
+	sci-libs/atlas[lapack]
 	sci-libs/fftw:3.0
 	plplot? ( sci-libs/plplot )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-	local mycblas=atlcblas  myclapack=atlclapack
+	local mycblas=atlcblas myclapack=atlclapack
 	if use threads; then
-		[[ -e ${EPREFIX}/usr/$(get_libdir)/libptcblas.so ]] && mycblas=ptcblas
-		[[ -e ${EPREFIX}/usr/$(get_libdir)/libptclapack.so ]] && myclapack=ptclapack
+		[[ -e "${EPREFIX}"/usr/$(get_libdir)/libptcblas.so ]] && \
+			mycblas=ptcblas
+		[[ -e "${EPREFIX}"/usr/$(get_libdir)/libptclapack.so ]] && \
+			myclapack=ptclapack
 	fi
-	# fix the configure and not the acx_atlas.m4. the eautoreconf will
-	# produce a configure giving  a wrong install Makefile target (to fix)
 	sed -i \
 		-e "s/-lcblas/-l${mycblas}/g" \
 		-e "s/AC_CHECK_LIB(cblas/AC_CHECK_LIB(${mycblas}/g" \
 		-e "s/-llapack/-l${myclapack}/g" \
 		-e "s/AC_CHECK_LIB(lapack/AC_CHECK_LIB(${myclapack}/g" \
-		configure || die "sed acx_atlas.m4 failed"
-	epatch "${FILESDIR}"/${P}-plplot599.patch
+		acx_atlas.m4 || die
+	eautoreconf
 }
 
 src_configure() {
 	econf \
 		--with-atlas-incdir="${EPREFIX}/usr/include/atlas" \
-		$(use_with plplot) \
 		$(use_enable threads)
 }
 
 src_install () {
 	default
-	use doc && dodoc doc/*,pdf
+	use doc && dodoc doc/*
 }



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

* [gentoo-commits] proj/sci:master commit in: sci-astronomy/scamp/
@ 2012-07-04 22:42 Sebastien Fabbro
  0 siblings, 0 replies; 8+ messages in thread
From: Sebastien Fabbro @ 2012-07-04 22:42 UTC (permalink / raw
  To: gentoo-commits

commit:     cc0832f86dc9f018b26a712d10992f32a09f5b5f
Author:     Sebastien Fabbro <sfabbro <AT> uvic <DOT> ca>
AuthorDate: Wed Jul  4 22:25:54 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Jul  4 22:25:54 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cc0832f8

sci-astronomy/scamp: cblas -> atlas

---
 sci-astronomy/scamp/scamp-1.7.0-r2.ebuild |    9 +++++----
 sci-astronomy/scamp/scamp-9999.ebuild     |    1 -
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sci-astronomy/scamp/scamp-1.7.0-r2.ebuild b/sci-astronomy/scamp/scamp-1.7.0-r2.ebuild
index d99ab48..d9fdb57 100644
--- a/sci-astronomy/scamp/scamp-1.7.0-r2.ebuild
+++ b/sci-astronomy/scamp/scamp-1.7.0-r2.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=4
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="Astrometric and photometric solutions for astronomical images"
 HOMEPAGE="http://www.astromatic.net/software/scamp"
@@ -15,7 +15,6 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc threads plplot"
 
 RDEPEND=">=sci-astronomy/cdsclient-3.4
-	virtual/cblas
 	sci-libs/atlas[lapack]
 	sci-libs/fftw:3.0
 	plplot? ( sci-libs/plplot )"
@@ -36,8 +35,10 @@ src_prepare() {
 		-e "s/AC_CHECK_LIB(cblas/AC_CHECK_LIB(${mycblas}/g" \
 		-e "s/-llapack/-l${myclapack}/g" \
 		-e "s/AC_CHECK_LIB(lapack/AC_CHECK_LIB(${myclapack}/g" \
-		configure || die
+		 acx_atlas.m4 || die
 	epatch "${FILESDIR}"/${P}-plplot599.patch
+	sed -i -e 's/doc//' Makefile.am || die
+	eautoreconf
 }
 
 src_configure() {
@@ -49,5 +50,5 @@ src_configure() {
 
 src_install () {
 	default
-	use doc && dodoc doc/*,pdf
+	use doc && dodoc doc/*
 }

diff --git a/sci-astronomy/scamp/scamp-9999.ebuild b/sci-astronomy/scamp/scamp-9999.ebuild
index 8208cc1..d3248f5 100644
--- a/sci-astronomy/scamp/scamp-9999.ebuild
+++ b/sci-astronomy/scamp/scamp-9999.ebuild
@@ -25,7 +25,6 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc plplot threads"
 
 RDEPEND=">=sci-astronomy/cdsclient-3.4
-	virtual/cblas
 	sci-libs/atlas[lapack]
 	sci-libs/fftw:3.0
 	plplot? ( sci-libs/plplot )"



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

* [gentoo-commits] proj/sci:master commit in: sci-astronomy/scamp/
@ 2012-06-15 17:04 Sebastien Fabbro
  0 siblings, 0 replies; 8+ messages in thread
From: Sebastien Fabbro @ 2012-06-15 17:04 UTC (permalink / raw
  To: gentoo-commits

commit:     88681514e2e856b4ee8b4ac65de3b44ceb2723e3
Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Fri Jun 15 17:04:09 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Jun 15 17:04:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=88681514

sci-astronomy/scamp: Fixed patch name

(Portage version: 2.1.10.63/git/Linux x86_64, unsigned Manifest commit)

---
 sci-astronomy/scamp/ChangeLog             |    3 +++
 sci-astronomy/scamp/scamp-1.7.0-r2.ebuild |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-astronomy/scamp/ChangeLog b/sci-astronomy/scamp/ChangeLog
index 3f1cc3b..0ce6588 100644
--- a/sci-astronomy/scamp/ChangeLog
+++ b/sci-astronomy/scamp/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-astronomy/scamp/ChangeLog,v 1.7 2011/08/04 18:32:22 bicatali Exp $
 
+  15 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org> scamp-1.7.0-r2.ebuild:
+  Fixed patch name
+
 *scamp-1.7.0-r2 (03 Jan 2012)
 
   03 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org> -scamp-1.7.0-r1.ebuild,

diff --git a/sci-astronomy/scamp/scamp-1.7.0-r2.ebuild b/sci-astronomy/scamp/scamp-1.7.0-r2.ebuild
index 6d3347d..69c4b2c 100644
--- a/sci-astronomy/scamp/scamp-1.7.0-r2.ebuild
+++ b/sci-astronomy/scamp/scamp-1.7.0-r2.ebuild
@@ -36,12 +36,12 @@ src_prepare() {
 		-e "s/-llapack/-l${myclapack}/g" \
 		-e "s/AC_CHECK_LIB(lapack/AC_CHECK_LIB(${myclapack}/g" \
 		configure || die "sed acx_atlas.m4 failed"
-	epatch "${FILESDIR}"/${PV}-plplot599.patch
+	epatch "${FILESDIR}"/${P}-plplot599.patch
 }
 
 src_configure() {
 	econf \
-		--with-atlas-incdir="${EROOT}/usr/include/atlas" \
+		--with-atlas-incdir="${EPREFIX}/usr/include/atlas" \
 		$(use_with plplot) \
 		$(use_enable threads)
 }



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

end of thread, other threads:[~2020-09-22 10:11 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-22 10:11 [gentoo-commits] proj/sci:master commit in: sci-astronomy/scamp/ Aisha Tammy
  -- strict thread matches above, loose matches on Subject: below --
2020-09-22 10:09 Aisha Tammy
2016-03-14  2:17 Christoph Junghans
2014-02-27 23:01 Sebastien Fabbro
2013-06-14 11:21 Justin Lecher
2012-07-04 22:42 Sebastien Fabbro
2012-07-04 22:42 Sebastien Fabbro
2012-06-15 17:04 Sebastien Fabbro

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