Revert "Bump sci-astronomy/astrometry and patches"

This reverts commit 8a6955c12939490dd0d4a8d8d50c49fa1f1b501e.

6 files changed, 91 insertions, 40 deletions

diff --git a/sci-astronomy/astrometry/Manifest b/sci-astronomy/astrometry/Manifest
index 8f93369..f6ad543 100644
--- a/sci-astronomy/astrometry/Manifest
+++ b/sci-astronomy/astrometry/Manifest
@@ -1 +1 @@
-DIST astrometry.net-0.64.tar.gz 10933852 SHA256 4b9b8e9d7133a7bcc1f85298cf5762699dce70548be0cb91165286fc6677136d SHA512 b9c42c84020f970c4bfb503486adfdafe679d1cf7bec6f1ada8416de4c951e316a0cdb07501642259a02c7d3feefba3819551482888ff9891fb47dee6febd304 WHIRLPOOL 3f3879b91b9878b67ca3b414d086f0c025c10fddfd838dbcf719374ab5ec87e1d9291ca122e0d6c5bf339e52a30e1ac1bc56e98da46016b889d4be90d5deb073
+DIST astrometry.net-0.52.tar.bz2 10445354 SHA256 4ec29e7b62a21cacfb648a450651486968091258dd784d2383284cb71a3f0948 SHA512 a86a71ae124a202cc23209a138ba430b12372b4f9665d0fe5bf319660c6aad6340c2e5dd2dd6d6ed2039c2b543d7dbf23e2d973dbc61500652faf46b625d23e4 WHIRLPOOL 8864492ae18653c9ea5fa11cbae1707fc4f575c312235961fdaffea899b85788dee704bd7752e8c4e2ea4a26534147a9a941bb8cb36b50850638a5d1c1ee83d8
diff --git a/sci-astronomy/astrometry/astrometry-0.64.ebuild b/sci-astronomy/astrometry/astrometry-0.52-r1.ebuild
index c39537c..92d1cc4 100644
--- a/sci-astronomy/astrometry/astrometry-0.64.ebuild
+++ b/sci-astronomy/astrometry/astrometry-0.52-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $id$
+# $Header: $
 
 EAPI=5
 
@@ -12,9 +12,9 @@ MYP=${PN}.net-${PV}
 
 DESCRIPTION="Automated astrometric calibration programs and service"
 HOMEPAGE="http://astrometry.net/"
-SRC_URI="${HOMEPAGE}/downloads/${MYP}.tar.gz"
+SRC_URI="${HOMEPAGE}/downloads/${MYP}.tar.bz2"
 
-LICENSE="GPL-3"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples extra python"
@@ -38,8 +38,9 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MYP}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/0.64-as-needed.patch
-	epatch "${FILESDIR}"/0.64-respect-user-flags.patch
+	epatch "${FILESDIR}"/0.52-as-needed.patch
+	epatch "${FILESDIR}"/0.52-respect-user-flags.patch
+	epatch "${FILESDIR}"/0.52-fix_installation_paths.patch
 	python_fix_shebang "${S}"
 	sed "s|python setup-util.py|${EPYTHON} setup-util.py|" "${S}"/util/Makefile -i || die
 	sed "s|python setup.py|${EPYTHON} setup.py|" "${S}"/{libkd,sdss,blind}/Makefile -i || die
diff --git a/sci-astronomy/astrometry/files/0.64-as-needed.patch b/sci-astronomy/astrometry/files/0.52-as-needed.patch
index 5352939..0d619cf 100644
--- a/sci-astronomy/astrometry/files/0.64-as-needed.patch
+++ b/sci-astronomy/astrometry/files/0.52-as-needed.patch
@@ -1,21 +1,21 @@
-diff -uN util/Makefile util.new/Makefile
---- util/Makefile	2015-12-03 19:56:28.689770871 +0100
-+++ util.new/Makefile	2015-12-03 20:03:54.439977807 +0100
-@@ -156,7 +156,7 @@
+diff -wurN astrometry.net-0.52/util/Makefile astrometry.net-0.52.as-needed/util/Makefile
+--- astrometry.net-0.52/util/Makefile	2015-03-06 21:25:23.000000000 +0100
++++ astrometry.net-0.52.as-needed/util/Makefile	2015-03-10 22:33:56.020047097 +0100
+@@ -175,7 +175,7 @@
  DEP_OBJ += $(addsuffix .o,$(PROGS))
  
  an-pnmtofits: an-pnmtofits.o $(ANFILES_SLIB)
 -	$(CC) -o $@ $(LDFLAGS) $^ $(NETPBM_LIB) $(LDLIBS)
