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