gui-apps/swaync dazu

media-libs/lensfun entfernt
app-misc/tmux: enable sixel support
2025-11-16 13:55:30 +01:00 · 2025-05-06 09:10:11 +02:00 · 2024-12-14 20:23:57 +01:00 · 2024-07-12 08:03:13 +02:00 · 2024-07-12 08:03:08 +02:00 · 2024-06-20 14:33:12 +02:00
33 changed files with 264 additions and 1381 deletions
--- a/app-admin/rcm/Manifest
+++ b/app-admin/rcm/Manifest
@@ -1,4 +0,0 @@
-DIST rcm-1.3.6.tar.gz 96280 BLAKE2B d8408a46ba1db78fccdac32064eb95086206beb7a83b3b63cded27b6e27866ec88512b39a612d2807bf7585741fb97b9778931a612f167e0bc68b9ec3da28880 SHA512 83c2e54161d569969d7b03f21601c5f2ef647dff2e573a75831cd3f8f7cc35b779d554ec2ac7d06e5a31c0d385f2856de0aa669290a9b6d51b17feeb954f99e0
-EBUILD rcm-1.3.6.ebuild 416 BLAKE2B 82823ca09d0d70a2c8067f01ba5924f2d2423bab726bffe204884c8fe066bb8898b66fa41da47c0458b4a0eef050210fcc0a12a9fc07da4e86518a5ae209dfef SHA512 4fc5e6aa0ca38bf2b1ae44b0d9fd59821c59b4c970a720504689e47c41da764f0b5f44ee33aefd22250ae021a29066b3646ab3d1c9c82dcdcc0965573e5e4626
-EBUILD rcm-9999.ebuild 416 BLAKE2B 962682ba63c33c8ddc8156b6788123d275eb85675ce9dff225c74c233e47286bf6a98e7853e7a8c7b83b2d3ad2d9b130c8a85023b1a4574d22d37fac8b4906db SHA512 9551e347b4f8529481064658d5ccb6363c2e1710042e90197a996eb50d242c02ca9dadec1dfcfcdb6f8c367e3c02b24065da51e794a5efe40c97ce0d676ef92e
-MISC metadata.xml 611 BLAKE2B f5dbb0eff044e60a1f78d8a93d9f3f24b2e6b5e7d8089de3c27fae174123d64aa8b954c17c5a63686cf52e8edfcd8765f68056f530559eddc4b337bb52f6a8f1 SHA512 508ce28286fa519f6d071d06b1c75e23113f67b9d96d879d4fdd0ab9bfc9bbfaef5fa8e33c0e8a617aeaf58c3e979cb19fc2171779a8cd7e4de06ebad733bbb0
--- a/app-admin/rcm/metadata.xml
+++ b/app-admin/rcm/metadata.xml
@@ -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>
--- a/app-admin/rcm/rcm-1.3.6.ebuild
+++ b/app-admin/rcm/rcm-1.3.6.ebuild
@@ -1,20 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="rc file (dotfile) management"
-HOMEPAGE="https://github.com/thoughtbot/rcm"
-SRC_URI="https://thoughtbot.github.io/${PN}/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-util/cram )"
-
-src_test() {
-	emake -j1 check
-}
--- a/app-admin/rcm/rcm-9999.ebuild
+++ b/app-admin/rcm/rcm-9999.ebuild
@@ -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
-}
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -0,0 +1,7 @@
+AUX tmux-2.4-flags.patch 456 BLAKE2B df85b32486894e8e3c5531937461ad46ca5effc5dd4d31b4f7a3f9bcf8d3dfa38fc186a603a90fe734b25781b9d517115c2b089648c29e4605fa9610f6dc311a SHA512 505d5ec4fa1d7844870c67aedccac3a147db1971464fc21d19319bb343fb6fd73b696e85298f8592e46900774b35b250cc53841b05514333c44c3e973bcdb860
+AUX tmux-3.5-fix-xterm-sym.patch 1263 BLAKE2B ec47a799cd7301cb53eb24d3435a3772017af05b92c414874c3cb413cb913d18a3dabe773ca28474488ef1921011de2010df483e833fec52d411d2f88e9ae07b SHA512 50bea66e52fa86021e2d56c7bcb702d8361f34832dbcb20efda99de037d438ca6a3d114b5c19f8bcf1b8aaf66289871bb4cf7d4d44da6985c7c907fa322f4471
+AUX tmux.service 124 BLAKE2B a4eecfeb4baa24433408c9dfb4848d420da4d54a2c62f6a4e05b0538e7b4c75bcec113d6ca86fea5085264903122e92e9adf7572e94ffafa3fe7f2038148b717 SHA512 73d3daf5362222da3e91641cc776c66fdaea50048000827a5eaa8693c769da73a320c19488aec6fd7660095eb6c44ef02f3473b2443909d55451442dfea70d28
+AUX tmux.socket 132 BLAKE2B 9aa90b43f2eaedfce327287cc8eee4808c7870364668c54d0ffd4b5064d45a4c986702fdf64dde5fe24496635e700e1385a92a02060cb07819b48ab9d381b65b SHA512 fd2a8feb7474702515e9186a801fa5601feca5aedd39138d0f0623911b93255bc7cf4aa0ee066ba2c059601a21f2eb29794fe041d5a8cff91c63584e579aaff9
+DIST tmux-3.4.tar.gz 707213 BLAKE2B 2b1990b95d7439702e9287402d9828d4ecab573202c099aa482969c047b540d4b899f79d87587fc712e727d9cebf5fa7393512087e469fc355b4a30b1894e229 SHA512 bd3880211d99d8ee15947000abf8a1832fdfa48b29b2df81b66d5969cf3f4e64e746f984f6139bfc57e3ebee7fe8dc7cbb6bccb779307607de6c376969fecbff
+EBUILD tmux-3.4-r101.ebuild 2216 BLAKE2B 78e3d6cf46a6626940ca87188119c5852f0c3a28519be278dc076c424455fcd55df8e253f1727d9dbe71214a7d7684913c8933c3a978f9815d4123a33a5630fa SHA512 88f8e253a1a5bff023fa4529fc8d688319cd43857fdabc0b5fcb89174bb6c5526704b0c0cee45a50f923ba33f0e6993847344d77366068368ca87c3f734600f0
+MISC metadata.xml 768 BLAKE2B c443cc60d807e1ffbfaa0499585f050566543a7337d4fa61569e03a6405077ebee7d81487530e75ccb3923aa5a1428e54c55b3cf7480a0aa786ad089c5e8a18b SHA512 cc26ffb4a98b8d207a3fc0aeaafe56b335bdf5d8b33b79a4b405e0c9220fe56d36b1d8a0203d611081c42ab81ecc476ded90ae98cc0fd4fe4bf6e47d312ee2ec
--- a/app-misc/tmux/files/tmux-2.4-flags.patch
+++ b/app-misc/tmux/files/tmux-2.4-flags.patch
@@ -0,0 +1,15 @@
+ Makefile.am |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+--- tmux-2.4/Makefile.am
+++ tmux-2.4/Makefile.am
+@@ -17,9 +17,8 @@
+ 
+ # Set flags for gcc.
+ if IS_GCC
+-AM_CFLAGS += -std=gnu99 -O2
+AM_CFLAGS += -std=gnu99
+ if IS_DEBUG
+-AM_CFLAGS += -g
+ AM_CFLAGS += -Wno-long-long -Wall -W -Wformat=2
+ AM_CFLAGS += -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
+ AM_CFLAGS += -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
--- a/app-misc/tmux/files/tmux-3.5-fix-xterm-sym.patch
+++ b/app-misc/tmux/files/tmux-3.5-fix-xterm-sym.patch
@@ -0,0 +1,38 @@
+https://github.com/tmux/tmux/commit/934035db7197d4510b330df8d8963f78e9c8756d
+
+From: nicm <nicm>
+Date: Mon, 14 Oct 2024 20:26:45 +0000
+Subject: [PATCH] Set ACS flag for REP. Reported by Romain Francoise, GitHub
+ issue 4182.
+
+--- a/input.c
+++ b/input.c
+@@ -1145,7 +1145,6 @@ input_print(struct input_ctx *ictx)
+ 		ictx->cell.cell.attr |= GRID_ATTR_CHARSET;
+ 	else
+ 		ictx->cell.cell.attr &= ~GRID_ATTR_CHARSET;
+-
+ 	utf8_set(&ictx->cell.cell.data, ictx->ch);
+ 	screen_write_collect_add(sctx, &ictx->cell.cell);
+
+@@ -1349,7 +1348,7 @@ input_csi_dispatch(struct input_ctx *ictx)
+ 	struct screen_write_ctx	       *sctx = &ictx->ctx;
+ 	struct screen		       *s = sctx->s;
+ 	struct input_table_entry       *entry;
+-	int				i, n, m, ek;
+	int				i, n, m, ek, set;
+ 	u_int				cx, bg = ictx->cell.cell.bg;
+
+ 	if (ictx->flags & INPUT_DISCARD)
+@@ -1592,6 +1591,11 @@ input_csi_dispatch(struct input_ctx *ictx)
+ 		if (~ictx->flags & INPUT_LAST)
+ 			break;
+
+		set = ictx->cell.set == 0 ? ictx->cell.g0set : ictx->cell.g1set;
+		if (set == 1)
+			ictx->cell.cell.attr |= GRID_ATTR_CHARSET;
+		else
+			ictx->cell.cell.attr &= ~GRID_ATTR_CHARSET;
+ 		utf8_copy(&ictx->cell.cell.data, &ictx->last);
+ 		for (i = 0; i < n; i++)
+ 			screen_write_collect_add(sctx, &ictx->cell.cell);
--- a/app-misc/tmux/files/tmux.service
+++ b/app-misc/tmux/files/tmux.service
@@ -0,0 +1,9 @@
+[Unit]
+Requires=tmux@%i.socket
+
+[Service]
+ExecStart=/usr/bin/tmux -D
+
+[Install]
+Also=tmux@%i.socket
+DefaultInstance=default
--- a/app-misc/tmux/files/tmux.socket
+++ b/app-misc/tmux/files/tmux.socket
@@ -0,0 +1,8 @@
+[Socket]
+ListenStream=/tmp/tmux-%U/%i
+DirectoryMode=0700
+SocketMode=0660
+
+[Install]
+WantedBy=sockets.target
+DefaultInstance=default
--- a/app-misc/tmux/metadata.xml
+++ b/app-misc/tmux/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
+	<use>
+		<flag name="utempter">Include libutempter support</flag>
+		<flag name="sixel">Include SIXEL graphics support</flag>
+	</use>
+	<longdescription>
+		tmux is a "terminal multiplexer", it enables a number of terminals
+		(or windows) to be accessed and controlled from a single terminal.
+		tmux is intended to be a simple, modern, BSD-licensed alternative to
+		programs such as <pkg>app-misc/screen</pkg>.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">tmux/tmux</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/app-misc/tmux/tmux-3.4-r101.ebuild
+++ b/app-misc/tmux/tmux-3.4-r101.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Terminal multiplexer"
+HOMEPAGE="https://tmux.github.io/"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b"
+	EGIT_REPO_URI="https://github.com/tmux/tmux.git"
+else
+	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	fi
+	S="${WORKDIR}/${P/_/-}"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="debug selinux systemd utempter vim-syntax +sixel"
+
+DEPEND="
+	dev-libs/libevent:=
+	sys-libs/ncurses:=
+	systemd? ( sys-apps/systemd:= )
+	utempter? ( sys-libs/libutempter )
+	kernel_Darwin? ( dev-libs/libutf8proc:= )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	app-alternatives/yacc
+"
+
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-screen )
+	vim-syntax? ( app-vim/vim-tmux )
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# BSD only functions
+	strtonum recallocarray
+	# missing on musl, tmux has fallback impl which it uses
+	b64_ntop
+)
+
+DOCS=( CHANGES README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4-flags.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# bug 438558
+	# 1.7 segfaults when entering copy mode if compiled with -Os
+	replace-flags -Os -O2
+
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc
+		$(use_enable debug)
+		$(use_enable systemd)
+		$(use_enable utempter)
+		$(use_enable sixel)
+
+		# For now, we only expose this for macOS, because
+		# upstream strongly encourage it. I'm not sure it's
+		# needed on Linux right now.
+		$(use_enable kernel_Darwin utf8proc)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	einstalldocs
+
+	dodoc example_tmux.conf
+	docompress -x /usr/share/doc/${PF}/example_tmux.conf
+
+	if use systemd; then
+		systemd_newuserunit "${FILESDIR}"/tmux.service tmux@.service
+		systemd_newuserunit "${FILESDIR}"/tmux.socket tmux@.socket
+	fi
+}
--- a/dev-vcs/git-remote-gcrypt/Manifest
+++ b/dev-vcs/git-remote-gcrypt/Manifest
@@ -1 +1 @@
-EBUILD git-remote-gcrypt-9999.ebuild 546 SHA256 50bf2d60b4347f5b0194522e7618f3e7aa19e89b1c52fd4a664976f05a9c4693 SHA512 01a900a4c7bb413a19db56cd0af2fd58775998fc2c31c73184336aaba50b7afb405e229bf89ae2524eee4fde57500efbf70a8f8b0ca4cf2121eee63b42d0b164 WHIRLPOOL 4eebbddeb7307c5f547b77404218efadb96277ebd3ad5867c3ad4975da108d984d13c4bf766ac09a9cdfe85098835b8b390d57bb68fd1b219aa1d3e7dc15bfe5
+EBUILD git-remote-gcrypt-9999.ebuild 546 BLAKE2B e918b16ce379e4072e0b4defa26853646b4b34789396beeb7d9842f12e294222a6324362113efe88c30888873aa50ddadf4b91e8b5448aa88d1849ff3a50a50e SHA512 8730662c9b7644205b854c3f391d018dcc1242d82ad3be1ca09f9eeaceac7ca8ee0e239510effc90e7095ea8970c42eae4c7209ca39c006d2e4d51e27a3fd1f6
--- a/dev-vcs/git-remote-gcrypt/git-remote-gcrypt-9999.ebuild
+++ b/dev-vcs/git-remote-gcrypt/git-remote-gcrypt-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=6
+EAPI=7

 inherit git-r3

