Merge updates from master

app-portage/pacvis/Manifest

@@ -1,2 +1 @@
-DIST pacvis-0.4.1.tar.gz 511582 BLAKE2B 61fe99358b2d1c6f1b500583fa9f4b017ba2548e246c0a4ed2ab59e224e8e8273cfb9c1fdaa233421ce3f45a0e498598b757995c2e74e568450e81cbd44184aa SHA512 146dc13f66c7dcb81f8cbe67461a58df2ea8874c7e4fe97910006b3295c55ce4aa1dff989586a46e2c50ab8156a8dd2519962bf041c54877d1e4de43915ae015
 DIST pacvis-0.4.2.tar.gz 511929 BLAKE2B 3be3dd286caf27b4a27e6ee813db2445262438016def5d14afbeaec70d12ea905fe97cb94b9e19bfc1a12a9560e5647808a5f7e17347db3980f0d308081ce773 SHA512 da86165454845edc229fcd417ceb293402e400caead4ac23f2b8a5c28fd40eea6720c6016092ab5d375d9a756744a7f68a4dbd78431a410dada86048ee188c58

app-portage/pacvis/pacvis-0.4.1.ebuild

@@ -1,18 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Displays dependency graphs of packages"
-HOMEPAGE="https://github.com/bgloyer/pacvis.git"
-SRC_URI="https://github.com/bgloyer/pacvis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="www-servers/tornado[${PYTHON_USEDEP}]"

games-action/netrek-brmh/Manifest

@@ -0,0 +1 @@
+DIST netrek-brmh-2.6.0.tar.gz 294581 BLAKE2B 62c7f8d5d1e905ee1d7202eee7d2320920ff0389b077b34ab090d8b1f0fb3b3bc9d07b0375b8a367ad2bd3a0a92f596c46bb5e5d53b64d9f1ef955710a7b295d SHA512 c8651b8857e685a9a6da5f783ab80019517ab9c5af09a1eada4be8f7e9694cad32a39bbeaf271e07f08cd7266819ed7ea155af3f7cfc0781c70c4814aebb2e0c

games-action/netrek-brmh/metadata.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>brian.gloyer@gmail.com</email>
+    <name>brian gloyer</name>
+  </maintainer>
+  <upstream>
+    <maintainer status="active">
+      <email>brian.gloyer@gmail.com</email>
+      <name>brian gloyer</name>
+    </maintainer>
+    <bugs-to>https://github.com/bgloyer/netrek-client-brmh/issues/</bugs-to>
+    <remote-id type="github">bgloyer/netrek-client-brmh</remote-id>
+  </upstream>
+</pkgmetadata>

games-action/netrek-brmh/netrek-brmh-2.6.0.ebuild

@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="brmh client for netrek"
+HOMEPAGE="https://netrek.org"
+SRC_URI="https://github.com/bgloyer/netrek-client-brmh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/netrek-client-brmh-${PV}"
+
+RDEPEND="
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXmu
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	x11-misc/imake
+	x11-misc/gccmakedep
+"
+
+src_configure() {
+	xmkmf || die
+	make depend || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		LOCAL_LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin netrek
+}

net-misc/rpki-client/Manifest

@@ -1,2 +1,2 @@
-DIST rpki-client-0.3.0.tar.gz 81004 BLAKE2B 1831ed0aab4f4112391ba2c40c7b335f5284c4fe13d2e0e59e5996c909368285073018a3d9b431f88fdc347a8281d2fc4613de68badcab011061e7274d3df2bf SHA512 92f62b3137a3848aa3cf27b5b303b1ce097da961dcb684b8bad9fa224690f2f233658bd3c73e48d60d3c7df965173a1c935b0497a61084fe0986dce4feb4bd70
 DIST rpki-client-6.6_p2.tar.gz 42840 BLAKE2B f5075376925cad57893a27c463c6727362e108cbccb348785ca4940fbaa8262286342ecb6f5fa59a0615009bc16571b15218483822c827528ecc19e1963c9e6b SHA512 5acdabef9b0373fb2fe47a2b9cb2638809ac1260b273c1566e3dbd34287c3703dd7979a7ba98b7d5b305664add6f2d5af4564ad2315033406e5e835f1051951f
+DIST rpki-client-6.7_p0.tar.gz 44454 BLAKE2B 2336f3a8f4a0cb53a9c6f4df6dbd269ff1e8bcb11b61d4c283c3153e563054efb163339ec7852f45e12cc7e9544522d7dabc62d0f79b5a6951014e47980caad9 SHA512 018e237a4075779850f18bdc69c49dac03d8bb2d377dbd680f1faa307057647ea3188acb6b78766e6563dd48afadd5eaea419413c41a018882d1a8b147bb6630

