* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/xephem/files/, sci-astronomy/xephem/
@ 2016-02-29 22:16 Sebastien Fabbro
0 siblings, 0 replies; 3+ messages in thread
From: Sebastien Fabbro @ 2016-02-29 22:16 UTC (permalink / raw
To: gentoo-commits
commit: 68cbf0ab6e2d940986c6902d72fab3b57e026c21
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 29 22:27:44 2016 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 23:13:05 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68cbf0ab
sci-astronomy/xephem: Version bump
Thanks Ooblick for his work.
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=572748
Package-Manager: portage-2.2.27
sci-astronomy/xephem/Manifest | 1 +
.../xephem/files/xephem-3.7.7-implicits.patch | 12 ++
.../files/xephem-3.7.7-respect_env_vars.patch | 137 +++++++++++++++++++++
sci-astronomy/xephem/xephem-3.7.7.ebuild | 56 +++++++++
4 files changed, 206 insertions(+)
diff --git a/sci-astronomy/xephem/Manifest b/sci-astronomy/xephem/Manifest
index 5205d30..22e06f8 100644
--- a/sci-astronomy/xephem/Manifest
+++ b/sci-astronomy/xephem/Manifest
@@ -1,2 +1,3 @@
DIST xephem-3.7.5.tar.gz 18908521 SHA256 edda7975bb690f74b1853d2729de2b0f4ada69fb37a08117ace7a22c23ee7d1a SHA512 58cd75e4cf8b541d818631e50453f14275cf81ca3349c442ac62eb7fa15509d3d2d57f88420f866312e41ecfd333c8aeeade7656a84e6e527811f98a26b8588d WHIRLPOOL 6d97bf755cc5e98909aa66c1a0ae942f32dd74541ef6e7c03d7c76214462a10929935a38a5a7c468e28ba315f019d9a0489e345f95ee547238d2250fdc9f8005
DIST xephem-3.7.6.tar.gz 17975496 SHA256 2080b628d80d52d9ff7148787e3093eb56f21fef5fba404f123b6198b2d64d05 SHA512 96d77852045e3d3cb996de5884a9272b2f3157216816acf3ad05a0bc60f20673fccc0f1efd54443cf7c38d0aaa86da1cf3f11989c2e37e26feb0cbd78855c84f WHIRLPOOL 94bba9595863cc30f5a058ea72dc4d4824d62355ce0bfef05c63a741667c064febb26bc4da884d7cc15ee04b74cf402031efbdbae844c458acc1c8cb0ec2a91a
+DIST xephem-3.7.7.tar.gz 18128523 SHA256 d1f8e17cfc5d2e3af5fd5a8bcf34bbf99a79d40f66326c098a819f82af62b4b7 SHA512 d9cfecf0ce8aa495f66fcf6772ca7df0638cef8b9f18d9d6cbf013846a7575786ae9b5c515abc2058783baa7610320c893ddbc6f68bae28c65661a1c73b88634 WHIRLPOOL 1986700ee6207b4a68ea8e5acb3c37f45286b48c5ed392934eb0b9beb2f9e733c2e995fc367da1f4079b7b48d9d92e2e5400658b9ed36cbf3961969f26e6013c
diff --git a/sci-astronomy/xephem/files/xephem-3.7.7-implicits.patch b/sci-astronomy/xephem/files/xephem-3.7.7-implicits.patch
new file mode 100644
index 0000000..4c34071
--- /dev/null
+++ b/sci-astronomy/xephem/files/xephem-3.7.7-implicits.patch
@@ -0,0 +1,12 @@
+sunmenu.c:920:3: warning: implicit declaration of function ‘strptime’
+
+--- a/GUI/xephem/sunmenu.c
++++ b/GUI/xephem/sunmenu.c
+@@ -1,6 +1,7 @@
+ /* code to manage the sun display
+ */
+
++#define _XOPEN_SOURCE /* See feature_test_macros(7) */
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <errno.h>
diff --git a/sci-astronomy/xephem/files/xephem-3.7.7-respect_env_vars.patch b/sci-astronomy/xephem/files/xephem-3.7.7-respect_env_vars.patch
new file mode 100644
index 0000000..e916bd3
--- /dev/null
+++ b/sci-astronomy/xephem/files/xephem-3.7.7-respect_env_vars.patch
@@ -0,0 +1,137 @@
+diff -ruN a/GUI/xephem/Makefile b/GUI/xephem/Makefile
+--- a/GUI/xephem/Makefile 2015-08-09 22:36:50.000000000 +0100
++++ b/GUI/xephem/Makefile 2016-01-24 09:34:24.378578717 +0000
+@@ -10,9 +10,9 @@
+ # one executable, xephem.
+
+ # These -I and -L flags point to the supporting XEphem libraries
+-LIBINC = -I../../libastro -I../../libip -I../../liblilxml -I../../libjpegd -I../../libpng -I../../libz
+-LIBLNK = -L../../libastro -L../../libip -L../../liblilxml -L../../libjpegd -L../../libpng -L../../libz
+-LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz
++LIBINC = -I../../libastro -I../../libip -I../../liblilxml
++LIBLNK = -L../../libastro -L../../libip -L../../liblilxml
++LIBLIB = -lastro -lip -llilxml -ljpeg -lpng -lz
+
+ # MOTIFI is the directory containing the Xm directory of include files.
+ # MOTIFL is the directory containing the libXm.a library.
+@@ -30,12 +30,9 @@
+ endif
+
+ # for linux and Apple OS X
+-CC = gcc
+-CLDFLAGS = -g
+-CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/opt/X11/include
+-LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/opt/X11/lib
+ XLIBS = -lXm -lXp -lXt -lXext -lXmu -lX11
+-LIBS = $(XLIBS) $(LIBLIB) -lm
++CFLAGS := $(LIBINC) $(CFLAGS)
++LIBS = $(LIBLNK) $(XLIBS) $(LIBLIB) -lm
+
+ # static linking on Apple using X11 libs from ports
+ # CC = gcc
+@@ -68,9 +65,9 @@
+ # MOTIFI = -I/usr/include
+ # MOTIFL = -L/usr/lib
+ # CC = cc
+-# CLDFLAGS =
++# CLDFLAGS =
+ # CFLAGS = $(LIBINC) $(CLDFLAGS) -O -I$(MOTIFI)
+-# LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL)
++# LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL)
+ # XLIBS = -lXm -lXt -lX11
+ # LIBS = $(XLIBS) $(LIBLIB) -lsocket -lnsl -lc -lm /usr/ucblib/libucb.a
+ # Note: if you get regex undefined, add -lgen to the end of LIBS.
+@@ -195,12 +192,9 @@
+ nroff -man $? > $@
+
+ libs:
+- cd ../../libastro; make
+- cd ../../libip; make
+- cd ../../libjpegd; make
+- cd ../../liblilxml; make
+- cd ../../libpng; make
+- cd ../../libz; make
++ $(MAKE) -C ../../libastro
++ $(MAKE) -C ../../libip
++ $(MAKE) -C ../../liblilxml
+
+ clean:
+ rm -fr *.o ../../lib*/*.[ao]
+diff -ruN a/libastro/Makefile b/libastro/Makefile
+--- a/libastro/Makefile 2006-02-24 03:37:31.000000000 +0000
++++ b/libastro/Makefile 2016-01-24 09:30:28.745982455 +0000
+@@ -4,8 +4,6 @@
+ # compiler and flags
+
+ # gcc
+-CC = gcc
+-CFLAGS= -O2 -Wall
+
+ # macosx universal binary
+ # CFLAGS= -O2 -Wall -arch i386 -arch ppc
+@@ -83,11 +81,11 @@
+ vsop87_data.o
+
+ libastro.a: $(HS) $(OBJS)
+- ar rv $@ $(OBJS)
+- ranlib $@
++ $(AR) rv $@ $(OBJS)
++ $(RANLIB) $@
+
+ libastro.so: $(HS) $(OBJS)
+- $(CC) -shared -o $@ $(OBJS)
++ $(CC) $(LDFLAGS) -shared -o $@ $(OBJS)
+
+ clobber:
+ rm -f *.o libastro.a
+diff -ruN a/libip/Makefile b/libip/Makefile
+--- a/libip/Makefile 2009-01-05 20:53:46.000000000 +0000
++++ b/libip/Makefile 2016-01-24 09:30:28.745982455 +0000
+@@ -2,8 +2,7 @@
+ # (C) 2001 Elwood Charles Downey
+
+ # gcc
+-CC = gcc
+-CFLAGS= -I../libastro -O2 -Wall
++CFLAGS += -I../libastro
+
+ # macosx universal binary
+ # CFLAGS= -I../libastro -O2 -Wall -arch i386 -arch ppc
+@@ -36,11 +35,11 @@
+ HS = ip.h fsmatch.h
+
+ libip.a: $(HS) $(OBJS)
+- ar rv $@ $(OBJS)
+- ranlib $@
++ $(AR) rv $@ $(OBJS)
++ $(RANLIB) $@
+
+ libip.so: $(OBJS)
+- gcc -shared -o $@ $(OBJS)
++ $(CC) $(LDFLAGS) -shared -o $@ $(OBJS)
+
+ clobber:
+ rm -f *.o libip.a
+diff -ruN a/liblilxml/Makefile b/liblilxml/Makefile
+--- a/liblilxml/Makefile 2006-02-24 03:37:32.000000000 +0000
++++ b/liblilxml/Makefile 2016-01-24 09:30:28.745982455 +0000
+@@ -4,8 +4,6 @@
+ # compiler and flags
+
+ # gcc
+-CC = gcc
+-CFLAGS= -O2 -Wall
+
+ # macosx universal binary
+ # CFLAGS= -O2 -Wall -arch i386 -arch ppc
+@@ -27,8 +25,8 @@
+ OBJS = lilxml.o base64.o
+
+ liblilxml.a: $(HS) $(OBJS)
+- ar r $@ $(OBJS)
+- ranlib $@
++ $(AR) r $@ $(OBJS)
++ $(RANLIB) $@
+
+ liltest: liltest.o liblilxml.a
+ $(CC) $(LDFLAGS) -o liltest liltest.o liblilxml.a
diff --git a/sci-astronomy/xephem/xephem-3.7.7.ebuild b/sci-astronomy/xephem/xephem-3.7.7.ebuild
new file mode 100644
index 0000000..967573d
--- /dev/null
+++ b/sci-astronomy/xephem/xephem-3.7.7.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Interactive tool for astronomical ephemeris and sky simulation"
+HOMEPAGE="http://www.clearskyinstitute.com/xephem"
+SRC_URI="http://97.74.56.125/free/${P}.tar.gz"
+
+LICENSE="XEphem"
+SLOT=0
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=x11-libs/motif-2.3:0
+ virtual/jpeg:0=
+ media-libs/libpng:0="
+DEPEND="${RDEPEND}
+ sys-apps/groff"
+
+PATCHES=(
+ "${FILESDIR}/${P}-respect_env_vars.patch"
+ "${FILESDIR}/${P}-implicits.patch"
+)
+
+src_prepare() {
+ default
+ echo > "${T}"/XEphem "XEphem.ShareDir: /usr/share/${PN}"
+ echo > "${T}"/99xephem "XEHELPURL=/usr/share/doc/${PF}/html/xephem.html"
+}
+
+src_compile() {
+ tc-export CC AR RANLIB
+ emake -C GUI/xephem
+}
+
+src_install() {
+ insinto /usr/share/X11/app-defaults
+ has_version '<x11-base/xorg-x11-7.0' && insinto /etc/X11/app-defaults
+ doins "${T}"/XEphem
+ doenvd "${T}"/99xephem
+ dodoc README
+
+ cd GUI/xephem
+ dobin xephem
+ doman xephem.1
+ newicon XEphem.png ${PN}.png
+ insinto /usr/share/${PN}
+ doins -r auxil catalogs fifos fits gallery lo
+ insinto /usr/share/doc/${PF}/html
+ doins -r help/*
+ make_desktop_entry xephem XEphem ${PN}
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/xephem/files/, sci-astronomy/xephem/
@ 2017-09-02 15:10 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2017-09-02 15:10 UTC (permalink / raw
To: gentoo-commits
commit: 920f4c182cead5aa77f0378a3ae2f9ebfaee7a5d
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 2 15:10:04 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep 2 15:10:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=920f4c18
sci-astronomy/xephem: remove 3.7.6
Package-Manager: Portage-2.3.6, Repoman-2.3.3
sci-astronomy/xephem/Manifest | 1 -
.../xephem/files/xephem-3.7.6-implicits.patch | 12 --
.../files/xephem-3.7.6-respect_env_vars.patch | 129 ---------------------
sci-astronomy/xephem/xephem-3.7.6.ebuild | 53 ---------
4 files changed, 195 deletions(-)
diff --git a/sci-astronomy/xephem/Manifest b/sci-astronomy/xephem/Manifest
index b091c7e22b3..b449d620c13 100644
--- a/sci-astronomy/xephem/Manifest
+++ b/sci-astronomy/xephem/Manifest
@@ -1,2 +1 @@
-DIST xephem-3.7.6.tar.gz 17975496 SHA256 2080b628d80d52d9ff7148787e3093eb56f21fef5fba404f123b6198b2d64d05 SHA512 96d77852045e3d3cb996de5884a9272b2f3157216816acf3ad05a0bc60f20673fccc0f1efd54443cf7c38d0aaa86da1cf3f11989c2e37e26feb0cbd78855c84f WHIRLPOOL 94bba9595863cc30f5a058ea72dc4d4824d62355ce0bfef05c63a741667c064febb26bc4da884d7cc15ee04b74cf402031efbdbae844c458acc1c8cb0ec2a91a
DIST xephem-3.7.7.tar.gz 18128523 SHA256 d1f8e17cfc5d2e3af5fd5a8bcf34bbf99a79d40f66326c098a819f82af62b4b7 SHA512 d9cfecf0ce8aa495f66fcf6772ca7df0638cef8b9f18d9d6cbf013846a7575786ae9b5c515abc2058783baa7610320c893ddbc6f68bae28c65661a1c73b88634 WHIRLPOOL 1986700ee6207b4a68ea8e5acb3c37f45286b48c5ed392934eb0b9beb2f9e733c2e995fc367da1f4079b7b48d9d92e2e5400658b9ed36cbf3961969f26e6013c
diff --git a/sci-astronomy/xephem/files/xephem-3.7.6-implicits.patch b/sci-astronomy/xephem/files/xephem-3.7.6-implicits.patch
deleted file mode 100644
index 4c340711e0e..00000000000
--- a/sci-astronomy/xephem/files/xephem-3.7.6-implicits.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-sunmenu.c:920:3: warning: implicit declaration of function ‘strptime’
-
---- a/GUI/xephem/sunmenu.c
-+++ b/GUI/xephem/sunmenu.c
-@@ -1,6 +1,7 @@
- /* code to manage the sun display
- */
-
-+#define _XOPEN_SOURCE /* See feature_test_macros(7) */
- #include <stdio.h>
- #include <stdlib.h>
- #include <errno.h>
diff --git a/sci-astronomy/xephem/files/xephem-3.7.6-respect_env_vars.patch b/sci-astronomy/xephem/files/xephem-3.7.6-respect_env_vars.patch
deleted file mode 100644
index 4fc48a763c5..00000000000
--- a/sci-astronomy/xephem/files/xephem-3.7.6-respect_env_vars.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff --git a/GUI/xephem/Makefile b/GUI/xephem/Makefile
-index b4c26f2..ab4f256 100644
---- a/GUI/xephem/Makefile
-+++ b/GUI/xephem/Makefile
-@@ -10,9 +10,9 @@
- # one executable, xephem.
-
- # These -I and -L flags point to the supporting XEphem libraries
--LIBINC = -I../../libastro -I../../libip -I../../liblilxml -I../../libjpegd -I../../libpng -I../../libz
--LIBLNK = -L../../libastro -L../../libip -L../../liblilxml -L../../libjpegd -L../../libpng -L../../libz
--LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz
-+LIBINC = -I../../libastro -I../../libip -I../../liblilxml
-+LIBLNK = -L../../libastro -L../../libip -L../../liblilxml
-+LIBLIB = -lastro -lip -llilxml -ljpeg -lpng -lz
-
- # MOTIFI is the directory containing the Xm directory of include files.
- # MOTIFL is the directory containing the libXm.a library.
-@@ -32,12 +32,9 @@ endif
-
- # for linux and Apple OS X
- # some systems now use just /usr/X11 (not /usr/X11R6)
--CC = gcc
--CLDFLAGS = -g
--CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/usr/X11R6/include
--LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/usr/X11R6/lib
-+CFLAGS := $(LIBINC) $(CFLAGS)
- XLIBS = -lXm -lXp -lXt -lXext -lXmu -lX11
--LIBS = $(XLIBS) $(LIBLIB) -lm
-+LIBS = $(LIBLNK) $(XLIBS) $(LIBLIB) -lm
-
- # for ppc Apple OS X to make universal (i386 and ppc binary), requires
- # Xcode 2.2, /Developers/SDK/MacOSX10.4u.sdk and all libs, including libXm,
-@@ -187,12 +184,9 @@ xephem.1: xephem.man
- nroff -man $? > $@
-
- libs:
-- cd ../../libastro; make
-- cd ../../libip; make
-- cd ../../libjpegd; make
-- cd ../../liblilxml; make
-- cd ../../libpng; make
-- cd ../../libz; make
-+ $(MAKE) -C ../../libastro
-+ $(MAKE) -C ../../libip
-+ $(MAKE) -C ../../liblilxml
-
- clean:
- rm -fr *.o ../../lib*/*.[ao]
-diff --git a/libastro/Makefile b/libastro/Makefile
-index b1ab0bf..62c5412 100644
---- a/libastro/Makefile
-+++ b/libastro/Makefile
-@@ -4,8 +4,6 @@
- # compiler and flags
-
- # gcc
--CC = gcc
--CFLAGS= -O2 -Wall
-
- # macosx universal binary
- # CFLAGS= -O2 -Wall -arch i386 -arch ppc
-@@ -83,11 +81,11 @@ OBJS = \
- vsop87_data.o
-
- libastro.a: $(HS) $(OBJS)
-- ar rv $@ $(OBJS)
-- ranlib $@
-+ $(AR) rv $@ $(OBJS)
-+ $(RANLIB) $@
-
- libastro.so: $(HS) $(OBJS)
-- $(CC) -shared -o $@ $(OBJS)
-+ $(CC) $(LDFLAGS) -shared -o $@ $(OBJS)
-
- clobber:
- rm -f *.o libastro.a
-diff --git a/libip/Makefile b/libip/Makefile
-index 35cb9c6..cba71e1 100644
---- a/libip/Makefile
-+++ b/libip/Makefile
-@@ -2,8 +2,7 @@
- # (C) 2001 Elwood Charles Downey
-
- # gcc
--CC = gcc
--CFLAGS= -I../libastro -O2 -Wall
-+CFLAGS += -I../libastro
-
- # macosx universal binary
- # CFLAGS= -I../libastro -O2 -Wall -arch i386 -arch ppc
-@@ -36,11 +35,11 @@ OBJS = \
- HS = ip.h fsmatch.h
-
- libip.a: $(HS) $(OBJS)
-- ar rv $@ $(OBJS)
-- ranlib $@
-+ $(AR) rv $@ $(OBJS)
-+ $(RANLIB) $@
-
- libip.so: $(OBJS)
-- gcc -shared -o $@ $(OBJS)
-+ $(CC) $(LDFLAGS) -shared -o $@ $(OBJS)
-
- clobber:
- rm -f *.o libip.a
-diff --git a/liblilxml/Makefile b/liblilxml/Makefile
-index 9ab98cb..85e7889 100644
---- a/liblilxml/Makefile
-+++ b/liblilxml/Makefile
-@@ -4,8 +4,6 @@
- # compiler and flags
-
- # gcc
--CC = gcc
--CFLAGS= -O2 -Wall
-
- # macosx universal binary
- # CFLAGS= -O2 -Wall -arch i386 -arch ppc
-@@ -27,8 +25,8 @@ HS = lilxml.h
- OBJS = lilxml.o base64.o
-
- liblilxml.a: $(HS) $(OBJS)
-- ar r $@ $(OBJS)
-- ranlib $@
-+ $(AR) r $@ $(OBJS)
-+ $(RANLIB) $@
-
- liltest: liltest.o liblilxml.a
- $(CC) $(LDFLAGS) -o liltest liltest.o liblilxml.a
diff --git a/sci-astronomy/xephem/xephem-3.7.6.ebuild b/sci-astronomy/xephem/xephem-3.7.6.ebuild
deleted file mode 100644
index 105c472dc2a..00000000000
--- a/sci-astronomy/xephem/xephem-3.7.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Interactive tool for astronomical ephemeris and sky simulation"
-HOMEPAGE="http://www.clearskyinstitute.com/xephem"
-SRC_URI="http://97.74.56.125/free/${P}.tar.gz"
-
-LICENSE="XEphem"
-SLOT=0
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=x11-libs/motif-2.3:0
- virtual/jpeg:0
- media-libs/libpng:0="
-DEPEND="${RDEPEND}
- sys-apps/groff"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-respect_env_vars.patch \
- "${FILESDIR}"/${P}-implicits.patch
- echo > "${T}"/XEphem "XEphem.ShareDir: /usr/share/${PN}"
- echo > "${T}"/99xephem "XEHELPURL=/usr/share/doc/${PF}/html/xephem.html"
-}
-
-src_compile() {
- tc-export CC AR RANLIB
- emake -C GUI/xephem
-}
-
-src_install() {
- dodoc README
-
- insinto /usr/share/X11/app-defaults
- has_version '<x11-base/xorg-x11-7.0' && insinto /etc/X11/app-defaults
- doins "${T}"/XEphem
-
- doenvd "${T}"/99xephem
-
- cd GUI/xephem
- dobin xephem
- doman xephem.1
- newicon XEphem.png ${PN}.png
- insinto /usr/share/${PN}
- doins -r auxil catalogs fifos fits gallery lo
- dohtml -r help/*
-
- make_desktop_entry xephem XEphem ${PN}
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/xephem/files/, sci-astronomy/xephem/
@ 2022-03-01 15:05 Andrew Ammerlaan
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2022-03-01 15:05 UTC (permalink / raw
To: gentoo-commits
commit: b6e954e30d906676f203c02b983e4367dd602209
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 1 15:05:00 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Mar 1 15:05:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6e954e3
sci-astronomy/xephem: add version 4.1.0
This version adds ssl support
Closes: https://bugs.gentoo.org/776166
Closes: https://bugs.gentoo.org/774933
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-astronomy/xephem/Manifest | 1 +
.../files/xephem-4.1.0-respect_env_vars.patch | 128 +++++++++++++++++++++
sci-astronomy/xephem/xephem-4.1.0.ebuild | 58 ++++++++++
3 files changed, 187 insertions(+)
diff --git a/sci-astronomy/xephem/Manifest b/sci-astronomy/xephem/Manifest
index 05ea2af9342a..09e25047eca9 100644
--- a/sci-astronomy/xephem/Manifest
+++ b/sci-astronomy/xephem/Manifest
@@ -1 +1,2 @@
DIST xephem-3.7.7.tgz 18128521 BLAKE2B a7d0ee2cf1be64f79ed0c5cea6d37e48c69875de5b3c9592554ee8be25b369e964c7a6bb05690ef28893b7af8277daf39ba85538f56852f35538180f9ad0c2ba SHA512 0a21f783a0a543f19a527afb87647ff2e988c6a426a37e01b9a3d1d76a9ee74125ce802e2dbc5e13034f11ef897e6188cb5b0bb92bc0d35db0fb8839e0c53157
+DIST xephem-4.1.0.tar.gz 17213750 BLAKE2B 921aa4b305cb80df5746db962739d16ee23f1831b59934389ecd218b874ba1fc51aab07896d1283760db1a50be6279da50ed112320fc481f90b4f2d6e25c96dc SHA512 bcad3a6b375cabf1f44e39bc99386552d97a7e7d2ee4063dae4ccd3d5842604f0efc3407447f18a5c9e7f265bab6eebe98bdb64626dcf2135b56f346818ef1b6
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
new file mode 100644
index 000000000000..0f08e4380c30
--- /dev/null
+++ b/sci-astronomy/xephem/files/xephem-4.1.0-respect_env_vars.patch
@@ -0,0 +1,128 @@
+diff --git a/GUI/xephem/Makefile b/GUI/xephem/Makefile
+index dd653c7..32966ee 100644
+--- a/GUI/xephem/Makefile
++++ b/GUI/xephem/Makefile
+@@ -9,9 +9,9 @@
+ # one executable, xephem.
+
+ # These -I and -L flags point to the supporting XEphem libraries
+-LIBINC = -I../../libastro -I../../libip -I../../liblilxml -I../../libjpegd -I../../libpng -I../../libz
+-LIBLNK = -L../../libastro -L../../libip -L../../liblilxml -L../../libjpegd -L../../libpng -L../../libz
+-LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz
++LIBINC = -I../../libastro -I../libastro -I../../libip -I../libip -I../../liblilxml -I../liblilxml
++LIBLNK = -L../../libastro -L../libastro -L../../libip -L../libip -L../../liblilxml -L../liblilxml
++LIBLIB = -lastro -lip -llilxml -ljpeg -lpng -lz
+
+ # MOTIFI is the directory containing the Xm directory of include files.
+ # MOTIFL is the directory containing the libXm.a library.
+@@ -29,12 +29,9 @@ MOTIFL = /usr/lib
+ endif
+
+ # for linux and Apple OS X
+-CC = gcc
+-CLDFLAGS = -g
+-CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/opt/X11/include
+-LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/opt/X11/lib
+ XLIBS = -lXm -lXt -lXext -lXmu -lX11
+-LIBS = $(XLIBS) $(LIBLIB) -lm -lssl
++CFLAGS := $(LIBINC) $(CFLAGS)
++LIBS = $(LIBLNK) $(XLIBS) $(LIBLIB) -lm -lssl
+
+ # static linking on Apple using X11 libs from ports
+ # CC = gcc
+@@ -194,12 +191,9 @@ xephem.1: xephem.man
+ nroff -man $? > $@
+
+ libs:
+- cd ../../libastro; make
+- cd ../../libip; make
+- cd ../../libjpegd; make
+- cd ../../liblilxml; make
+- cd ../../libpng; make
+- cd ../../libz; make
++ $(MAKE) -C ../../libastro
++ $(MAKE) -C ../../libip
++ $(MAKE) -C ../../liblilxml
+
+ clean:
+ rm -fr *.o ../../lib*/*.[ao]
+diff --git a/libastro/Makefile b/libastro/Makefile
+index 0a8ecb6..a640c95 100644
+--- a/libastro/Makefile
++++ b/libastro/Makefile
+@@ -4,8 +4,6 @@
+ # compiler and flags
+
+ # gcc
+-CC = gcc
+-CFLAGS= -O2 -Wall
+
+ # macosx universal binary
+ # CFLAGS= -O2 -Wall -arch i386 -arch ppc
+@@ -83,11 +81,11 @@ OBJS = \
+ vsop87_data.o
+
+ libastro.a: $(HS) $(OBJS)
+- ar rv $@ $(OBJS)
+- ranlib $@
++ $(AR) rv $@ $(OBJS)
++ $(RANLIB) $@
+
+ libastro.so: $(HS) $(OBJS)
+- $(CC) -shared -o $@ $(OBJS)
++ $(CC) $(LDFLAGS) -shared -o $@ $(OBJS)
+
+ clobber:
+ rm -f *.o libastro.a
+diff --git a/libip/Makefile b/libip/Makefile
+index 5c36ac8..f093d6f 100644
+--- a/libip/Makefile
++++ b/libip/Makefile
+@@ -2,8 +2,6 @@
+ # (C) 2001 Elwood Charles Downey
+
+ # gcc
+-CC = gcc
+-CFLAGS= -I../libastro -O2 -Wall
+
+ # macosx universal binary
+ # CFLAGS= -I../libastro -O2 -Wall -arch i386 -arch ppc
+@@ -36,11 +34,11 @@ OBJS = \
+ HS = ip.h fsmatch.h
+
+ libip.a: $(HS) $(OBJS)
+- ar rv $@ $(OBJS)
+- ranlib $@
++ $(AR) rv $@ $(OBJS)
++ $(RANLIB) $@
+
+ libip.so: $(OBJS)
+- gcc -shared -o $@ $(OBJS)
++ $(CC) $(LDFLAGS) -shared -o $@ $(OBJS)
+
+ clobber:
+ rm -f *.o libip.a
+diff --git a/liblilxml/Makefile b/liblilxml/Makefile
+index 2e73761..c75651b 100644
+--- a/liblilxml/Makefile
++++ b/liblilxml/Makefile
+@@ -4,8 +4,6 @@
+ # compiler and flags
+
+ # gcc
+-CC = gcc
+-CFLAGS= -O2 -Wall
+
+ # macosx universal binary
+ # CFLAGS= -O2 -Wall -arch i386 -arch ppc
+@@ -27,8 +25,8 @@ HS = lilxml.h
+ OBJS = lilxml.o base64.o
+
+ liblilxml.a: $(HS) $(OBJS)
+- ar r $@ $(OBJS)
+- ranlib $@
++ $(AR) r $@ $(OBJS)
++ $(RANLIB) $@
+
+ liltest: liltest.o liblilxml.a
+ $(CC) $(LDFLAGS) -o liltest liltest.o liblilxml.a
diff --git a/sci-astronomy/xephem/xephem-4.1.0.ebuild b/sci-astronomy/xephem/xephem-4.1.0.ebuild
new file mode 100644
index 000000000000..93bd0f5554d6
--- /dev/null
+++ b/sci-astronomy/xephem/xephem-4.1.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Interactive tool for astronomical ephemeris and sky simulation"
+HOMEPAGE="https://xephem.github.io/XEphem/Site/xephem.html"
+SRC_URI="https://github.com/XEphem/XEphem/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/XEphem-${PV}"
+
+LICENSE="MIT"
+SLOT=0
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ dev-libs/openssl:=
+ >=x11-libs/motif-2.3:0
+ virtual/jpeg:0
+ media-libs/libpng:0=
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXt
+"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/groff"
+
+HTML_DOCS=( GUI/xephem/help/. )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.7.7-implicits.patch"
+ "${FILESDIR}/${P}-respect_env_vars.patch"
+)
+
+src_compile() {
+ tc-export CC AR RANLIB
+ emake -C GUI/xephem
+}
+
+src_install() {
+ insinto /usr/share/X11/app-defaults
+ newins - XEphem <<-EOF
+ XEphem.ShareDir: /usr/share/${PN}
+ EOF
+ newenvd - 99xephem <<-EOF
+ XEHELPURL=/usr/share/doc/${PF}/html/xephem.html
+ EOF
+ einstalldocs
+
+ cd GUI/xephem || die
+ dobin xephem
+ doman xephem.1
+ newicon XEphem.png ${PN}.png
+ insinto /usr/share/${PN}
+ doins -r auxil catalogs fifos fits gallery lo
+ make_desktop_entry xephem XEphem ${PN}
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-03-01 15:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-29 22:16 [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/xephem/files/, sci-astronomy/xephem/ Sebastien Fabbro
-- strict thread matches above, loose matches on Subject: below --
2017-09-02 15:10 Michael Palimaka
2022-03-01 15:05 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox