gentoo auto-resync : 03:02:2023 - 15:10:30

5 files changed, 113 insertions, 2 deletions

diff --git a/x11-plugins/gkrellm-vaiobright/Manifest b/x11-plugins/gkrellm-vaiobright/Manifest
index bef809b5866b..d74d2dc5f690 100644
--- a/x11-plugins/gkrellm-vaiobright/Manifest
+++ b/x11-plugins/gkrellm-vaiobright/Manifest
@@ -1,5 +1,8 @@
+AUX gkrellm-vaiobright-2.5-Fix-Wreturn-type.patch 630 BLAKE2B fdd1562d952d8b75640021788d31d293c7476a84f9518774584e476813966f379504bfb5da544b287455076cda0157bf5fc075232c47f65878a1a017147b2729 SHA512 d999bbf54b94a086a94ff602eb857e9d6a43daacd3ff09c8d45cf73b6f669dab97f704fb88ad2b750df72269674194588df58b2bd98f945acda8ab33eca4d52b
+AUX gkrellm-vaiobright-2.5-Use-standard-int-types.patch 1427 BLAKE2B d05312a2f8a279d548682ad173dc2179f4649ca438f163b4674e0a373febc35a4452b7f38804d9d558e92acba558b7f04f610dd39e63146ad7831f6f71cd3fd6 SHA512 7f05684670055d0aac074fe491d65754b99724d5c788ddc4569b197bba5d3db9951006b4ff7642237f924ec0f1dedf065ff006b187fbe53f9b778b6d4837714f
 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-r3.ebuild 673 BLAKE2B 2dd117add6422035ccce79845f6797125b178ea97bd20856b3c8c3d44fdac9096636381830ce10eb44a95f66dab9dd9dc3fc853abb272e288067ae73c9c14643 SHA512 6939d3ad7c37f6963023fdb22d98c80882ddcf68eb060c1e5fcf2c452f3df7a44f63f2c4d20e038a32658b1dbd1fa049b0c3923f45be0add93099f88f899a70f
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+EBUILD gkrellm-vaiobright-2.5-r4.ebuild 766 BLAKE2B 5b683b558ad1757650ea61e1f8a99471e50442bee7d354c10cd3b2d5d5d4876e41a65a7ee51b46e07cd997b58ab02459239ced24d323030c4ad00f06b80e277d SHA512 361e136c3eeb1d71e0cc7bcebb09514594973a5f0e895aed679289d39736885972b3d66e93de07d753a7c6ec6ca80b87ca47c46b6aa17f4d7d0dfebc6671e085
+MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-Fix-Wreturn-type.patch b/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-Fix-Wreturn-type.patch
new file mode 100644
index 000000000000..992f3b66b1b8
--- /dev/null
+++ b/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-Fix-Wreturn-type.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/742902
+
+From 5312ab56edcc721529af6520c9ecccaa20af4cdc Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 3 Feb 2023 09:46:55 +0000
+Subject: [PATCH 1/2] Fix -Wreturn-type
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/vaiobright.c
++++ b/vaiobright.c
+@@ -110,7 +110,7 @@ static int vaiobright_get_brightness() {
+     // If we're broken, try again to open it
+     if (vaiobright_bslider->broken == 1) {
+         if (vaiobright_open_device() == -1)
+-            return;
++            return -1;
+     }
+ 
+     if (ioctl(vaiobright_bslider->sony_fd, SONYPI_IOCGBRT, &value) < 0) {
+-- 
+2.39.1
+
diff --git a/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-Use-standard-int-types.patch b/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-Use-standard-int-types.patch
new file mode 100644
index 000000000000..cec38819ff3f
--- /dev/null
+++ b/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-Use-standard-int-types.patch
@@ -0,0 +1,48 @@
+From ab824d40f56e3c8037df77a15114de6bd0a332e0 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 3 Feb 2023 09:48:01 +0000
+Subject: [PATCH 2/2] Use standard int types
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/vaiobright.c
++++ b/vaiobright.c
+@@ -15,6 +15,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <stdint.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+@@ -24,8 +25,8 @@
+ #include <linux/types.h>
+ 
+ // Define our ioctl's (stolen from spicctrl)
+-#define SONYPI_IOCGBRT _IOR('v', 0, __u8)
+-#define SONYPI_IOCSBRT _IOW('v', 0, __u8)
++#define SONYPI_IOCGBRT _IOR('v', 0, uint8_t)
++#define SONYPI_IOCSBRT _IOW('v', 0, uint8_t)
+ 
+ static void create_vaiobright_plug_config(GtkWidget *tab);
+ static void load_vaiobright_plug_config(gchar *arg);
+@@ -88,7 +89,7 @@ static void vaiobright_close_device(void) {
+ 
+ // Write a new brightness level out to the control application
+ static void vaiobright_set_brightness(int level) {
+-    __u8 value = (__u8) level;
++    uint8_t value = (uint8_t) level;
+ 
+     // If we're broken, try again to open it
+     if (vaiobright_bslider->broken == 1) {
+@@ -105,7 +106,7 @@ static void vaiobright_set_brightness(int level) {
+ }
+ 
+ static int vaiobright_get_brightness() {
+-    __u8 value = 0;
++    uint8_t value = 0;
+ 
+     // If we're broken, try again to open it
+     if (vaiobright_bslider->broken == 1) {
+-- 
+2.39.1
+
diff --git a/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r4.ebuild b/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r4.ebuild
new file mode 100644
index 000000000000..d6693add74ee
--- /dev/null
+++ b/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-textrel.patch
+	"${FILESDIR}"/${P}-fixinfo.patch
+	"${FILESDIR}"/${P}-Fix-Wreturn-type.patch
+	"${FILESDIR}"/${P}-Use-standard-int-types.patch
+)
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+
+	PLUGIN_SO=( vaiobright$(get_modname) )
+	default
+}
diff --git a/x11-plugins/gkrellm-vaiobright/metadata.xml b/x11-plugins/gkrellm-vaiobright/metadata.xml
index 85e4ed814fa2..641cbd3703e7 100644
--- a/x11-plugins/gkrellm-vaiobright/metadata.xml
+++ b/x11-plugins/gkrellm-vaiobright/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 </pkgmetadata>