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} +}
