gentoo resync : 16.09.2020

6 files changed, 6 insertions, 327 deletions

diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 634bf39c2d8b..69b7637d400e 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -1,14 +1,10 @@
 AUX gkrellm-2.3.5-config.patch 1530 BLAKE2B 4e672d58a680c7c0d3f660a2ff26fd5340d14e39d1fb9f824464a5a89b593a9f1b915cc8735c215d27c198147a2a4a438b506e27e5c5469ccbc80534867dc380 SHA512 c8259770dd088a119c349d2f19728f4874a24c407273edbf7129a531589e908ef37fbdf7bdbaaaf51ae6fa527d88601749a9e358746bff514082535b355d2ad0
 AUX gkrellm-2.3.5-sansfont.patch 688 BLAKE2B 679912990141a5758b14f67712ec154e46b0fd8d1fd3fe5a1eb14c9d95ce8113cdf887b72290f9045bb9d37bb6ba132240b74dc3262a6d99fb54b0f204e81100 SHA512 7f404c8f57091f00e66435b0cd311611b40fc6e3f3e953476a40e9a4521e91f7bbd3b19094d88a74b9d8cef20b00c1b5289197df5219455a84ab68e5271ce11f
 AUX gkrellm-2.3.5-width.patch 350 BLAKE2B 94b3690a464b6bfcfe6b88cf7b73880680b33b389ea3ec9f299518aadfc1e9161f7ae8046b3ba484a1a0ff5f4b4d8b3d81a604b4ccc63c546156e8dfa81d687a SHA512 4324fad0b59b482b8a2bea489373a280bc6a5a647f0863f9b1c5929454f7786b94f8293731c3de94ddbef0e8cfbe6018b721fc223dade3d23feb598e4569f3ed
-AUX gkrellmd 536 BLAKE2B 6d6cf06ef51a1afc7c943b78041c9d21a9630eec0a8f598c17013868085ae06d65fdac32a4abc5bfdffb1faa33010deb9e109ccd660064a5e474402c65b55008 SHA512 7a0fa7f32f2aa5739747bec37bdcf2fd5fffffd36fdcfc4c10a36dddbf3987f003d6f8ad367d4e8b9a2d50fbef618dbb9812fc65eeed3d8e70dcf2a1da587495
 AUX gkrellmd.conf 250 BLAKE2B 2b0cfcd1940cd695c67db32c13bbb7f372936b1f88938a2e43aa27d5eeeacf746e5df3367a3c6f68c4f4470633e52a08611dc65e41a9342b98b6d4e80da81064 SHA512 257e13405bc5ce7b61b7a18e7456d1ae22d6fc2052e0e65e3b53c352a43aad2bedb4660dfd7cb95709b51f54b8949f6ff114de310be1ce49d70b074b3b8f8ef5
-AUX gkrellmd.initd 345 BLAKE2B 922967be33dcc733c55cfffa59addc01bbe2ba0298be14541925e88bac16f2310f226448545263527a96499454007baf04272fc5ce136628f03587bbc322f74b SHA512 197ad175f8e8afbc9bb81957d594ee2190c7fb3e251cfda5e987c140174a6a08e485ce2fa4e3d7a21b9bb19979c853e4c04f33021beb497f084f0ddfb2c725ba
+AUX gkrellmd.initd 338 BLAKE2B 6ff2ab29e354578efc477af50af6a7e517bb7ec9267575d75fb5d5a12c9894a60996ffa37672760657eeee0680b9b7573d3d03d7d5efbe20122d330e5a55ebd8 SHA512 403431a0bfe8264ccdaf3c7e361e363a18a5e2deda8b2287919030c746c7caf80571b1a2dda407c113a9f878253078e67202017a026d83dec43bc5ca0389cc06
 AUX gkrellmd.service 173 BLAKE2B c89a772fd0273b54766f5cea36aab9156d7a1d59f5759bdd673651afebdc21e1bf6108cadbc6328287e6fc62d0edac215eeb7e6dd9d8d6a916c7ff913222c511 SHA512 8703ea4e51d243050034b65b7bc50b3d1862a6369af72b0d9e47285558763066e27dbdfadd54a4316da0402aac0d92c17cf1c42eed2b7926226191ce5d85089d
