[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellm-bluez/, x11-plugins/gkrellm-bluez/files/

[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellm-bluez/, x11-plugins/gkrellm-bluez/files/

[Sam James]

commit:     bce6663f13b4edfa8169124fbaf6a265be9dc5a1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  3 04:54:49 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb  3 05:07:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bce6663f

x11-plugins/gkrellm-bluez: EAPI 8

Bug: https://bugs.gentoo.org/892251
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../gkrellm-bluez/files/gkrellm-bluez-0.2-notheme.patch  | 10 ++++------
 ...m-bluez-0.2-r2.ebuild => gkrellm-bluez-0.2-r3.ebuild} | 16 ++++++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/x11-plugins/gkrellm-bluez/files/gkrellm-bluez-0.2-notheme.patch b/x11-plugins/gkrellm-bluez/files/gkrellm-bluez-0.2-notheme.patch
index 6a9841652dd2..548da1f0f46f 100644
--- a/x11-plugins/gkrellm-bluez/files/gkrellm-bluez-0.2-notheme.patch
+++ b/x11-plugins/gkrellm-bluez/files/gkrellm-bluez-0.2-notheme.patch
@@ -1,6 +1,5 @@
-diff -u --new-file gkrellm-bluez-0.2-orig/src/decal_net_leds.xpm gkrellm-bluez-0.2/src/decal_net_leds.xpm
---- gkrellm-bluez-0.2-orig/src/decal_net_leds.xpm	1969-12-31 18:00:00.000000000 -0600
-+++ gkrellm-bluez-0.2/src/decal_net_leds.xpm	2007-03-08 09:07:50.000000000 -0600
+--- a/src/decal_net_leds.xpm
++++ b/src/decal_net_leds.xpm
 @@ -0,0 +1,66 @@
 +/* XPM */
 +static char * decal_net_leds_xpm[] = {
@@ -68,9 +67,8 @@ diff -u --new-file gkrellm-bluez-0.2-orig/src/decal_net_leds.xpm gkrellm-bluez-0
 +"34567890ab",
 +"cdefghijkl",
 +"34567890ab"};
-diff -u --new-file gkrellm-bluez-0.2-orig/src/gkrellm-bluez-chart.c gkrellm-bluez-0.2/src/gkrellm-bluez-chart.c
---- gkrellm-bluez-0.2-orig/src/gkrellm-bluez-chart.c	2006-11-14 13:50:24.000000000 -0600
-+++ gkrellm-bluez-0.2/src/gkrellm-bluez-chart.c	2007-03-08 09:13:29.000000000 -0600
+--- a/src/gkrellm-bluez-chart.c
++++ b/src/gkrellm-bluez-chart.c
 @@ -22,6 +22,8 @@
  
  #include "gkrellm-bluez-chart.h"

diff --git a/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r2.ebuild b/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r3.ebuild
similarity index 82%
rename from x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r2.ebuild
rename to x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r3.ebuild
index dd151ebe1f93..af6b5cade5f1 100644
--- a/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r2.ebuild
+++ b/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit gkrellm-plugin
 
 DESCRIPTION="GKrellm plugin for monitoring bluetooth (Linux BlueZ) adapters"
-SRC_URI="mirror://sourceforge/gkrellm-bluez/${P}.tar.gz"
 HOMEPAGE="http://gkrellm-bluez.sourceforge.net"
+SRC_URI="mirror://sourceforge/gkrellm-bluez/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -15,15 +15,19 @@ KEYWORDS="amd64 x86"
 
 RDEPEND="
 	app-admin/gkrellm:2[X]
-	net-wireless/bluez"
+	net-wireless/bluez
+"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-notheme.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-notheme.patch
+)
 
 PLUGIN_DOCS=( THEMING NEWS )
 
 src_prepare() {
 	default
+
 	# Be a bit more future proof, bug #260948
 	sed "s/-Werror//" -i src/Makefile.am src/Makefile.in || die
 }
@@ -31,5 +35,5 @@ src_prepare() {
 src_configure() {
 	PLUGIN_SO=( src/.libs/gkrellmbluez$(get_modname) )
 
-	econf --disable-static
+	default
 }