Merge updates from master

11 files changed, 1 insertions, 348 deletions

diff --git a/app-admin/gtkdiskfree/Manifest b/app-admin/gtkdiskfree/Manifest
index 5b4152767616..634471e9e704 100644
--- a/app-admin/gtkdiskfree/Manifest
+++ b/app-admin/gtkdiskfree/Manifest
@@ -1,3 +1,2 @@
-DIST gtkdiskfree-2.0.1.tar.gz 354661 BLAKE2B 39731b38eedf92554303fa8f6784c1cc9c6f1843f5c62c8b6e269856198440a0818a913a7cefedc8b8667167974e3b2d269dc35a1465213b5d6cb4db62399ce8 SHA512 ec202cc79dc80fb66fdf028b6a89610344bb76d7cbe09563f5f47ae072bed791e395d9d1389954046c25e882587d3685b14db4e871e26244045beabb8b579de8
 DIST gtkdiskfree-2.0.3.tar.bz2 216189 BLAKE2B 146dae89b0f66328840f22bd7b9e8ad751759dea3a67c332d71e513388be46122cb761fec6229258b63e85c726ee889e04a56d405437904f1eb8060ea31ee88a SHA512 c6f093ff023cb8c67090b3bd3660a998163e786b08386f346bdc1aa7b29e030a31cfb0ef54c55f109f211bf045f90afd20558b91849a4f82d041c99532f170fe
 DIST gtkdiskfree-bdda379b9109a226a37801505a19da91494144a6.tar.gz 318381 BLAKE2B 06fa325714dba0ec8ee319448286af791472d4aebdd7b94923fc102dfa0352f69247b941e91877c906b754a3b15c8c97d3b01281389274bc92ae23d1c4dfe858 SHA512 641aff62adb665ed6faa82925cc8941d894591e8209a46097b04a5feaba50a401144414edaaa1d97dd9c6b01fa6b4a057b3a5d96f9fd20318f85e535550ef2b7
diff --git a/app-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild b/app-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild
deleted file mode 100644
index d6cdb81631ea..000000000000
--- a/app-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils flag-o-matic
-
-DESCRIPTION="Graphical tool to show free disk space"
-HOMEPAGE="https://gitlab.com/mazes_80/gtkdiskfree"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="nls"
-
-RDEPEND="x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${PN}-master"
-
-PATCHES=( "${FILESDIR}/${P}-desktop-file.patch" )
-
-src_prepare() {
-	sed -i \
-		-e '/^CFLAGS=/s:=" -Wall -O2 :+=" :' \
-		configure.in || die "sed on configure.in failed"
-
-	# Fix underlinking, bug #463578
-	append-libs -lm
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--without-gtk2
-		$(use_enable nls)
-	)
-	autotools-utils_src_configure
-}
diff --git a/app-admin/whowatch/Manifest b/app-admin/whowatch/Manifest
index 0db3583b2eb5..d13aac091fa0 100644
--- a/app-admin/whowatch/Manifest
+++ b/app-admin/whowatch/Manifest
@@ -1,2 +1 @@
-DIST whowatch-1.8.5.tar.gz 133845 BLAKE2B f0f5b80d7adc488030877936ab8d12687f8b5617e445efa604971ae6e0b2de403b6f77a119f9ab1311811900003af85235ad546c425296facece165034b82cad SHA512 9a534dcc859101e3f6636fcfc191be3c0a66b843225dbace0d851f8cca7bbf1374929f604414556c651167c24a223525304fe2963a92b97ba97a8f57179ec738
 DIST whowatch-1.8.6.tar.gz 141801 BLAKE2B d52ae8304d25c570873c65cc3b91d8fe227bf71f1802cc8055332f4614b9ca9f6c17dea10b07bbd20f834623f9e10456b19c6393996f6c66819e7e921ffb6240 SHA512 49aa45b0a88a41c98fb7b548f0f098004c8bcca9ec078e977fcec8bc109c9beab25989003bfff4b3dc38a9d62d69378f64441753a1cca62729d2013d2ed73cb0
