[gentoo-commits] repo/gentoo:master commit in: xfce-extra/xfce4-cpugraph-plugin/files/, xfce-extra/xfce4-cpugraph-plugin/

2021-02-18 Thread Michał Górny 
commit: 745b7fdee7669cb1c38bb0a438c6a49f643c8901
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Feb 19 00:58:55 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Feb 19 01:03:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=745b7fde

xfce-extra/xfce4-cpugraph-plugin: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 xfce-extra/xfce4-cpugraph-plugin/Manifest  |  2 --
 .../xfce4-cpugraph-plugin-1.1.0-panel-4.15.patch   | 25 ---
 .../xfce4-cpugraph-plugin-1.1.0.ebuild | 37 --
 .../xfce4-cpugraph-plugin-1.2.0.ebuild | 36 -
 4 files changed, 100 deletions(-)

diff --git a/xfce-extra/xfce4-cpugraph-plugin/Manifest 
b/xfce-extra/xfce4-cpugraph-plugin/Manifest
index 9b96be8d1b9..d7bdb8f498d 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/Manifest
+++ b/xfce-extra/xfce4-cpugraph-plugin/Manifest
@@ -1,4 +1,2 @@
-DIST xfce4-cpugraph-plugin-1.1.0.tar.bz2 391629 BLAKE2B 
e1a18df75461466abf908100e3ace73c46751d78527a9928a5712e3b3388cb0908b697055bd229f700f3e36e908cbc90f2732fc65568ebbe47d876aa376fd087
 SHA512 
c928baac776517da8929b8ce3842be7e02a2b3394b7cc848028d1720ca611e1aa4ef706bd00736fecfed0b3b2d0cce94c09b0f905a226db5e50c036dabb8df2a
-DIST xfce4-cpugraph-plugin-1.2.0.tar.bz2 416669 BLAKE2B 
1adc1ac15b5280cb20dbc9e346ac99692fa5ce345431ffadad0e202cbad462d8210433b03d58f6970c493987a69866e97287b4a4ce655afe3d867258c8f8c14d
 SHA512 
b7d8402646bb4bca82c767b2a4e25a96d6d9a0327f13b934afd2165e9884a134686cf18e43c6fb30f93f9aba5f41aeceb0cbfb49c15f165ce972ed82eb9eb563
 DIST xfce4-cpugraph-plugin-1.2.1.tar.bz2 424101 BLAKE2B 
228277cccbe89ac43b78d41de489f1b58e30cc8e6f900840bf0d3c41d3f392d10fcba43b64bb8edb4ecade363d63af2860f1174b5b1b944ac7dc261071397111
 SHA512 
ca8b7dc1ccad163e8bbe28723ded0c9cf5a1b72aa350e1d9c8e0b0654e97704f0ffba9a7128fc6da289dbea7b9668f1d493eca09e87abd0cdd109998a2749fe1
 DIST xfce4-cpugraph-plugin-1.2.2.tar.bz2 425245 BLAKE2B 
1ca1bc0d210b607079ba4706db5c0bd58b3fae17d22f82722f55d685132bf4ea04ec28d148eafe1183cff517c7ea859032a92ed1e5a20c7bbaac77ba9249a4ed
 SHA512 
18bdda603e657b87bf3c4bbf5785aaa5b735102dfde515f2850396b2501ba8d5305245b5b4cbf3157bde8178167499ba3def7535ba357750a311531b9c2072a9

diff --git 
a/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-1.1.0-panel-4.15.patch
 
b/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-1.1.0-panel-4.15.patch
deleted file mode 100644
index dd12aa3331e..000
--- 
a/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-1.1.0-panel-4.15.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a9b0c62d34737cc6f5e0806c8f5305c137f9f155 Mon Sep 17 00:00:00 2001
-From: Andre Miranda 
-Date: Fri, 4 Oct 2019 00:41:13 -0300
-Subject: [PATCH] Allow compilation with panel 4.15
-