--- a/gui-apps/swaync/Manifest
+++ b/gui-apps/swaync/Manifest
@@ -0,0 +1,2 @@
+DIST swaync-0.12.3.tar.gz 146516 BLAKE2B cf90caa755e533043320f5a9b37ee1bde806e7ae3f6648c45b347e899d4a93934bfdbcaff5d81ff72329f5c1240466c6ff603aaaaf9282844ca848971df6be78 SHA512 847fa8b46f432d40f4c1c7a8559d5b3f5b431784e3dc7afb90edb57533c6662116af2d78965b2e4b9f635432b108e3a1ad518d739c6fa13ee317b0d80bcbb8cf
+EBUILD swaync-0.12.3.ebuild 1373 BLAKE2B 61d2806a20ac189c9aa8215f79cda3c89204c5517d2ba0b5270f2f6647a6ba53b6e3d2350ca413ffa05e46c4ca10d41ee981c918901deb1f55dcf45209b190a6 SHA512 fdd2bc40c5badd707fcd473fe62713ed6d7c31d71c699e1d8025101cd8113c73c5d2535fda7c11a8684898dce995cf611a955d33fe4444690a5ba365bda23c03
--- a/gui-apps/swaync/swaync-0.12.3.ebuild
+++ b/gui-apps/swaync/swaync-0.12.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{12..14} )
+inherit meson vala gnome2-utils python-any-r1
+VALA_USE_DEPEND="vapigen"
+
+MY_PN="SwayNotificationCenter"
+DESCRIPTION="A simple notification daemon with a GTK gui for notifications and control center"
+HOMEPAGE="https://github.com/ErikReider/SwayNotificationCenter"
+SRC_URI="https://github.com/ErikReider/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="pulseaudio"
+
+DEPEND="
+	dev-lang/sassc
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	>=dev-libs/granite-7.0.0:=
+	dev-libs/json-glib
+	dev-libs/libgee:0.8=
+	gui-libs/gtk4-layer-shell[introspection,vala]
+	gui-libs/gtk:4[introspection,wayland]
+	gui-libs/libadwaita
+	gui-libs/libhandy:1
+	pulseaudio? ( media-libs/libpulse )
+	sys-apps/dbus
+	x11-libs/gdk-pixbuf:2
+"
+RDEPEND="
+	${DEPEND}
+	x11-libs/cairo
+	x11-libs/pango
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(vala_depend)
+	app-text/scdoc
+	dev-util/blueprint-compiler
+"
+# https://bugs.gentoo.org/961696
+BDEPEND+=">=dev-build/meson-1.8.2"
+
+src_configure() {
+	local emesonargs=($(meson_use pulseaudio pulse-audio))
+	meson_src_configure
+}
+
+src_prepare() {
+	default
+	vala_setup
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
--- a/media-libs/glyr/Manifest
+++ b/media-libs/glyr/Manifest
@@ -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
--- a/media-libs/glyr/glyr-1.0.10.ebuild
+++ b/media-libs/glyr/glyr-1.0.10.ebuild
@@ -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
-}
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -1,4 +0,0 @@
-AUX lensfun-0.3.2-warnings.patch 1813 BLAKE2B d0ee40324b584eddbee19442f1c221b25043d06b90357feee37b93e9c77dc9475bb45bb23fcd884d90cea031f6b6b46fc9c50e6f22d5bb816d9e289bac8a1e3a SHA512 517d613ba3916dd031eb026748465ec71f2cdc4658b0ce3dede827386f9805916f9bb1c4adc9af350b61b7e68bba1ceee02f89989ff91e52ffcb1ee442599527
-DIST lensfun-0.3.3.tar.gz 992432 BLAKE2B 174f9a34195ca8d7f09de43a2f0d1015bc766579607c44541f631142386a3b5c27c823f9f54f08d462946a0809610b6a87e61cd093b69339fa7d57d28cc833ae SHA512 2d913e3d121ac069f4cb7acb3f09c9cf11c5d0069e743500631bd4b6007a1b19ebccf871a4ac8cfc2797a03066f8a678ea9d70feba0f7d6a05c28cef61f7d9cf
-EBUILD lensfun-0.3.3-r1.ebuild 1764 BLAKE2B 93a81c5996c275e0ee4084b1125744e1b72125c047c802a3320f2feab6eef6e05a1ec454bf5dc21f1c7bb0782ae938191f25003decb29d886460817fe1b4af19 SHA512 a6a64bc37d4e355d3a62d958d213922c0c40e033353c7876a26593bc03511848a1bfd615d6688b8cccd5b1065d676772d8a44c405eb3eab072b5df7bff055efe
-MISC metadata.xml 714 BLAKE2B 68947d3724407e09902ca87a7d7857ef43007fc04fbf428ae23ca065564755836c9939c29b745d4477d1e75da71a436dc9308b99a98219aa86c059bfb50f8b38 SHA512 a62f71b0b4deba655826f8f78e95a3585d5e012ed3ab9c8576cba1f6535ef3d4626dfe821ec62e60bd00d00dffd00c1da5ca7a5ae5dba1b7587dc3fc57550078
--- a/media-libs/lensfun/files/lensfun-0.3.2-warnings.patch
+++ b/media-libs/lensfun/files/lensfun-0.3.2-warnings.patch
@@ -1,48 +0,0 @@
-Adapted from upstream commit
-
-From 694542f350fc7c9ccafa2d9acb4d4e00e690cbdc Mon Sep 17 00:00:00 2001
-From: Sebastian Kraft <mail@sebastiankraft.net>
-Date: Thu, 22 Dec 2016 18:51:29 +0100
-Subject: [PATCH] Fix some warnings which were introduced when swithcing to
- C++11 mode
-
---
- libs/lensfun/cpuid.cpp  | 4 ++--
- libs/lensfun/mod-pc.cpp | 8 ++++----
- tests/test_modifier.cpp | 4 ++--
- 3 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/libs/lensfun/cpuid.cpp b/libs/lensfun/cpuid.cpp
-index c435f8ac..d2d63972 100644
--- a/libs/lensfun/cpuid.cpp
-+++ b/libs/lensfun/cpuid.cpp
-@@ -92,9 +92,9 @@ guint _lf_detect_cpu_features ()
- {
- #define cpuid(cmd) \
-     __asm volatile ( \
-        "push %%"R_BX"\n" \
-+        "push %%" R_BX "\n" \
-         "cpuid\n" \
-        "pop %%"R_BX"\n" \
-+        "pop %%" R_BX "\n" \
-        : "=a" (ax), "=c" (cx),  "=d" (dx) \
-        : "0" (cmd))
- 
-diff --git a/tests/test_modifier.cpp b/tests/test_modifier.cpp
-index f087917c..ffa3d4d7 100644
--- a/tests/test_modifier.cpp
-+++ b/tests/test_modifier.cpp
-@@ -78,8 +78,8 @@ void test_mod_projection_center(lfFixture* lfFix, gconstpointer data)
- // check if output becomes NaN when processing geometry conversion
- void test_mod_projection_borders(lfFixture* lfFix, gconstpointer data)
- {
-    float in[2]  = {lfFix->img_width, lfFix->img_height};
-    float in2[2] = {(lfFix->img_width-1)/2, (lfFix->img_height-1)/2};
-+    float in[2]  = {(float) lfFix->img_width, (float) lfFix->img_height};
-+    float in2[2] = {(float) (lfFix->img_width-1)/2, (float) (lfFix->img_height-1)/2};
-     float res[2] = {0, 0};
- 
-     lfLensType geom_types [] = {LF_RECTILINEAR, LF_PANORAMIC, LF_EQUIRECTANGULAR, LF_FISHEYE_STEREOGRAPHIC, LF_FISHEYE, LF_FISHEYE_EQUISOLID, LF_FISHEYE_ORTHOGRAPHIC, LF_FISHEYE_THOBY, LF_UNKNOWN};
-- 
-2.26.2
-
--- a/media-libs/lensfun/lensfun-0.3.3-r1.ebuild
+++ b/media-libs/lensfun/lensfun-0.3.3-r1.ebuild
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 cmake
-
-DESCRIPTION="Library for rectifying and simulating photographic lens distortions"
-HOMEPAGE="https://lensfun.github.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc cpu_flags_x86_sse cpu_flags_x86_sse2 test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-python/docutils
-	)
-"
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.40
-	media-libs/libpng:0=
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md docs/mounts.txt ChangeLog )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.3.2-warnings.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
-		-DSETUP_PY_INSTALL_PREFIX=/usr
-		-DBUILD_LENSTOOL=ON
-		-DBUILD_STATIC=OFF
-		-DBUILD_DOC=$(usex doc)
-		-DBUILD_FOR_SSE=$(usex cpu_flags_x86_sse)
-		-DBUILD_FOR_SSE2=$(usex cpu_flags_x86_sse2)
-		-DBUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	mkdir -p "${T}/db/lensfun" || die
-	cp data/db/* "${T}/db/lensfun/" || die
-
-	XDG_DATA_HOME="${T}/db" cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# We have no use for an *.egg file without a corresponding *.pth, and those are deprecated.
-	# Replace it with the unpacked module and its metadata.
-	cd "${BUILD_DIR}/apps"
-	python_domodule lensfun lensfun.egg-info
-	rm "${D}"/usr/lib/${EPYTHON}/site-packages/*.egg || die
-}
--- a/media-libs/lensfun/metadata.xml
+++ b/media-libs/lensfun/metadata.xml
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>dilfridge@gentoo.org</email>
-		<name>Andreas K. Huettel</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>maekke@gentoo.org</email>
-		<name>Markus Meier</name>
-	</maintainer>
-	<longdescription lang="en">
-The project provides a database of photographic lenses and a library that allows advanced access to the database including functions to correct images based on intimate knowledge of lens characteristics and calibration data.
-</longdescription>
-	<upstream>
-		<remote-id type="github">lensfun/lensfun</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1 +0,0 @@
-EBUILD testssl-9999.ebuild 796 SHA256 3d382c48ae688b08d54a5d79eba77e416d8e35a01881b116b013b8ec1690bc61 SHA512 2ac3c00da3e0536a6ef27b38a703f599b87ddd8982aa19f0ed95d669eb761c28dd6bc8c0c25b01b524a560e89fdac119d6e909d529dfa98a8a3d07cdf4b96893 WHIRLPOOL 9458f6905f31442c16b32391f35a9952d1df683cb77cb00afc9899e70349f8adbeffe044b42908637b155fe890def137ef0dbd652ac7f3c6ece6b4844297981e
--- a/net-analyzer/testssl/testssl-9999.ebuild
+++ b/net-analyzer/testssl/testssl-9999.ebuild
@@ -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
-}
--- a/sci-astronomy/xephem/Manifest
+++ b/sci-astronomy/xephem/Manifest
@@ -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
--- 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
@@ -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
--- a/sci-astronomy/xephem/files/xephem-3.7.7-implicits.patch
+++ b/sci-astronomy/xephem/files/xephem-3.7.7-implicits.patch
@@ -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>
--- a/sci-astronomy/xephem/files/xephem-3.7.7-no_xprint.patch
+++ b/sci-astronomy/xephem/files/xephem-3.7.7-no_xprint.patch
@@ -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
- 
--- 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
@@ -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
--- a/sci-astronomy/xephem/files/xephem-3.7.7_openssl.patch
+++ b/sci-astronomy/xephem/files/xephem-3.7.7_openssl.patch
@@ -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"
--- a/sci-astronomy/xephem/files/xephem-3.7.7_openssl_earthmenu.patch
+++ b/sci-astronomy/xephem/files/xephem-3.7.7_openssl_earthmenu.patch
@@ -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);
--- a/sci-astronomy/xephem/metadata.xml
+++ b/sci-astronomy/xephem/metadata.xml
@@ -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>
--- a/sci-astronomy/xephem/xephem-3.7.7-r100.ebuild
+++ b/sci-astronomy/xephem/xephem-3.7.7-r100.ebuild
@@ -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}
-}
--- a/sci-astronomy/xephem/xephem-3.7.7-r101.ebuild
+++ b/sci-astronomy/xephem/xephem-3.7.7-r101.ebuild
@@ -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}
-}
Author	SHA1	Message	Date
Florian Tham	54ac49be30	gui-apps/swaync dazu	2025-11-16 13:55:30 +01:00
Florian Tham	e2cb317136	media-libs/lensfun entfernt	2025-05-06 09:10:11 +02:00
Florian Tham	e9bb0d01bf	app-misc/tmux: enable sixel support	2024-12-14 20:23:57 +01:00
Florian Tham	9ef66744ae	Merge branch 'master' of git.qcft.de:flo/overlay	2024-07-12 08:03:13 +02:00
Florian Tham	7b4942a513	dev-vcs/git-remote-gcrypt EAPI bump	2024-07-12 08:03:08 +02:00
Florian Tham	1d02c683d8	sci-astronomy/xephem entfernt	2024-06-20 14:33:12 +02:00
Florian Tham	396b96453f	media-libs/glyr entfernt	2024-01-06 17:28:10 +01:00
Florian Tham	841823e509	net-analyzer/testssl entfernt	2023-03-19 18:09:46 +01:00
Florian Tham	ca93c1d792	app-admin/rcm entfernt	2023-01-17 08:30:08 +01:00
				`@@ -1 +0,0 @@`
				`EBUILD testssl-9999.ebuild 796 SHA256 3d382c48ae688b08d54a5d79eba77e416d8e35a01881b116b013b8ec1690bc61 SHA512 2ac3c00da3e0536a6ef27b38a703f599b87ddd8982aa19f0ed95d669eb761c28dd6bc8c0c25b01b524a560e89fdac119d6e909d529dfa98a8a3d07cdf4b96893 WHIRLPOOL 9458f6905f31442c16b32391f35a9952d1df683cb77cb00afc9899e70349f8adbeffe044b42908637b155fe890def137ef0dbd652ac7f3c6ece6b4844297981e`