gentoo resync : 28.04.2019

4 files changed, 2 insertions, 100 deletions

diff --git a/xfce-extra/xfce4-battery-plugin/Manifest b/xfce-extra/xfce4-battery-plugin/Manifest
index d9f2a5f73e5d..8128f6274f69 100644
--- a/xfce-extra/xfce4-battery-plugin/Manifest
+++ b/xfce-extra/xfce4-battery-plugin/Manifest
@@ -1,7 +1,3 @@
-DIST xfce4-battery-plugin-1.1.0.tar.bz2 398621 BLAKE2B 461f32e07708c29f2157c8909ba48a43458c06c9622ec0835f4cf6abb0b1232bc35f23a7e945315eb2d49048b9c0023da3a27803cf95217374962531db986e97 SHA512 d3f5b6d3657abfba2c4c5cb3ab8ddc87f4862f24eb614cb91af48332b3082c3dce7f32eb2e3cb8a9d501ddb01c6259c4fbfbab8ed9c221633e47eb17c623cf09
-DIST xfce4-battery-plugin-1.1.1.tar.bz2 465880 BLAKE2B 09f257226009de387b8965e8233aae9a0c756fa2c854f1bdf346e23638a0c55b7100c57eb33111c2f8e20908350baba2a608cf7e2a7046770d5dd4b758ce4e61 SHA512 15c0755f95cc03db95f8fe61faa87607dcdb24622c8de3a7941c254e15bf3d65b6683e5a0ff1fd96ca252afede6763f4440c8455665e346169b1107ad44d6651
 DIST xfce4-battery-plugin-1.1.2.tar.bz2 464077 BLAKE2B d3a8c661a96fae4992d89a9e0e7c313fc7a816bc6586443eb0490617f00a5afc81a2e4cdc0b7b3e3444ffb7342cc503f0fa1e84c967c0412ce287daaca41c950 SHA512 51778d00c34c41bdad234893c4a91f3bd562481df343d811e266719cb7903f60e1d56ba39f64f14ab882ce6419d0f0f4010aa112e9d0059133e7e4d30470f491
-EBUILD xfce4-battery-plugin-1.1.0.ebuild 1101 BLAKE2B bbc742ccf3cfb93277e3f5dd7eee324587f14a154bd286688ab1d715a6247e291b2a5f087086538351d5e217bd2eb0862b734331ae29390e024ca592af5120a5 SHA512 908ef23e02b60659d1478e042ff5239d10aa539db7bec59504932a054e216690a3be5a6909a50026e89b038ac01bc8107a828b56a04a8bef556670ab541d994c
-EBUILD xfce4-battery-plugin-1.1.1.ebuild 1059 BLAKE2B d7394aefabc79e7f400fd0779b7b9cb5c777c967de14b501202739b6e69cf2a5de56a5da4c4f19b70fc72aa5592332975a7f7194686bcfc5d7b9fb6b2fc83203 SHA512 e15fbed72f595e4b8e68639313193d6e377215f16569ea16313892337e641da847ab1a8695bfa2d0e09c126f6533ba3ea3f3caaed65f6cf1f97880b33f1cf25f
-EBUILD xfce4-battery-plugin-1.1.2.ebuild 1021 BLAKE2B 575d583a56a6f0b432f8b5621f95a675bec4e0ff5e0c5f5e1c4c5fcd4f95360aea6eed8cd3df5410407d10b0a40a9ee68a75e7684000442c46729d599c7ec498 SHA512 0a8f55f747405ba7b912ea4884d40c115eca736d9b890f0e093c2648ce21d2f595bba0d53fd28676f65184b5d0d84d5aa865d72df18387bd2e6072a83205b8e5
+EBUILD xfce4-battery-plugin-1.1.2.ebuild 1019 BLAKE2B a075f2425fcb93fb61b86b7e23cb395d6a79faaef3a5f349de1d84ef6cf71395a2aaccd42c498e3f05a44ac302d6f98ff3b795e4d1287eafe4e40cd40fb50703 SHA512 0e469126e0f6de8be485bbe39dfe5600daa206e0407898e87bf54eb626d51b9bd533debdd62ae4fb5d64deaad77758de82c2a88e694c5ed014f4059b955388e6
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.0.ebuild b/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.0.ebuild
deleted file mode 100644
index 49751e1695fb..000000000000
--- a/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils linux-info xdg-utils
-
-DESCRIPTION="A battery monitor panel plugin for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc x86"
-IUSE="kernel_linux"
-
-RDEPEND=">=dev-libs/glib-2.24:2=
-	>=x11-libs/gtk+-3.14:3=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.8:=
-	>=xfce-base/xfce4-panel-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-pkg_setup() {
-	if use kernel_linux; then
-		CONFIG_CHECK="~ACPI_BATTERY"
-		linux-info_pkg_setup
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.1.ebuild b/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.1.ebuild
deleted file mode 100644
index d6c420f8d833..000000000000
--- a/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils linux-info xdg-utils
-
-DESCRIPTION="A battery monitor panel plugin for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc x86"
-IUSE="kernel_linux"
-
-RDEPEND=">=dev-libs/glib-2.24:2=
-	>=x11-libs/gtk+-3.16:3=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.8:=
-	>=xfce-base/xfce4-panel-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-pkg_setup() {
-	if use kernel_linux; then
-		CONFIG_CHECK="~ACPI_BATTERY"
-		linux-info_pkg_setup
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.2.ebuild b/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.2.ebuild
index 207fe3d2f3b5..b83baf8184a7 100644
--- a/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.2.ebuild
+++ b/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~mips ~ppc x86"
 IUSE="kernel_linux"
 
 RDEPEND=">=dev-libs/glib-2.24:2=