diff --git a/app-admin/rcm/Manifest b/app-admin/rcm/Manifest
deleted file mode 100644
index 070b1d3..0000000
--- a/app-admin/rcm/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD rcm-9999.ebuild 416 SHA256 57fb70579fa668e0e36ec69a25fe6602373dae0f43a8c486198b9d20a1ca0a47 SHA512 9551e347b4f8529481064658d5ccb6363c2e1710042e90197a996eb50d242c02ca9dadec1dfcfcdb6f8c367e3c02b24065da51e794a5efe40c97ce0d676ef92e WHIRLPOOL 6157d7db5c71345da96e520605bba9b47f46a3acf4241e1bdfcde2998a8ef9d9190ac25ba180e20b71d87e04ad6ecb00b8fcfd49796f5a4cf79e021ee6d26686
-MISC metadata.xml 611 SHA256 fcf271608ad4d7dd7c9662cc1977eeacb0c3a0656636809df0998f591afddb49 SHA512 508ce28286fa519f6d071d06b1c75e23113f67b9d96d879d4fdd0ab9bfc9bbfaef5fa8e33c0e8a617aeaf58c3e979cb19fc2171779a8cd7e4de06ebad733bbb0 WHIRLPOOL bd1a656747fd4a4ed5069bd5caf0266479aa1f0d26ce6556b533205513e6a10d17d3b878f0175b48416444d8bf30013a3fd765e3706c92f8d20041911681363e
diff --git a/app-admin/rcm/metadata.xml b/app-admin/rcm/metadata.xml
deleted file mode 100644
index 4d26f07..0000000
--- a/app-admin/rcm/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>fgtham+genbugs@gmail.com</email>
-		<name>Florian Tham</name>
-		<description>Proxy maintainer - set to assignee on bugs</description>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">thoughtbot/rcm</remote-id>
-	</upstream>
-	<longdescription lang="en">
-		rcm is a management suite for dotfiles.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-admin/rcm/rcm-9999.ebuild b/app-admin/rcm/rcm-9999.ebuild
deleted file mode 100644
index 31e7d7e..0000000
--- a/app-admin/rcm/rcm-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit git-r3
-
-DESCRIPTION="rc file (dotfile) management"
-HOMEPAGE="https://github.com/thoughtbot/rcm"
-EGIT_REPO_URI="https://github.com/thoughtbot/rcm.git"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="dev-ruby/mustache"
-RDEPEND="${DEPEND}"
-
-src_prepare () {
-	./autogen.sh
-	default
-}
diff --git a/media-libs/glyr/Manifest b/media-libs/glyr/Manifest
deleted file mode 100644
index 887b8cd..0000000
--- a/media-libs/glyr/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST glyr-1.0.10.tar.gz 416414 SHA256 77e8da60221c8d27612e4a36482069f26f8ed74a1b2768ebc373c8144ca806e8 SHA512 dc5a579c84c321de7c28861e42196d42ef73bbdbe86b5d662d7ace1d79efe8d6d8d0a8086092ed9c32af9651db8cb11bf1678c5582b17192b23e20a66812bb21 WHIRLPOOL 9f6077d80b6b22a35405a620ad9d34e739549992ad99805600fdb0e85de5d498300a57ebdb0e29d5c5e67670bab67ff6d05551c8d8c016f7b10ceb352450d9fd
-EBUILD glyr-1.0.10.ebuild 721 SHA256 3714dc080e91c3f84201e230d00ca6b8e2c736314e899329f9eac11ea7965c58 SHA512 f20489097f427ea8368539a0d866b99bba1a95cf4ff377737c516a8c70897172599b87df6fc149249eb8ecbc8674ee156467a000e935cbf7a639399b59def03c WHIRLPOOL 8de54766272004ac8fec023aa475658b1a1739d1bb5eee40b569a74fcd903b885a414145efa9fbbe2be6354debf9f6c1cb838fa9ba4f84b16d23b7a06b77fa99
diff --git a/media-libs/glyr/glyr-1.0.10.ebuild b/media-libs/glyr/glyr-1.0.10.ebuild
deleted file mode 100644
index fbed2b3..0000000
--- a/media-libs/glyr/glyr-1.0.10.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="A music related metadata searchengine, both with commandline interface and C API"
-HOMEPAGE="https://github.com/sahib/glyr"
-SRC_URI="https://github.com/sahib/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-db/sqlite:3
-	>=dev-libs/glib-2.10:2
-	net-misc/curl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS README*" # CHANGELOG is obsolete in favour of git history
-
-src_prepare() {
-	sed -i \
-		-e '/GCC_ONLY_OPT.*-s/d' \
-		-e '/FLAGS/s:-Os::' \
-		-e '/FLAGS/s:-g3::' \
-		CMakeLists.txt || die
-}
diff --git a/metadata/md5-cache/app-admin/rcm-1.3.6 b/metadata/md5-cache/app-admin/rcm-1.3.6
new file mode 100644
index 0000000..c99e6d9
--- /dev/null
+++ b/metadata/md5-cache/app-admin/rcm-1.3.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=test
+DEPEND=test? ( dev-util/cram )
+DESCRIPTION=rc file (dotfile) management
+EAPI=8
+HOMEPAGE=https://github.com/thoughtbot/rcm
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://thoughtbot.github.io/rcm/dist/rcm-1.3.6.tar.gz
+_md5_=a118c39fa98921a1ac199d336833d7dd
diff --git a/metadata/md5-cache/app-admin/rcm-9999 b/metadata/md5-cache/app-admin/rcm-9999
new file mode 100644
index 0000000..5631da4
--- /dev/null
+++ b/metadata/md5-cache/app-admin/rcm-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare unpack
+DEPEND=dev-ruby/mustache >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=rc file (dotfile) management
+EAPI=6
+HOMEPAGE=https://github.com/thoughtbot/rcm
+INHERIT=git-r3
+LICENSE=BSD
+PROPERTIES=live
+RDEPEND=dev-ruby/mustache
+SLOT=0
+_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f
+_md5_=3330083eee7e1151d1126b13077f0cd2
diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
deleted file mode 100644
index 14dc01d..0000000
--- a/net-analyzer/testssl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-EBUILD testssl-9999.ebuild 796 SHA256 3d382c48ae688b08d54a5d79eba77e416d8e35a01881b116b013b8ec1690bc61 SHA512 2ac3c00da3e0536a6ef27b38a703f599b87ddd8982aa19f0ed95d669eb761c28dd6bc8c0c25b01b524a560e89fdac119d6e909d529dfa98a8a3d07cdf4b96893 WHIRLPOOL 9458f6905f31442c16b32391f35a9952d1df683cb77cb00afc9899e70349f8adbeffe044b42908637b155fe890def137ef0dbd652ac7f3c6ece6b4844297981e
diff --git a/net-analyzer/testssl/testssl-9999.ebuild b/net-analyzer/testssl/testssl-9999.ebuild
deleted file mode 100644
index 623bbb8..0000000
--- a/net-analyzer/testssl/testssl-9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit git-r3
-
-DESCRIPTION="Testing TLS/SSL encryption"
-HOMEPAGE="https://testssl.sh"
-EGIT_REPO_URI="https://github.com/drwetter/testssl.sh.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-# Don't strip debug symbols from the provided OpenSSL binaries.
-RESTRICT="strip"
-
-INSTALLDIR="/usr/share/${PN}"
-
-PATCHES=(
-	"${FILESDIR}/follow_symlinks.patch"
-)
-
-src_install() {
-	dodir "${INSTALLDIR}"
-	dodir "${INSTALLDIR}/bin"
-	dodir "${INSTALLDIR}/etc"
-	exeinto "${INSTALLDIR}"
-	doexe testssl.sh
-	insinto "${INSTALLDIR}/etc"
-	doins etc/*
-	exeinto "${INSTALLDIR}/bin"
-	doexe bin/openssl.*
-	dosym "${INSTALLDIR}/testssl.sh" /usr/bin/testssl
-}
diff --git a/sci-astronomy/xephem/Manifest b/sci-astronomy/xephem/Manifest
deleted file mode 100644
index a5e2b85..0000000
--- a/sci-astronomy/xephem/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX xephem-3.7.7-fix_gsc_lookup.patch 1809 BLAKE2B ab4cffe222761f79e1cee37dc5933f1c2f02aee491aec95595b7422f6643ef29eb0315366bed6a0358ad50d158c56f92741f1403b661aabeca2a68a3dc93f8f9 SHA512 37155ec90da672940bc603ea4f91202d5ca018cea3f3ccbf12e1fa72f5c7fa470376c8288be4bc8b8b66bc0e62e5685b85c8b4dacbf126665f22b47a079bc9d4
-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
-AUX xephem-3.7.7_openssl.patch 20456 BLAKE2B 668162e05035c419e3f0624f5f2fbf4678778283d96ea920a7e472ce5bffa868b2f13ec7934cb4685192f0c0e73feb3441c1e623ce316825cb04c975a0baae92 SHA512 0609495c3e9af08e072862d804db2999b4493b6a8daa1586278f4e01443269d1158c8cec1cd4c2d04baaa42d1288538cd778382f6636d63073da8238dd0d57d1
-AUX xephem-3.7.7_openssl_earthmenu.patch 2536 BLAKE2B 22c18a98db2c8c03e9c96be4524e4cd1a433038d45d767da8e61881626824a5499809c9f8ae5cb6c0628c937bfc602c98885c7413adf7f89ccb1613d31951099 SHA512 8263df72d8275a2abddf3a6ace10d1db88693d98064e8bdca0adbf131798e02956db4106978f0516583e59ecdb130f556081afc2e4de88bafdc2e34dabd23d35
-DIST xephem-3.7.7.tar.gz 18128523 BLAKE2B 85173bfb21e31198aab9231f6020267beadd4750c832d514f06983ea9c88487c4175d3ac0e7b973a8fb41785658e0155e23be6cb89ac370f9a908e6eff8ea5e8 SHA512 d9cfecf0ce8aa495f66fcf6772ca7df0638cef8b9f18d9d6cbf013846a7575786ae9b5c515abc2058783baa7610320c893ddbc6f68bae28c65661a1c73b88634
-EBUILD xephem-3.7.7-r100.ebuild 1377 BLAKE2B b59d387b2462ac5428429826a9668ee468fc43a6f56be1520de0835c9bc6f467a5b1f8feb60ae9707c36c7609c263cd0c1b30b23b12d35c7a5018f97ca278474 SHA512 757e40b5deba336f8b2a515af8c5aa86765d15ba1ef2c7ab8a457bde88e4e1c22abb7da590f3a4c3b35a30963c80a319c5dd1a7ad466aa17597f38d1f72a329c
-EBUILD xephem-3.7.7-r101.ebuild 1418 BLAKE2B d232241f8e8eb19f0795fc45b7ca0bb70a86876c1d6b294ef90edc3cc83e4891a7fe60c93ad44bb56b0f055da8119f9fa57ce771fcc6e267fba1f0e1fd4c59d7 SHA512 6f6b2283174599cedf6e54bd89397bbd05e165f6ae6cffa6a8c988cf49d887accce54a04ef0fe5e48c79861f989173dfe3178175af96014c27f1e1399dfaa03b
-MISC metadata.xml 730 BLAKE2B c1e84de3e52a140cf7641db3d63d47176a50d2dced49c61dbc0d2b4e8eb8a6a8e689cfbec88e67eba9a0372b3ff7cbcd13938da68add5f558058d11b9e07b7df SHA512 faf972aa6cc2761a5aa05994b3718af494c9cc3e4130204128dff553f35c54db96556d713fbc648b0aff9e4058af94eb9e74edfc697423a82e821b1ddfaae8c8
diff --git a/sci-astronomy/xephem/files/xephem-3.7.7-fix_gsc_lookup.patch b/sci-astronomy/xephem/files/xephem-3.7.7-fix_gsc_lookup.patch
deleted file mode 100644
index 305c0b8..0000000
--- a/sci-astronomy/xephem/files/xephem-3.7.7-fix_gsc_lookup.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/GUI/xephem/gscnet.c	2020-01-24 12:20:10.210100009 +0100
-+++ b/GUI/xephem/gscnet.c	2020-01-24 12:20:43.711842644 +0100
-@@ -29,7 +29,7 @@
- {
- #define	GSC23MAXFOV	degrad(30./60.0)		/* max fov */
- 	/* http://gsss.stsci.edu/webservices/vo/ConeSearch.aspx?RA=10.0&DEC=5.0&SR=0.2&FORMAT=CSV */
--	static char ifmt[] = "%[^,],%lf,%lf,%*[^,],%*[^,],%*[^,],%*[^,],%lf,%lf,%*[^,],%*[^,],%lf,%lf,%lf,%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%d";
-+	static char ifmt[] = "%[^,],%*[^,],%lf,%lf,%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%lf,%*[^,],%*[^,],%lf,%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%lf,%*[^,],%*[^,],%lf,%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%d";
- 	static char gfmt[] = " GET http://%s%s?RA=%g&DEC=%g&SR=%g&FORMAT=CSV HTTP/1.0\r\nUser-Agent: xephem/%s\r\n\r\n";
- 	char host[1024];
- 	char buf[2048];
-@@ -80,7 +80,7 @@
- 	while ((n = recvlineb (sockfd, buf, sizeof(buf))) > 0) {
- 	    char name[1024];
- 	    double radeg, decdeg;
--	    double fmag, jmag, bmag, vmag, rmag;
-+	    double fmag, jmag, bmag, vmag;
- 	    int class;
- 	    Obj *op;
- 
-@@ -90,9 +90,9 @@
- 
- 	    /* crack */
- 	    if (sscanf (buf, ifmt, name, &radeg, &decdeg, &fmag, &jmag, &bmag,
--						&vmag, &rmag, &class) != 9)
-+						&vmag, &class) != 8)
- 		continue;
--	    if (fmag>lmag && jmag>lmag && bmag>lmag && vmag>lmag && rmag>lmag)
-+	    if (fmag>lmag && jmag>lmag && bmag>lmag && vmag>lmag)
- 		continue;
- 
- 	    /* good -- grow list */
-@@ -120,8 +120,6 @@
- 		set_fmag (op, vmag);
- 	    else if (bmag<=lmag)
- 		set_fmag (op, bmag);
--	    else if (rmag<=lmag)
--		set_fmag (op, rmag);
- 	    else if (fmag<=lmag)
- 		set_fmag (op, fmag);
- 	    else
diff --git a/sci-astronomy/xephem/files/xephem-3.7.7-implicits.patch b/sci-astronomy/xephem/files/xephem-3.7.7-implicits.patch
deleted file mode 100644
index 4c34071..0000000
--- a/sci-astronomy/xephem/files/xephem-3.7.7-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.7-no_xprint.patch b/sci-astronomy/xephem/files/xephem-3.7.7-no_xprint.patch
deleted file mode 100644
index e41112f..0000000
--- a/sci-astronomy/xephem/files/xephem-3.7.7-no_xprint.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/GUI/xephem/Makefile
-+++ b/GUI/xephem/Makefile
-@@ -30,7 +30,7 @@
- endif
- 
- # for linux and Apple OS X
--XLIBS = -lXm -lXp -lXt -lXext -lXmu -lX11
-+XLIBS = -lXm -lXt -lXext -lXmu -lX11
- CFLAGS := $(LIBINC) $(CFLAGS)
- LIBS = $(LIBLNK) $(XLIBS) $(LIBLIB) -lm
- 
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
deleted file mode 100644
index e916bd3..0000000
--- a/sci-astronomy/xephem/files/xephem-3.7.7-respect_env_vars.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-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/files/xephem-3.7.7_openssl.patch b/sci-astronomy/xephem/files/xephem-3.7.7_openssl.patch
deleted file mode 100644
index f411e53..0000000
--- a/sci-astronomy/xephem/files/xephem-3.7.7_openssl.patch
+++ /dev/null
@@ -1,671 +0,0 @@
-diff -Naur a/GUI/xephem/auxil/mpcorb2edb.pl b/GUI/xephem/auxil/mpcorb2edb.pl
---- a/GUI/xephem/auxil/mpcorb2edb.pl	2014-07-11 04:46:35.000000000 +0200
-+++ b/GUI/xephem/auxil/mpcorb2edb.pl	2018-01-08 02:54:53.603935652 +0100
-@@ -78,7 +78,7 @@
- # setup cutoff mag
- my $dimmag = 13;			# dimmest mag to be saved in "bright" file
- # set site and file in case of -f
--my $MPCSITE = "http://www.minorplanetcenter.net";
-+my $MPCSITE = "https://www.minorplanetcenter.net";
- my $MPCFTPDIR = "/iau/MPCORB";
- my $MPCFILE = "MPCORB.DAT";
- my $MPCZIPFILE = "MPCORB.DAT.gz";
-diff -Naur a/GUI/xephem/fallbacks.c b/GUI/xephem/fallbacks.c
---- a/GUI/xephem/fallbacks.c	2015-04-09 02:20:19.000000000 +0200
-+++ b/GUI/xephem/fallbacks.c	2018-01-08 21:26:23.529915768 +0100
-@@ -747,10 +747,10 @@
-     "XEphem*WebDB*URL1.value: http://celestrak.com/NORAD/elements/science.txt",
-     "XEphem*WebDB*URL2.value: http://celestrak.com/NORAD/elements/tle-new.txt",
-     "XEphem*WebDB*URL3.value: http://celestrak.com/NORAD/elements/amateur.txt",
--    "XEphem*WebDB*URL4.value: http://www.minorplanetcenter.org/iau/Ephemerides/Comets/Soft03Cmt.txt",
--    "XEphem*WebDB*URL5.value: http://www.minorplanetcenter.org/iau/Ephemerides/CritList/Soft03CritList.txt",
--    "XEphem*WebDB*URL6.value: http://www.minorplanetcenter.org/iau/Ephemerides/Distant/Soft03Distant.txt",
--    "XEphem*WebDB*URL7.value: http://www.minorplanetcenter.org/iau/Ephemerides/Unusual/Soft03Unusual.txt",
-+    "XEphem*WebDB*URL4.value: https://www.minorplanetcenter.org/iau/Ephemerides/Comets/Soft03Cmt.txt",
-+    "XEphem*WebDB*URL5.value: https://www.minorplanetcenter.org/iau/Ephemerides/CritList/Soft03CritList.txt",
-+    "XEphem*WebDB*URL6.value: https://www.minorplanetcenter.org/iau/Ephemerides/Distant/Soft03Distant.txt",
-+    "XEphem*WebDB*URL7.value: https://www.minorplanetcenter.org/iau/Ephemerides/Unusual/Soft03Unusual.txt",
-     "XEphem*WebDB.x: 200",
-     "XEphem*WebDB.y: 200",
-     "XEphem*WeekStart.Monday.set: False",
-diff -Naur a/GUI/xephem/Makefile b/GUI/xephem/Makefile
---- a/GUI/xephem/Makefile	2015-08-09 23:36:50.000000000 +0200
-+++ b/GUI/xephem/Makefile	2018-01-08 21:20:45.200717791 +0100
-@@ -32,7 +32,7 @@
- # for linux and Apple OS X
- XLIBS = -lXm -lXt -lXext -lXmu -lX11
- CFLAGS := $(LIBINC) $(CFLAGS)
--LIBS = $(LIBLNK) $(XLIBS) $(LIBLIB) -lm
-+LIBS = $(LIBLNK) $(XLIBS) $(LIBLIB) -lm -lssl
- 
- # static linking on Apple using X11 libs from ports
- # CC = gcc
-diff -Naur a/GUI/xephem/net.h b/GUI/xephem/net.h
---- a/GUI/xephem/net.h	2005-03-20 12:04:50.000000000 +0100
-+++ b/GUI/xephem/net.h	2018-01-08 19:45:27.561208366 +0100
-@@ -20,6 +20,13 @@
- #include <sys/select.h>
- #endif
- 
-+#include <openssl/ssl.h>
-+
-+typedef struct {
-+	int fd;		//file desciptor for the underlying connection socket
-+	SSL *ssl;	//ssl connection for use with SSL_read( )and SSL_write()
-+} XE_SSL_FD;
-+
- /* support functions */
- 
- extern int httpGET (char *host, char *GETcmd, char msg[]);
-@@ -29,8 +36,11 @@
- extern int recvline (int fd, char buf[], int max);
- extern int recvlineb (int sock, char *buf, int size);
- extern int sendbytes (int fd, unsigned char buf[], int n);
--
--
-+extern int httpsGET (char *host, char *GETcmd, char msg[], XE_SSL_FD *ssl_fd);
-+extern int ssl_recvbytes (XE_SSL_FD *ssl_fd, unsigned char buf[], int n);
-+extern int ssl_readbytes (XE_SSL_FD *ssl_fd, unsigned char buf[], int n);
-+extern int ssl_recvline (XE_SSL_FD *ssl_fd, char buf[], int max);
-+extern int ssl_recvlineb (XE_SSL_FD *ssl_fd, char *buf, int size);
- 
- /* For RCS Only -- Do Not Edit
-  * @(#) $RCSfile: net.h,v $ $Date: 2003/03/17 07:26:21 $ $Revision: 1.3 $ $Name:  $
-diff -Naur a/GUI/xephem/netmenu.c b/GUI/xephem/netmenu.c
---- a/GUI/xephem/netmenu.c	2010-10-06 23:12:40.000000000 +0200
-+++ b/GUI/xephem/netmenu.c	2018-01-08 22:02:16.090940142 +0100
-@@ -9,6 +9,8 @@
- #include <string.h>
- #include <unistd.h>
- 
-+#include <openssl/ssl.h>
-+
- #include <Xm/Form.h>
- #include <Xm/Label.h>
- #include <Xm/PushB.h>
-@@ -70,12 +72,24 @@
- 
- static char netcategory[] = "Network";	/* Save category */
- 
-+static SSL_METHOD *ssl_method;	/* global ssl dispatch structure for creating a ssl context */
-+static SSL_CTX *ssl_ctx;	/* global ssl context structure for creating ssl connections */
-+
- /* call to set up without actually bringing up the menus.
-  */
- void
- net_create()
- {
- 	if (!netshell_w) {
-+	    if (SSL_library_init() < 0) {
-+		fprintf (stderr, "Could not initialize the OpenSSL library !\n");
-+	    } else {
-+		ssl_method = SSLv23_client_method();	/* deprecated since openssl 1.1.x */
-+//		ssl_method = TLS_client_method();	/* since openssl 1.1.x */
-+		ssl_ctx = SSL_CTX_new (ssl_method);
-+		SSL_CTX_set_options (ssl_ctx, SSL_OP_NO_SSLv2);
-+	    };
-+
- 	    net_create_form();
- 	    (void) net_save();	/* confirming here is just annoying */
- 	}
-@@ -251,8 +265,8 @@
-             struct {
- 		unsigned char  VN;	/* version number */
- 		unsigned char  CD;	/* command code */
--		unsigned short DSTPORT;	/* destination port */
--		unsigned long  DSTIP;	/* destination IP addres */
-+		uint16_t       DSTPORT;	/* destination port */
-+		uint32_t       DSTIP;	/* destination IP address */
- 	    } SocksPacket;
- 
- 	    struct hostent *hs = gethostbyname (socks_host);
-@@ -390,7 +404,7 @@
- 
- /* read up to and including the next '\n' from socket fd into buf[max].
-  * we silently ignore all '\r'. we add a trailing '\0'.
-- * return line lenth (not counting \0) if all ok, else -1.
-+ * return line length (not counting \0) if all ok, else -1.
-  * N.B. this never reads ahead -- if that's ok, recvlineb() is better
-  */
- int
-@@ -445,6 +459,216 @@
- 		if (nr <= 0) {
- 		    ok = nr;
- 		    rb_next = 0;
-+		    rb_unk = 0;
-+		    break;
-+		}
-+		rb_next = 0;
-+		rb_unk = nr;
-+	    }
-+
-+	    if ((c = rb_linebuf[rb_next++]) != '\r')
-+		*buf++ = c;
-+
-+	} while (buf-origbuf < size && c != '\n');
-+
-+	/* always give back a real line regardless, else status */
-+	if (ok > 0) {
-+	    *buf = '\0';
-+	    ok = buf - origbuf;
-+	}
-+
-+	return (ok);
-+}
-+
-+/* open the host, do the given GET cmd, and return a socket fd for the result.
-+ * on success it fills the XE_SSL_FD structure for later use by SSL_read() and necessary cleanup.
-+ * return -1 and with excuse in msg[], else 0 if ok.
-+ * N.B. can be called before we are created if net set in app defaults.
-+ */
-+int
-+httpsGET (char *host, char *GETcmd, char msg[], XE_SSL_FD *ssl_fd)
-+{
-+	char buf[2048];
-+	int fd;
-+	int connected;
-+	SSL *ssl;
-+	int n;
-+	int ret;
-+	int httpsport = 443;
-+
-+	/* open connection */
-+	if (proxy_on) {
-+	    fd = mkconnection (proxy_host, proxy_port, msg);
-+	    if (fd < 0)
-+		return (-1);
-+
-+	    /* fill buf with CONNECT */
-+	    (void) sprintf (buf, "CONNECT %1$s:%2$d HTTP/1.0\r\nUser-Agent: xephem/%3$s\r\nHost: %1$s:%2$d\r\n\r\n", host, httpsport, PATCHLEVEL);
-+
-+	    /* add proxy auth if enabled */
-+	    if (!auth_w)
-+		net_create_form();
-+	    if (XmToggleButtonGetState (auth_w))
-+		addAuth(buf);
-+
-+	    /* log it */
-+	    xe_msg (0, "https proxy connect: %s", buf);
-+
-+	    /* send it */
-+	    n = strlen (buf);
-+	    if (sendbytes(fd, (unsigned char *)buf, n) < 0) {
-+		(void) sprintf (msg, "%s: send error: %s", proxy_host, syserrstr());
-+		(void) close (fd);
-+		return (-1);
-+	    }
-+
-+	    connected = 0;
-+	    while (recvline (fd, buf, sizeof(buf)) > 1) {
-+		xe_msg (0, "Rcv: %s", buf);
-+		if (strstr (buf, "200 "))
-+		    connected = 1;
-+	    }
-+	    if (!connected) {
-+		(void) sprintf (msg, "%s: connect error: %s", proxy_host, syserrstr());
-+		(void) close (fd);
-+		return (-1);
-+	    }
-+	} else {
-+	    /* SOCKS or direct are both handled by mkconnection() */
-+	    fd = mkconnection (host, httpsport, msg);
-+	    if (fd < 0)
-+		return (-1);
-+	}
-+
-+	/* fill buf with GETcmd */
-+	(void) sprintf (buf, "%s", GETcmd);
-+
-+	/* start ssl connection */
-+	ssl = SSL_new (ssl_ctx);
-+	SSL_set_fd (ssl, fd);
-+	SSL_connect (ssl);
-+
-+	/* log it */
-+	xe_msg (0, "https: %s", buf);
-+
-+	/* send it */
-+	n = strlen (buf);
-+	ret = SSL_write (ssl, (unsigned char *)buf, n);
-+	if (ret <= 0) {
-+	    (void) sprintf (msg, "%s: ssl send error code: %d", host, SSL_get_error (ssl, ret));
-+	    (void) SSL_free (ssl);
-+	    (void) close (fd);
-+	    return (-1);
-+	}
-+
-+	/* caller can read response */
-+	ssl_fd->fd = fd;
-+	ssl_fd->ssl = ssl;
-+	return (fd);
-+}
-+
-+/* receive exactly n bytes from ssl connection ssl_fd into buf.
-+ * return -1, 0 or n.
-+ * N.B. with fallback to ordinary read from socket if ssl_fd->ssl is NULL
-+ */
-+int
-+ssl_recvbytes (XE_SSL_FD *ssl_fd, unsigned char buf[], int n)
-+{
-+	int ns, tot;
-+
-+	for (tot = 0; tot < n; tot += ns) {
-+	    if (tout (TOUT, ssl_fd->fd, 0) < 0)
-+		return (-1);
-+	    if (ssl_fd->ssl)
-+		ns = SSL_read (ssl_fd->ssl, (void *)(buf+tot), n-tot);
-+	    else
-+		ns = read (ssl_fd->fd, (void *)(buf+tot), n-tot);
-+	    if (ns <= 0)
-+		return (ns);
-+	}
-+	return (n);
-+}
-+
-+/* like read(2) except we time out and allow user to cancel.
-+ * receive up to n bytes from ssl connection ssl_fd into buf.
-+ * return count, or 0 on eof or -1 on error.
-+ * N.B. with fallback to ordinary read from socket if ssl_fd->ssl is NULL
-+ */
-+int
-+ssl_readbytes (XE_SSL_FD *ssl_fd, unsigned char buf[], int n)
-+{
-+	int ns;
-+
-+	if (tout (TOUT, ssl_fd->fd, 0) < 0)
-+	    return (-1);
-+	if (ssl_fd->ssl)
-+	    ns = SSL_read (ssl_fd->ssl, (void *)buf, n);
-+	else
-+	    ns = read (ssl_fd->fd, (void *)buf, n);
-+	return (ns);
-+}
-+
-+/* read up to and including the next '\n' from ssl into buf[max].
-+ * we silently ignore all '\r'. we add a trailing '\0'.
-+ * return line length (not counting \0) if all ok, else -1.
-+ * N.B. with fallback to ordinary read from socket if ssl_fd->ssl is NULL
-+ */
-+int
-+ssl_recvline (XE_SSL_FD *ssl_fd, char buf[], int max)
-+{
-+	unsigned char c;
-+	int n;
-+
-+	max--;	/* leave room for trailing \0 */
-+
-+	for (n = 0; n < max && ssl_recvbytes (ssl_fd, &c, 1) == 1; ) {
-+	    if (c != '\r') {
-+		buf[n++] = c;
-+		if (c == '\n') {
-+		    buf[n] = '\0';
-+		    return (n);
-+		}
-+	    }
-+	}
-+
-+	return (-1);
-+}
-+
-+/* rather like ssl_recvline but reads ahead in big chunk for efficiency.
-+ * return length if read a line ok, 0 if hit eof, -1 if error.
-+ * N.B. we silently swallow all '\r'.
-+ * N.B. we read ahead and can hide bytes after each call.
-+ * N.B. with fallback to ordinary read from socket if ssl_fd->ssl is NULL
-+ */
-+int
-+ssl_recvlineb (XE_SSL_FD *ssl_fd, char *buf, int size)
-+{
-+	char *origbuf = buf;		/* save to prevent overfilling buf */
-+	char c = '\0';
-+	int ok = 1;
-+
-+	/* always leave room for trailing \n */
-+	size -= 1;
-+
-+	/* read and copy linebuf[next] to buf until buf fills or copied a \n */
-+	do {
-+
-+	    if (rb_next >= rb_unk) {
-+		/* linebuf is empty -- refill */
-+
-+		int nr;
-+
-+		if (tout (TOUT, ssl_fd->fd, 0) < 0) {
-+		    nr = -1;
-+		    break;
-+		}
-+		if (ssl_fd->ssl)
-+		    nr = SSL_read (ssl_fd->ssl, rb_linebuf, sizeof(rb_linebuf));
-+		else
-+		    nr = read (ssl_fd->fd, rb_linebuf, sizeof(rb_linebuf));
-+		if (nr <= 0) {
-+		    ok = nr;
-+		    rb_next = 0;
- 		    rb_unk = 0;
- 		    break;
- 		}
-diff -Naur a/GUI/xephem/sunmenu.c b/GUI/xephem/sunmenu.c
---- a/GUI/xephem/sunmenu.c	2012-04-02 00:38:50.000000000 +0200
-+++ b/GUI/xephem/sunmenu.c	2018-01-08 22:09:43.585825210 +0100
-@@ -885,9 +885,11 @@
- 	int isjpeg, jpegl;
- 	int njpeg;
- 	unsigned char *jpeg;
-+	XE_SSL_FD ssl_fd;
- 	int fd, nr;
- 	struct tm tm;
- 
-+	memset(&ssl_fd, 0, sizeof(ssl_fd));
- 	memset(&tm, 0, sizeof(struct tm));
- 
- 	/* get desired type and size */
-@@ -900,18 +902,18 @@
- 
- 	/* build GET command */
- 	sprintf (get, "GET http://%s%s HTTP/1.0\r\nUser-Agent: xephem/%s\r\n\r\n", sohohost, fn, PATCHLEVEL);
--
-+	
- 	/* query server */
--	fd = httpGET (sohohost, get, buf);
-+	fd = httpsGET (sohohost, get, buf, &ssl_fd);
- 	if (fd < 0) {
--	    xe_msg (1, "http get: %s", buf);
-+	    xe_msg (1, "https get: %s", buf);
- 	    return (-1);
- 	}
- 
- 	/* read header (everything to first blank line), looking for jpeg */
- 	isjpeg = 0;
- 	jpegl = 0;
--	while (recvline (fd, buf, sizeof(buf)) > 1) {
-+	while (ssl_recvline (&ssl_fd, buf, sizeof(buf)) > 1) {
- 	    xe_msg (0, "Rcv: %s", buf);
- 	    if (strstr (buf, "Content-Type:") && strstr (buf, "image/jpeg"))
- 		isjpeg = 1;
-@@ -924,15 +926,17 @@
- 	    }
- 	}
- 	if (!isjpeg) {
--	    while (recvline (fd, buf, sizeof(buf)) > 0)
-+	    while (ssl_recvline (&ssl_fd, buf, sizeof(buf)) > 0)
- 		xe_msg (0, "Rcv: %s", buf);
- 	    xe_msg (1, "Error talking to SOHO .. see File->System log\n");
--	    close (fd);
-+	    SSL_free (ssl_fd.ssl);
-+	    close (ssl_fd.fd);
- 	    return (-1);
- 	}
- 	if (jpegl == 0) {
- 	    xe_msg (1, "No Content-Length in header");
--	    close (fd);
-+	    SSL_free (ssl_fd.ssl);
-+	    close (ssl_fd.fd);
- 	    return (-1);
- 	}
- 
-@@ -942,20 +946,22 @@
- 	for (njpeg = 0; njpeg < jpegl; njpeg += nr) {
- 	    pm_set (100*njpeg/jpegl);
- 	    jpeg = (unsigned char *) XtRealloc ((char*)jpeg, njpeg+NSREAD);
--	    nr = readbytes (fd, jpeg+njpeg, NSREAD);
--	    if (nr < 0) {
--		xe_msg (1, "%s:\n%s", sohohost, syserrstr());
-+	    nr = SSL_read (ssl_fd.ssl, jpeg+njpeg, NSREAD);
-+	    if (nr <= 0) {
-+		xe_msg (1, "%s: ssl read error code: %d", sohohost, SSL_get_error(ssl_fd.ssl, nr));
- 		pm_down();
--		close (fd);
-+		SSL_free (ssl_fd.ssl);
-+		close (ssl_fd.fd);
- 		return (-1);
- 	    }
- 	    if (nr == 0)
- 		break;
- 	}
- 	pm_down();
--	close (fd);
-+	SSL_free (ssl_fd.ssl);
-+	close (ssl_fd.fd);
- 
--        sprintf (fn, "/%s_%s.jpg", filetime, filetype);
-+	sprintf (fn, "/%s_%s.jpg", filetime, filetype);
- 	/* display jpeg */
- 	if (displayPic (fn, jpeg, njpeg) < 0)
- 	    return (-1);
-diff -Naur a/GUI/xephem/ucac.c b/GUI/xephem/ucac.c
---- a/GUI/xephem/ucac.c	2013-03-02 03:41:37.000000000 +0100
-+++ b/GUI/xephem/ucac.c	2018-01-08 21:53:08.398538689 +0100
-@@ -18,15 +18,15 @@
- 
- #define	MAXFOV	15.0			/* max fov, degs */
- 
--typedef unsigned char UC;		/* byte */
--typedef unsigned int UI;		/* unsigned integer */
-+typedef unsigned char XE_UC;		/* byte */
-+typedef unsigned int XE_UI;		/* unsigned integer */
- 
- /* access an I*2 or I*4 at offset i in UC array a in little-endian byte order.
-  * a bit slow but ultra portable.
-  */
--#define	I2(a,i)		((int)(short)((((UI)(a)[i]) | (((UI)(a)[i+1])<<8))))
--#define	I4(a,i)		((int)((((UI)(a)[i]) | (((UI)(a)[i+1])<<8) | \
--				(((UI)(a)[i+2])<<16) | (((UI)(a)[i+3])<<24))))
-+#define	I2(a,i)		((int)(short)((((XE_UI)(a)[i]) | (((XE_UI)(a)[i+1])<<8))))
-+#define	I4(a,i)		((int)((((XE_UI)(a)[i]) | (((XE_UI)(a)[i+1])<<8) | \
-+				(((XE_UI)(a)[i+2])<<16) | (((XE_UI)(a)[i+3])<<24))))
- 
- /* keep track of an array of ObjF */
- typedef struct {
-@@ -48,9 +48,9 @@
- 
- #define	DPMAS	(1.0/3600000.0)		/* degrees per milliarcsecond */
- 
--typedef UC U2Star[44];			/* UCAC2 record */
--typedef UC U3Star[84];			/* UCAC3 record */
--typedef UC U4Star[78];			/* UCAC4 record */
-+typedef XE_UC U2Star[44];		/* UCAC2 record */
-+typedef XE_UC U3Star[84];		/* UCAC3 record */
-+typedef XE_UC U4Star[78];		/* UCAC4 record */
- static char *basedir;			/* full dir with zone files and index */
- static FILE *indexfp;			/* index file handle */
- 
-@@ -293,7 +293,7 @@
- read4Index (int rz, int dz, int *nskip, int *nnew)
- {
- 	off_t offset;
--	UC i4[4];
-+	XE_UC i4[4];
- 
- 	offset = (rz*NZH4 + dz)*sizeof(i4);
- 	if (fseek (indexfp, offset, SEEK_SET) < 0) {
-@@ -508,7 +508,7 @@
- read3Index (int rz, int dz, int *nskip, int *nnew)
- {
- 	off_t offset;
--	UC i4[4];
-+	XE_UC i4[4];
- 
- 	offset = (rz*NZH + dz)*sizeof(i4);
- 	if (fseek (indexfp, offset, SEEK_SET) < 0) {
-@@ -663,7 +663,7 @@
- get2N (int rz, int dz, int *idp)
- {
- 	off_t offset;
--	UC nat[4];
-+	XE_UC nat[4];
- 
- 	offset = (dz*NZW + rz)*sizeof(nat);
- 	if (fseek (indexfp, offset, SEEK_SET) < 0)
-diff -Naur a/GUI/xephem/usno.c b/GUI/xephem/usno.c
---- a/GUI/xephem/usno.c	2005-03-20 12:04:51.000000000 +0100
-+++ b/GUI/xephem/usno.c	2016-10-26 18:59:16.469149437 +0200
-@@ -14,8 +14,8 @@
- #define	CATBPR	12	/* bytes per star record in .cat file */
- #define	ACCBPR	30	/* bytes per record in .acc file */
- 
--typedef unsigned int UI;
--typedef unsigned char UC;
-+typedef unsigned int XE_UI;
-+typedef unsigned char XE_UC;
- 
- /* One Field star */
- typedef struct {
-@@ -36,7 +36,7 @@
-     double lr[2], int *nd, double fd[2], double ld[2], int zone[2], char msg[]);
- static int fetchSwath (int zone, double maxmag, double fr, double lr,
-     double fd, double ld, StarArray *sap, char msg[]);
--static int crackCatBuf (UC buf[CATBPR], FieldStar *fsp);
-+static int crackCatBuf (XE_UC buf[CATBPR], FieldStar *fsp);
- static int addGS (StarArray *sap, FieldStar *fsp);
- 
- static char *cdpath;		/* where CD rom is mounted */
-@@ -236,7 +236,7 @@
- {
- 	char fn[1024];
- 	char buf[ACCBPR];
--	UC catbuf[CATBPR];
-+	XE_UC catbuf[CATBPR];
- 	FieldStar fs;
- 	long frec;
- 	long os;
-@@ -314,13 +314,13 @@
-  * return 0 if ok, else -1.
-  */
- static int
--crackCatBuf (UC buf[CATBPR], FieldStar *fsp)
-+crackCatBuf (XE_UC buf[CATBPR], FieldStar *fsp)
- {
--#define	BEUPACK(b) (((UI)((b)[0])<<24) | ((UI)((b)[1])<<16) | ((UI)((b)[2])<<8)\
--							    | ((UI)((b)[3])))
-+#define	BEUPACK(b) (((XE_UI)((b)[0])<<24) | ((XE_UI)((b)[1])<<16) | ((XE_UI)((b)[2])<<8)\
-+							    | ((XE_UI)((b)[3])))
- 	double ra, dec;
- 	int red, blu;
--	UI mag;
-+	XE_UI mag;
- 
- 	/* first 4 bytes are packed RA, big-endian */
- 	ra = BEUPACK(buf)/(100.0*3600.0*15.0);
-diff -Naur a/GUI/xephem/webdbmenu.c b/GUI/xephem/webdbmenu.c
---- a/GUI/xephem/webdbmenu.c	2012-11-23 06:22:09.000000000 +0100
-+++ b/GUI/xephem/webdbmenu.c	2018-01-08 21:58:01.975042039 +0100
-@@ -404,6 +404,10 @@
- char *url;
- {
- 	static char http[] = "http://";
-+	static char https[] = "https://";
-+	char *transport = http;
-+	int ltransport = strlen (transport);
-+	int ishttp = 0;
- 	char buf[512], msg[1024];
- 	char l0[512], l1[512], l2[512];
- 	char *l0p = l0, *l1p = l1, *l2p = l2;
-@@ -411,21 +415,31 @@
- 	char *slash, *dot;
- 	char filename[256];
- 	FILE *fp;
-+	XE_SSL_FD ssl_fd;
- 	int sockfd;
- 	int nfound;
- 
-+	memset(&ssl_fd, 0, sizeof(ssl_fd));
-+
- 	/* start */
- 	watch_cursor(1);
- 	l0[0] = l1[0] = l2[0] = '\0';
- 
- 	/* find transport and host */
--	if (strncmp (url, http, 7)) {
--	    xe_msg (1, "URL must begin with %s", http);
-+	if (!strncmp (url, transport, ltransport)) {
-+	    ishttp = 1;
-+	} else {
-+	    transport = https;
-+	    ltransport = strlen (transport);
-+	}
-+
-+	if ((!ishttp) && (strncmp (url, transport, ltransport))) {
-+	    xe_msg (1, "URL must begin with %s or %s", http, https);
- 	    watch_cursor (0);
- 	    return;
- 	}
- 
--	slash = strchr (url+7, '/');
-+	slash = strchr (url+ltransport, '/');
- 	dot = strrchr (url, '.');
- 	if (!slash || !dot) {
- 	    xe_msg (1, "Badly formed URL");
-@@ -434,11 +448,16 @@
- 	}
- 
- 	/* connect to check url */
--	sprintf (host, "%.*s", (int)(slash-url-7), url+7);
-+	sprintf (host, "%.*s", (int)(slash-url-ltransport), url+ltransport);
- 	sprintf (buf, "GET %s HTTP/1.1\r\nHost: %s\r\nConnection: close\r\nUser-Agent: xephem/%s\r\n\r\n",
- 						url, host, PATCHLEVEL);
- 	stopd_up();
--	sockfd = httpGET (host, buf, msg);
-+	if (ishttp) {
-+	    sockfd = httpGET (host, buf, msg);
-+	    ssl_fd.fd = sockfd;
-+	} else {
-+	    sockfd = httpsGET (host, buf, msg, &ssl_fd);
-+	}
- 	if (sockfd < 0) {
- 	    xe_msg (1, "http GET to %s failed: %s%s\n", host, buf, msg);
- 	    stopd_down();
-@@ -447,20 +466,22 @@
- 	}
- 
- 	/* create local file */
--	slash = strrchr (url+7, '/');
-+	slash = strrchr (url+ltransport, '/');
- 	sprintf (filename, "%s/%.*sedb", getPrivateDir(), (int)(dot-slash), slash+1);
- 	fp = fopen (filename, "w");
- 	if (!fp) {
- 	    xe_msg (1, "%s:\n%s", filename, syserrstr());
- 	    watch_cursor (0);
--	    close (sockfd);
-+	    if (!ishttp)
-+		SSL_free (ssl_fd.ssl);
-+	    close (ssl_fd.fd);
- 	    return;
- 	}
- 
- 	/* copy to file, insuring only .edb lines.
- 	 */
- 	nfound = 0;
--	while (recvlineb (sockfd, l2p, sizeof(l2)) > 0) {
-+	while (ssl_recvlineb (&ssl_fd, l2p, sizeof(l2)) > 0) {
- 	    char *lrot;
- 	    Obj o;
- 
-@@ -484,7 +505,9 @@
- 
- 	/* tidy up and done */
- 	fclose (fp);
--	close (sockfd);
-+	if (!ishttp)
-+	    SSL_free (ssl_fd.ssl);
-+	close (ssl_fd.fd);
- 	if (!nfound) {
- 	    xe_msg (1, "No objects in file");
- 	    remove (filename);
-diff -Naur a/GUI/xephem/xephem.h b/GUI/xephem/xephem.h
---- a/GUI/xephem/xephem.h	2012-12-30 18:01:12.000000000 +0100
-+++ b/GUI/xephem/xephem.h	2016-10-26 20:09:47.000000000 +0200
-@@ -12,12 +12,12 @@
- 
- #include <stdarg.h>		/* be kind to those who don't use xe_msg() */
- 
-+#include "net.h"		/* has to be included before astro.h because of openssl */
- #include "astro.h"
- #include "ip.h"
- 
- /* local glue files */
- #include "map.h"
--#include "net.h"
- #include "patchlevel.h"
- #include "preferences.h"
- #include "db.h"
diff --git a/sci-astronomy/xephem/files/xephem-3.7.7_openssl_earthmenu.patch b/sci-astronomy/xephem/files/xephem-3.7.7_openssl_earthmenu.patch
deleted file mode 100644
index 438f35e..0000000
--- a/sci-astronomy/xephem/files/xephem-3.7.7_openssl_earthmenu.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -Naur a/GUI/xephem/earthmenu.c b/GUI/xephem/earthmenu.c
---- a/GUI/xephem/earthmenu.c	2012-11-23 05:15:39.000000000 +0100
-+++ b/GUI/xephem/earthmenu.c	2018-09-24 01:17:34.248048815 +0200
-@@ -4886,8 +4886,11 @@
- 	int nrawgif;
- 	char buf[1024];
- 	int w, h;
-+	XE_SSL_FD ssl_fd;
- 	int fd;
- 
-+	memset(&ssl_fd, 0, sizeof(ssl_fd));
-+
- 	/* open test case, else real network */
- 	fd = openh ("/tmp/latest_cmoll.gif", O_RDONLY);
- 	if (fd >= 0) {
-@@ -4902,12 +4905,12 @@
- 	    stopd_up();
- 
- 	    /* make connection to server for the file */
--	    xe_msg (0, "Getting\nhttp://%s%s", wxhost, wxfile);
--	    (void) sprintf (buf, "GET http://%s%s HTTP/1.0\r\nUser-Agent: xephem/%s\r\n\r\n",
--						wxhost, wxfile, PATCHLEVEL);
--	    fd = httpGET (wxhost, buf, buf);
-+	    xe_msg (0, "Getting\nhttps://%s%s", wxhost, wxfile);
-+	    (void) sprintf (buf, "GET %s HTTP/1.1\r\nHost: %s\r\nConnection: close\r\nUser-Agent: xephem/%s\r\n\r\n",
-+						wxfile, wxhost, PATCHLEVEL);
-+	    fd = httpsGET (wxhost, buf, buf, &ssl_fd);
- 	    if (fd < 0) {
--		xe_msg (1, "http get:\n%s", buf);
-+		xe_msg (1, "https get:\n%s", buf);
- 		stopd_down();
- 		return (-1);
- 	    }
-@@ -4915,7 +4918,7 @@
- 	    /* read header, looking for some header info */
- 	    isgif = 0;
- 	    length = 0;
--	    while (recvline (fd, buf, sizeof(buf)) > 1) {
-+	    while (ssl_recvline (&ssl_fd, buf, sizeof(buf)) > 1) {
- 		xe_msg (0, "Rcv: %s", buf);
- 		if (strstr (buf, "image/gif"))
- 		    isgif = 1;
-@@ -4923,9 +4926,10 @@
- 		    length = atoi (buf+15);
- 	    }
- 	    if (!isgif) {
--		while (recvline (fd, buf, sizeof(buf)) > 1)
-+		while (ssl_recvline (&ssl_fd, buf, sizeof(buf)) > 1)
- 		    xe_msg (0, "Rcv: %s", buf);
--		close (fd);
-+		SSL_free (ssl_fd.ssl);
-+		close (ssl_fd.fd);
- 		stopd_down();
- 		return (-1);
- 	    }
-@@ -4936,12 +4940,13 @@
- 	    pm_up();
- 	    for (nrawgif = 0; nrawgif < sizeof(rawgif); nrawgif += nr) {
- 		pm_set (100*nrawgif/length);
--		nr = readbytes (fd, rawgif+nrawgif, 4096);
-+		nr = SSL_read (ssl_fd.ssl, rawgif+nrawgif, 4096);
- 		if (nr < 0) {
--		    xe_msg (1, "%s:\n%s", wxhost, syserrstr());
-+		    xe_msg (1, "%s: ssl read error code: %d", wxhost, SSL_get_error(ssl_fd.ssl, nr));
- 		    stopd_down();
- 		    pm_down();
--		    close (fd);
-+		    SSL_free (ssl_fd.ssl);
-+		    close (ssl_fd.fd);
- 		    return (-1);
- 		}
- 		if (nr == 0)
-@@ -4949,7 +4954,8 @@
- 	    }
- 	    stopd_down();
- 	    pm_down();
--	    close (fd);
-+	    SSL_free (ssl_fd.ssl);
-+	    close (ssl_fd.fd);
- 	    if (nr > 0) {
- 		xe_msg (1, "File too large");
- 		return (-1);
diff --git a/sci-astronomy/xephem/metadata.xml b/sci-astronomy/xephem/metadata.xml
deleted file mode 100644
index 3e8c9be..0000000
--- a/sci-astronomy/xephem/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci-astronomy@gentoo.org</email>
-		<name>Gentoo Astronomy Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		Xephem is an interactive astronomical ephemeris program for X Windows
-		systems. It computes heliocentric, geocentric and topocentric
-		information for fixed celestial objects and objects in heliocentric
-		and geocentric orbits; has built-in support for all planet positions;
-		the moons of Jupiter, Saturn and Earth; Mars' and Jupiter's central
-		meridian longitude; Saturn's rings; and Jupiter's Great Red Spot.
-	</longdescription>
-</pkgmetadata>
diff --git a/sci-astronomy/xephem/xephem-3.7.7-r100.ebuild b/sci-astronomy/xephem/xephem-3.7.7-r100.ebuild
deleted file mode 100644
index 1a69179..0000000
--- a/sci-astronomy/xephem/xephem-3.7.7-r100.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~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"
-	"${FILESDIR}/${P}_openssl.patch"
-	"${FILESDIR}/${P}_openssl_earthmenu.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-3.7.7-r101.ebuild b/sci-astronomy/xephem/xephem-3.7.7-r101.ebuild
deleted file mode 100644
index e144a3e..0000000
--- a/sci-astronomy/xephem/xephem-3.7.7-r101.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~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"
-	"${FILESDIR}/${P}_openssl.patch"
-	"${FILESDIR}/${P}_openssl_earthmenu.patch"
-	"${FILESDIR}/${P}-fix_gsc_lookup.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}
-}