| 1 |
commit: 878c84ae5cb567acaf8a04821436e57bbba59512 |
| 2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 26 18:12:46 2016 +0000 |
| 4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 27 03:14:25 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=878c84ae |
| 7 |
|
| 8 |
sci-astronomy/cdsclient: Version bump and cleanup |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.27 |
| 11 |
|
| 12 |
sci-astronomy/cdsclient/Manifest | 2 +- |
| 13 |
...sclient-3.7.2.ebuild => cdsclient-3.8.1.ebuild} | 9 ++--- |
| 14 |
.../cdsclient/files/cdsclient-makefile.patch | 40 ++++++++++++---------- |
| 15 |
3 files changed, 28 insertions(+), 23 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-astronomy/cdsclient/Manifest b/sci-astronomy/cdsclient/Manifest |
| 18 |
index 5eff80f..33ac348 100644 |
| 19 |
--- a/sci-astronomy/cdsclient/Manifest |
| 20 |
+++ b/sci-astronomy/cdsclient/Manifest |
| 21 |
@@ -1 +1 @@ |
| 22 |
-DIST cdsclient-3.72.tar.gz 99642 SHA256 517bb13a52c528858faac63f4b3a8180998f71d9fc33e0de9d2480aadd935045 SHA512 88d4b35c05b3565e74ad1bb7e593231486580c58901f90d4a7cc5295d11578b30a4e61579aa1125a4879c940104ed3087d9f97fc8170c01342f09f2b720bd32e WHIRLPOOL ee00668a77fc589dd7d4a3f31ddebdab42d6d2e48e25df2bf42f7ceb9a32543f6af2c643ba96db5ed27f25aea2b209551a54b17720476276de9d84c0a270c2e9 |
| 23 |
+DIST cdsclient-3.81.tar.gz 122719 SHA256 d74dca1d450e2c8f187e3d7c4952ac480a8913da799f5522a42ea7d5075e339d SHA512 3fcf7a902dfddb3583ff34eedbcddd6a5641bf9c87d234159090378436ac370313ea311d3fee6e202ee84b3fe4065ef45a46a15b5d996e05afd1418e617c20ea WHIRLPOOL 350a5d3bff06fbe15105b9f60c4d8266dda15974b32f01b19ec8aca05fb1e830298dc9f885088f58d4ddf6685da84579db908a68f15fe7bb64165684a2d8cd58 |
| 24 |
|
| 25 |
diff --git a/sci-astronomy/cdsclient/cdsclient-3.7.2.ebuild b/sci-astronomy/cdsclient/cdsclient-3.8.1.ebuild |
| 26 |
similarity index 84% |
| 27 |
rename from sci-astronomy/cdsclient/cdsclient-3.7.2.ebuild |
| 28 |
rename to sci-astronomy/cdsclient/cdsclient-3.8.1.ebuild |
| 29 |
index 9b085f9..1558408 100644 |
| 30 |
--- a/sci-astronomy/cdsclient/cdsclient-3.7.2.ebuild |
| 31 |
+++ b/sci-astronomy/cdsclient/cdsclient-3.8.1.ebuild |
| 32 |
@@ -1,8 +1,8 @@ |
| 33 |
-# Copyright 1999-2013 Gentoo Foundation |
| 34 |
+# Copyright 1999-2016 Gentoo Foundation |
| 35 |
# Distributed under the terms of the GNU General Public License v2 |
| 36 |
# $Id$ |
| 37 |
|
| 38 |
-EAPI=5 |
| 39 |
+EAPI=6 |
| 40 |
|
| 41 |
inherit eutils versionator |
| 42 |
|
| 43 |
@@ -24,10 +24,11 @@ RDEPEND="app-shells/tcsh" |
| 44 |
|
| 45 |
S="${WORKDIR}/${MYP}" |
| 46 |
|
| 47 |
+PATCHES=( "${FILESDIR}/${PN}-makefile.patch" ) |
| 48 |
src_prepare() { |
| 49 |
- epatch "${FILESDIR}"/${PN}-makefile.patch |
| 50 |
+ default |
| 51 |
# remove non standard "mantex" page |
| 52 |
- sed -i -e 's/aclient.tex//' configure || die |
| 53 |
+ sed -e 's/aclient.tex//' -i configure || die |
| 54 |
} |
| 55 |
|
| 56 |
src_install() { |
| 57 |
|
| 58 |
diff --git a/sci-astronomy/cdsclient/files/cdsclient-makefile.patch b/sci-astronomy/cdsclient/files/cdsclient-makefile.patch |
| 59 |
index 3f5e5fe..6d135a6 100644 |
| 60 |
--- a/sci-astronomy/cdsclient/files/cdsclient-makefile.patch |
| 61 |
+++ b/sci-astronomy/cdsclient/files/cdsclient-makefile.patch |
| 62 |
@@ -1,6 +1,6 @@ |
| 63 |
---- Makefile.in.orig 2013-07-08 09:45:42.667070273 -0700 |
| 64 |
-+++ Makefile.in 2013-07-08 09:46:43.928417641 -0700 |
| 65 |
-@@ -29,17 +29,17 @@ |
| 66 |
+--- cdsclient-3.81/Makefile.in.orig 2016-02-26 17:33:14.217750589 +0000 |
| 67 |
++++ cdsclient-3.81/Makefile.in 2016-02-26 17:38:22.463875411 +0000 |
| 68 |
+@@ -31,17 +31,17 @@ |
| 69 |
################################################################# |
| 70 |
#PREFIX = /usr/local |
| 71 |
#PREFIX = $(HOME) |
| 72 |
@@ -21,7 +21,13 @@ |
| 73 |
########### |
| 74 |
# NOTE: The definition below is required only on SOLARIS |
| 75 |
# Comment the following line if required |
| 76 |
-@@ -60,7 +60,7 @@ |
| 77 |
+@@ -57,12 +57,13 @@ |
| 78 |
+ COPY = cp -p |
| 79 |
+ RM = rm |
| 80 |
+ AWK = @AWK@ |
| 81 |
++MKDIR = mkdir -p |
| 82 |
+ |
| 83 |
+ # C options -------------------------------- |
| 84 |
DEBUG = |
| 85 |
C_OPT = -O |
| 86 |
SYS = |
| 87 |
@@ -30,7 +36,7 @@ |
| 88 |
|
| 89 |
# FILES -------------------------------- |
| 90 |
VERFILE = $(PREFIX)/versions |
| 91 |
-@@ -98,7 +98,7 @@ |
| 92 |
+@@ -102,7 +103,7 @@ |
| 93 |
# RULES -------------------------------- |
| 94 |
.SUFFIXES: .o .c |
| 95 |
.c.o: |
| 96 |
@@ -39,20 +45,18 @@ |
| 97 |
|
| 98 |
# DEPENDENCIES -------------------------------- |
| 99 |
|
| 100 |
-@@ -117,41 +117,41 @@ |
| 101 |
+@@ -121,41 +122,39 @@ |
| 102 |
# rm -f $$f; ln finducac2 $$f; done |
| 103 |
|
| 104 |
aclient: aclient.o $(OBJ) |
| 105 |
- $(CC) $@.o $(OBJ) $(LIBSYS) -o $@ |
| 106 |
- $(STRIP) $@ |
| 107 |
+ $(CC) $(LDFLAGS) $@.o $(OBJ) $(LIBSYS) -o $@ |
| 108 |
-+ |
| 109 |
|
| 110 |
wwwget: wwwget.c |
| 111 |
- $(CC) wwwget.c $(LIBSYS) -o $@ |
| 112 |
- $(STRIP) $@ |
| 113 |
+ $(CC) $(CFLAGS) $(LDFLAGS) wwwget.c $(LIBSYS) -o $@ |
| 114 |
-+ |
| 115 |
|
| 116 |
doc: sk.tex man.tex aclient.tex |
| 117 |
latex man.tex |
| 118 |
@@ -66,37 +70,37 @@ |
| 119 |
install_man: $(MAN) |
| 120 |
if [ -d $(MANDIR) ]; then echo $(MANDIR) exists; \ |
| 121 |
- else mkdir $(MANDIR); fi |
| 122 |
-+ else mkdir -p $(MANDIR); fi |
| 123 |
++ else $(MKDIR) $(MANDIR); fi |
| 124 |
for f in $(MAN); do \ |
| 125 |
e=`echo $$f | cut -d. -f2`; \ |
| 126 |
if [ -d $(MANDIR)/man$$e ] ; then echo $(MANDIR)/man$$e exists ; \ |
| 127 |
- else mkdir $(MANDIR)/man$$e ; fi ; \ |
| 128 |
-+ else mkdir -p $(MANDIR)/man$$e ; fi ; \ |
| 129 |
++ else $(MKDIR) $(MANDIR)/man$$e ; fi ; \ |
| 130 |
$(COPY) $$f $(MANDIR)/man$$e ; \ |
| 131 |
done |
| 132 |
|
| 133 |
install_h: $(INC) |
| 134 |
- test -d $(INCDIR) || mkdir $(INCDIR) |
| 135 |
-+ test -d $(INCDIR) || mkdir -p $(INCDIR) |
| 136 |
++ test -d $(INCDIR) || $(MKDIR) $(INCDIR) |
| 137 |
$(COPY) $(INC) $(INCDIR) |
| 138 |
|
| 139 |
install_bin: $(BIN) |
| 140 |
- test -d $(BINDIR) || mkdir $(BINDIR) |
| 141 |
-+ test -d $(BINDIR) || mkdir -p $(BINDIR) |
| 142 |
++ test -d $(BINDIR) || $(MKDIR) $(BINDIR) |
| 143 |
$(COPY) $(BIN) $(BINDIR) |
| 144 |
|
| 145 |
install_shs: Makefile |
| 146 |
- test -d $(SHSDIR) || mkdir $(SHSDIR) |
| 147 |
-+ test -d $(SHSDIR) || mkdir -p $(SHSDIR) |
| 148 |
++ test -d $(SHSDIR) || $(MKDIR) $(SHSDIR) |
| 149 |
ractools=""; test -r $(RACatCDS) && ractools=$(RACatCDS)/*; \ |
| 150 |
test -z "$$ractools" || ls -l $$ractools; \ |
| 151 |
cdsutil="$(SHSatCDS)"; test -z "$(atCDS)" && cdsutil=""; \ |
| 152 |
-@@ -189,7 +189,7 @@ |
| 153 |
+@@ -195,7 +194,7 @@ |
| 154 |
$(MAKE) clean |
| 155 |
-test -d /tmp/$(DISTRIB) && rm -rf /tmp/$(DISTRIB) |
| 156 |
autoconf |
| 157 |
- mkdir /tmp/$(DISTRIB) |
| 158 |
-+ mkdir -p /tmp/$(DISTRIB) |
| 159 |
- cp -p $(SHS) Makefile.in configure /tmp/$(DISTRIB) |
| 160 |
- test -z "$(atCDS)" || cp -p $(SHSatCDS) /tmp/$(DISTRIB) |
| 161 |
- |
| 162 |
++ $(MKDIR) /tmp/$(DISTRIB) |
| 163 |
+ cp -p COPYRIGHT /ftp/pub/sw/COPYING /tmp/$(DISTRIB) |
| 164 |
+ for f in $(SHS) Makefile.in configure; do cp -p $$f /tmp/$(DISTRIB); \ |
| 165 |
+ add_license $$f > /tmp/$(DISTRIB)/$$f; done |
Archives