gentoo resync : 20.03.2022

4 files changed, 189 insertions, 58 deletions

diff --git a/sci-astronomy/xephem/Manifest b/sci-astronomy/xephem/Manifest
index de76b029b944..2e825216ebfe 100644
--- a/sci-astronomy/xephem/Manifest
+++ b/sci-astronomy/xephem/Manifest
@@ -1,8 +1,9 @@
 AUX xephem-3.7.7-implicits.patch 305 BLAKE2B ad16733b6d44619528af60a33710f3b558a16ebd24bad15b2c1ccf728a113f5495c5f26ded2c1ac61a3fedb9f916571b8bf8076527c7c2ee1353e212e710b319 SHA512 220186bb7f72fe0de6ca75a67df7b1a4d4cc57cc4768d565dc8225e20df93738c7bdd62bde6297941d1ec6638800950ef56e355de8ca1e3e8192b903b021adba
 AUX xephem-3.7.7-no_xprint.patch 262 BLAKE2B 6676f7e94978d4433f3f26ff3ec4738fd3f5735462806b7f19e7aa4b7671e62e8f7e894071a04f5a90510782b8a57ab0de0a722d4c5520d5c1cf5bbc0c4c9f52 SHA512 d0277edb3c011bf606803a280461410263fe9986d164df28a6801d3bcd7a0a21405728f9d27fd3dfa1a620e4b364d1d8b65843382bd99a2cf2c3e05755a277c2
 AUX xephem-3.7.7-respect_env_vars.patch 3781 BLAKE2B e596c7216c0f70145a189696ff890e136ba282113dc5c9acee4808f7a6474f7e0d9295997ee4dbc595dd8a50d1cb67d22e138b465a82a13a2e294a093f0a7061 SHA512 84a9697c3b05ed28bcc59f4b30807aad76c3228e1aec3db898995d36cae3ef58557ff984a57f60b99e15dd04670a65061451dc00437498c14ed081c0cf06830d
-DIST xephem-3.7.7.tar.gz 18128523 BLAKE2B 85173bfb21e31198aab9231f6020267beadd4750c832d514f06983ea9c88487c4175d3ac0e7b973a8fb41785658e0155e23be6cb89ac370f9a908e6eff8ea5e8 SHA512 d9cfecf0ce8aa495f66fcf6772ca7df0638cef8b9f18d9d6cbf013846a7575786ae9b5c515abc2058783baa7610320c893ddbc6f68bae28c65661a1c73b88634
+AUX xephem-4.1.0-respect_env_vars.patch 3331 BLAKE2B 9e9cd514429485e7934b0d82355ebac66dce6870fd85a490f691fd4943bc23aa66531d7bce4d4e925a6d26bd7bffad0e0eb37506b593b032914a1d8d34edaeab SHA512 c88ce6569cf1e9fd27d3868344e1160d666fc0399a4dd2d4c3c10154fc947f25ebf5904123edd7ae3ca54832eeb89d67c6e2586fd4fa8e3bcb31304d44a1e8a9
 DIST xephem-3.7.7.tgz 18128521 BLAKE2B a7d0ee2cf1be64f79ed0c5cea6d37e48c69875de5b3c9592554ee8be25b369e964c7a6bb05690ef28893b7af8277daf39ba85538f56852f35538180f9ad0c2ba SHA512 0a21f783a0a543f19a527afb87647ff2e988c6a426a37e01b9a3d1d76a9ee74125ce802e2dbc5e13034f11ef897e6188cb5b0bb92bc0d35db0fb8839e0c53157
+DIST xephem-4.1.0.tar.gz 17213750 BLAKE2B 921aa4b305cb80df5746db962739d16ee23f1831b59934389ecd218b874ba1fc51aab07896d1283760db1a50be6279da50ed112320fc481f90b4f2d6e25c96dc SHA512 bcad3a6b375cabf1f44e39bc99386552d97a7e7d2ee4063dae4ccd3d5842604f0efc3407447f18a5c9e7f265bab6eebe98bdb64626dcf2135b56f346818ef1b6
 EBUILD xephem-3.7.7-r1.ebuild 1186 BLAKE2B f249535f9449eaa36fbbe3ca33407c9d42385f0143cd77849d6f5c746934bc967bf56880f9205409bffd13e058b2fa7951d8c1181823b476a0f4c06be6d192ff SHA512 f814d7754b9f3ba339d10ca0c4b0b9ba30408b7595dfbd2e91ffe1f9924703caf7a4099bbd4ebd1f670d9310c752f78b9daa584316b93d8bd65e83f9135e7c4e
-EBUILD xephem-3.7.7.ebuild 1298 BLAKE2B ab342fcd86ee614db44edda41c812c8e683b644f635ce8d91e669e5b9c37721eed673ce453bd2b79dc5e52d1502757f8ec0aec4523a7fcf0faa63ae4fd876441 SHA512 eb9d963f44439d3afd2a55cb74cf18865896f47f78be469963816607ddf27b52e09248e35fed76c06e48f5e7220ee33d7aebc385c4a6df2f5ad4a81877ceda1e
+EBUILD xephem-4.1.0.ebuild 1281 BLAKE2B a6b4a55118d8a13d36031cddc165c222c3d1580f63963b4fdd8673a8119672299a351f1b19703e3197edaca003fe88cd663bdba7b48d33b89b93921f52342851 SHA512 7de7beccf2e1054be8281122c94d471f52eaa03990726d9214d66331f41201e252c9fc61799ca84af6c08b607bb6dd1a29a9a5541b6184944f46e1dfb34991e0
 MISC metadata.xml 731 BLAKE2B 980eecb953df6c70d788fd68a61cc584f6b1d6605c6970afc82a21ab0a6dacd69354e8156bc0b7dfc04cc205042d2d1d2170abd40bbb74a077a0462a72a78d95 SHA512 ac2f5d29c822dc4e89eedcfa0e2797d61a29531509267290e4426df1ca6179e9b07673f961b473cafacb2b35cf7e0b6f579053648bcee6ae61ae9dee319eaa55
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-3.7.7.ebuild b/sci-astronomy/xephem/xephem-3.7.7.ebuild
deleted file mode 100644
index 84eaeb909c70..000000000000
--- a/sci-astronomy/xephem/xephem-3.7.7.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop toolchain-funcs
-
-DESCRIPTION="Interactive tool for astronomical ephemeris and sky simulation"
-HOMEPAGE="https://www.clearskyinstitute.com/xephem"
-SRC_URI="http://97.74.56.125/free/${P}.tar.gz"
-
-LICENSE="XEphem"
-SLOT=0
-KEYWORDS="amd64 ppc ppc64 x86 ~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"
-	"${FILESDIR}/${P}-no_xprint.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}
-}
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}
+}