Merge updates from master

14 files changed, 12 insertions, 141 deletions

diff --git a/app-editors/vile/metadata.xml b/app-editors/vile/metadata.xml
index 5156eb857fef..d110c3ebb42b 100644
--- a/app-editors/vile/metadata.xml
+++ b/app-editors/vile/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<changelog>https://invisible-island.net/vile/CHANGES.html</changelog>
+		<remote-id type="github">ThomasDickey/vile-snapshots</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/cdk/metadata.xml b/dev-libs/cdk/metadata.xml
index 9dc14192b95c..f683d1054e8f 100644
--- a/dev-libs/cdk/metadata.xml
+++ b/dev-libs/cdk/metadata.xml
@@ -4,5 +4,6 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<changelog>https://dickey.his.com/cdk/CHANGES.html</changelog>
+		<remote-id type="github">ThomasDickey/cdk-snapshots</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/bcpp/metadata.xml b/dev-util/bcpp/metadata.xml
index 64a2f533d433..2ccc0a6e418d 100644
--- a/dev-util/bcpp/metadata.xml
+++ b/dev-util/bcpp/metadata.xml
@@ -4,5 +4,6 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<changelog>https://invisible-island.net/bcpp/CHANGES</changelog>
+		<remote-id type="github">ThomasDickey/bcpp-snapshots</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/byacc/metadata.xml b/dev-util/byacc/metadata.xml
index de03cd291619..8e4415f86e02 100644
--- a/dev-util/byacc/metadata.xml
+++ b/dev-util/byacc/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<changelog>https://invisible-island.net/byacc/CHANGES.html</changelog>
+		<remote-id type="github">ThomasDickey/byacc-snapshots</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/cproto/metadata.xml b/dev-util/cproto/metadata.xml
index 7587b7e8e51b..3af032a14a57 100644
--- a/dev-util/cproto/metadata.xml
+++ b/dev-util/cproto/metadata.xml
@@ -4,5 +4,6 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<changelog>https://invisible-island.net/cproto/CHANGES.html</changelog>
+		<remote-id type="github">ThomasDickey/cproto-snapshots</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/dialog/metadata.xml b/dev-util/dialog/metadata.xml
index 7a9829e938bb..fd93c5744e48 100644
--- a/dev-util/dialog/metadata.xml
+++ b/dev-util/dialog/metadata.xml
@@ -10,5 +10,6 @@
 	</use>
 	<upstream>
 		<changelog>https://invisible-island.net/dialog/CHANGES.html</changelog>
+		<remote-id type="github">ThomasDickey/dialog-snapshots</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/mawk/metadata.xml b/sys-apps/mawk/metadata.xml
index 70c9644a61c5..528178a88402 100644
--- a/sys-apps/mawk/metadata.xml
+++ b/sys-apps/mawk/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<changelog>https://invisible-island.net/mawk/CHANGES.html</changelog>
+		<remote-id type="github">ThomasDickey/mawk-snapshots</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 05c0b37fa3b3..85706e051c7c 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -1,4 +1,4 @@
-DIST ceph-15.2.16.tar.gz 148628915 BLAKE2B 4f624078027c706428eae3eddd5b5479efe3b4442c19a4e6b6cdf8d3839cf56e2863b18249dc3c5079a7e25f60796bfec3202ffd695537587654f5e2f820caaa SHA512 532b8a5073e157fe9ed552b26976faeb64dc29b79a249910c0982134ad5f945d4f57d8bf451adf63487b6d285c6e4bd5c39f0e3fcd449230d6fb3087539f8c3b
+DIST ceph-15.2.17.tar.gz 148640102 BLAKE2B a10dd702ffca005a8741bff645eaf2f671300be969edf9e9e321e29abdc34a403de7c56684fd1509d30c2bd32b996fff3aaa88d1d08c3d258d6f5ef43ecefddf SHA512 952cd4db057fcab5efa3c6331fbc19cf1e904f5855266c2ed13e41ffb2e5a7d18ed133bd113fea493149005a182f429eef39931c4ceac7776aefe84a208a745a
 DIST ceph-16.2.10.tar.gz 157176743 BLAKE2B 065b6f1941f87fde150ab22ba45aa9f58069acf7f33a483456faf0a26e41936846944e800ccd7f99bd8863db8438ae70804621522f75065c0b2506522c4fdd7d SHA512 ae164c24462c3e08763d202acc3e2fe86ffc09f312b5059bae07863e804fc47bd158fc130aa2923246ffcfe26ae6d6d9317326aec96373226e6f9030d7123c8b
 DIST ceph-16.2.9.tar.gz 157168096 BLAKE2B 0a667a9699925cfc920ca0cc535e5331cbcd95997fb0b9816a4d84c8add454b6b17813018bc1d1de07c802167ef50aa528704b10b01f42759189392ccdb5088f SHA512 bf369038ad6383f88abbed267f0239e9d8a1d33b46b34ed260aeeb1fda1b374cb6e658238e1ace013fbbb68e73b8cd2922b7def318d7a110e5f4560eeae8fca3
 DIST ceph-17.2.3.tar.gz 168821857 BLAKE2B 21ec5ac33591ae8b22eae3d88680ae87340e639cc21cb9c79bc4fb2f7b6cc7e93aa6b5af0242a6c094a4af9808a2b6f86b6bd7e3c8f247a513c91defa6d4e4a9 SHA512 fd6e057ba8440f69423e870dddb2705d68015089ff8d97356bdc359c2ab41e19351fb1c914330de6ba05180f48e328e3ea4c877e9dd80be049e2ec5895068595
