gentoo resync : 28.04.2021

4 files changed, 22 insertions, 18 deletions

diff --git a/x11-plugins/gkrellm-vaiobright/Manifest b/x11-plugins/gkrellm-vaiobright/Manifest
index 0f3616b27c11..a7479b2dad29 100644
--- a/x11-plugins/gkrellm-vaiobright/Manifest
+++ b/x11-plugins/gkrellm-vaiobright/Manifest
@@ -1,5 +1,5 @@
-AUX gkrellm-vaiobright-2.5-fixinfo.patch 1774 BLAKE2B fd08b2b417147723d868b0b9062b66cbd22508e2f131f18c1ffdf087d2ac9e4a3f552282d7eb17ac1e0f0fcdc965207953a5533cb7955f89ea75f9dae9668ec4 SHA512 51c7983830a045f38dd08039dcc0e9c1fdc682394649761a998511e72ccd7e9ea6a2632312ed589967b1e3b02cd5c7764c7724da19fee770f71048d43818d160
-AUX gkrellm-vaiobright-2.5-textrel.patch 1053 BLAKE2B 2a8a14fb2bba01a46cfd137b55294d858a0a9688cd4b907cfb9f1999e7c35ff3a631ab629ab2c7810c1bb28b3c48de006fd675b150a6c60a1142c1ba4defa4c5 SHA512 2742b7e75af6f83ac6f5cc53116dee9802d12262eb4f2a3628740b2d5f50cdf6485aacfe36eb546e36d7800be0dfc874dc6f7dee0e09a5f269ec29cd52dc1943
+AUX gkrellm-vaiobright-2.5-fixinfo.patch 1428 BLAKE2B 268b0f1f335941be1d9b943f9f3412d1884cd4f82ce27b3ba899e6c2cd925c7a81b60c23df1f45a0ee34ae275151260f3d0640cf3220be22e635105114d8f3d3 SHA512 240b8876afbd843d47b6327fc8cffff639939182a9e1e18ce251ec3c905b1a14d063ebe6a02fef72887daeb24cd8c9d128e63cf2aecbad586182d3ccd54bad8b
+AUX gkrellm-vaiobright-2.5-textrel.patch 956 BLAKE2B 9016fef53211827fd6e2ba4aed4572bd6ad070e3c27035ee4e03e33795aaddee4893ab32d6e0cf3f1a1412a9fbd77c46352ab325c09fb3888e501bd4d8251466 SHA512 957bf1ef6fb8658c91886d495cae9f8ca9c40d7a61e0c54b9c93d0bc3bc8b62b4e37130ad548b59b4d89442442eb880dd0a915ae73f449c0c7d0f0c148d09f02
 DIST vaiobright-2.5.tar.gz 6178 BLAKE2B ed7add9147db7676e66cd51eee89e60a071896aeb33d1246b45918c2d63bf1b3cb074cb85b404a411e1cf93ffc244b8847b888a4b2f89957e282d4d41757fc0e SHA512 e58b74fe5dedd8ccc69cbcadf4b273aeb0e52fb2619e148121f79c53e41dcbff36e6ddf748b0c24a33e26c6d84ec84cf5e2cfa4d655443b9fe03d6e0150b5c3d
-EBUILD gkrellm-vaiobright-2.5-r2.ebuild 582 BLAKE2B 5d4775acd85a0e1e7649686f6e23776e5d3452dd416959e70b13f4e89f89782568a3628e72e3f4780e5c0754b25f5fe1ad27db5030bc70927fd8fe3a63bc225e SHA512 8ae63b5574d4ccc4e33a5451ac0e20dfd72df3904e3a76b6deb9df4bc450c554cb052b61dfa92cea2c743c8233e4e0e829b8dc338393023dd96b6feccdfa775c
+EBUILD gkrellm-vaiobright-2.5-r2.ebuild 654 BLAKE2B 926207b96002c6cf1c849fc3c77aeb4ea1670ef5cd33e8153b4972f1b1a7ced6d45f5420163694685a1d7c12c0f663b2c94b806ba4b3c1550e9c3fc333276bea SHA512 2792619056b49c858cbc59465454b869df47ab57440ed57b60a18e0dd11d60d5a53f43a478b4bbe03f228098e072be5772dccca258eea22893059944f0d8fae2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-fixinfo.patch b/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-fixinfo.patch
index f2e4ac4c56e0..3ecf0e058ff7 100644
--- a/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-fixinfo.patch
+++ b/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-fixinfo.patch
@@ -1,6 +1,5 @@
-diff -ur vaiobright-2.5/readme vaiobright-2.5-infofix/readme
---- vaiobright-2.5/README	2004-03-20 13:58:13.000000000 -0500
-+++ vaiobright-2.5-infofix/README	2004-03-20 13:59:30.000000000 -0500
+--- a/README
++++ b/README
 @@ -28,6 +28,7 @@
  bright or max dark depending on the current value.
  
