From 8a6955c12939490dd0d4a8d8d50c49fa1f1b501e Mon Sep 17 00:00:00 2001 From: Ctibor Date: Thu, 3 Dec 2015 20:46:52 +0100 Subject: Bump sci-astronomy/astrometry and patches --- .../cryptsetup-opensc/cryptsetup-opensc-0.1.ebuild | 64 +++++++++++++++ sci-astronomy/astrometry/Manifest | 2 +- sci-astronomy/astrometry/astrometry-0.52-r1.ebuild | 93 ---------------------- sci-astronomy/astrometry/astrometry-0.64.ebuild | 92 +++++++++++++++++++++ .../astrometry/files/0.52-as-needed.patch | 87 -------------------- .../files/0.52-fix_installation_paths.patch | 50 ------------ .../astrometry/files/0.52-respect-user-flags.patch | 12 --- .../astrometry/files/0.64-as-needed.patch | 87 ++++++++++++++++++++ .../astrometry/files/0.64-respect-user-flags.patch | 12 +++ sys-apps/initramfs-tools/Manifest | 1 + .../initramfs-tools/initramfs-tools-0.120.ebuild | 80 +++++++++++++++++++ 11 files changed, 337 insertions(+), 243 deletions(-) create mode 100644 app-crypt/cryptsetup-opensc/cryptsetup-opensc-0.1.ebuild delete mode 100644 sci-astronomy/astrometry/astrometry-0.52-r1.ebuild create mode 100644 sci-astronomy/astrometry/astrometry-0.64.ebuild delete mode 100644 sci-astronomy/astrometry/files/0.52-as-needed.patch delete mode 100644 sci-astronomy/astrometry/files/0.52-fix_installation_paths.patch delete mode 100644 sci-astronomy/astrometry/files/0.52-respect-user-flags.patch create mode 100644 sci-astronomy/astrometry/files/0.64-as-needed.patch create mode 100644 sci-astronomy/astrometry/files/0.64-respect-user-flags.patch create mode 100644 sys-apps/initramfs-tools/Manifest create mode 100644 sys-apps/initramfs-tools/initramfs-tools-0.120.ebuild diff --git a/app-crypt/cryptsetup-opensc/cryptsetup-opensc-0.1.ebuild b/app-crypt/cryptsetup-opensc/cryptsetup-opensc-0.1.ebuild new file mode 100644 index 0000000..c5cebca --- /dev/null +++ b/app-crypt/cryptsetup-opensc/cryptsetup-opensc-0.1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-themes/smooth-themes/smooth-themes-0.5.8-r1.ebuild,v 1.8 2007/07/11 02:54:47 leio Exp $ + +inherit + +DESCRIPTION="A script (and some initrd utils) for using a smartcard with cryptsetup-LUKS" +HOMEPAGE="https://systemausfall.org/mail-archive/?0::240" +SRC_URI="${PN}.tar.gz" + + +KEYWORDS="~x86" +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="" +RESTRICT="fetch" + +RDEPEND="sys-apps/initramfs-tools + dev-libs/opensc" + +DEPEND="${RDEPEND}" + +pkg_nofetch() { + einfo "Please go to $HOMEPAGE and download the cryptsetup-opensc.tar.gz" + einfo "package manually. You may have to rename it, as it is served by a script." +} + +S=$WORKDIR + +src_unpack() { + unpack "${A}" +} + +src_install() { + cd ${S} + for item in *; do + cp -a ${item} ${D}/ + done + + chmod +x ${D}/lib/cryptsetup/scripts/decrypt_opensc \ + ${D}/etc/initramfs-tools/hooks/cryptopensc \ + ${D}/etc/initramfs-tools/scripts/local-top/cryptopensc \ + ${D}/etc/initramfs-tools/scripts/local-bottom/cryptopensc +} + +pkg_postinst() { + einfo "If you wish to use this in a genkernel-made initrd, you will" + einfo "need to modify /usr/share/genkernel/generic/initrd.scripts." + einfo "Specifically, you will need to modify the openLUKS function" + einfo "so that it uses the decrypt_opensc script. The actual change" + einfo "that you need to make is to replace the line that reads" + einfo '"cryptsetup luksOpen ${LUKS_DEVICE} ${LUKS_NAME}" with the lines' + einfo '"/lib/cryptsetup/scripts/decrypt_opensc /boot/YOUR_ENCRYPTED_KEY >/tmp/decrypted_LUKS_key"' + einfo '"cryptsetup luksOpen ${LUKS_DEVICE} ${LUKS_NAME} --key-file /tmp/decrypted_LUKS_key"' + einfo 'You will need to run "DESTDIR=/ /etc/initramfs-tools/hooks/cryptopensc"' + einfo "in order to copy the neccessary executables and libraries" + einfo "to locations that will be included in the initrd" + einfo "It is also recommended that you visit ${HOMEPAGE}" + einfo "for instructions on how to generate (and set up) an encrypted key" + einfo "for use with this package. This is EXPERIMENTAL, use the" + einfo "--kernname=smartcard option for genkernel, or otherwise preserve" + einfo "your previous initrd. Also back up the initrd.scripts file" + einfo "and keep a bootloader entry pointing to your old initrd" + einfo "until you have verified that this actually works." \ No newline at end of file diff --git a/sci-astronomy/astrometry/Manifest b/sci-astronomy/astrometry/Manifest index f6ad543..8f93369 100644 --- a/sci-astronomy/astrometry/Manifest +++ b/sci-astronomy/astrometry/Manifest @@ -1 +1 @@ -DIST astrometry.net-0.52.tar.bz2 10445354 SHA256 4ec29e7b62a21cacfb648a450651486968091258dd784d2383284cb71a3f0948 SHA512 a86a71ae124a202cc23209a138ba430b12372b4f9665d0fe5bf319660c6aad6340c2e5dd2dd6d6ed2039c2b543d7dbf23e2d973dbc61500652faf46b625d23e4 WHIRLPOOL 8864492ae18653c9ea5fa11cbae1707fc4f575c312235961fdaffea899b85788dee704bd7752e8c4e2ea4a26534147a9a941bb8cb36b50850638a5d1c1ee83d8 +DIST astrometry.net-0.64.tar.gz 10933852 SHA256 4b9b8e9d7133a7bcc1f85298cf5762699dce70548be0cb91165286fc6677136d SHA512 b9c42c84020f970c4bfb503486adfdafe679d1cf7bec6f1ada8416de4c951e316a0cdb07501642259a02c7d3feefba3819551482888ff9891fb47dee6febd304 WHIRLPOOL 3f3879b91b9878b67ca3b414d086f0c025c10fddfd838dbcf719374ab5ec87e1d9291ca122e0d6c5bf339e52a30e1ac1bc56e98da46016b889d4be90d5deb073 diff --git a/sci-astronomy/astrometry/astrometry-0.52-r1.ebuild b/sci-astronomy/astrometry/astrometry-0.52-r1.ebuild deleted file mode 100644 index 92d1cc4..0000000 --- a/sci-astronomy/astrometry/astrometry-0.52-r1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -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.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="examples extra python" - -RDEPEND=" - dev-python/numpy[${PYTHON_USEDEP}] - sci-astronomy/wcslib - sci-libs/cfitsio - sci-libs/gsl - sys-libs/zlib - virtual/pyfits[${PYTHON_USEDEP}] - 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}" - -src_prepare() { - 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 - sed "s|python -c|${EPYTHON} -c|" "${S}"/blind/Makefile -i || die - sed "s|python -V|${EPYTHON} -V|" "${S}"/Makefile -i || die -} - -src_compile() { - emake \ - CC=$(tc-getCC) \ - RANLIB=$(tc-getRANLIB) \ - AR=$(tc-getAR) \ - all report.txt - if use extra; then - emake \ - CC=$(tc-getCC) \ - RANLIB=$(tc-getRANLIB) \ - AR=$(tc-getAR) \ - extra - fi - - if use python; then - emake \ - CC=$(tc-getCC) \ - RANLIB=$(tc-getRANLIB) \ - AR=$(tc-getAR) \ - py - fi -} - -src_install() { - export INSTALL_DIR="${ED}"/usr - export DATA_INSTALL_DIR="${INSTALL_DIR}"/share/"${PN}"/data - export BIN_INSTALL_DIR="${INSTALL_DIR}"/bin - export INCLUDE_INSTALL_DIR="${INSTALL_DIR}"/include/"${PN}" - export LIB_INSTALL_DIR="${INSTALL_DIR}"/lib - python_export python2.7 - export PY_BASE_INSTALL_DIR="${LIB_INSTALL_DIR}"/"${EPYTHON}"/"${PN}" - export PY_BASE_LINK_DIR=../lib/"${EPYTHON}"/"${PN}" - export ETC_INSTALL_DIR="${INSTALL_DIR}"/share/"${PN}"/etc - export DOC_INSTALL_DIR="${INSTALL_DIR}"/share/doc/"${PF}" - export UPS_INSTALL_DIR="${DOC_INSTALL_DIR}"/ups - export EXAMPLES_INSTALL_DIR="${DOC_INSTALL_DIR}"/examples - - emake install-core - use extra && emake -C blind install-extra - - # remove cfitsio duplicates - rm ${INSTALL_DIR}/bin/{fitscopy,imcopy,listhead} || die -} \ No newline at end of file diff --git a/sci-astronomy/astrometry/astrometry-0.64.ebuild b/sci-astronomy/astrometry/astrometry-0.64.ebuild new file mode 100644 index 0000000..c39537c --- /dev/null +++ b/sci-astronomy/astrometry/astrometry-0.64.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $id$ + +EAPI=5 + +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="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="examples extra python" + +RDEPEND=" + dev-python/numpy[${PYTHON_USEDEP}] + sci-astronomy/wcslib + sci-libs/cfitsio + sci-libs/gsl + sys-libs/zlib + virtual/pyfits[${PYTHON_USEDEP}] + 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}" + +src_prepare() { + epatch "${FILESDIR}"/0.64-as-needed.patch + epatch "${FILESDIR}"/0.64-respect-user-flags.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 + sed "s|python -c|${EPYTHON} -c|" "${S}"/blind/Makefile -i || die + sed "s|python -V|${EPYTHON} -V|" "${S}"/Makefile -i || die +} + +src_compile() { + emake \ + CC=$(tc-getCC) \ + RANLIB=$(tc-getRANLIB) \ + AR=$(tc-getAR) \ + all report.txt + if use extra; then + emake \ + CC=$(tc-getCC) \ + RANLIB=$(tc-getRANLIB) \ + AR=$(tc-getAR) \ + extra + fi + + if use python; then + emake \ + CC=$(tc-getCC) \ + RANLIB=$(tc-getRANLIB) \ + AR=$(tc-getAR) \ + py + fi +} + +src_install() { + export INSTALL_DIR="${ED}"/usr + export DATA_INSTALL_DIR="${INSTALL_DIR}"/share/"${PN}"/data + export BIN_INSTALL_DIR="${INSTALL_DIR}"/bin + export INCLUDE_INSTALL_DIR="${INSTALL_DIR}"/include/"${PN}" + export LIB_INSTALL_DIR="${INSTALL_DIR}"/lib + python_export python2.7 + export PY_BASE_INSTALL_DIR="${LIB_INSTALL_DIR}"/"${EPYTHON}"/"${PN}" + export PY_BASE_LINK_DIR=../lib/"${EPYTHON}"/"${PN}" + export ETC_INSTALL_DIR="${INSTALL_DIR}"/share/"${PN}"/etc + export DOC_INSTALL_DIR="${INSTALL_DIR}"/share/doc/"${PF}" + export UPS_INSTALL_DIR="${DOC_INSTALL_DIR}"/ups + export EXAMPLES_INSTALL_DIR="${DOC_INSTALL_DIR}"/examples + + emake install-core + use extra && emake -C blind install-extra + + # remove cfitsio duplicates + rm ${INSTALL_DIR}/bin/{fitscopy,imcopy,listhead} || die +} \ No newline at end of file diff --git a/sci-astronomy/astrometry/files/0.52-as-needed.patch b/sci-astronomy/astrometry/files/0.52-as-needed.patch deleted file mode 100644 index 0d619cf..0000000 --- a/sci-astronomy/astrometry/files/0.52-as-needed.patch +++ /dev/null @@ -1,87 +0,0 @@ -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 $@ - ALL_OBJ += an-pnmtofits.o - - _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 \ -- $(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 && \ - echo "#define NEED_CANONICALIZE_FILE_NAME 0") \ - || echo "#define NEED_CANONICALIZE_FILE_NAME 1") >> $@.tmp - @echo - @echo "Testing declare qsort_r..." - @echo "Testing declare qsort_r..." >> os-features.log -- (($(CC) -o os-features-test-declare-qsort \ -- $(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 && \ - echo "#define NEED_DECLARE_QSORT_R 1") \ - || echo "#define NEED_DECLARE_QSORT_R 0") >> $@.tmp - @echo - @echo "Testing qsort_r..." - @echo "Testing qsort_r..." >> os-features.log -- (($(CC) -o os-features-test-qsort \ -- $(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 && \ - echo "#define NEED_QSORT_R 0") \ - || echo "#define NEED_QSORT_R 1") >> $@.tmp - @echo - @echo "Testing swap qsort_r..." - @echo "Testing swap qsort_r..." >> os-features.log -- (($(CC) -Werror -o os-features-test-swap-qsort \ -- $(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 -@@ -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 \ -- $(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 -@@ -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 \ -- $(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 -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) -- $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(ALL_TEST_EXTRA_LDFLAGS) $(LDLIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(ALL_TEST_EXTRA_LDFLAGS) $(LDLIBS) -o $@ - - $(ALL_TEST_FILES_O) $(ALL_TEST_FILES_MAIN_O) test.o: %.o: %.c - $(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 deleted file mode 100644 index 088dd46..0000000 --- a/sci-astronomy/astrometry/files/0.52-fix_installation_paths.patch +++ /dev/null @@ -1,50 +0,0 @@ -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 deleted file mode 100644 index 6902310..0000000 --- a/sci-astronomy/astrometry/files/0.52-respect-user-flags.patch +++ /dev/null @@ -1,12 +0,0 @@ -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-as-needed.patch b/sci-astronomy/astrometry/files/0.64-as-needed.patch new file mode 100644 index 0000000..5352939 --- /dev/null +++ b/sci-astronomy/astrometry/files/0.64-as-needed.patch @@ -0,0 +1,87 @@ +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 @@ + DEP_OBJ += $(addsuffix .o,$(PROGS)) + + an-pnmtofits: an-pnmtofits.o $(ANFILES_SLIB) +- $(CC) -o $@ $(LDFLAGS) $^ $(NETPBM_LIB) $(LDLIBS) ++ $(CC) $(LDFLAGS) $^ $(NETPBM_LIB) $(LDLIBS) -o $@ + ALL_OBJ += an-pnmtofits.o + + wcs-pv2sip: wcs-pv2sip.o $(ANUTILS_SLIB) +@@ -253,32 +253,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 && \ ++ (($(CC) $(LDFLAGS) \ ++ $(CFLAGS) -DTEST_CANONICALIZE_FILE_NAME $^ -o os-features-test-canonicalize >> os-features.log && \ + ./os-features-test-canonicalize >> os-features.log && \ + echo "#define NEED_CANONICALIZE_FILE_NAME 0") \ + || echo "#define NEED_CANONICALIZE_FILE_NAME 1") >> $@.tmp + @echo + @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 && \ ++ (($(CC) $(LDFLAGS) \ ++ $(CFLAGS) -DTEST_DECLARE_QSORT_R $^ -o os-features-test-declare-qsort >> os-features.log && \ + ./os-features-test-declare-qsort >> os-features.log && \ + echo "#define NEED_DECLARE_QSORT_R 1") \ + || echo "#define NEED_DECLARE_QSORT_R 0") >> $@.tmp + @echo + @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 && \ ++ (($(CC) $(LDFLAGS) \ ++ $(CFLAGS) -DTEST_QSORT_R $^ -o os-features-test-qsort >> os-features.log && \ + ./os-features-test-qsort >> os-features.log && \ + echo "#define NEED_QSORT_R 0") \ + || echo "#define NEED_QSORT_R 1") >> $@.tmp + @echo + @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 && \ ++ (($(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 @@ + @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 && \ ++ (($(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)" + ( \ + 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) $^ -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 @@ + $(AN_SHELL) $(MAKE_TESTS) $(TEST_SOURCES) > $@ + + test: test.o $(COMMON)/cutest.o $(ALL_TEST_FILES_O) $(sort $(ALL_TEST_EXTRA_OBJS)) $(ALL_TEST_LIBS) +- $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(ALL_TEST_EXTRA_LDFLAGS) $(LDLIBS) ++ $(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) diff --git a/sci-astronomy/astrometry/files/0.64-respect-user-flags.patch b/sci-astronomy/astrometry/files/0.64-respect-user-flags.patch new file mode 100644 index 0000000..ab55cbb --- /dev/null +++ b/sci-astronomy/astrometry/files/0.64-respect-user-flags.patch @@ -0,0 +1,12 @@ +--- 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) + diff --git a/sys-apps/initramfs-tools/Manifest b/sys-apps/initramfs-tools/Manifest new file mode 100644 index 0000000..9fec5e4 --- /dev/null +++ b/sys-apps/initramfs-tools/Manifest @@ -0,0 +1 @@ +DIST initramfs-tools_0.120.tar.xz 80328 SHA256 e5bd5a4fa543e9438ad59399d275681c7db0840fed2c531383ad81d5d8b5552f SHA512 99201241c77dece93f49cbd6c3024a6da87d0d62b21ae0bdc97c032fc133991b71fdb5fa65691fd2f089565bc5176bb96ac694df48426ce40c67068d71e5229a WHIRLPOOL 7a789ba3d37c49bdefb6e7ff1df789a21a6013e3a28d625767fa78cf7cdf0f95ede29e42d4fd4f2c8d153a25d0c01f00a34a1f95803650814cd980b32dcea86b diff --git a/sys-apps/initramfs-tools/initramfs-tools-0.120.ebuild b/sys-apps/initramfs-tools/initramfs-tools-0.120.ebuild new file mode 100644 index 0000000..97d7cef --- /dev/null +++ b/sys-apps/initramfs-tools/initramfs-tools-0.120.ebuild @@ -0,0 +1,80 @@ + +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-2.22.1.ebuild,v 1.5 2007/08/17 01:26:44 vapier Exp $ + +inherit eutils flag-o-matic + +DESCRIPTION="A set of tools for creating initramfs images from Debian" +HOMEPAGE="http://packages.debian.org/unstable/utils/${PN}" +SRC_URI="mirror://debian/pool/main/i/${PN}/${PN}_${PV}.tar.xz" + +LICENSE="GPL-2 BSD" +SLOT="0" +KEYWORDS="~x86" +IUSE="" + +RDEPEND="app-arch/cpio + >=dev-libs/klibc-1.4 + >=sys-apps/busybox-1.1 + sys-apps/module-init-tools + >=sys-fs/udev-100" + +DEPEND="${RDEPEND}" + +src_unpack() { + unpack ${A} + S="${WORKDIR}/${PN}" + cd "${S}" +} + +src_install() { + S="${WORKDIR}/${PN}" + cd ${S} + + dodir /usr/share/initramfs-tools/modules.d + dodir /var/lib/initramfs-tools + dodir /etc/initramfs-tools + dodir /etc/initramfs-tools/conf.d + dodir /etc/initramfs-tools/hooks + dodir /etc/initramfs-tools/scripts + dodir /etc/initramfs-tools/scripts/init-bottom + dodir /etc/initramfs-tools/scripts/init-premount + dodir /etc/initramfs-tools/scripts/init-top + dodir /etc/initramfs-tools/scripts/local-bottom + dodir /etc/initramfs-tools/scripts/local-premount + dodir /etc/initramfs-tools/scripts/local-top + dodir /etc/initramfs-tools/scripts/nfs-bottom + dodir /etc/initramfs-tools/scripts/nfs-premount + dodir /etc/initramfs-tools/scripts/nfs-top + + insinto /etc/initramfs-tools/ + newins conf/initramfs.conf initramfs.conf + newins conf/update-initramfs.conf update-initramfs.conf + newins conf/modules modules + + exeinto /usr/share/bug/initramfs-tools + newexe debian/script script + + insinto /usr/share/initramfs-tools + newins conf/modules modules + doins hooks + doins scripts + + exeinto /usr/share/initramfs-tools + doexe hook-functions + doexe init + + insinto /usr/share/initramfs-tools/examples + newins conf/modules modules + + exeinto /usr/share/initramfs-tools/examples + newexe docs/example_script example_script + newexe docs/example_hook example_hook + newexe docs/example_hook_cpiogz example_hook_cpiogz + + into /usr + dosbin mkinitramfs mkinitramfs-kpkg update-initramfs + dodoc HACKING + doman mkinitramfs.8 mkinitramfs-kpkg.8 initramfs.conf.5 initramfs-tools.8 update-initramfs.8 update-initramfs.conf.5 +} \ No newline at end of file -- cgit v1.2.3