net-misc/rpki-client/files/rpki-client-0.2.0-Makefile.patch

@@ -1,19 +0,0 @@
---- Makefile	2019-06-16 16:32:45.000000000 +0200
-+++ Makefile	2019-12-07 17:14:01.888076319 +0100
-@@ -30,12 +30,12 @@
- 	   test-tal
- 
- # Linux.
--#LDADD += `pkg-config --libs openssl` -lresolv
--#CFLAGS += `pkg-config --cflags openssl`
-+LDADD += `pkg-config --libs openssl` -lresolv
-+CFLAGS += `pkg-config --cflags openssl`
- 
- # OpenBSD.
--CFLAGS += -I/usr/local/include/eopenssl
--LDADD += /usr/local/lib/eopenssl/libssl.a /usr/local/lib/eopenssl/libcrypto.a
-+#CFLAGS += -I/usr/local/include/eopenssl
-+#LDADD += /usr/local/lib/eopenssl/libssl.a /usr/local/lib/eopenssl/libcrypto.a
- 
- all: $(BINS)
- 

net-misc/rpki-client/files/rpki-client-6.7-update.patch

@@ -0,0 +1,25 @@
+--- a/update.sh	2020-05-19 20:27:54.816143493 +0200
++++ b/update.sh	2020-05-19 20:28:03.700182804 +0200
+@@ -4,22 +4,6 @@
+ openbsd_branch=`cat OPENBSD_BRANCH`
+ openbgpd_version=`cat VERSION`
+ 
+-# pull in latest upstream code
+-echo "pulling upstream openbsd source"
+-if [ ! -d openbsd ]; then
+-	if [ -z "${RPKICLIENT_GIT}" ]; then
+-		git clone https://github.com/rpki-client/rpki-client-openbsd.git openbsd
+-	else
+-		git clone "${RPKICLIENT_GIT}/openbsd"
+-	fi
+-fi
+-if [ -d openbsd/.git ]; then
+-	(cd openbsd/src
+-	 git fetch
+-	 git checkout "${openbsd_branch}"
+-	 git pull --rebase)
+-fi
+-
+ # setup source paths
+ dir=`pwd`
+ patches="${dir}/patches"

net-misc/rpki-client/rpki-client-0.3.0.ebuild

@@ -1,40 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils
-
-VERSION="VERSION_${PV//./_}"
-
-DESCRIPTION="RPKI client implementation"
-HOMEPAGE="https://github.com/kristapsdz/rpki-client"
-SRC_URI="https://github.com/kristapsdz/${PN}/archive/${VERSION}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	acct-group/_rpki-client
-	acct-user/_rpki-client
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/${PN}-${VERSION}"
-
-src_configure() {
-	./configure CPPFLAGS="`pkg-config --cflags openssl`" \
-		LDFLAGS="`pkg-config --libs-only-L openssl`" \
-		LDADD="`pkg-config --libs openssl` -lresolv"
-}
-
-src_install() {
-	emake DESTDIR="${D}" BINDIR="/usr/bin" MANDIR="/usr/share/man" install
-	insinto /usr/share/${PN}
-	doins tals/*
-	keepdir /var/cache/${PN}/
-	fowners -R _rpki-client /var/cache/${PN}/
-}

net-misc/rpki-client/rpki-client-6.7_p0.ebuild

@@ -0,0 +1,68 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools git-r3
+
+MY_PN="${PN}-portable"
+MY_PV="${PV/_p/p}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Portability shim for OpenBSD's rpki-client"
+HOMEPAGE="https://rpki-client.org/"
+SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+EGIT_REPO_URI="https://github.com/${PN}/${PN}-openbsd.git"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	acct-group/_rpki-client
+	acct-user/_rpki-client
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}/${PN}-${PV%_*}-update.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	default
+
+	EGIT_BRANCH=$(cat "${S}"/OPENBSD_BRANCH)
+	EGIT_CHECKOUT_DIR="${S}/openbsd"
+	git-r3_fetch
+	git-r3_checkout
+}
+
+src_prepare() {
+	default
+
+	cd "${S}"
+	./autogen.sh
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-rsync=rsync
+		--with-base-dir="/var/cache/${PN}"
+		--with-output-dir="/var/db/${PN}"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" BINDIR="/usr/bin" MANDIR="/usr/share/man" install
+	insinto /etc/rpki
+	doins *.tal
+	keepdir "/var/db/${PN}/"
+	fowners -R _rpki-client "/var/db/${PN}/"
+}