diff --git a/app-admin/whowatch/whowatch-1.8.5.ebuild b/app-admin/whowatch/whowatch-1.8.5.ebuild
deleted file mode 100644
index e63c78391d8a..000000000000
--- a/app-admin/whowatch/whowatch-1.8.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Displays information about users currently logged on in real time"
-HOMEPAGE="http://wizard.ae.krakow.pl/~mike/"
-SRC_URI="http://wizard.ae.krakow.pl/~mike/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~mips ppc x86"
-IUSE=""
-
-RDEPEND="
-	sys-libs/ncurses:0=
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.8.4-tinfo.patch
-	epatch "${FILESDIR}"/${PN}-1.8.4-select.patch
-	eautoreconf
-}
-
-src_install() {
-	dobin src/${PN}
-	doman ${PN}.1
-	dodoc AUTHORS ChangeLog README TODO
-}
diff --git a/app-admin/whowatch/whowatch-1.8.6.ebuild b/app-admin/whowatch/whowatch-1.8.6.ebuild
index ba5febb05efb..68ac8f0dbbe8 100644
--- a/app-admin/whowatch/whowatch-1.8.6.ebuild
+++ b/app-admin/whowatch/whowatch-1.8.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mtsuszycki/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~mips ~ppc x86"
+KEYWORDS="amd64 ~arm hppa ~mips ppc x86"
 
 RDEPEND="
 	sys-libs/ncurses:0=
diff --git a/app-misc/ddccontrol-db/Manifest b/app-misc/ddccontrol-db/Manifest
index c612b957c0af..ac37a45d0809 100644
--- a/app-misc/ddccontrol-db/Manifest
+++ b/app-misc/ddccontrol-db/Manifest
@@ -1,3 +1 @@
-DIST ddccontrol-db-20061014_p20121105.tar.gz 62043 BLAKE2B 558af647f21839f6df8a19cb84237aeb8ad5d023b1373de3180b9a88fcf7425d17797348cc0e2d44a4d5d1d715a429475873b82d0d8c728d8177b17d77b9cc42 SHA512 323c2ac498f634d20a183ea96e67868b8f3e8bb26da0133b91848b06accbef5605b3d5ca56b4861a8d28d9da9a28b11579a2e1fcc248624835190cdb01943c80
-DIST ddccontrol-db-20190826.tar.gz 76861 BLAKE2B e5f88dc74363b985b34ab7c5427555f725a4c0ad76e9496ceb914062f136443afa85e77710e7966884208e7fb2c30922d340501f365328d1369e76a9088003ce SHA512 f1939568fd77b9a6faf5d848cefe90910134ed4a661d07a399c88bdfdba7f087111dfe95332355080be90fa88011909e28b302248d42a9b909028eaf39a40a7c
 DIST ddccontrol-db-20190826_p20200613.tar.gz 85044 BLAKE2B 6f80a7a53843dc29ff6158614dd36eba3d7f8172e21592776426464729b4bdcfd3bea51b8412919aa5231015f75766da51eb71f4d808b4c280c045209a4edf1a SHA512 9171193fd31c877699df9e8740cbed0a8de68acc41b614ded36022a25be27f01cf34129033ae3c219211bff54ea82882a955f587dfa87fa7571d3992ac3fa4de