- panel-plugin/cpu.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/panel-plugin/cpu.h b/panel-plugin/cpu.h
-index 71c90a2..f6d11ee 100644
 a/panel-plugin/cpu.h
-+++ b/panel-plugin/cpu.h
-@@ -28,7 +28,7 @@
- #include "config.h"
- #endif
- 
--#include 
-+#include 
- 
- #include "os.h"
- 
--- 
-GitLab
-

diff --git 
a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.1.0.ebuild 
b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.1.0.ebuild
deleted file mode 100644
index b7377089eb1..000
--- a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="A system load plug-in for the Xfce panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin;
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2;
-
-LICENSE="BSD-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 
~amd64-linux ~x86-linux"
-
-RDEPEND=">=x11-libs/gtk+-3.22:3
-   >=xfce-base/libxfce4ui-4.12:=
-   >=xfce-base/xfce4-panel-4.12:="
-DEPEND="${RDEPEND}
-   dev-util/intltool
-   sys-devel/gettext
-   virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/xfce4-cpugraph-plugin-1.1.0-panel-4.15.patch" )
-
-src_install() {
-   default
-   find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-   xdg_icon_cache_update
-}
-
-pkg_postrm() {
-   xdg_icon_cache_update
-}

diff --git 
a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.0.ebuild 
b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.0.ebuild
deleted file mode 100644
index 05bb474023a..000
--- a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="A system load plug-in for the Xfce panel"

[gentoo-commits] repo/gentoo:master commit in: xfce-extra/xfce4-cpugraph-plugin/files/, xfce-extra/xfce4-cpugraph-plugin/

2020-10-21 Thread Michał Górny 
commit: fe03b19cff75cc394adef109c65ce776f436d6ad
Author: Jan Ziak <0xe2.0x9a.0x9b  gmail  com>
AuthorDate: Wed Oct 21 06:42:40 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Oct 21 07:45:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe03b19c

xfce-extra/xfce4-cpugraph-plugin: panel-4.15 compatibility

Closes: https://bugs.gentoo.org/730886
Closes: https://bugs.gentoo.org/744058
Signed-off-by: Jan Ziak <0xe2.0x9a.0x9b  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17986
Signed-off-by: Michał Górny  gentoo.org>

 .../xfce4-cpugraph-plugin-1.1.0-panel-4.15.patch   | 25 ++
 .../xfce4-cpugraph-plugin-1.1.0.ebuild |  4 +++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git 
a/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-1.1.0-panel-4.15.patch
 
b/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-1.1.0-panel-4.15.patch
new file mode 100644
index 000..dd12aa3331e
--- /dev/null
+++ 
b/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-1.1.0-panel-4.15.patch
@@ -0,0 +1,25 @@
+From a9b0c62d34737cc6f5e0806c8f5305c137f9f155 Mon Sep 17 00:00:00 2001
+From: Andre Miranda 
+Date: Fri, 4 Oct 2019 00:41:13 -0300
+Subject: [PATCH] Allow compilation with panel 4.15
+
+---
+ panel-plugin/cpu.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/panel-plugin/cpu.h b/panel-plugin/cpu.h
+index 71c90a2..f6d11ee 100644
+--- a/panel-plugin/cpu.h
 b/panel-plugin/cpu.h
+@@ -28,7 +28,7 @@
+ #include "config.h"
+ #endif
+ 
+-#include 
++#include 
+ 
+ #include "os.h"
+ 
+-- 
+GitLab
+

diff --git 
a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.1.0.ebuild 
b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.1.0.ebuild
index c63a69c5752..b7377089eb1 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.1.0.ebuild
+++ b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,6 +21,8 @@ DEPEND="${RDEPEND}
sys-devel/gettext
virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/xfce4-cpugraph-plugin-1.1.0-panel-4.15.patch" )
+
 src_install() {
default
find "${ED}" -name '*.la' -delete || die