[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/astrometry/, sci-astronomy/astrometry/files/
commit: 8d9d0ff89910ae6e6caccdcf93245cddf3e9219a
Author: Mikle Kolyada gentoo org>
AuthorDate: Sat Dec 28 16:32:14 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sat Dec 28 16:32:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d9d0ff8
sci-astronomy/astrometry: remove last-rited pkg
Signed-off-by: Mikle Kolyada gentoo.org>
sci-astronomy/astrometry/Manifest | 3 -
sci-astronomy/astrometry/astrometry-0.67-r2.ebuild | 108 ---
sci-astronomy/astrometry/astrometry-0.70.ebuild| 108 ---
sci-astronomy/astrometry/astrometry-0.72.ebuild| 115 -
.../astrometry/files/astrometry-0.67-dynlink.patch | 78 --
.../astrometry/files/astrometry-0.67-qsortr.patch | 10 --
.../astrometry/files/astrometry-0.67-soname.patch | 25 -
.../astrometry/files/astrometry-0.72-dynlink.patch | 92 -
sci-astronomy/astrometry/metadata.xml | 18
9 files changed, 557 deletions(-)
diff --git a/sci-astronomy/astrometry/Manifest
b/sci-astronomy/astrometry/Manifest
deleted file mode 100644
index 2c1665c77d8..000
--- a/sci-astronomy/astrometry/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST astrometry.net-0.67.tar.gz 10941863 BLAKE2B
16c88e9040d2cecec831fd4775f8b5a3b8e10223e2f17b185f92fe222ab1f4cbea8ec5fae9af661cc069987e7cddcfee9e1bdd88a77ffce8db8fb66afad124ba
SHA512
f087e5a73a9881b1d4b1e4c205d45dc8b8663c304d8d1c1369a8427884df49fc8331fafeb5dc63648c2670b41a2626745568f6f11943bac56972db2d2bb11ddb
-DIST astrometry.net-0.70.tar.gz 11195158 BLAKE2B
f0de1cd592873194199810e095d81559754f73bf433cbf803c63c1d4b81db15722c61e3d5ee3798f8f3e5d9b4f67e87ab2e38edaac8639665ec5a9348337fb0e
SHA512
27e1dd27d69427bdff46613723423048959e447662126d25c8b2fbab571d09b834e4085e5a4a9a9f6e8122ff0868a1762a335086de8f674f49fdbc7374299409
-DIST astrometry.net-0.72.tar.gz 11339766 BLAKE2B
91dfe1e49c21a7d0a6b1a39c32d3f50ceafd2d1aa9b75c151d71faef4511164292546013a103d277f127e0391310f40521e6ec9bf83660734cb60c8ed415b3fd
SHA512
6fa63ea1075b267ebbe0a5aea4c66679b552350b206f098fb64f69f0e13fb9f8cf9c12e3fbc18942a444165cfd68251201dee9e18d6ebb01a2f16899675c70ff
diff --git a/sci-astronomy/astrometry/astrometry-0.67-r2.ebuild
b/sci-astronomy/astrometry/astrometry-0.67-r2.ebuild
deleted file mode 100644
index 75a92d3581f..000
--- a/sci-astronomy/astrometry/astrometry-0.67-r2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils toolchain-funcs python-single-r1
-
-MYP=${PN}.net-${PV}
-
-DESCRIPTION="Automated astrometric calibration programs and service"
-HOMEPAGE="http://astrometry.net/";
-SRC_URI="https://github.com/dstndstn/astrometry.net/releases/download/${PV}/${MYP}.tar.gz";
-
-LICENSE="BSD GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- dev-python/astropy[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- media-libs/libpng:0
- media-libs/netpbm
- sci-astronomy/wcslib:0=
- sci-libs/cfitsio:0=
- sci-libs/gsl:0=
- sys-libs/zlib:0=
- virtual/jpeg:0
- x11-libs/cairo
- ${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
- dev-lang/swig:0
- virtual/pkgconfig"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-soname.patch
- "${FILESDIR}"/${P}-dynlink.patch
- "${FILESDIR}"/${P}-qsortr.patch
-)
-
-src_prepare() {
- default
- # fix python scripts
- python_fix_shebang "${S}"
- sed -e "s|python setup-util.py|${EPYTHON} setup-util.py|" -i
util/Makefile || die
- sed -e "s|python setup.py|${EPYTHON} setup.py|" -i
{libkd,sdss,blind}/Makefile || die
- sed -e "s|python -c|${EPYTHON} -c|" -i blind/Makefile || die
- sed -e "s|python < /dev/null
- ./test || die "failed tests in ${d}"
- popd ${d} > /dev/null
- done
-}
-
-ap_make() {
- emake \
- INSTALL_DIR="${ED%/}/usr" \
- DATA_INSTALL_DIR="${ED%/}/usr/share/astrometry" \
- LIB_INSTALL_DIR="${ED%/}/usr/$(get_libdir)" \
- ETC_INSTALL_DIR="${ED%/}/etc" \
- MAN1_INSTALL_DIR="${ED%/}/usr/share/man/man1" \
- DOC_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}" \
- EXAMPLE_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}/examples" \
- PY_BASE_INSTALL_DIR="${D}/$(python_get_sitedir)/astrometry" \
- PY_BASE_LINK_DIR="../$(python_get_sitedir | sed -e
's|/usr/||')/astrometry" \
- FINAL_DIR="${EPREFIX%/}/usr" \
- DATA_FINAL_DIR="${EPREFIX%/}/usr/share/astrometry" \
- $@
-}
-
-src_install() {
- ap_make install-core
- ap_make -C util install
- ap_make -C blind install-extra
-
[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/astrometry/
commit: c573742f5219d6c98b6c7d5b82b8ab17b538e20b
Author: David Seifert gentoo org>
AuthorDate: Sun Aug 11 11:50:08 2019 +
Commit: David Seifert gentoo org>
CommitDate: Sun Aug 11 11:50:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c573742f
sci-astronomy/astrometry: [QA] Fix double-prefix
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: David Seifert gentoo.org>
sci-astronomy/astrometry/astrometry-0.67-r2.ebuild | 4 ++--
sci-astronomy/astrometry/astrometry-0.70.ebuild| 4 ++--
sci-astronomy/astrometry/astrometry-0.72.ebuild| 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sci-astronomy/astrometry/astrometry-0.67-r2.ebuild
b/sci-astronomy/astrometry/astrometry-0.67-r2.ebuild
index 79cf93d35da..75a92d3581f 100644
--- a/sci-astronomy/astrometry/astrometry-0.67-r2.ebuild
+++ b/sci-astronomy/astrometry/astrometry-0.67-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -87,7 +87,7 @@ ap_make() {
MAN1_INSTALL_DIR="${ED%/}/usr/share/man/man1" \
DOC_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}" \
EXAMPLE_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}/examples" \
- PY_BASE_INSTALL_DIR="${ED%/}$(python_get_sitedir)/astrometry" \
+ PY_BASE_INSTALL_DIR="${D}/$(python_get_sitedir)/astrometry" \
PY_BASE_LINK_DIR="../$(python_get_sitedir | sed -e
's|/usr/||')/astrometry" \
FINAL_DIR="${EPREFIX%/}/usr" \
DATA_FINAL_DIR="${EPREFIX%/}/usr/share/astrometry" \
diff --git a/sci-astronomy/astrometry/astrometry-0.70.ebuild
b/sci-astronomy/astrometry/astrometry-0.70.ebuild
index 99a28b7ec1d..d17b0d7aaf9 100644
--- a/sci-astronomy/astrometry/astrometry-0.70.ebuild
+++ b/sci-astronomy/astrometry/astrometry-0.70.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -87,7 +87,7 @@ ap_make() {
MAN1_INSTALL_DIR="${ED%/}/usr/share/man/man1" \
DOC_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}" \
EXAMPLE_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}/examples" \
- PY_BASE_INSTALL_DIR="${ED%/}$(python_get_sitedir)/astrometry" \
+ PY_BASE_INSTALL_DIR="${D}/$(python_get_sitedir)/astrometry" \
PY_BASE_LINK_DIR="../$(python_get_sitedir | sed -e
's|/usr/||')/astrometry" \
FINAL_DIR="${EPREFIX%/}/usr" \
DATA_FINAL_DIR="${EPREFIX%/}/usr/share/astrometry" \
diff --git a/sci-astronomy/astrometry/astrometry-0.72.ebuild
b/sci-astronomy/astrometry/astrometry-0.72.ebuild
index 0a59e2174f1..b0fe8ea5b2a 100644
--- a/sci-astronomy/astrometry/astrometry-0.72.ebuild
+++ b/sci-astronomy/astrometry/astrometry-0.72.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -87,7 +87,7 @@ ap_make() {
MAN1_INSTALL_DIR="${ED%/}/usr/share/man/man1" \
DOC_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}" \
EXAMPLE_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}/examples" \
- PY_BASE_INSTALL_DIR="${ED%/}$(python_get_sitedir)/astrometry" \
+ PY_BASE_INSTALL_DIR="${D}/$(python_get_sitedir)/astrometry" \
PY_BASE_LINK_DIR="../$(python_get_sitedir | sed -e
's|/usr/||')/astrometry" \
FINAL_DIR="${EPREFIX%/}/usr" \
DATA_FINAL_DIR="${EPREFIX%/}/usr/share/astrometry" \
[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/astrometry/, sci-astronomy/astrometry/files/
commit: 9bdc8b234834e623f4dfae3d13d636c25bdf69d3
Author: Sébastien Fabbro gentoo org>
AuthorDate: Thu Jul 13 20:00:00 2017 +
Commit: Sebastien Fabbro gentoo org>
CommitDate: Fri Jul 14 17:31:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bdc8b23
sci-astronomy/astrometry: version bump
Package-Manager: Portage-2.3.6, Repoman-2.3.2
sci-astronomy/astrometry/Manifest | 1 +
sci-astronomy/astrometry/astrometry-0.72.ebuild| 115 +
.../astrometry/files/astrometry-0.72-dynlink.patch | 92 +
3 files changed, 208 insertions(+)
diff --git a/sci-astronomy/astrometry/Manifest
b/sci-astronomy/astrometry/Manifest
index 8dfe102eac1..e1e4aa28ff0 100644
--- a/sci-astronomy/astrometry/Manifest
+++ b/sci-astronomy/astrometry/Manifest
@@ -1,2 +1,3 @@
DIST astrometry.net-0.67.tar.gz 10941863 SHA256
e351c81f7787550d42d45855db394a1702fd17c249ba934bdf4b6abf56281446 SHA512
f087e5a73a9881b1d4b1e4c205d45dc8b8663c304d8d1c1369a8427884df49fc8331fafeb5dc63648c2670b41a2626745568f6f11943bac56972db2d2bb11ddb
WHIRLPOOL
f4f71a54dd2694d0e98168e98e31846c7423c7cf593c0a629fa825e67b596ce3fa191719ef8cf3f52c1d0d641307e720176a977f28ffb1cffb0c60071f729af6
DIST astrometry.net-0.70.tar.gz 11195158 SHA256
e087b26b3f3821e63ba3c4d1f6a5cc342784c5ab938c05d59b75ba91b2866b6a SHA512
27e1dd27d69427bdff46613723423048959e447662126d25c8b2fbab571d09b834e4085e5a4a9a9f6e8122ff0868a1762a335086de8f674f49fdbc7374299409
WHIRLPOOL
8e8faf78913503ffa347bd2ce0bf0ca7931f3ee43c6191da098873853b970371be17c431d39edc9c95fd189b3058de7e81032c1f3440d4973b353dc5e4f1ca59
+DIST astrometry.net-0.72.tar.gz 11339766 SHA256
c9f3c2c70847d8ac835f4eb3cfccdcfe938ad8762acea7dd18acbf84c7e97cb6 SHA512
6fa63ea1075b267ebbe0a5aea4c66679b552350b206f098fb64f69f0e13fb9f8cf9c12e3fbc18942a444165cfd68251201dee9e18d6ebb01a2f16899675c70ff
WHIRLPOOL
88c5095f8a345c5abaa85a37a353545f37e5d68238bb8f59ed9a764d876b1c158ede2be1840dace1709ff7c6b979e302418b0962a6e5d450c80861f973075866
diff --git a/sci-astronomy/astrometry/astrometry-0.72.ebuild
b/sci-astronomy/astrometry/astrometry-0.72.ebuild
new file mode 100644
index 000..0a59e2174f1
--- /dev/null
+++ b/sci-astronomy/astrometry/astrometry-0.72.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# this could be a multiple python package
+# but the way it is packaged makes it very time consuming.
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils toolchain-funcs python-single-r1
+
+MYP=${PN}.net-${PV}
+
+DESCRIPTION="Automated astrometric calibration programs and service"
+HOMEPAGE="http://astrometry.net/";
+SRC_URI="https://github.com/dstndstn/astrometry.net/releases/download/${PV}/${MYP}.tar.gz";
+
+LICENSE="BSD GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ dev-python/astropy[${PYTHON_USEDEP}]
+ dev-python/fitsio[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ media-libs/libpng:0
+ media-libs/netpbm
+ sci-astronomy/wcslib:0=
+ sci-libs/cfitsio:0=
+ sci-libs/gsl:0=
+ sys-libs/zlib:0=
+ virtual/jpeg:0
+ x11-libs/cairo
+ ${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+ dev-lang/swig:0
+ virtual/pkgconfig"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.67-soname.patch
+ "${FILESDIR}"/${PN}-0.67-qsortr.patch
+)
+# "${FILESDIR}"/${PN}-0.72-dynlink.patch
+
+src_prepare() {
+ default
+ # respect user compilation flags
+ sed -e '/-O3/d' \
+ -e '/-fomit-frame-pointer/d' \
+ -i util/makefile.common || die
+ # fix underlinking
+ sed -e "s|-lm|-lm $($(tc-getPKG_CONFIG) --libs wcslib gsl)|" \
+ -i util/Makefile || die
+ export SYSTEM_GSL=yes
+}
+
+src_compile() {
+ tc-export CC RANLIB AR
+ # fragile makefiles, build targets sequentially
+ emake
+ emake py
+ emake extra
+ emake report.txt
+}
+
+src_test() {
+ emake test
+ local d
+ for d in util blind libkd; do
+ pushd ${d} > /dev/null
+ ./test || die "failed tests in ${d}"
+ popd ${d} > /dev/null
+ done
+}
+
+ap_make() {
+ emake \
+ INSTALL_DIR="${ED%/}/usr" \
+ DATA_INSTALL_DIR="${ED%/}/usr/share/astrometry" \
+ LIB_INSTALL_DIR="${ED%/}/usr/$(get_libdir)" \
+ ETC_INSTALL_DIR="${ED%/}/etc" \
+ MAN1_INSTALL_DIR="${ED%/}/usr/share/man/man1" \
+ DOC_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}" \
+ EXAMPLE_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}/examples" \
+ PY_BASE_INSTALL_DIR="${ED%/}$(python_get_sitedir)/astrometry" \
+ PY_BASE_LINK_DIR="../$(python_get_sitedir | sed -e
's|/usr/||')/astro
[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/astrometry/
commit: ffc0e7857fec56227b17efe59b718cebe3004c00
Author: Sébastien Fabbro gentoo org>
AuthorDate: Thu Dec 29 01:14:10 2016 +
Commit: Sebastien Fabbro gentoo org>
CommitDate: Thu Dec 29 07:01:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffc0e785
sci-astronomy/astrometry: version bump
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sci-astronomy/astrometry/Manifest | 2 +-
.../astrometry/{astrometry-0.69.ebuild => astrometry-0.70.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-astronomy/astrometry/Manifest
b/sci-astronomy/astrometry/Manifest
index 131f514..8dfe102 100644
--- a/sci-astronomy/astrometry/Manifest
+++ b/sci-astronomy/astrometry/Manifest
@@ -1,2 +1,2 @@
DIST astrometry.net-0.67.tar.gz 10941863 SHA256
e351c81f7787550d42d45855db394a1702fd17c249ba934bdf4b6abf56281446 SHA512
f087e5a73a9881b1d4b1e4c205d45dc8b8663c304d8d1c1369a8427884df49fc8331fafeb5dc63648c2670b41a2626745568f6f11943bac56972db2d2bb11ddb
WHIRLPOOL
f4f71a54dd2694d0e98168e98e31846c7423c7cf593c0a629fa825e67b596ce3fa191719ef8cf3f52c1d0d641307e720176a977f28ffb1cffb0c60071f729af6
-DIST astrometry.net-0.69.tar.gz 11194563 SHA256
6a445acfd4ff3c082eb56fcba22ee626b45a98665633710a6b1d4a3edef36f3f SHA512
1c36655d2f716d41ecc3f48f837342d6f960b75a46df14f80630770a209c6a9c34851177ebec5180690f0d8ae61762dd5affded05565f7511a59ac90c2340453
WHIRLPOOL
fbe7f877f6abefaeaae783a685a493e72690aa6734e9389edf62430576e49ee5350d4876f18f654b7397bba84316cec0152ef805e55d2a1f644d7813d47789a4
+DIST astrometry.net-0.70.tar.gz 11195158 SHA256
e087b26b3f3821e63ba3c4d1f6a5cc342784c5ab938c05d59b75ba91b2866b6a SHA512
27e1dd27d69427bdff46613723423048959e447662126d25c8b2fbab571d09b834e4085e5a4a9a9f6e8122ff0868a1762a335086de8f674f49fdbc7374299409
WHIRLPOOL
8e8faf78913503ffa347bd2ce0bf0ca7931f3ee43c6191da098873853b970371be17c431d39edc9c95fd189b3058de7e81032c1f3440d4973b353dc5e4f1ca59
diff --git a/sci-astronomy/astrometry/astrometry-0.69.ebuild
b/sci-astronomy/astrometry/astrometry-0.70.ebuild
similarity index 100%
rename from sci-astronomy/astrometry/astrometry-0.69.ebuild
rename to sci-astronomy/astrometry/astrometry-0.70.ebuild
[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/astrometry/
commit: 61b4817787b6297547bf6ee0e402f9dcab0d2d69
Author: Sébastien Fabbro gentoo org>
AuthorDate: Mon Dec 5 22:57:21 2016 +
Commit: Sebastien Fabbro gentoo org>
CommitDate: Mon Dec 5 22:58:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61b48177
sci-astronomy/astrometry: version bump
Package-Manager: portage-2.3.2
sci-astronomy/astrometry/Manifest | 1 +
sci-astronomy/astrometry/astrometry-0.69.ebuild | 107
2 files changed, 108 insertions(+)
diff --git a/sci-astronomy/astrometry/Manifest
b/sci-astronomy/astrometry/Manifest
index e29b4f7..131f514 100644
--- a/sci-astronomy/astrometry/Manifest
+++ b/sci-astronomy/astrometry/Manifest
@@ -1 +1,2 @@
DIST astrometry.net-0.67.tar.gz 10941863 SHA256
e351c81f7787550d42d45855db394a1702fd17c249ba934bdf4b6abf56281446 SHA512
f087e5a73a9881b1d4b1e4c205d45dc8b8663c304d8d1c1369a8427884df49fc8331fafeb5dc63648c2670b41a2626745568f6f11943bac56972db2d2bb11ddb
WHIRLPOOL
f4f71a54dd2694d0e98168e98e31846c7423c7cf593c0a629fa825e67b596ce3fa191719ef8cf3f52c1d0d641307e720176a977f28ffb1cffb0c60071f729af6
+DIST astrometry.net-0.69.tar.gz 11194563 SHA256
6a445acfd4ff3c082eb56fcba22ee626b45a98665633710a6b1d4a3edef36f3f SHA512
1c36655d2f716d41ecc3f48f837342d6f960b75a46df14f80630770a209c6a9c34851177ebec5180690f0d8ae61762dd5affded05565f7511a59ac90c2340453
WHIRLPOOL
fbe7f877f6abefaeaae783a685a493e72690aa6734e9389edf62430576e49ee5350d4876f18f654b7397bba84316cec0152ef805e55d2a1f644d7813d47789a4
diff --git a/sci-astronomy/astrometry/astrometry-0.69.ebuild
b/sci-astronomy/astrometry/astrometry-0.69.ebuild
new file mode 100644
index ..5261dfba
--- /dev/null
+++ b/sci-astronomy/astrometry/astrometry-0.69.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils toolchain-funcs python-single-r1
+
+MYP=${PN}.net-${PV}
+
+DESCRIPTION="Automated astrometric calibration programs and service"
+HOMEPAGE="http://astrometry.net/";
+SRC_URI="https://github.com/dstndstn/astrometry.net/releases/download/${PV}/${MYP}.tar.gz";
+
+LICENSE="BSD GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+RDEPEND="
+ dev-python/astropy[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ media-libs/libpng:0
+ media-libs/netpbm
+ sci-astronomy/wcslib:0=
+ sci-libs/cfitsio:0=
+ sci-libs/gsl:0=
+ sys-libs/zlib:0=
+ virtual/jpeg:0
+ x11-libs/cairo"
+DEPEND="${RDEPEND}
+ dev-lang/swig:0
+ virtual/pkgconfig"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.67-soname.patch
+ "${FILESDIR}"/${PN}-0.67-dynlink.patch
+ "${FILESDIR}"/${PN}-0.67-qsortr.patch
+)
+
+src_prepare() {
+ default
+ # fix python scripts
+ python_fix_shebang "${S}"
+ sed -e "s|python setup-util.py|${EPYTHON} setup-util.py|" -i
util/Makefile || die
+ sed -e "s|python setup.py|${EPYTHON} setup.py|" -i
{libkd,sdss,blind}/Makefile || die
+ sed -e "s|python -c|${EPYTHON} -c|" -i blind/Makefile || die
+ sed -e "s|python < /dev/null
+ ./test || die "failed tests in ${d}"
+ popd ${d} > /dev/null
+ done
+}
+
+ap_make() {
+ emake \
+ INSTALL_DIR="${ED%/}/usr" \
+ DATA_INSTALL_DIR="${ED%/}/usr/share/astrometry" \
+ LIB_INSTALL_DIR="${ED%/}/usr/$(get_libdir)" \
+ ETC_INSTALL_DIR="${ED%/}/etc" \
+ MAN1_INSTALL_DIR="${ED%/}/usr/share/man/man1" \
+ DOC_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}" \
+ EXAMPLE_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}/examples" \
+ PY_BASE_INSTALL_DIR="${ED%/}$(python_get_sitedir)/astrometry" \
+ PY_BASE_LINK_DIR="../$(python_get_sitedir | sed -e
's|/usr/||')/astrometry" \
+ FINAL_DIR="${EPREFIX%/}/usr" \
+ DATA_FINAL_DIR="${EPREFIX%/}/usr/share/astrometry" \
+ $@
+}
+
+src_install() {
+ ap_make install-core
+ ap_make -C util install
+ ap_make -C blind install-extra
+
+ # remove duplicates and non installable libraries
+ rm "${ED}"/usr/bin/{fitscopy,imcopy,listhead} || die
+ rm "${ED}"/usr/$(get_libdir)/lib*.a || die
+ rm "${ED}"/usr/share/doc/${PF}/LICENSE || die
+
+ use examples || rm -r "${ED}"/usr/share/doc/${PF}/examples
+}
[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/astrometry/files/, sci-astronomy/astrometry/
commit: 80af1e25462e8f08484b82b17d9e67ac5a9c4712
Author: Sébastien Fabbro gentoo org>
AuthorDate: Thu Nov 17 00:33:05 2016 +
Commit: Sebastien Fabbro gentoo org>
CommitDate: Thu Nov 17 17:26:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80af1e25
sci-astronomy/astrometry: fixed a few issues and cleanup
* missing slashes in configuration (bug #595024)
* QA implicit declarations (bug #595162)
* download page and upstream release metadata
* remove extra USE flag, it needs graphics in all cases (bug #595160)
Package-Manager: portage-2.3.2
...ry-0.67-r1.ebuild => astrometry-0.67-r2.ebuild} | 50 +++---
.../astrometry/files/astrometry-0.67-qsortr.patch | 10 +
sci-astronomy/astrometry/metadata.xml | 6 +--
3 files changed, 38 insertions(+), 28 deletions(-)
diff --git a/sci-astronomy/astrometry/astrometry-0.67-r1.ebuild
b/sci-astronomy/astrometry/astrometry-0.67-r2.ebuild
similarity index 65%
rename from sci-astronomy/astrometry/astrometry-0.67-r1.ebuild
rename to sci-astronomy/astrometry/astrometry-0.67-r2.ebuild
index f46ffd0..d3149dc 100644
--- a/sci-astronomy/astrometry/astrometry-0.67-r1.ebuild
+++ b/sci-astronomy/astrometry/astrometry-0.67-r2.ebuild
@@ -12,25 +12,24 @@ MYP=${PN}.net-${PV}
DESCRIPTION="Automated astrometric calibration programs and service"
HOMEPAGE="http://astrometry.net/";
-SRC_URI="${HOMEPAGE}/downloads/${MYP}.tar.gz"
+SRC_URI="https://github.com/dstndstn/astrometry.net/releases/download/${PV}/${MYP}.tar.gz";
LICENSE="BSD GPL-2 GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples extra"
+IUSE="examples"
RDEPEND="
dev-python/astropy[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
+ media-libs/libpng:0
+ media-libs/netpbm
sci-astronomy/wcslib:0=
sci-libs/cfitsio:0=
sci-libs/gsl:0=
sys-libs/zlib:0=
- extra? (
- media-libs/libpng:0
- media-libs/netpbm
- virtual/jpeg:0
- x11-libs/cairo )"
+ virtual/jpeg:0
+ x11-libs/cairo"
DEPEND="${RDEPEND}
dev-lang/swig:0
virtual/pkgconfig"
@@ -38,8 +37,9 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${MYP}"
PATCHES=(
- "${FILESDIR}/${P}-soname.patch"
- "${FILESDIR}/${P}-dynlink.patch"
+ "${FILESDIR}"/${P}-soname.patch
+ "${FILESDIR}"/${P}-dynlink.patch
+ "${FILESDIR}"/${P}-qsortr.patch
)
src_prepare() {
@@ -54,15 +54,16 @@ src_prepare() {
# respect use compilation flags
sed -e '/-O3/d' -e '/-fomit-frame-pointer/d' -i util/makefile.common ||
die
# as-needed
- sed -e "s|-lm|$(pkg-config --libs wcslib gsl)|" -i util/Makefile || die
+ sed -e "s|-lm|-lm $($(tc-getPKG_CONFIG) --libs wcslib gsl)|" -i
util/Makefile || die
export SYSTEM_GSL=yes
}
src_compile() {
tc-export CC RANLIB AR
+ # fragile makefiles, build targets sequentially
emake
emake py
- use extra && emake extra
+ emake extra
emake report.txt
}
@@ -78,30 +79,29 @@ src_test() {
ap_make() {
emake \
- INSTALL_DIR="${ED}usr" \
- DATA_INSTALL_DIR="${ED}usr/share/astrometry" \
- LIB_INSTALL_DIR="${ED}usr/$(get_libdir)" \
- ETC_INSTALL_DIR="${ED}etc" \
- MAN1_INSTALL_DIR="${ED}usr/share/man/man1" \
- DOC_INSTALL_DIR="${ED}usr/share/doc/${PF}" \
- EXAMPLE_INSTALL_DIR="${ED}usr/share/doc/${PF}/examples" \
- PY_BASE_INSTALL_DIR="${ED}$(python_get_sitedir)/astrometry" \
+ INSTALL_DIR="${ED%/}/usr" \
+ DATA_INSTALL_DIR="${ED%/}/usr/share/astrometry" \
+ LIB_INSTALL_DIR="${ED%/}/usr/$(get_libdir)" \
+ ETC_INSTALL_DIR="${ED%/}/etc" \
+ MAN1_INSTALL_DIR="${ED%/}/usr/share/man/man1" \
+ DOC_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}" \
+ EXAMPLE_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}/examples" \
+ PY_BASE_INSTALL_DIR="${ED%/}$(python_get_sitedir)/astrometry" \
PY_BASE_LINK_DIR="../$(python_get_sitedir | sed -e
's|/usr/||')/astrometry" \
- FINAL_DIR="${EPREFIX}usr" \
- DATA_FINAL_DIR="${EPREFIX}usr/share/astrometry" \
+ FINAL_DIR="${EPREFIX%/}/usr" \
+ DATA_FINAL_DIR="${EPREFIX%/}/usr/share/astrometry" \
$@
}
src_install() {
ap_make install-core
ap_make -C util install
- use extra && ap_make -C blind install-extra
+ ap_make -C blind install-extra
- # remove cfitsio duplicates and non installable libraries
+ # remove duplicates and non installable libraries
rm "${ED}"/usr/bin/{fitscopy,imcopy,listhead} || die
rm "${ED}"/usr/$(get_libdir)/lib*.a || die
-
- # remove license file
rm "${ED}"/usr/share/doc/${PF}/LICENSE ||
[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/astrometry/
commit: f35ea2e9a3beaa03244ee3df0b7ff8523915a8f7
Author: Kacper Kowalik gentoo org>
AuthorDate: Sun Sep 25 20:37:01 2016 +
Commit: Kacper Kowalik gentoo org>
CommitDate: Sun Sep 25 20:37:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f35ea2e9
sci-astronomy/astrometry: add missing dependency on astropy
Fixes #595024 reported by Karsten Elfenbein gmx.de>
Package-Manager: portage-2.2.28
sci-astronomy/astrometry/astrometry-0.67-r1.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sci-astronomy/astrometry/astrometry-0.67-r1.ebuild
b/sci-astronomy/astrometry/astrometry-0.67-r1.ebuild
index 791af35..f46ffd0 100644
--- a/sci-astronomy/astrometry/astrometry-0.67-r1.ebuild
+++ b/sci-astronomy/astrometry/astrometry-0.67-r1.ebuild
@@ -20,6 +20,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="examples extra"
RDEPEND="
+ dev-python/astropy[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
sci-astronomy/wcslib:0=
sci-libs/cfitsio:0=
[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/astrometry/
commit: 0121cf433d10ad90251b5c8875b7321f279f7a00
Author: Sébastien Fabbro gentoo org>
AuthorDate: Tue Mar 22 22:52:50 2016 +
Commit: Sebastien Fabbro gentoo org>
CommitDate: Tue Mar 22 23:18:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0121cf43
sci-astronomy/astrometry: fix utilities relative linking
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=577786
Package-Manager: portage-2.2.28
.../astrometry/{astrometry-0.67.ebuild => astrometry-0.67-r1.ebuild} | 1 +
1 file changed, 1 insertion(+)
diff --git a/sci-astronomy/astrometry/astrometry-0.67.ebuild
b/sci-astronomy/astrometry/astrometry-0.67-r1.ebuild
similarity index 97%
rename from sci-astronomy/astrometry/astrometry-0.67.ebuild
rename to sci-astronomy/astrometry/astrometry-0.67-r1.ebuild
index df51244..791af35 100644
--- a/sci-astronomy/astrometry/astrometry-0.67.ebuild
+++ b/sci-astronomy/astrometry/astrometry-0.67-r1.ebuild
@@ -85,6 +85,7 @@ ap_make() {
DOC_INSTALL_DIR="${ED}usr/share/doc/${PF}" \
EXAMPLE_INSTALL_DIR="${ED}usr/share/doc/${PF}/examples" \
PY_BASE_INSTALL_DIR="${ED}$(python_get_sitedir)/astrometry" \
+ PY_BASE_LINK_DIR="../$(python_get_sitedir | sed -e
's|/usr/||')/astrometry" \
FINAL_DIR="${EPREFIX}usr" \
DATA_FINAL_DIR="${EPREFIX}usr/share/astrometry" \
$@
[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/astrometry/files/, sci-astronomy/astrometry/
commit: 3190a49bb37f43eafde10e486a83f083ff1c1771
Author: Sébastien Fabbro gentoo org>
AuthorDate: Tue Mar 1 23:07:49 2016 +
Commit: Sebastien Fabbro gentoo org>
CommitDate: Tue Mar 1 23:42:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3190a49b
sci-astronomy/astrometry: Initial import (major bump from science overlay)
Package-Manager: portage-2.2.27
sci-astronomy/astrometry/Manifest | 1 +
sci-astronomy/astrometry/astrometry-0.67.ebuild| 105 +
.../astrometry/files/astrometry-0.67-dynlink.patch | 78 +++
.../astrometry/files/astrometry-0.67-soname.patch | 25 +
sci-astronomy/astrometry/metadata.xml | 18
5 files changed, 227 insertions(+)
diff --git a/sci-astronomy/astrometry/Manifest
b/sci-astronomy/astrometry/Manifest
new file mode 100644
index 000..e29b4f7
--- /dev/null
+++ b/sci-astronomy/astrometry/Manifest
@@ -0,0 +1 @@
+DIST astrometry.net-0.67.tar.gz 10941863 SHA256
e351c81f7787550d42d45855db394a1702fd17c249ba934bdf4b6abf56281446 SHA512
f087e5a73a9881b1d4b1e4c205d45dc8b8663c304d8d1c1369a8427884df49fc8331fafeb5dc63648c2670b41a2626745568f6f11943bac56972db2d2bb11ddb
WHIRLPOOL
f4f71a54dd2694d0e98168e98e31846c7423c7cf593c0a629fa825e67b596ce3fa191719ef8cf3f52c1d0d641307e720176a977f28ffb1cffb0c60071f729af6
diff --git a/sci-astronomy/astrometry/astrometry-0.67.ebuild
b/sci-astronomy/astrometry/astrometry-0.67.ebuild
new file mode 100644
index 000..df51244
--- /dev/null
+++ b/sci-astronomy/astrometry/astrometry-0.67.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils toolchain-funcs python-single-r1
+
+MYP=${PN}.net-${PV}
+
+DESCRIPTION="Automated astrometric calibration programs and service"
+HOMEPAGE="http://astrometry.net/";
+SRC_URI="${HOMEPAGE}/downloads/${MYP}.tar.gz"
+
+LICENSE="BSD GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples extra"
+
+RDEPEND="
+ dev-python/numpy[${PYTHON_USEDEP}]
+ sci-astronomy/wcslib:0=
+ sci-libs/cfitsio:0=
+ sci-libs/gsl:0=
+ sys-libs/zlib:0=
+ extra? (
+ media-libs/libpng:0
+ media-libs/netpbm
+ virtual/jpeg:0
+ x11-libs/cairo )"
+DEPEND="${RDEPEND}
+ dev-lang/swig:0
+ virtual/pkgconfig"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-soname.patch"
+ "${FILESDIR}/${P}-dynlink.patch"
+)
+
+src_prepare() {
+ default
+ # fix python scripts
+ python_fix_shebang "${S}"
+ sed -e "s|python setup-util.py|${EPYTHON} setup-util.py|" -i
util/Makefile || die
+ sed -e "s|python setup.py|${EPYTHON} setup.py|" -i
{libkd,sdss,blind}/Makefile || die
+ sed -e "s|python -c|${EPYTHON} -c|" -i blind/Makefile || die
+ sed -e "s|python < /dev/null
+ ./test || die "failed tests in ${d}"
+ popd ${d} > /dev/null
+ done
+}
+
+ap_make() {
+ emake \
+ INSTALL_DIR="${ED}usr" \
+ DATA_INSTALL_DIR="${ED}usr/share/astrometry" \
+ LIB_INSTALL_DIR="${ED}usr/$(get_libdir)" \
+ ETC_INSTALL_DIR="${ED}etc" \
+ MAN1_INSTALL_DIR="${ED}usr/share/man/man1" \
+ DOC_INSTALL_DIR="${ED}usr/share/doc/${PF}" \
+ EXAMPLE_INSTALL_DIR="${ED}usr/share/doc/${PF}/examples" \
+ PY_BASE_INSTALL_DIR="${ED}$(python_get_sitedir)/astrometry" \
+ FINAL_DIR="${EPREFIX}usr" \
+ DATA_FINAL_DIR="${EPREFIX}usr/share/astrometry" \
+ $@
+}
+
+src_install() {
+ ap_make install-core
+ ap_make -C util install
+ use extra && ap_make -C blind install-extra
+
+ # remove cfitsio duplicates and non installable libraries
+ rm "${ED}"/usr/bin/{fitscopy,imcopy,listhead} || die
+ rm "${ED}"/usr/$(get_libdir)/lib*.a || die
+
+ # remove license file
+ rm "${ED}"/usr/share/doc/${PF}/LICENSE || die
+ use examples || rm -r "${ED}"/usr/share/doc/${PF}/examples
+}
diff --git a/sci-astronomy/astrometry/files/astrometry-0.67-dynlink.patch
b/sci-astronomy/astrometry/files/astrometry-0.67-dynlink.patch
new file mode 100644
index 000..64b87c0
--- /dev/null
+++ b/sci-astronomy/astrometry/files/astrometry-0.67-dynlink.patch
@@ -0,0 +1,78 @@
+Author: Ole Streicher
+Description: Dynamically link to libastrometry.so, when possible
+--- a/blind/Makefile
b/blind/Makefile
+@@ -43,9 +43,7 @@
+ LDLIBS := $(LDLIBS_DEF)
+ LDLIBS += $(ANFILES_LIB)
+
+-SLIB := $(ENGINE_LIB)
+-SLIB += $(CATS_SLIB)
+-SLIB += $(ANFILES_SLIB)
++SLIB := $(ENGINE_SO)
+
+ CAIRO_SLIB := $(COMMON)/cairoutils.o
+ CAIRO_SLIB += $(SLIB)
+@@ -131,7 +129,7 @@
+ resort-xylist.o
+
+ BUILD_INDEX_OBJS := build-index.o uniformize-catalog.o startr