diff --git a/app-misc/ddccontrol-db/ddccontrol-db-20061014_p20121105.ebuild b/app-misc/ddccontrol-db/ddccontrol-db-20061014_p20121105.ebuild
deleted file mode 100644
index 79ee7d4da0ba..000000000000
--- a/app-misc/ddccontrol-db/ddccontrol-db-20061014_p20121105.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools
-
-DESCRIPTION="DDCControl monitor database"
-HOMEPAGE="http://ddccontrol.sourceforge.net/"
-COMMIT_ID="130da80af5cd5d2897ffeed63362262262c6944f"
-SRC_URI="https://github.com/ddccontrol/ddccontrol-db/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-
-S=${WORKDIR}/${PN}-${COMMIT_ID}
-
-RDEPEND="nls? ( sys-devel/gettext )"
-DEPEND="${RDEPEND}
-		dev-util/intltool
-		dev-perl/XML-Parser"
-
-src_prepare() {
-	touch db/options.xml.h ABOUT-NLS config.rpath || die
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/app-misc/ddccontrol-db/ddccontrol-db-20190826.ebuild b/app-misc/ddccontrol-db/ddccontrol-db-20190826.ebuild
deleted file mode 100644
index afe9ca3a52f7..000000000000
--- a/app-misc/ddccontrol-db/ddccontrol-db-20190826.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools
-
-DESCRIPTION="DDCControl monitor database"
-HOMEPAGE="http://ddccontrol.sourceforge.net/"
-#COMMIT_ID="..."
-MY_PV=${COMMIT_ID:-${PV}}
-SRC_URI="https://github.com/ddccontrol/ddccontrol-db/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-RDEPEND="nls? ( sys-devel/gettext )"
-DEPEND="${RDEPEND}
-		dev-util/intltool
-		dev-perl/XML-Parser"
-
-src_prepare() {
-	touch db/options.xml.h ABOUT-NLS config.rpath || die
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README.md
-}
diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest
index 6a72dd46c973..051e205dae9a 100644
--- a/sys-cluster/drbd-utils/Manifest
+++ b/sys-cluster/drbd-utils/Manifest
@@ -1,2 +1 @@
-DIST drbd-utils-8.9.3.tar.gz 768700 BLAKE2B 4d6989e69ecb68b3f4d68b0e807aa911e60511fc91c0ea4e7500d044262348ad00a5517505c9bb912ba392677cb4b6a64405a9821cf59f1200f8eb7b662d89ec SHA512 1b1cb3d1eb7f14f693e8a73b9864257e439e443ce685084c3864da4340113f18355d1e447177956ee0d8edcee35e771442b9f85b89ec5a6eb0ad717738461ca2
 DIST drbd-utils-8.9.6.tar.gz 788183 BLAKE2B 314c3c647f7fc52f82e94853949185daf4092e8c182c5799773e5d6b3e77995d2068087a10cf33133414c5fba91498a7cd1e5d487887aea03df3e18c0426dcb4 SHA512 cbdeeb7b298bc21de0d2188566362d7a634a72df243403f4bc91d5836c757f15ee86314b1385860aecda5657be5dc6309f2481b0403012bde841dd0618188938
diff --git a/sys-cluster/drbd-utils/drbd-utils-8.9.3.ebuild b/sys-cluster/drbd-utils/drbd-utils-8.9.3.ebuild
deleted file mode 100644
index 7bb3129097f5..000000000000
--- a/sys-cluster/drbd-utils/drbd-utils-8.9.3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1 eutils multilib udev versionator
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/${P/_/}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="heartbeat pacemaker +udev xen"
-SLOT="0"
-
-DEPEND="heartbeat? ( sys-cluster/heartbeat )
-	pacemaker? ( sys-cluster/pacemaker )
-	udev? ( virtual/udev )
-	!!sys-cluster/drbd"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P/_/}"
-
-src_prepare() {
-	# respect LDFLAGS, #453442
-	sed -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" \
-		-e "/\$(DESTDIR)\$(localstatedir)\/lock/d" \
-		-i user/*/Makefile.in || die
-
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
-		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
-		-i user/*/Makefile.in || die
-
-	# correct install paths (really correct this time)
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:$(get_bashcompdir):" \
-		scripts/Makefile.in || die
-
-	# don't participate in user survey bug 360483
-	sed -i -e '/usage-count/ s/yes/no/' scripts/global_common.conf || die
-	sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in || die
-
-	epatch "${FILESDIR}"/run-lock.patch
-
-	autoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		--with-bashcompletion \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools
-	dodoc README ChangeLog
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN/-utils/}
-
-	dodoc scripts/drbd.conf.example
-
-	dosym /usr/sbin/drbdadm /sbin/drbdadm
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN/-utils/}.conf.example.bz2 to /etc/${PN/-utils/}.conf"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-	elog "Remember to enable drbd support in kernel."
-}
diff --git a/sys-cluster/drbd-utils/drbd-utils-8.9.6.ebuild b/sys-cluster/drbd-utils/drbd-utils-8.9.6.ebuild
deleted file mode 100644
index d66c244db4a2..000000000000
--- a/sys-cluster/drbd-utils/drbd-utils-8.9.6.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1 eutils multilib udev versionator
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/${P/_/}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="heartbeat pacemaker +udev xen"
-SLOT="0"
-
-DEPEND="heartbeat? ( sys-cluster/heartbeat )
-	pacemaker? ( sys-cluster/pacemaker )
-	udev? ( virtual/udev )
-	!!sys-cluster/drbd"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P/_/}"
-
-src_prepare() {
-	# respect LDFLAGS, #453442
-	sed -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" \
-		-e "/\$(DESTDIR)\$(localstatedir)\/lock/d" \
-		-i user/*/Makefile.in || die
-
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
-		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
-		-i user/*/Makefile.in || die
-
-	# correct install paths (really correct this time)
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:$(get_bashcompdir):" \
-		scripts/Makefile.in || die
-
-	# don't participate in user survey bug 360483
-	sed -i -e '/usage-count/ s/yes/no/' scripts/global_common.conf || die
-	sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in || die
-
-	epatch "${FILESDIR}"/run-lock.patch
-
-	autoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		--with-bashcompletion \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools install-doc
-	dodoc README ChangeLog
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN/-utils/}
-
-	dodoc scripts/drbd.conf.example
-
-	dosym /usr/sbin/drbdadm /sbin/drbdadm
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN/-utils/}.conf.example.bz2 to /etc/${PN/-utils/}.conf"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-	elog "Remember to enable drbd support in kernel."
-}