gentoo resync : 15.01.2020

3 files changed, 2 insertions, 52 deletions

diff --git a/xfce-extra/xfce4-hdaps/Manifest b/xfce-extra/xfce4-hdaps/Manifest
index 3dd115eadc67..ab802c27b5b6 100644
--- a/xfce-extra/xfce4-hdaps/Manifest
+++ b/xfce-extra/xfce4-hdaps/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-hdaps-0.0.9.tar.bz2 304851 BLAKE2B 1f1318bb27628eb1ff72a1642737271ab37e722a18a6c3c6d40c7a05f56e36813bc7a570d5bc51d169dfcc89467cb6173d61c2f0cc2c90a90a795ba63ef1e07d SHA512 7ee963dacd3e1096fb205fa78c05202925977a4fc88aaa96ba779dc08e32937602fdc83a27457386b2b89847487c5dcc75385f2763201b1613f30eee8124e740
 DIST xfce4-hdaps-1.0.0.tar.xz 350888 BLAKE2B bc34321f42b0f51a10ef65429cdcf5e3d63f20914aa0c593c004c830932c8a63f194a25b602784527f5da0f74302142ccbcb3ecfc2a677b004b71e5bad4e5ee5 SHA512 0efdedbccfe578304e61cccb86936b4d62e9e3de6cb9c3cf7b288983b93bd8388e1b227565ebe354aadbd58fc493b67e5c3fea02bf9dbc1b37b5d2ec419a5d7b
-EBUILD xfce4-hdaps-0.0.9-r4.ebuild 1054 BLAKE2B d249d994f67525000f092d22591b8a4f8cac6c5c0231ea9cf8faf512c190c2c27e596937e60b8bf16ee2ea1f37d0896c85b3cf517c2fe72037f804be49cddbfd SHA512 3acf0ad90955e45da42292280686ecbf0d77cda387fd8f92416855795909b5d2828e3032adc061d469c1b5617628cba51c733a22773f593d14b02684bb74edf7
-EBUILD xfce4-hdaps-1.0.0.ebuild 814 BLAKE2B e5fa920d432566c6a4cf8414d2130a07cd83ea7af16a5f1ce2fd0181dd477b858b2f8bb05b41be068981a576659a4207510fb3d99975ced378fe15b901d67d0b SHA512 19aaa2f75356d0eca84f2c82d266768d813d404432846f870bd7e781203257daa6913174a800f6e81295aac31f74c8527e34d7644ce4bb094e774683dbe99fd9
+EBUILD xfce4-hdaps-1.0.0.ebuild 812 BLAKE2B 7c1212db7794e5a5f274175110a51d0929f0a5c9782ff4e0bbac111e902a23948130aaef3684621724c07379ba0280c8169020cd9cb31f7e0f60feea54529159 SHA512 7ecd673d2ee4c3df5e61b62933c35f37bba522cc09236db0453bc12c99697dbc1106ca510650cec1793eab4e96d25785a53a2446e4f639642a990533c66ee413
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-hdaps/xfce4-hdaps-0.0.9-r4.ebuild b/xfce-extra/xfce4-hdaps/xfce4-hdaps-0.0.9-r4.ebuild
deleted file mode 100644
index 04c33bded30e..000000000000
--- a/xfce-extra/xfce4-hdaps/xfce4-hdaps-0.0.9-r4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils linux-info
-
-DESCRIPTION="A plugin to indicate the status of the IBM Hard Drive Active Protection System"
-HOMEPAGE="http://michael.orlitzky.com/code/xfce4-hdaps.php"
-SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND=">=x11-libs/gtk+-2.20:2
-	x11-libs/libX11
-	<xfce-base/libxfce4ui-4.15:=[gtk2(+)]
-	>=xfce-base/libxfce4util-4.8
-	<xfce-base/xfce4-panel-4.15:=[gtk2(+)]"
-RDEPEND="${COMMON_DEPEND}
-	>=app-laptop/hdapsd-20090101
-	>=app-laptop/tp_smapi-0.39"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	linux-info_pkg_setup
-
-	if kernel_is lt 2 6 28; then
-		ewarn "Unsupported kernel detected. Upgrade to 2.6.28 or above."
-	fi
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.0.ebuild b/xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.0.ebuild
index a680a7fb6696..01862e4cc199 100644
--- a/xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.0.ebuild
+++ b/xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz"
 
 LICENSE="AGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="dev-util/intltool