gentoo resync : 15.12.2019

4 files changed, 2 insertions, 140 deletions

diff --git a/sys-apps/irqbalance/Manifest b/sys-apps/irqbalance/Manifest
index d27beff0ebd3..f4e68df58629 100644
--- a/sys-apps/irqbalance/Manifest
+++ b/sys-apps/irqbalance/Manifest
@@ -1,10 +1,7 @@
-AUX irqbalance-1.4.0-configure.patch 2370 BLAKE2B 235d7a6b2fe7f49cb9ae7d98e0c991fea67c712aa430975b49967133441e213336ca94d8c788297984cb6d5343b82a1ec4824c9667c7a3d8e5dbced444055144 SHA512 70b7510df8f0ad61eb3b432f7fcf4ec8e3408ba7a7397b47a6052a3e9be3a4bbffb0bc1f9b0eb3b7eaad783e548f2f81fd195fa9a93d937e73a9dec80c549374
 AUX irqbalance.confd-1 577 BLAKE2B 2744f203cb1d20ec44bec2f4cd2adc92209575a4742c601f45780cc55ff44434248987c31faf6ae2205ae02b2ecfdbd914f271169cb345e403f41376e3bc48b8 SHA512 90e7ed187b4dccd6f6c4383ba54d6e1aed1645240e44aaf02db1b70b56594b1a828644d671e6db91212417981b1d5e53d1ecfd4b366496dbcb484d1064d7d24c
 AUX irqbalance.init.4 524 BLAKE2B 473ee234adf186f620ec022cf20d61b3aaec368611659ce29be47e1038a0d54e4c353264326353cfbca9e43486e4b9bff17086c8484357512dbd9dc74997ff06 SHA512 3b438b142915139d403f6162271e00807db6f0e9432798b3f2955e798dd58ecb07a6c8920cc85032e65cc5a6d4c16fc65402119d6334920ea6715c4f918f6cbc
-DIST irqbalance-1.4.0.tar.gz 53431 BLAKE2B 35271fab011cb917e5472079025f88df45142b0622d94570f62ef7cce7f2a4e9c9c0b77a79121afa5e7edf4510707c7ace52e894b2af44a5a26b543160f481d0 SHA512 d95909c5e86efa452d0d440df0335b398bd2bf973d6a84e29068534f8c4dc033df90913bf507a6d1b7cdab11b288bafbd2c88b4e476f04e32d5f4c89efe4f7d9
 DIST irqbalance-1.5.0.tar.gz 55150 BLAKE2B b111e9fd4cfec968b261f6ae8a6876d15845849ebf28d7304fd8af3bdeb93b8b9a626888c5728b69925f02a5e472c3512f5862726c6ae9a4d378c46ebcf39069 SHA512 343421fd533d7d161fd05a0edfadaddf1da6ced854a19e9f10ea6c12b97b2ef1629aad855214d9700d31d056bb816bf3ec90cdf7c643a1b6e8af1de5befa64f5
 DIST irqbalance-1.6.0.tar.gz 55310 BLAKE2B 67589a40541e9034a0ac09d60a2293dde7a0cf524620794e25b60b4d78f2c91270252f6cebc2c91c66aed105536a211d51aeb29305fc1235112d96b714dc80bd SHA512 ce89dc41eb3aab5950a56b4b1c817aae5e87eaa84bc69bf88618caf53386513e488bb0b4724a600ae175c96be509367cfc418c7f85531007f80e02f7de549b16
-EBUILD irqbalance-1.4.0-r1.ebuild 1372 BLAKE2B 1e12173e698ea23c7b1a7f76b189d96f9dd5ce8227c6b3a9880602651d84f329d7c8cace2026645e31843b163956880b9fb9058da653341d34b7169ba6536b95 SHA512 336cf37b2def1d788592c40ad1e5aafc124e01a0ecfc5d3ed62bd43e7ff9e1bd1c5dfdacdc65dcca254ec65aaf4db0d5af825796c2a33f19ee56b63e00c69080
 EBUILD irqbalance-1.5.0.ebuild 1322 BLAKE2B b7c9fdaeef6a657caa89f3f1cdd641b55c82657bfb8a81d9cb7ec16387c5bc0e6629f655fc675f7485931a5480276aa56d959e81d22ab11c51343e54a7f29f02 SHA512 0557b7a96c9a1b23ee82e524b90d9253699cd2b3c31b566db027838cf7b33b01b55ebfd3a8bd49ee9001110e2aca6058cbdf2604f56f5311ce5143c0b360a7e6
-EBUILD irqbalance-1.6.0.ebuild 1312 BLAKE2B 15b955847573ae02a71f155b51581319f602692f02a5b1a7336635b186f70c4947328e1ef72397fe43c0e4042288f9afdf60c7cfb63d5311978aad55823860fa SHA512 5c318b5baf762149b5084f89eb3c04e2051536fbb2110490e43e6f89015de6444891197f22f9b5be48638053d47d5c1d3af784d78f0cb28551ac38f7c5e2b074
+EBUILD irqbalance-1.6.0.ebuild 1309 BLAKE2B 6ea42f237e543cc39a7327be36cb390af4db3b45d68548026526c66ce979116246f34e08232f264a5f072cbda70bc0605d24186d2e9fd92c2112a1503f9a6bc3 SHA512 4e8b97047793e1cbd5775978062b050be83eba0eb4694b4018ec233fa69f2db9d99b32b020d2f373c8c186d2be112695b0e11e9501d402e4f8431f0bbae7ace9
 MISC metadata.xml 546 BLAKE2B 9c510c79c069672f2fdd1ccd7d2bd08917b692779904237650fbf8262bed2a6a40af805179d9f265534e761f074cb4d533fe89e46533880edae9c30f9a118a7f SHA512 6510fd0c07b1b59b79037b05a482554b3934c8d19acc8f4d54058ac5bc605c5adde426d3c12b7f618dd87381435467ecbab7baafcfb27166981f83cb56b72a04
