Merge updates from master

4 files changed, 62 insertions, 3 deletions

diff --git a/dev-python/qrcode/qrcode-6.1.ebuild b/dev-python/qrcode/qrcode-6.1.ebuild
index 6478dfae767c..302af0286b49 100644
--- a/dev-python/qrcode/qrcode-6.1.ebuild
+++ b/dev-python/qrcode/qrcode-6.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
@@ -21,8 +22,6 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 distutils_enable_tests unittest
 
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 355f36f59e38..f3df05eeb670 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -355,7 +355,7 @@ distutils_enable_sphinx() {
 			if grep -F -q 'sphinx.ext.autodoc' "${confpy}"; then
 				die "distutils_enable_sphinx: --no-autodoc passed but sphinx.ext.autodoc found in ${confpy}"
 			fi
-		else
+		elif [[ -z ${_DISTUTILS_SPHINX_PLUGINS[@]} ]]; then
 			if ! grep -F -q 'sphinx.ext.autodoc' "${confpy}"; then
 				die "distutils_enable_sphinx: sphinx.ext.autodoc not found in ${confpy}, pass --no-autodoc"
 			fi
diff --git a/xfce-extra/xfce4-power-manager/Manifest b/xfce-extra/xfce4-power-manager/Manifest
index 703a0fb56e7d..bd0c32265e7d 100644
--- a/xfce-extra/xfce4-power-manager/Manifest
+++ b/xfce-extra/xfce4-power-manager/Manifest
@@ -1 +1,2 @@
 DIST xfce4-power-manager-1.6.5.tar.bz2 1205473 BLAKE2B 64d3aa04ccb11b7b541b9ec8c3dd4544c66f8e7de626c5395cd10ea1e0004d7f3e941d9357941b73aec3997ed9935f04540d2c04ca1e6ac271baa80732de0f72 SHA512 ebcf9ba7431518fdafa74f49511200e16093c34f78516e823a2f7ac02a085a08377efe5f9c6fe285f3d1e2de253789404e01b34a48e3f5ff23c2c143b2801207
+DIST xfce4-power-manager-1.7.0.tar.bz2 1235629 BLAKE2B bf6bd6c3ebfc86d199362168788b3d9b1ca2cd691a93a2cbab04415d7e68e11a3b1cb36328e8a974e504eb00282e584cc497ea4f7dcddb20e6854d06bef5ec7d SHA512 30c6c37ce278d869b73880bc33d04115086646850c8fc9129e4fbeb71b36d4bb7ce7ee1758ea804b42b3736ec6632f7bcd8e7806a00421e0e24ac8433e34ac24
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.7.0.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.7.0.ebuild
new file mode 100644
index 000000000000..9df144416fc2
--- /dev/null
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.7.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit xdg-utils
+
+DESCRIPTION="Power manager for the Xfce desktop environment"
+HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-power-manager"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="kernel_linux networkmanager +panel-plugin policykit"
+
+COMMON_DEPEND=">=dev-libs/glib-2.42
+	>=sys-power/upower-0.99.0
+	sys-power/pm-utils
+	>=x11-libs/gtk+-3.14:3
+	>=x11-libs/libnotify-0.7
+	x11-libs/libX11
+	>=x11-libs/libXrandr-1.2
+	x11-libs/libXext
+	x11-libs/libXtst
+	>=xfce-base/xfconf-4.12:=
+	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.12:=
+	panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= )
+	policykit? ( >=sys-auth/polkit-0.112 )"
+RDEPEND="${COMMON_DEPEND}
+	networkmanager? ( net-misc/networkmanager )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto"
+
+src_configure() {
+	local myconf=(
+		$(use_enable policykit polkit)
+		$(use_enable networkmanager network-manager)
+		$(use_enable panel-plugin xfce4panel)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}