[gentoo-commits] repo/gentoo:master commit in: xfce-extra/multiload-nandhp/

[Michał Górny]

commit:     6e4d4ae3bbb35ae95233e1603f078fb62f9b974a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  9 07:01:51 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jun  9 07:38:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e4d4ae3

xfce-extra/multiload-nandhp: Clean old up

 xfce-extra/multiload-nandhp/Manifest               |  1 -
 xfce-extra/multiload-nandhp/metadata.xml           |  3 --
 .../multiload-nandhp/multiload-nandhp-0.2.ebuild   | 51 ----------------------
 3 files changed, 55 deletions(-)

diff --git a/xfce-extra/multiload-nandhp/Manifest 
b/xfce-extra/multiload-nandhp/Manifest
index 095370ea762..9dd787c2daa 100644
--- a/xfce-extra/multiload-nandhp/Manifest
+++ b/xfce-extra/multiload-nandhp/Manifest
@@ -1,2 +1 @@
-DIST multiload-nandhp-0.2.tar.gz 32910 SHA256 
3f8169522179f804470ed697fbb3c1213e6a1ada832fa45caac64e5698a17852 SHA512 
07665b5d43f495e03553e0ae5ab6d2cdc46caa65a4336b824d36a7f9269313d1a3783a0fe48135f47cee14e76790ec8b1ce5948638fccc84f7b2157cdb07bee5
 WHIRLPOOL 
1146308c7d59eb6f461f96d79e273ccba06144ff47c4d9077e2a9015f39bcaab32f81e178651ce7bfb3b88978fcab5ae5f4199491112f3880b143761c24d68f5
 DIST multiload-nandhp-0.3.tar.gz 34812 SHA256 
6ede95477422c94cd12c7999d7f3c4c3a7cf1db70999dd0dc50f3a44762290c7 SHA512 
68367d0bca144a9c2c56516254b9f1531aedfbc0c34f924e0264314cd9a1215a13d1b3b6f1d3c1b0781a95abfa0705819e7d886e3c3b84705c3b5b60f7d5806c
 WHIRLPOOL 
74254cc52a1f2ef4c73d1069ca408cf2e374062c254300e2fb9a3bcaafd44e6cc22d2c7d0a53fd70b15b930681df5b908a9e245ad9d6891c526b0267a5348e27

diff --git a/xfce-extra/multiload-nandhp/metadata.xml 
b/xfce-extra/multiload-nandhp/metadata.xml
index c34496abfc3..eae94889781 100644
--- a/xfce-extra/multiload-nandhp/metadata.xml
+++ b/xfce-extra/multiload-nandhp/metadata.xml
@@ -5,9 +5,6 @@
     <email>x...@gentoo.org</email>
     <name>XFCE Team</name>
   </maintainer>
-  <use>
-    <flag name="lxpanel">Build the applet for <pkg>lxde-base/lxpanel</pkg>, 
you can set XFCE_PLUGINS="" if you don't want the Xfce dependencies.</flag>
-  </use>
   <upstream>
     <remote-id type="github">nandhp/multiload-nandhp</remote-id>
   </upstream>

diff --git a/xfce-extra/multiload-nandhp/multiload-nandhp-0.2.ebuild 
b/xfce-extra/multiload-nandhp/multiload-nandhp-0.2.ebuild
deleted file mode 100644
index 08d49aba3cf..00000000000
--- a/xfce-extra/multiload-nandhp/multiload-nandhp-0.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-MY_PV=version-${PV/./-}
-
-DESCRIPTION="A port of the GNOME multiload applet for the Xfce and LXDE panels"
-HOMEPAGE="https://github.com/nandhp/multiload-nandhp";
-SRC_URI="https://github.com/nandhp/${PN}/archive/${MY_PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="lxpanel +xfce_plugins_multiload-nandhp"
-
-RDEPEND=">=x11-libs/gtk+-2.14:2
-       x11-libs/cairo
-       >=gnome-base/libgtop-2.11.92
-       lxpanel? ( lxde-base/lxpanel )
-       xfce_plugins_multiload-nandhp? (
-               >=xfce-base/libxfce4ui-4.10
-               >=xfce-base/libxfce4util-4.10
-               >=xfce-base/xfce4-panel-4.10
-               )"
-DEPEND="${RDEPEND}
-       dev-util/intltool
-       sys-devel/gettext
-       virtual/pkgconfig"
-
-REQUIRED_USE="|| ( xfce_plugins_multiload-nandhp lxpanel )"
-
-DOCS="AUTHORS README.md"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
-       eautoreconf
-}
-
-src_configure() {
-       econf \
-               $(use_with xfce_plugins_multiload-nandhp xfce4) \
-               $(use_with lxpanel)
-}
-
-src_install() {
-       default
-       prune_libtool_files --all
-}