-DIST gkrellm-2.3.10.tar.bz2 782794 BLAKE2B c0aac7df866d40c79667551ca4b25346da4267a0aad8853776425a08097dcfe3a24082e7e5d17db6d3936b59d10c29afa11e8a425319c19696141c02f7d95f25 SHA512 3ae0baa0d51729e1bac7b8f10e008bd7ed9d93d48cd894630e3a027565266e6458df0dcb3171fb271ca7766f4030149e3e6aa234ec191e8e223ae4dee1feb295
 DIST gkrellm-2.3.11.tar.bz2 783123 BLAKE2B b68c60477e4994e9508a8e5ea39fd09ab5cf0f019fc6b4567b9482b3b1fd315dd2548daed262095b42dda43ac068295d5c3c375c5cb80c91fda76ef8b9834df2 SHA512 e4147aa90e09925b9672728f287880bde26632d77d83d3f0b9458a201593a57158d9eb8cbb31e569e0d71d91a08c9bceba29814f59e542315775663ef9fd27a9
-EBUILD gkrellm-2.3.10-r2.ebuild 3269 BLAKE2B 8c3ae715ca6f500851ded3929326182033152e56b2690012b83741de46b493469439374c6972abb1c495c5b8d06062ed97d8234358c8e21c08da3fd4252399b5 SHA512 9cfef7a70d9fa015e70a93e6c5bc7a65706af7c9861bb3142680ea56007b64a63f8b05e0281baee16fb03779756b4a26c8d17de784c98ca3f038813f631625b7
 EBUILD gkrellm-2.3.11-r1.ebuild 3334 BLAKE2B bbd6fe1265a6b72e1e9a9830d829e28875b8604f851f8879564aeb79bf9a807cf716ce06926b7613b043aa42644230927ef1926fe5a89c33313426d5b9791a06 SHA512 d0bdd181eed540ce917e3830cc148dc18723d32b1a825dff53ce61ef083e6d2b9a8aec61f53195588f0194f73969c665d6e56f5f4ee546d863f0eefed8bb39e8
-EBUILD gkrellm-2.3.11.ebuild 3380 BLAKE2B fcbdcea39dc5cd9d3064b88135cfb3e0157005df600c4e527b33401fef53d51b81d6aba724e732b63e71a38235e6955fddff697d1aa86afd9213b57901acb071 SHA512 1cf4e0fb31e9e323ed1859c847ebded405489376c3cbec6365d63a62aba7362c3b355a330574aaab40ce7338da1a12a0871e45960a787eebe83f9a37ae419290
-EBUILD gkrellm-9999.ebuild 3340 BLAKE2B abbdc51c93283e45f59bce3d08cea145d25e53745b74a78031681e3dae31ecefb9c6ba57a0e93f2952fe2f576c587ad1733688a40258467f2218391a89191965 SHA512 4868a487263094f3557998fabf8f908a05b1023983d45b576f1c14295df880356647e7f1588f5ac0de8f0b1d21ab16379e4a4d96f7dbe455a960f35f11a54c36
+EBUILD gkrellm-9999.ebuild 3352 BLAKE2B dab875e96a3baacbb110e23b544c412787b5ad1f20cca62196ce6b6d5b89588275836e80fcebd1e3d141f8cd3993695687ed52aaae7af6e9c71c2310146eb13c SHA512 c939397ccb34fce1892a13abac3cc6c990c16dc9e8c3a370f7767d28b0d3c4231cb3813873a5afba938bb0a6c37bee1f0b2ff30c6e84a259cd841bd11d43649b
 MISC metadata.xml 917 BLAKE2B 88567611e5ddaed8c1f81e639c7e82a120f9201f56b9e512bca08d948c78a967e57490e754f7e3b2c9a4a9a2c216b1288c8059593589378b5404b51db50a9644 SHA512 8b880d60459e4cba922f2fe586f0dfdcc4b0f8054e5f5cf8650ab10bacb30380b67f81795c671e28bf0c51bd6f3379c3b653bc78c0ec954bc7456dccdad274f0