diff --git a/sys-cluster/ceph/ceph-15.2.16.ebuild b/sys-cluster/ceph/ceph-15.2.17.ebuild
index 0b443b7f37b3..d3e65042d29a 100644
--- a/sys-cluster/ceph/ceph-15.2.16.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.17.ebuild
@@ -49,6 +49,7 @@ DEPEND="
 	dev-libs/leveldb:=[snappy,tcmalloc(-)?]
 	dev-libs/libaio:=
 	dev-libs/libfmt:=
+	<dev-libs/libfmt-9:=
 	dev-libs/libnl:3=
 	dev-libs/libxml2:=
 	<dev-libs/rocksdb-6.15:=
diff --git a/sys-cluster/ceph/files/ceph.logrotate b/sys-cluster/ceph/files/ceph.logrotate
deleted file mode 100644
index df03f5e69a4b..000000000000
--- a/sys-cluster/ceph/files/ceph.logrotate
+++ /dev/null
@@ -1,18 +0,0 @@
-/var/log/ceph/*.log
-{
-    rotate 7
-    daily
-    compress
-    sharedscripts
-    prerotate
-	for dmn in $(cd /run/ceph && ls *.asok 2>/dev/null); do
-		ceph --admin-daemon /run/ceph/${dmn} log flush 2>/dev/null >/dev/null
-	done
-    endscript
-    postrotate
-	for dmn in $(cd /run/ceph && ls *.asok 2>/dev/null); do
-		ceph --admin-daemon /run/ceph/${dmn} log reopen 2>/dev/null >/dev/null
-        done
-    endscript
-    missingok
-}
diff --git a/sys-cluster/ceph/files/rbdmap.initd b/sys-cluster/ceph/files/rbdmap.initd
deleted file mode 100644
index 9313cf658863..000000000000
--- a/sys-cluster/ceph/files/rbdmap.initd
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/sbin/openrc-run
-
-DESC="RBD Mapping:"
-RBDMAPFILE="/etc/ceph/rbdmap"
-
-extra_started_commands="reload"
-
-depend() {
-	need localmount net
-	before netmount
-}
-
-start() {
-
-	if [ ! -f "${RBDMAPFILE}" ]; then
-		ewarn "$DESC : No ${RBDMAPFILE} found."
-		exit 0
-	fi
-
-	RET=0
-	# Read /etc/ceph/rbdmap to create non-existant mapping
-	while read DEV PARAMS; do
-		case "$DEV" in
-		  ""|\#*)
-		  	continue
-			;;
-		  */*)
-		  	;;
-		  *)
-		  	DEV=rbd/$DEV
-			;;
-		esac
-		ebegin "${DESC} '${DEV}'"
-		newrbd=""
-		MAP_RV=""
-		RET_OP=0
-		OIFS=$IFS
-		IFS=','
-		for PARAM in ${PARAMS[@]}; do
-			CMDPARAMS="${CMDPARAMS} --$(echo ${PARAM} | tr '=' ' ')"
-		done
-		IFS=$OIFS
-		if [ ! -b /dev/rbd/${DEV} ]; then
-			MAP_RV=$(rbd map ${DEV} ${CMDPARAMS} 2>&1)
-			if [ $? -eq 0 ]; then
-				newrbd="yes"
-			else
-				RET=$((${RET}+$?))
-				RET_OP=1
-			fi
-		fi
-		eend ${RET_OP} "${MAP_RV}"
-
-		if [ "$newrbd" ]; then
-			## Mount new rbd
-			MNT_RV=""
-			mount --fake /dev/rbd/${DEV} >>/dev/null 2>&1 \
-			&& MNT_RV=$(mount -vn /dev/rbd/${DEV} 2>&1)
-			[ -n "${MNT_RV}" ] && einfo "mount: ${MNT_RV}"
-
-			## post-mapping
-			if [ -x "/etc/ceph/rbd.d/${DEV}" ]; then
-				einfo "RBD Running post-map hook '/etc/ceph/rbd.d/${DEV}'"
-				/etc/ceph/rbd.d/${DEV} map "/dev/rbd/${DEV}"
-			fi
-		fi
-	done < ${RBDMAPFILE}
-	eend ${RET}
-}
-
-stop() {
-
-	RET=0
-	## Unmount and unmap all rbd devices
-	if ls /dev/rbd[0-9]* >/dev/null 2>&1; then
-		for DEV in /dev/rbd[0-9]*; do
-			## pre-unmapping
-			for L in $(find /dev/rbd -type l); do
-				LL="${L##/dev/rbd/}"
-				if [ "$(readlink -f $L)" = "${DEV}" ] \
-				&& [ -x "/etc/ceph/rbd.d/${LL}" ]; then
-					einfo "RBD pre-unmap:  '${DEV}' hook '/etc/ceph/rbd.d/${LL}'"
-					/etc/ceph/rbd.d/${LL} unmap "$L"
-					break
-				fi
-			done
-
-			ebegin "Unmapping RBD device: '${DEV}'"
-			UMNT_RV=""
-			UMAP_RV=""
-			RET_OP=0
-			MNT=$(findmnt --mtab --source ${DEV} --noheadings | awk '{print $1'})
-			if [ -n "${MNT}" ]; then
-				einfo "un-mounting '${MNT}'"
-				UMNT_RV=$(umount "${MNT}" 2>&1)
-			fi
-			if mountpoint -q "${MNT}"; then
-				## Un-mounting failed.
-				RET_OP=1
-				RET=$((${RET}+1))
-			else
-				## Un-mapping.
-				UMAP_RV=$(rbd unmap $DEV 2>&1)
-				if [ $? -ne 0 ]; then
-					RET=$((${RET}+$?))
-					RET_OP=1
-				fi
-			fi
-			eend ${RET_OP} "${UMAP_RV}"
-			[ -n "${UMNT_RV}" ] && einfo "${UMNT_RV}"
-		done
-	fi
-	eend ${RET}
-}
-
-reload() {
-	start
-}
-
-status() {
-	rbd showmapped
-}
diff --git a/www-client/lynx/metadata.xml b/www-client/lynx/metadata.xml
index cff28d637bc8..142dd473b0ba 100644
--- a/www-client/lynx/metadata.xml
+++ b/www-client/lynx/metadata.xml
@@ -8,5 +8,6 @@
 	</use>
 	<upstream>
 		<changelog>https://lynx.invisible-island.net/current/CHANGES.html</changelog>
+		<remote-id type="github">ThomasDickey/lynx-snapshots</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-apps/luit/metadata.xml b/x11-apps/luit/metadata.xml
index a9008c5e06b0..0dd220c66856 100644
--- a/x11-apps/luit/metadata.xml
+++ b/x11-apps/luit/metadata.xml
@@ -4,5 +4,6 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<changelog>https://invisible-island.net/luit/luit.log.html</changelog>
+		<remote-id type="github">ThomasDickey/luit-snapshots</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-terms/xterm/metadata.xml b/x11-terms/xterm/metadata.xml
index f4e653d10222..afa7b8cf58e8 100644
--- a/x11-terms/xterm/metadata.xml
+++ b/x11-terms/xterm/metadata.xml
@@ -12,5 +12,6 @@
 	</use>
 	<upstream>
 		<changelog>https://invisible-island.net/xterm/xterm.log.html</changelog>
+		<remote-id type="github">ThomasDickey/xterm-snapshots</remote-id>
 	</upstream>
 </pkgmetadata>