diff --git a/sys-apps/irqbalance/files/irqbalance-1.4.0-configure.patch b/sys-apps/irqbalance/files/irqbalance-1.4.0-configure.patch
deleted file mode 100644
index 6008e45126c7..000000000000
--- a/sys-apps/irqbalance/files/irqbalance-1.4.0-configure.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 8ad74cdabac37599d20a985e6a456b1faca92df8 Mon Sep 17 00:00:00 2001
-From: Manuel Mommertz <2kmm@gmx.de>
-Date: Mon, 9 Jul 2018 14:08:35 +0200
-Subject: [PATCH 1/2] configure.ac: Fix --without-caps option
-
-irqbalance links to libcap-ng if it is installed, even when useflag
-caps is disabled. This is an error in the configure-script, which
-checks for the wrong variable to determine if the user used --with/
---without for libcap-ng.
-
-Downstream bug report: https://bugs.gentoo.org/660782
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index f6c60da..19b148a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -65,7 +65,7 @@ AC_ARG_WITH([libcap-ng],
-   AS_HELP_STRING([libcap-ng], [Add libcap-ng-support @<:@default=auto@:>@]))
- 
- AS_IF(
--  [test "x$libcap_ng" != "xno"],
-+  [test "x$with_libcap_ng" != "xno"],
-   [
-   PKG_CHECK_MODULES([LIBCAP_NG], [libcap-ng],
-     [AC_DEFINE(HAVE_LIBCAP_NG,1,[libcap-ng support])],
--- 
-2.18.0
-
-From bc56dbd4eead9ad19ff1d84dc8810123c96503c0 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Mon, 9 Jul 2018 14:11:44 +0200
-Subject: [PATCH 2/2] configure.ac: Fix --enable-irqbalance-ui logic
-
-Before this patch --enable-irqbalance-ui disabled compilation/
-installation of the ui because AC_ARG_WITH is used wrong.
-The third arguement to AC_ARG_WITH is _action-if-present_ which means
-that this action gets triggered once the --enable option has been
-submitted to configure on command line no matter if it's enabled or
-disabled.
-See also https://autotools.io/autoconf/arguments.html chapter 3.1
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 19b148a..75c234d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -43,9 +43,9 @@ AM_PROG_CC_C_O
- AC_ARG_WITH([irqbalance-ui],
- 	[AC_HELP_STRING([--without-irqbalance-ui],
- 			[Dont build the irqbalance ui component])],
--			[with_irqbalanceui=false], [with_irqbalanceui=true])
-+			[with_irqbalanceui=$withval], [with_irqbalanceui=yes])
- 
--AM_CONDITIONAL([IRQBALANCEUI], [test x$with_irqbalanceui = xtrue])
-+AM_CONDITIONAL([IRQBALANCEUI], [test x$with_irqbalanceui = xyes])
- 
- AC_ARG_WITH([systemd],
-   [ AS_HELP_STRING([--with-systemd],[Add systemd-lib support])]
--- 
-2.18.0
-
diff --git a/sys-apps/irqbalance/irqbalance-1.4.0-r1.ebuild b/sys-apps/irqbalance/irqbalance-1.4.0-r1.ebuild
deleted file mode 100644
index 4b61bf9bc3c6..000000000000
--- a/sys-apps/irqbalance/irqbalance-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools systemd linux-info
-
-DESCRIPTION="Distribute hardware interrupts across processors on a multiprocessor system"
-HOMEPAGE="https://github.com/Irqbalance/irqbalance"
-SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="caps +numa selinux tui"
-
-CDEPEND="
-	dev-libs/glib:2
-	caps? ( sys-libs/libcap-ng )
-	numa? ( sys-process/numactl )
-	tui? ( sys-libs/ncurses:0=[unicode] )
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-irqbalance )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-configure.patch"
-)
-
-pkg_setup() {
-	CONFIG_CHECK="~PCI_MSI"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	# Follow systemd policies
-	# https://wiki.gentoo.org/wiki/Project:Systemd/Ebuild_policy
-	sed \
-		-e 's/ $IRQBALANCE_ARGS//' \
-		-e '/EnvironmentFile/d' \
-		-i misc/irqbalance.service || die
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with caps libcap-ng)
-		$(use_enable numa)
-		$(use_with tui irqbalance-ui)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/irqbalance.init.4 irqbalance
-	newconfd "${FILESDIR}"/irqbalance.confd-1 irqbalance
-	systemd_dounit misc/irqbalance.service
-}
diff --git a/sys-apps/irqbalance/irqbalance-1.6.0.ebuild b/sys-apps/irqbalance/irqbalance-1.6.0.ebuild
index d2cdd3beca3f..fec100e24229 100644
--- a/sys-apps/irqbalance/irqbalance-1.6.0.ebuild
+++ b/sys-apps/irqbalance/irqbalance-1.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="caps +numa selinux tui"
 
 DEPEND="