@@ -9,9 +8,8 @@ diff -ur vaiobright-2.5/readme vaiobright-2.5-infofix/readme
  2.5           Sun 20 Oct 2002   Removed need for external helper applications
                                  entirely.  SonyPI is now required, but no suid
                                  or spicctrl binaries are needed.
-diff -ur vaiobright-2.5/vaiobright.c vaiobright-2.5-infofix/vaiobright.c
---- vaiobright-2.5/vaiobright.c	2002-10-20 19:22:26.000000000 -0400
-+++ vaiobright-2.5-infofix/vaiobright.c	2004-03-20 12:55:38.000000000 -0500
+--- a/vaiobright.c
++++ b/vaiobright.c
 @@ -422,21 +422,9 @@
                         (GtkSignalFunc) vaiobright_toggle_toggled, REVERSE_TOGGLE);
  
diff --git a/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-textrel.patch b/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-textrel.patch
index 4cdaa1dd4c8e..2437cf8a430b 100644
--- a/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-textrel.patch
+++ b/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-textrel.patch
@@ -1,5 +1,5 @@
---- vaiobright-2.5/Makefile.orig	2002-10-20 16:52:19.000000000 -0600
-+++ vaiobright-2.5/Makefile	2007-02-21 08:55:39.000000000 -0600
+--- a/Makefile
++++ b/Makefile
 @@ -1,10 +1,11 @@
  HOME	= .
  PREFIX  = /usr
@@ -7,11 +7,11 @@
 +CC	?= cc
  INCLUDE	= -I./ -I${PREFIX}/include
 -OPTS	= -shared `pkg-config gtk+-2.0 --cflags`
-+CFLAGS	+= -shared `pkg-config gtk+-2.0 --cflags` -fPIC
++CFLAGS	+= -shared `${PKG_CONFIG} gtk+-2.0 --cflags` -fPIC
 +LDFLAGS  += -shared -fPIC
  DEFINES = 
 -LIBS	= `pkg-config gtk+-2.0 --cflags`
-+LIBS	= `pkg-config gtk+-2.0 --libs`
++LIBS	= `${PKG_CONFIG} gtk+-2.0 --libs`
  
  GKVO	= vaiobright.o
  GKV	= vaiobright.so 
diff --git a/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r2.ebuild b/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r2.ebuild
index efe7712aba51..2d377754fddb 100644
--- a/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r2.ebuild
+++ b/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r2.ebuild
@@ -1,28 +1,34 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit gkrellm-plugin
+inherit gkrellm-plugin toolchain-funcs
 
 MY_P=${P/gkrellm-/}
 
 DESCRIPTION="Superslim VAIO LCD Brightness Control Plugin for Gkrellm"
 SRC_URI="http://nerv-un.net/~dragorn/code/${MY_P}.tar.gz"
 HOMEPAGE="http://nerv-un.net/~dragorn/"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~amd64 x86"
-IUSE=""
 
 RDEPEND="app-admin/gkrellm:2[X]"
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
 
-S=${WORKDIR}/${MY_P}
 PATCHES=(
 	"${FILESDIR}"/${P}-textrel.patch
 	"${FILESDIR}"/${P}-fixinfo.patch
 )
 
 PLUGIN_SO=( vaiobright$(get_modname) )
+
+src_configure() {
+	tc-export PKG_CONFIG
+}