1 |
commit: b6e954e30d906676f203c02b983e4367dd602209 |
2 |
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 1 15:05:00 2022 +0000 |
4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 1 15:05:29 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6e954e3 |
7 |
|
8 |
sci-astronomy/xephem: add version 4.1.0 |
9 |
|
10 |
This version adds ssl support |
11 |
|
12 |
Closes: https://bugs.gentoo.org/776166 |
13 |
Closes: https://bugs.gentoo.org/774933 |
14 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
15 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> |
16 |
|
17 |
sci-astronomy/xephem/Manifest | 1 + |
18 |
.../files/xephem-4.1.0-respect_env_vars.patch | 128 +++++++++++++++++++++ |
19 |
sci-astronomy/xephem/xephem-4.1.0.ebuild | 58 ++++++++++ |
20 |
3 files changed, 187 insertions(+) |
21 |
|
22 |
diff --git a/sci-astronomy/xephem/Manifest b/sci-astronomy/xephem/Manifest |
23 |
index 05ea2af9342a..09e25047eca9 100644 |
24 |
--- a/sci-astronomy/xephem/Manifest |
25 |
+++ b/sci-astronomy/xephem/Manifest |
26 |
@@ -1 +1,2 @@ |
27 |
DIST xephem-3.7.7.tgz 18128521 BLAKE2B a7d0ee2cf1be64f79ed0c5cea6d37e48c69875de5b3c9592554ee8be25b369e964c7a6bb05690ef28893b7af8277daf39ba85538f56852f35538180f9ad0c2ba SHA512 0a21f783a0a543f19a527afb87647ff2e988c6a426a37e01b9a3d1d76a9ee74125ce802e2dbc5e13034f11ef897e6188cb5b0bb92bc0d35db0fb8839e0c53157 |
28 |
+DIST xephem-4.1.0.tar.gz 17213750 BLAKE2B 921aa4b305cb80df5746db962739d16ee23f1831b59934389ecd218b874ba1fc51aab07896d1283760db1a50be6279da50ed112320fc481f90b4f2d6e25c96dc SHA512 bcad3a6b375cabf1f44e39bc99386552d97a7e7d2ee4063dae4ccd3d5842604f0efc3407447f18a5c9e7f265bab6eebe98bdb64626dcf2135b56f346818ef1b6 |
29 |
|
30 |
diff --git a/sci-astronomy/xephem/files/xephem-4.1.0-respect_env_vars.patch b/sci-astronomy/xephem/files/xephem-4.1.0-respect_env_vars.patch |
31 |
new file mode 100644 |
32 |
index 000000000000..0f08e4380c30 |
33 |
--- /dev/null |
34 |
+++ b/sci-astronomy/xephem/files/xephem-4.1.0-respect_env_vars.patch |
35 |
@@ -0,0 +1,128 @@ |
36 |
+diff --git a/GUI/xephem/Makefile b/GUI/xephem/Makefile |
37 |
+index dd653c7..32966ee 100644 |
38 |
+--- a/GUI/xephem/Makefile |
39 |
++++ b/GUI/xephem/Makefile |
40 |
+@@ -9,9 +9,9 @@ |
41 |
+ # one executable, xephem. |
42 |
+ |
43 |
+ # These -I and -L flags point to the supporting XEphem libraries |
44 |
+-LIBINC = -I../../libastro -I../../libip -I../../liblilxml -I../../libjpegd -I../../libpng -I../../libz |
45 |
+-LIBLNK = -L../../libastro -L../../libip -L../../liblilxml -L../../libjpegd -L../../libpng -L../../libz |
46 |
+-LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz |
47 |
++LIBINC = -I../../libastro -I../libastro -I../../libip -I../libip -I../../liblilxml -I../liblilxml |
48 |
++LIBLNK = -L../../libastro -L../libastro -L../../libip -L../libip -L../../liblilxml -L../liblilxml |
49 |
++LIBLIB = -lastro -lip -llilxml -ljpeg -lpng -lz |
50 |
+ |
51 |
+ # MOTIFI is the directory containing the Xm directory of include files. |
52 |
+ # MOTIFL is the directory containing the libXm.a library. |
53 |
+@@ -29,12 +29,9 @@ MOTIFL = /usr/lib |
54 |
+ endif |
55 |
+ |
56 |
+ # for linux and Apple OS X |
57 |
+-CC = gcc |
58 |
+-CLDFLAGS = -g |
59 |
+-CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/opt/X11/include |
60 |
+-LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/opt/X11/lib |
61 |
+ XLIBS = -lXm -lXt -lXext -lXmu -lX11 |
62 |
+-LIBS = $(XLIBS) $(LIBLIB) -lm -lssl |
63 |
++CFLAGS := $(LIBINC) $(CFLAGS) |
64 |
++LIBS = $(LIBLNK) $(XLIBS) $(LIBLIB) -lm -lssl |
65 |
+ |
66 |
+ # static linking on Apple using X11 libs from ports |
67 |
+ # CC = gcc |
68 |
+@@ -194,12 +191,9 @@ xephem.1: xephem.man |
69 |
+ nroff -man $? > $@ |
70 |
+ |
71 |
+ libs: |
72 |
+- cd ../../libastro; make |
73 |
+- cd ../../libip; make |
74 |
+- cd ../../libjpegd; make |
75 |
+- cd ../../liblilxml; make |
76 |
+- cd ../../libpng; make |
77 |
+- cd ../../libz; make |
78 |
++ $(MAKE) -C ../../libastro |
79 |
++ $(MAKE) -C ../../libip |
80 |
++ $(MAKE) -C ../../liblilxml |
81 |
+ |
82 |
+ clean: |
83 |
+ rm -fr *.o ../../lib*/*.[ao] |
84 |
+diff --git a/libastro/Makefile b/libastro/Makefile |
85 |
+index 0a8ecb6..a640c95 100644 |
86 |
+--- a/libastro/Makefile |
87 |
++++ b/libastro/Makefile |
88 |
+@@ -4,8 +4,6 @@ |
89 |
+ # compiler and flags |
90 |
+ |
91 |
+ # gcc |
92 |
+-CC = gcc |
93 |
+-CFLAGS= -O2 -Wall |
94 |
+ |
95 |
+ # macosx universal binary |
96 |
+ # CFLAGS= -O2 -Wall -arch i386 -arch ppc |
97 |
+@@ -83,11 +81,11 @@ OBJS = \ |
98 |
+ vsop87_data.o |
99 |
+ |
100 |
+ libastro.a: $(HS) $(OBJS) |
101 |
+- ar rv $@ $(OBJS) |
102 |
+- ranlib $@ |
103 |
++ $(AR) rv $@ $(OBJS) |
104 |
++ $(RANLIB) $@ |
105 |
+ |
106 |
+ libastro.so: $(HS) $(OBJS) |
107 |
+- $(CC) -shared -o $@ $(OBJS) |
108 |
++ $(CC) $(LDFLAGS) -shared -o $@ $(OBJS) |
109 |
+ |
110 |
+ clobber: |
111 |
+ rm -f *.o libastro.a |
112 |
+diff --git a/libip/Makefile b/libip/Makefile |
113 |
+index 5c36ac8..f093d6f 100644 |
114 |
+--- a/libip/Makefile |
115 |
++++ b/libip/Makefile |
116 |
+@@ -2,8 +2,6 @@ |
117 |
+ # (C) 2001 Elwood Charles Downey |
118 |
+ |
119 |
+ # gcc |
120 |
+-CC = gcc |
121 |
+-CFLAGS= -I../libastro -O2 -Wall |
122 |
+ |
123 |
+ # macosx universal binary |
124 |
+ # CFLAGS= -I../libastro -O2 -Wall -arch i386 -arch ppc |
125 |
+@@ -36,11 +34,11 @@ OBJS = \ |
126 |
+ HS = ip.h fsmatch.h |
127 |
+ |
128 |
+ libip.a: $(HS) $(OBJS) |
129 |
+- ar rv $@ $(OBJS) |
130 |
+- ranlib $@ |
131 |
++ $(AR) rv $@ $(OBJS) |
132 |
++ $(RANLIB) $@ |
133 |
+ |
134 |
+ libip.so: $(OBJS) |
135 |
+- gcc -shared -o $@ $(OBJS) |
136 |
++ $(CC) $(LDFLAGS) -shared -o $@ $(OBJS) |
137 |
+ |
138 |
+ clobber: |
139 |
+ rm -f *.o libip.a |
140 |
+diff --git a/liblilxml/Makefile b/liblilxml/Makefile |
141 |
+index 2e73761..c75651b 100644 |
142 |
+--- a/liblilxml/Makefile |
143 |
++++ b/liblilxml/Makefile |
144 |
+@@ -4,8 +4,6 @@ |
145 |
+ # compiler and flags |
146 |
+ |
147 |
+ # gcc |
148 |
+-CC = gcc |
149 |
+-CFLAGS= -O2 -Wall |
150 |
+ |
151 |
+ # macosx universal binary |
152 |
+ # CFLAGS= -O2 -Wall -arch i386 -arch ppc |
153 |
+@@ -27,8 +25,8 @@ HS = lilxml.h |
154 |
+ OBJS = lilxml.o base64.o |
155 |
+ |
156 |
+ liblilxml.a: $(HS) $(OBJS) |
157 |
+- ar r $@ $(OBJS) |
158 |
+- ranlib $@ |
159 |
++ $(AR) r $@ $(OBJS) |
160 |
++ $(RANLIB) $@ |
161 |
+ |
162 |
+ liltest: liltest.o liblilxml.a |
163 |
+ $(CC) $(LDFLAGS) -o liltest liltest.o liblilxml.a |
164 |
|
165 |
diff --git a/sci-astronomy/xephem/xephem-4.1.0.ebuild b/sci-astronomy/xephem/xephem-4.1.0.ebuild |
166 |
new file mode 100644 |
167 |
index 000000000000..93bd0f5554d6 |
168 |
--- /dev/null |
169 |
+++ b/sci-astronomy/xephem/xephem-4.1.0.ebuild |
170 |
@@ -0,0 +1,58 @@ |
171 |
+# Copyright 1999-2022 Gentoo Authors |
172 |
+# Distributed under the terms of the GNU General Public License v2 |
173 |
+ |
174 |
+EAPI=8 |
175 |
+ |
176 |
+inherit desktop toolchain-funcs |
177 |
+ |
178 |
+DESCRIPTION="Interactive tool for astronomical ephemeris and sky simulation" |
179 |
+HOMEPAGE="https://xephem.github.io/XEphem/Site/xephem.html" |
180 |
+SRC_URI="https://github.com/XEphem/XEphem/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" |
181 |
+S="${WORKDIR}/XEphem-${PV}" |
182 |
+ |
183 |
+LICENSE="MIT" |
184 |
+SLOT=0 |
185 |
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
186 |
+ |
187 |
+RDEPEND=" |
188 |
+ dev-libs/openssl:= |
189 |
+ >=x11-libs/motif-2.3:0 |
190 |
+ virtual/jpeg:0 |
191 |
+ media-libs/libpng:0= |
192 |
+ x11-libs/libXext |
193 |
+ x11-libs/libXmu |
194 |
+ x11-libs/libXt |
195 |
+" |
196 |
+DEPEND="${RDEPEND}" |
197 |
+BDEPEND="sys-apps/groff" |
198 |
+ |
199 |
+HTML_DOCS=( GUI/xephem/help/. ) |
200 |
+ |
201 |
+PATCHES=( |
202 |
+ "${FILESDIR}/${PN}-3.7.7-implicits.patch" |
203 |
+ "${FILESDIR}/${P}-respect_env_vars.patch" |
204 |
+) |
205 |
+ |
206 |
+src_compile() { |
207 |
+ tc-export CC AR RANLIB |
208 |
+ emake -C GUI/xephem |
209 |
+} |
210 |
+ |
211 |
+src_install() { |
212 |
+ insinto /usr/share/X11/app-defaults |
213 |
+ newins - XEphem <<-EOF |
214 |
+ XEphem.ShareDir: /usr/share/${PN} |
215 |
+ EOF |
216 |
+ newenvd - 99xephem <<-EOF |
217 |
+ XEHELPURL=/usr/share/doc/${PF}/html/xephem.html |
218 |
+ EOF |
219 |
+ einstalldocs |
220 |
+ |
221 |
+ cd GUI/xephem || die |
222 |
+ dobin xephem |
223 |
+ doman xephem.1 |
224 |
+ newicon XEphem.png ${PN}.png |
225 |
+ insinto /usr/share/${PN} |
226 |
+ doins -r auxil catalogs fifos fits gallery lo |
227 |
+ make_desktop_entry xephem XEphem ${PN} |
228 |
+} |