diff --git a/app-admin/gkrellm/files/gkrellmd b/app-admin/gkrellm/files/gkrellmd
deleted file mode 100644
index 93743c57b7df..000000000000
--- a/app-admin/gkrellm/files/gkrellmd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-	after lm_sensors
-	after hddtemp
-}
-
-start() {
-	ebegin "Starting GNU Krell Monitor daemon"
-	start-stop-daemon --start --quiet --background --pidfile /var/run/gkrellmd.pid --make-pidfile --exec /usr/bin/gkrellmd -- ${GKRELLMD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping GNU Krell Monitor daemon"
-	start-stop-daemon --stop --quiet --pidfile /var/run/gkrellmd.pid --name gkrellmd
-	eend $?
-}
diff --git a/app-admin/gkrellm/files/gkrellmd.initd b/app-admin/gkrellm/files/gkrellmd.initd
index fe295128e4ea..7ab4cfc103ee 100644
--- a/app-admin/gkrellm/files/gkrellmd.initd
+++ b/app-admin/gkrellm/files/gkrellmd.initd
@@ -1,9 +1,9 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 description="gkrell system monitor daemon"
-pidfile="/var/run/gkrellmd.pid"
+pidfile="/run/gkrellmd.pid"
 command="/usr/bin/gkrellmd"
 command_args="${GKRELLMD_OPTS}"
 command_background="true"
diff --git a/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild b/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
deleted file mode 100644
index cf113afd6726..000000000000
--- a/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop multilib user systemd toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Single process stack of various system monitors"
-HOMEPAGE="http://www.gkrellm.net/"
-SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X"
-
-RDEPEND="
-	dev-libs/glib:2
-	hddtemp? ( app-admin/hddtemp )
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:= )
-	nls? ( virtual/libintl )
-	ntlm? ( net-libs/libntlm )
-	X? (
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/pango
-		)"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.5-config.patch
-	"${FILESDIR}"/${PN}-2.3.5-width.patch
-	"${FILESDIR}"/${PN}-2.3.5-sansfont.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( Changelog CREDITS README )
-
-pkg_pretend() {
-	if use gnutls && ! use ssl ; then
-		ewarn "You have enabled the \"gnutls\" USE flag but not the \"ssl\" USE flag."
-		ewarn "No ssl backend will be built!"
-	fi
-}
-
-pkg_setup() {
-	TARGET=
-	use kernel_FreeBSD && TARGET="freebsd"
-}
-
-src_prepare() {
-	sed -e 's:-O2 ::' \
-		-e 's:override CC:CFLAGS:' \
-		-e 's:-L/usr/X11R6/lib::' \
-		-i */Makefile || die "sed Makefile(s) failed"
-
-	sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
-		-e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
-		-i src/${PN}.h || die "sed ${PN}.h failed"
-
-	default
-}
-
-src_compile() {
-	if use X ; then
-		emake \
-			${TARGET} \
-			CC="$(tc-getCC)" \
-			STRIP="" \
-			INSTALLROOT="${EPREFIX}/usr" \
-			INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
-			LOCALEDIR="${EPREFIX}/usr/share/locale" \
-			$(usex nls "" "enable_nls=0") \
-			$(usex lm-sensors "" "without-libsensors=yes") \
-			$(usex ntlm "" "without-ntlm=yes") \
-			$(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes')
-	else
-		cd server || die
-		emake \
-			${TARGET} \
-			CC="$(tc-getCC)" \
-			LINK_FLAGS="$LDFLAGS -Wl,-E" \
-			STRIP="" \
-			$(usex nls "" "enable_nls=0") \
-			$(usex lm-sensors "" "without-libsensors=yes")
-	fi
-}
-
-src_install() {
-	if use X ; then
-		emake \
-			install${TARGET:+_}${TARGET} \
-			$(usex nls "" "enable_nls=0") \
-			STRIP="" \
-			INSTALLDIR="${ED}/usr/bin" \
-			INCLUDEDIR="${ED}/usr/include" \
-			LOCALEDIR="${ED}/usr/share/locale" \
-			PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
-			MANDIR="${ED}/usr/share/man/man1"
-
-		docinto html
-		dodoc *.html
-
-		newicon src/icon.xpm ${PN}.xpm
-		make_desktop_entry ${PN} GKrellM ${PN}
-	else
-		dobin server/gkrellmd
-
-		insinto /usr/include/gkrellm2
-		doins server/gkrellmd.h
-		doins shared/log.h
-	fi
-
-	newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd
-	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
-
-	systemd_dounit "${FILESDIR}"/gkrellmd.service
-
-	insinto /etc
-	doins server/gkrellmd.conf
-
-	einstalldocs
-}
-
-pkg_preinst() {
-	enewgroup gkrellmd
-	enewuser gkrellmd -1 -1 -1 gkrellmd
-}
diff --git a/app-admin/gkrellm/gkrellm-2.3.11.ebuild b/app-admin/gkrellm/gkrellm-2.3.11.ebuild
deleted file mode 100644
index 93834c49a9a6..000000000000
--- a/app-admin/gkrellm/gkrellm-2.3.11.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop multilib user systemd toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Single process stack of various system monitors"
-HOMEPAGE="http://www.gkrellm.net/"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.srcbox.net/gkrellm"
-else
-	SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-LICENSE="GPL-3"
-SLOT="2"
-IUSE="gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X"
-
-RDEPEND="
-	dev-libs/glib:2
-	hddtemp? ( app-admin/hddtemp )
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:= )
-	nls? ( virtual/libintl )
-	ntlm? ( net-libs/libntlm )
-	X? (
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/pango
-		)"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.5-config.patch
-	"${FILESDIR}"/${PN}-2.3.5-width.patch
-	"${FILESDIR}"/${PN}-2.3.5-sansfont.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( Changelog CREDITS README )
-
-pkg_pretend() {
-	if use gnutls && ! use ssl ; then
-		ewarn "You have enabled the \"gnutls\" USE flag but not the \"ssl\" USE flag."
-		ewarn "No ssl backend will be built!"
-	fi
-}
-
-pkg_setup() {
-	TARGET=
-	use kernel_FreeBSD && TARGET="freebsd"
-}
-
-src_prepare() {
-	sed -e 's:-O2 ::' \
-		-e 's:override CC:CFLAGS:' \
-		-e 's:-L/usr/X11R6/lib::' \
-		-i */Makefile || die "sed Makefile(s) failed"
-
-	sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
-		-e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
-		-i src/${PN}.h || die "sed ${PN}.h failed"
-
-	default
-}
-
-src_compile() {
-	if use X ; then
-		emake \
-			${TARGET} \
-			CC="$(tc-getCC)" \
-			STRIP="" \
-			INSTALLROOT="${EPREFIX}/usr" \
-			INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
-			LOCALEDIR="${EPREFIX}/usr/share/locale" \
-			$(usex nls "" "enable_nls=0") \
-			$(usex lm-sensors "" "without-libsensors=yes") \
-			$(usex ntlm "" "without-ntlm=yes") \
-			$(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes')
-	else
-		cd server || die
-		emake \
-			${TARGET} \
-			CC="$(tc-getCC)" \
-			LINK_FLAGS="$LDFLAGS -Wl,-E" \
-			STRIP="" \
-			$(usex nls "" "enable_nls=0") \
-			$(usex lm-sensors "" "without-libsensors=yes")
-	fi
-}
-
-src_install() {
-	if use X ; then
-		emake \
-			install${TARGET:+_}${TARGET} \
-			$(usex nls "" "enable_nls=0") \
-			STRIP="" \
-			INSTALLDIR="${ED}/usr/bin" \
-			INCLUDEDIR="${ED}/usr/include" \
-			LOCALEDIR="${ED}/usr/share/locale" \
-			PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
-			MANDIR="${ED}/usr/share/man/man1"
-
-		docinto html
-		dodoc *.html
-
-		newicon src/icon.xpm ${PN}.xpm
-		make_desktop_entry ${PN} GKrellM ${PN}
-	else
-		dobin server/gkrellmd
-
-		insinto /usr/include/gkrellm2
-		doins server/gkrellmd.h
-		doins shared/log.h
-	fi
-
-	newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd
-	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
-
-	systemd_dounit "${FILESDIR}"/gkrellmd.service
-
-	insinto /etc
-	doins server/gkrellmd.conf
-
-	einstalldocs
-}
-
-pkg_preinst() {
-	enewgroup gkrellmd
-	enewuser gkrellmd -1 -1 -1 gkrellmd
-}
diff --git a/app-admin/gkrellm/gkrellm-9999.ebuild b/app-admin/gkrellm/gkrellm-9999.ebuild
index 1e4443fdd6e6..e757131b4748 100644
--- a/app-admin/gkrellm/gkrellm-9999.ebuild
+++ b/app-admin/gkrellm/gkrellm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ DESCRIPTION="Single process stack of various system monitors"
 HOMEPAGE="http://www.gkrellm.net/"
 if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://git.srcbox.net/gkrellm"
+	EGIT_REPO_URI="https://git.srcbox.net/gkrellm/gkrellm.git"
 else
 	SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"