-+	$(CC) $(LDFLAGS) $^ $(NETPBM_LIB) $(LDLIBS) -o $@
++	$(CC) $(LDFLAGS) $^ $(NETPBM_LIB) $(LDLIBS) -o $@ 
  ALL_OBJ += an-pnmtofits.o
  
- wcs-pv2sip: wcs-pv2sip.o $(ANUTILS_SLIB)
-@@ -253,32 +253,32 @@
+ _util$(PYTHON_SO_EXT): util.i lanczos.i $(ANFILES_SLIB)
+@@ -264,32 +264,32 @@
  	@echo
  	@echo "Testing canonicalize_file_name..."
  	@echo "Testing canonicalize_file_name..." >> os-features.log
 -	(($(CC) -o os-features-test-canonicalize \
--	  $(CPPFLAGS) $(CFLAGS) -DTEST_CANONICALIZE_FILE_NAME $^ $(LDFLAGS) >> os-features.log && \
+-	  $(CFLAGS) -DTEST_CANONICALIZE_FILE_NAME $^ $(LDFLAGS) >> os-features.log && \
 +	(($(CC) $(LDFLAGS) \
 +	  $(CFLAGS) -DTEST_CANONICALIZE_FILE_NAME $^ -o os-features-test-canonicalize >> os-features.log && \
  	  ./os-features-test-canonicalize >> os-features.log && \
@@ -25,7 +25,7 @@ diff -uN util/Makefile util.new/Makefile
  	@echo "Testing declare qsort_r..."
  	@echo "Testing declare qsort_r..." >> os-features.log
 -	(($(CC) -o os-features-test-declare-qsort \
--	   $(CPPFLAGS) $(CFLAGS) -DTEST_DECLARE_QSORT_R $^ $(LDFLAGS) >> os-features.log && \
+-	   $(CFLAGS) -DTEST_DECLARE_QSORT_R $^ $(LDFLAGS) >> os-features.log && \
 +	(($(CC) $(LDFLAGS) \
 +	   $(CFLAGS) -DTEST_DECLARE_QSORT_R $^ -o os-features-test-declare-qsort >> os-features.log && \
  	   ./os-features-test-declare-qsort >> os-features.log && \
@@ -35,7 +35,7 @@ diff -uN util/Makefile util.new/Makefile
  	@echo "Testing qsort_r..."
  	@echo "Testing qsort_r..." >> os-features.log
 -	(($(CC) -o os-features-test-qsort \
--	   $(CPPFLAGS) $(CFLAGS) -DTEST_QSORT_R $^ $(LDFLAGS) >> os-features.log && \
+-	   $(CFLAGS) -DTEST_QSORT_R $^ $(LDFLAGS) >> os-features.log && \
 +	(($(CC) $(LDFLAGS) \
 +	   $(CFLAGS) -DTEST_QSORT_R $^ -o os-features-test-qsort >> os-features.log && \
  	   ./os-features-test-qsort >> os-features.log && \
@@ -45,38 +45,38 @@ diff -uN util/Makefile util.new/Makefile
  	@echo "Testing swap qsort_r..."
  	@echo "Testing swap qsort_r..." >> os-features.log
 -	(($(CC) -Werror -o os-features-test-swap-qsort \
--	   $(CPPFLAGS) $(CFLAGS) -DTEST_SWAP_QSORT_R $^ $(LDFLAGS) >> os-features.log && \
+-	   $(CFLAGS) -DTEST_SWAP_QSORT_R $^ $(LDFLAGS) >> os-features.log && \
 +	(($(CC) $(LDFLAGS) -Werror  \
 +	   $(CFLAGS) -DTEST_SWAP_QSORT_R $^ -o os-features-test-swap-qsort >> os-features.log && \
  	   ./os-features-test-swap-qsort >> os-features.log && \
  	   echo "#define NEED_SWAP_QSORT_R 0") \
  	|| echo "#define NEED_SWAP_QSORT_R 1") >> $@.tmp
-@@ -287,8 +287,8 @@
+@@ -298,8 +298,8 @@
  	@echo "   NETPBM_INC is $(NETPBM_INC_ORIG)"
  	@echo "   NETPBM_LIB is $(NETPBM_LIB_ORIG)"
  	@echo "Testing netpbm..." >> os-features.log
 -	(($(CC) -o os-features-test-netpbm \
--	   $(CPPFLAGS) $(CFLAGS) -DTEST_NETPBM $(NETPBM_INC_ORIG) $^ $(LDFLAGS) $(NETPBM_LIB_ORIG) >> os-features.log && \
+-	   $(CFLAGS) -DTEST_NETPBM $(NETPBM_INC_ORIG) $^ $(LDFLAGS) $(NETPBM_LIB_ORIG) >> os-features.log && \
 +	(($(CC) $(LDFLAGS) \
 +	   $(CFLAGS) -DTEST_NETPBM $(NETPBM_INC_ORIG) $^ -o os-features-test-netpbm $(NETPBM_LIB_ORIG) >> os-features.log && \
  	   ./os-features-test-netpbm >> os-features.log && \
  	   echo "#define HAVE_NETPBM 1") \
  	|| echo "#define HAVE_NETPBM 0") >> $@.tmp
-@@ -314,8 +314,8 @@
- 	@echo "   NETPBM_LIB_ORIG is $(NETPBM_LIB_ORIG)"
+@@ -322,8 +322,8 @@
+ 	-rm -f os-features-makefile.log
  	( \
  	 echo "# This file is generated by util/Makefile."; \
 -	 (($(CC) -o os-features-test-netpbm-make \
--	   $(CPPFLAGS) $(CFLAGS) -DTEST_NETPBM_MAKE $(NETPBM_INC_ORIG) $^ $(LDFLAGS) $(NETPBM_LIB_ORIG) >> os-features-makefile.log && \
-+	(($(CC) $(LDFLAGS) \
+-	   $(CFLAGS) -DTEST_NETPBM_MAKE $(NETPBM_INC_ORIG) $^ $(LDFLAGS) $(NETPBM_LIB_ORIG) >> os-features-makefile.log && \
++	 (($(CC) $(LDFLAGS) \
 +	   $(CFLAGS) -DTEST_NETPBM_MAKE $(NETPBM_INC_ORIG) $^ -o os-features-test-netpbm-make $(NETPBM_LIB_ORIG) >> os-features-makefile.log && \
  	   ./os-features-test-netpbm-make >> os-features-makefile.log && \
  	   echo "HAVE_NETPBM := yes") \
  	|| (echo "# Astrometry.net didn't find netpbm; not setting HAVE_NETPBM."; \
-diff -uN util/makefile.tests util.new/makefile.tests
---- util/makefile.tests	2015-12-03 19:56:28.689770871 +0100
-+++ util.new/makefile.tests	2015-12-03 20:04:49.151881458 +0100
-@@ -37,7 +37,7 @@
+diff -wurN astrometry.net-0.52/util/makefile.tests astrometry.net-0.52.as-needed/util/makefile.tests
+--- astrometry.net-0.52/util/makefile.tests	2015-03-06 21:25:23.000000000 +0100
++++ astrometry.net-0.52.as-needed/util/makefile.tests	2015-03-10 22:03:04.734163318 +0100
+@@ -50,7 +50,7 @@
  	$(AN_SHELL) $(MAKE_TESTS) $(TEST_SOURCES) > $@
  
  test: test.o $(COMMON)/cutest.o $(ALL_TEST_FILES_O) $(sort $(ALL_TEST_EXTRA_OBJS)) $(ALL_TEST_LIBS)
@@ -84,4 +84,4 @@ diff -uN util/makefile.tests util.new/makefile.tests
 +	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(ALL_TEST_EXTRA_LDFLAGS) $(LDLIBS) -o $@
  
  $(ALL_TEST_FILES_O) $(ALL_TEST_FILES_MAIN_O) test.o: %.o: %.c
- 	$(CC) -o $@ $(CPPFLAGS) $(CFLAGS) -c $< -I$(COMMON)
+ 	$(CC) -o $@ $(CFLAGS) -c $< -I$(COMMON)
diff --git a/sci-astronomy/astrometry/files/0.52-fix_installation_paths.patch b/sci-astronomy/astrometry/files/0.52-fix_installation_paths.patch
new file mode 100644
index 0000000..088dd46
--- /dev/null
+++ b/sci-astronomy/astrometry/files/0.52-fix_installation_paths.patch
@@ -0,0 +1,50 @@
+diff -wurN astrometry.net-0.52/Makefile astrometry.net-0.52.fix-paths/Makefile
+--- astrometry.net-0.52/Makefile	2015-03-06 21:26:45.000000000 +0100
++++ astrometry.net-0.52.fix-paths/Makefile	2015-03-11 19:30:45.513371808 +0100
+@@ -122,18 +122,18 @@
+ install-core:
+ 	mkdir -p '$(DATA_INSTALL_DIR)'
+ 	mkdir -p '$(BIN_INSTALL_DIR)'
+-	mkdir -p '$(INSTALL_DIR)/doc'
++	mkdir -p '$(DOC_INSTALL_DIR)'
+ 	mkdir -p '$(INCLUDE_INSTALL_DIR)'
+ 	mkdir -p '$(LIB_INSTALL_DIR)'
+-	mkdir -p '$(INSTALL_DIR)/examples'
++	mkdir -p '$(EXAMPLES_INSTALL_DIR)'
+ 	mkdir -p '$(PY_BASE_INSTALL_DIR)'
+-	mkdir -p '$(INSTALL_DIR)/ups'
+-	cp ups/astrometry_net.table-dist '$(INSTALL_DIR)/ups/astrometry_net.table'
+-	cp ups/astrometry_net.cfg '$(INSTALL_DIR)/ups'
++	mkdir -p '$(UPS_INSTALL_DIR)'
++	cp ups/astrometry_net.table-dist '$(UPS_INSTALL_DIR)/astrometry_net.table'
++	cp ups/astrometry_net.cfg '$(UPS_INSTALL_DIR)/'
+ 	cp __init__.py '$(PY_BASE_INSTALL_DIR)'
+-	cp CREDITS LICENSE README.md '$(INSTALL_DIR)/doc'
+-	cp report.txt '$(INSTALL_DIR)/doc'
+-	cp demo/* '$(INSTALL_DIR)/examples'
++	cp CREDITS LICENSE README.md '$(DOC_INSTALL_DIR)/'
++	cp report.txt '$(DOC_INSTALL_DIR)/'
++	cp demo/* '$(EXAMPLES_INSTALL_DIR)/'
+ 	$(MAKE) -C util  install-core
+ 	$(MAKE) -C catalogs install
+ 	$(MAKE) -C libkd install
+diff -wurN astrometry.net-0.52/util/makefile.common astrometry.net-0.52.fix-paths/util/makefile.common
+--- astrometry.net-0.52/util/makefile.common	2015-03-06 21:26:45.000000000 +0100
++++ astrometry.net-0.52.fix-paths/util/makefile.common	2015-03-11 19:16:37.893728999 +0100
+@@ -22,16 +22,6 @@
+ # Put INSTALL_DIR in the environment of commands run by Make.
+ export INSTALL_DIR
+ 
+-# Installation subdirs
+-
+-PY_BASE_INSTALL_DIR := $(INSTALL_DIR)/lib/python/astrometry
+-INCLUDE_INSTALL_DIR := $(INSTALL_DIR)/include/astrometry
+-LIB_INSTALL_DIR := $(INSTALL_DIR)/lib
+-BIN_INSTALL_DIR := $(INSTALL_DIR)/bin
+-DATA_INSTALL_DIR := $(INSTALL_DIR)/data
+-PY_BASE_LINK_DIR := ../lib/python/astrometry
+-ETC_INSTALL_DIR ?= $(INSTALL_DIR)/etc
+-
+ # If your build system stages an install in one place (say, a temp
+ # dir) and then copies everything to the final install place, (eg,
+ # debian), set *_INSTALL_DIR to the staging place and *_FINAL_DIR to
diff --git a/sci-astronomy/astrometry/files/0.52-respect-user-flags.patch b/sci-astronomy/astrometry/files/0.52-respect-user-flags.patch
new file mode 100644
index 0000000..6902310
--- /dev/null
+++ b/sci-astronomy/astrometry/files/0.52-respect-user-flags.patch
@@ -0,0 +1,12 @@
+diff -wurN astrometry.net-0.52/util/makefile.common astrometry.net-0.52.optimize/util/makefile.common
+--- astrometry.net-0.52/util/makefile.common	2015-03-06 21:26:45.000000000 +0100
++++ astrometry.net-0.52.optimize/util/makefile.common	2015-03-10 22:41:54.598828875 +0100
+@@ -250,8 +250,6 @@
+ 
+ ifeq ($(OPTIMIZE),yes)
+   # speedy!
+-  FLAGS_DEF += -O3
+-  FLAGS_DEF += -fomit-frame-pointer
+   # turn off asserts:
+   FLAGS_DEF += $(ASSERT)
+ 
diff --git a/sci-astronomy/astrometry/files/0.64-respect-user-flags.patch b/sci-astronomy/astrometry/files/0.64-respect-user-flags.patch
deleted file mode 100644
index ab55cbb..0000000
--- a/sci-astronomy/astrometry/files/0.64-respect-user-flags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- util/makefile.common	2015-10-26 16:32:56.000000000 +0100
-+++ util/makefile.common.new	2015-12-03 20:29:01.368257244 +0100
-@@ -241,9 +228,6 @@
- else
- 
- ifeq ($(OPTIMIZE),yes)
--  # speedy!
--  FLAGS_DEF += -O3
--  FLAGS_DEF += -fomit-frame-pointer
-   # turn off asserts:
-   FLAGS_DEF += $(ASSERT)
-