gentoo auto-resync : 14:07:2022 - 19:40:39

5 files changed, 236 insertions, 29 deletions

diff --git a/app-misc/razertool/Manifest b/app-misc/razertool/Manifest
index ee7890d4cb2c..ee8caa6cb807 100644
--- a/app-misc/razertool/Manifest
+++ b/app-misc/razertool/Manifest
@@ -1,4 +1,5 @@
-AUX razertool-0.0.7-ar.patch 347 BLAKE2B 8225103a88e2fbbdcbc23546c06b6052c4d148dbde8151648fa9b4aa563c815296a7801c8b10a5337aa762cd8e2eb76aff3329b261033dff0082a5d1df9a12f2 SHA512 70c570cf089bd165b76adc4242d39b484333931352406d32324db80746151f6722c5a4fcd718b875d9cfae34ffd0d17bf02c63c94cc0f0b1addf43028f0f1734
+AUX razertool-0.0.7-configure.patch 6844 BLAKE2B 6492b444ec681b9e88350855a98386ab26f11132f0fdb37a5eabaa4b16b707b12d826f43b478b53c600727064766fb08cdca02ac628cb51de67ed4c4385be1e5 SHA512 66dfdcc491d84af91e14cd28b984b83c888bf1da7d43717aaf3bfa973d2c928d31b5f4e2f0c79d49300b98cca0ced6182041f859de56c113e30e904788941ed7
+AUX razertool-0.0.7-rules.patch 685 BLAKE2B 466e7b2f8c1afe5d897bd477b0175f2f76a73de23109c30a813963e2cbca43f6ac25e6da1c43e8794584e7c23253da91ba1ab2a1d6496ab2efe4bfef461d5454 SHA512 25a084ae4bc9610f9388b29fbcfeecdf5ed19a13248216562e105cf40c084aef251382c25f4c6261931e983e155c8a81d6402b9d47baa3671ee8068b643e745f
 DIST razertool_0.0.7.orig.tar.gz 192274 BLAKE2B 415896f9f6ebaf653be9ede84985b13149f27d4471a8aa53089d138f4f7d58a10ade2aa5f46ec88951572bc7ca1c222db5f88b3df6b37e3ef2ad544a2a7ff28e SHA512 0221ec90b55f4459f5a772eb651e9807423d9e3c82ebd680ee835167bcebf2552e1d7767d294c5392b1fbc58558084e7022cb67f529c033eaff33b4fb3eb1017
-EBUILD razertool-0.0.7-r4.ebuild 1762 BLAKE2B 8219eee8ab8ddbf25cddc3ff9d458a7cf7a2c4f7487fe90e0f5a0c41cc889d027826616808691bb5059aa5a7dd0c26fd24b1dc115a5125bc4fd3f8b2be44289b SHA512 3ad75bc24804ac6e0ffd72e186eaa6b0c352d510011eeb6ae23fce6b977ebf13f17c79818f2ba18cd49f0d5563bea3461f5c65701dd00513aca65e4f20ecd73b
+EBUILD razertool-0.0.7-r5.ebuild 1601 BLAKE2B 45502e28b15c4128bc6a0f56a3359a36b441e7b9875b9a72f4ba69222f18c0e6f848f629a20a14d5d55ab80a79ccd3b06e15f1781ca69d81212d5c98c2315b2d SHA512 21a684aa7138a323f3c64bd480ddebde3211a0a4984152aaf7888371ec3b19adb9b0e2eaeb340ac39ad7be19e3de006caa27e45f7270d7bb0b0989881eb4133b
 MISC metadata.xml 558 BLAKE2B 471cbef3552e5828c5aaec305cf318a6d30f36491e12f777ac18b639d9c49db83a4f42c2f66f5d8c9ecb3282766f3ec13fdaaf3f2ae3be51f8fba229a40c02dc SHA512 484d5e869c03fb44d7d6f8248350319a869f963cdcfb15149b4c4277ce07ff0e4be4e763e5f59a8cd9a9ee942c9de9fb2010252284f1ec3e9a0d865546fd0f09
diff --git a/app-misc/razertool/files/razertool-0.0.7-ar.patch b/app-misc/razertool/files/razertool-0.0.7-ar.patch
deleted file mode 100644
index b585205b1b92..000000000000
--- a/app-misc/razertool/files/razertool-0.0.7-ar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur razertool-0.0.7.orig/configure.in razertool-0.0.7/configure.in
---- razertool-0.0.7.orig/configure.in	2006-08-13 21:57:35.000000000 +0200
-+++ razertool-0.0.7/configure.in	2020-09-03 12:53:51.991020189 +0200
-@@ -10,6 +10,7 @@
- dnl checks for programs
- AC_ISC_POSIX
- AC_PROG_CC
-+AM_PROG_AR
- AM_PROG_CC_STDC
- AC_PROG_RANLIB
- AC_HEADER_STDC
diff --git a/app-misc/razertool/files/razertool-0.0.7-configure.patch b/app-misc/razertool/files/razertool-0.0.7-configure.patch
new file mode 100644
index 000000000000..3fed676a28b3
--- /dev/null
+++ b/app-misc/razertool/files/razertool-0.0.7-configure.patch
@@ -0,0 +1,212 @@
+diff -Naur razertool-0.0.7.orig/configure.ac razertool-0.0.7/configure.ac
+--- razertool-0.0.7.orig/configure.ac	1970-01-01 01:00:00.000000000 +0100
++++ razertool-0.0.7/configure.ac	2022-07-14 13:28:37.682934002 +0200
+@@ -0,0 +1,68 @@
++dnl Process this file with autoconf to produce a configure script.
++
++AC_INIT(configure.ac)
++AM_INIT_AUTOMAKE(razertool, 0.0.7)
++AM_CONFIG_HEADER(config.h)
++AM_MAINTAINER_MODE
++
++AC_ARG_ENABLE(gtk,[AS_HELP_STRING([--disable-gtk],[Don\'t build razertool-gtk])],[enable_gtk_force=yes],[enable_gtk_force=no;enable_gtk=yes])
++
++dnl checks for programs
++AC_ISC_POSIX
++AC_PROG_CC
++AM_PROG_AR
++AM_PROG_CC_STDC
++AC_PROG_RANLIB
++AC_HEADER_STDC
++PKG_PROG_PKG_CONFIG
++
++dnl checks for libraries
++PKG_CHECK_MODULES(libusb, [libusb >= 0.1.0])
++
++if test x$enable_gtk = xyes; then
++pkg_modules="gtk+-2.0 >= 2.8.0 librsvg-2.0 >= 2.0.0 cairo >= 1.0.0"
++PKG_CHECK_MODULES(GTKLIBS,[$pkg_modules],,[
++	AC_MSG_RESULT([no])
++	AC_MSG_WARN([
++Package requirements ($pkg_modules) were not met:
++
++$GTKLIBS_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables GTKLIBS_CFLAGS
++and GTKLIBS_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++])
++	if test x$enable_gtk_force = xyes; then
++		AC_MSG_ERROR([Aborting since --enable-gtk was used])
++	fi
++	AC_MSG_WARN([Not building razertool-gtk])
++	enable_gtk=no
++])
++fi
++
++dnl i18n
++GETTEXT_PACKAGE=razertool-gtk
++AC_SUBST(GETTEXT_PACKAGE)
++
++ALL_LINGUAS=`cat "${srcdir}/po/LINGUAS"`
++AM_GLIB_GNU_GETTEXT
++
++dnl output
++AM_CONDITIONAL(BUILD_GTK,test x$enable_gtk = xyes)
++
++AC_SUBST(libusb_CFLAGS)
++AC_SUBST(libusb_LIBS)
++AC_SUBST(GTKLIBS_CFLAGS)
++AC_SUBST(GTKLIBS_LIBS)
++
++AC_OUTPUT([Makefile src/Makefile gtk/Makefile po/Makefile.in])
++
++if test x$enable_gtk_force != xyes && test x$enable_gtk != xyes; then
++AC_MSG_WARN([
++
++*** NOT BUILDING RAZERTOOL-GTK ***
++])
++fi
+diff -Naur razertool-0.0.7.orig/configure.in razertool-0.0.7/configure.in
+--- razertool-0.0.7.orig/configure.in	2006-08-13 21:57:35.000000000 +0200
++++ razertool-0.0.7/configure.in	1970-01-01 01:00:00.000000000 +0100
+@@ -1,67 +0,0 @@
+-dnl Process this file with autoconf to produce a configure script.
+-
+-AC_INIT(configure.in)
+-AM_INIT_AUTOMAKE(razertool, 0.0.7)
+-AM_CONFIG_HEADER(config.h)
+-AM_MAINTAINER_MODE
+-
+-AC_ARG_ENABLE(gtk,[AS_HELP_STRING([--disable-gtk],[Don\'t build razertool-gtk])],[enable_gtk_force=yes],[enable_gtk_force=no;enable_gtk=yes])
+-
+-dnl checks for programs
+-AC_ISC_POSIX
+-AC_PROG_CC
+-AM_PROG_CC_STDC
+-AC_PROG_RANLIB
+-AC_HEADER_STDC
+-PKG_PROG_PKG_CONFIG
+-
+-dnl checks for libraries
+-PKG_CHECK_MODULES(libusb, [libusb >= 0.1.0])
+-
+-if test x$enable_gtk = xyes; then
+-pkg_modules="gtk+-2.0 >= 2.8.0 librsvg-2.0 >= 2.0.0 cairo >= 1.0.0"
+-PKG_CHECK_MODULES(GTKLIBS,[$pkg_modules],,[
+-	AC_MSG_RESULT([no])
+-	AC_MSG_WARN([
+-Package requirements ($pkg_modules) were not met:
+-
+-$GTKLIBS_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables GTKLIBS_CFLAGS
+-and GTKLIBS_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-])
+-	if test x$enable_gtk_force = xyes; then
+-		AC_MSG_ERROR([Aborting since --enable-gtk was used])
+-	fi
+-	AC_MSG_WARN([Not building razertool-gtk])
+-	enable_gtk=no
+-])
+-fi
+-
+-dnl i18n
+-GETTEXT_PACKAGE=razertool-gtk
+-AC_SUBST(GETTEXT_PACKAGE)
+-
+-ALL_LINGUAS=`cat "${srcdir}/po/LINGUAS"`
+-AM_GLIB_GNU_GETTEXT
+-
+-dnl output
+-AM_CONDITIONAL(BUILD_GTK,test x$enable_gtk = xyes)
+-
+-AC_SUBST(libusb_CFLAGS)
+-AC_SUBST(libusb_LIBS)
+-AC_SUBST(GTKLIBS_CFLAGS)
+-AC_SUBST(GTKLIBS_LIBS)
+-
+-AC_OUTPUT([Makefile src/Makefile gtk/Makefile po/Makefile.in])
+-
+-if test x$enable_gtk_force != xyes && test x$enable_gtk != xyes; then
+-AC_MSG_WARN([
+-
+-*** NOT BUILDING RAZERTOOL-GTK ***
+-])
+-fi
+diff -Naur razertool-0.0.7.orig/gtk/Makefile.in razertool-0.0.7/gtk/Makefile.in
+--- razertool-0.0.7.orig/gtk/Makefile.in	2007-02-15 07:55:23.000000000 +0100
++++ razertool-0.0.7/gtk/Makefile.in	2022-07-14 13:27:46.765830454 +0200
+@@ -1,5 +1,5 @@
+ # Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# @configure_input@
++# @configure.acput@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+ # 2003, 2004, 2005  Free Software Foundation, Inc.
+@@ -40,7 +40,7 @@
+ subdir = gtk
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+diff -Naur razertool-0.0.7.orig/Makefile.in razertool-0.0.7/Makefile.in
+--- razertool-0.0.7.orig/Makefile.in	2007-02-15 07:55:24.000000000 +0100
++++ razertool-0.0.7/Makefile.in	2022-07-14 13:27:46.765830454 +0200
+@@ -1,5 +1,5 @@
+ # Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# @configure_input@
++# @configure.acput@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+ # 2003, 2004, 2005  Free Software Foundation, Inc.
+@@ -42,7 +42,7 @@
+ 	mkinstalldirs
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+diff -Naur razertool-0.0.7.orig/missing razertool-0.0.7/missing
+--- razertool-0.0.7.orig/missing	2006-11-27 03:51:30.000000000 +0100
++++ razertool-0.0.7/missing	2022-07-14 13:27:46.765830454 +0200
+@@ -39,7 +39,7 @@
+ if test -f configure.ac; then
+   configure_ac=configure.ac
+ else
+-  configure_ac=configure.in
++  configure_ac=configure.ac
+ fi
+ 
+ msg="missing on your system"
+diff -Naur razertool-0.0.7.orig/src/Makefile.in razertool-0.0.7/src/Makefile.in
+--- razertool-0.0.7.orig/src/Makefile.in	2007-02-15 07:55:23.000000000 +0100
++++ razertool-0.0.7/src/Makefile.in	2022-07-14 13:27:46.765830454 +0200
+@@ -1,5 +1,5 @@
+ # Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# @configure_input@
++# @configure.acput@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+ # 2003, 2004, 2005  Free Software Foundation, Inc.
+@@ -41,7 +41,7 @@
+ subdir = src
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/app-misc/razertool/files/razertool-0.0.7-rules.patch b/app-misc/razertool/files/razertool-0.0.7-rules.patch
new file mode 100644
index 000000000000..b04357e17029
--- /dev/null
+++ b/app-misc/razertool/files/razertool-0.0.7-rules.patch
@@ -0,0 +1,8 @@
+diff -Naur razertool-0.0.7.orig/razertool.rules.example razertool-0.0.7/razertool.rules.example
+--- razertool-0.0.7.orig/razertool.rules.example	2007-02-15 06:09:41.000000000 +0100
++++ razertool-0.0.7/razertool.rules.example	2022-07-14 13:23:13.519271582 +0200
+@@ -1,2 +1,2 @@
+-ACTION=="add", BUS=="usb", SYSFS{idVendor}=="1532", SYSFS{idProduct}=="0101", MODE="0660", GROUP="plugdev"
+-ACTION=="add", BUS=="usb", SYSFS{idVendor}=="1532", SYSFS{idProduct}=="0009", MODE="0660", GROUP="plugdev"
++SUBSYSTEMS=="usb", ATTRS{idVendor}=="1532", ATTRS{idProduct}=="0101", MODE="0660", GROUP="usb"
++SUBSYSTEMS=="usb", ATTRS{idVendor}=="1532", ATTRS{idProduct}=="0009", MODE="0660", GROUP="usb"
diff --git a/app-misc/razertool/razertool-0.0.7-r4.ebuild b/app-misc/razertool/razertool-0.0.7-r5.ebuild
index c4a446040f4f..d650ed16d3ba 100644
--- a/app-misc/razertool/razertool-0.0.7-r4.ebuild
+++ b/app-misc/razertool/razertool-0.0.7-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit autotools desktop
+inherit autotools desktop udev
 
 DESCRIPTION="Unofficial tool for controlling the Razer Copperhead mouse"
 HOMEPAGE="http://razertool.sourceforge.net/"
@@ -16,6 +16,7 @@ IUSE="gtk"
 
 RDEPEND="dev-libs/glib:2
 	virtual/libusb:0
+	virtual/udev
 	gtk? (
 		dev-libs/atk
 		>=gnome-base/librsvg-2.0
@@ -28,20 +29,11 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
-PATCHES=( "${FILESDIR}"/${P}-ar.patch )
+PATCHES=( "${FILESDIR}"/${P}-configure.patch
+	"${FILESDIR}"/${P}-rules.patch )
 
 src_prepare() {
 	default
-
-	sed -i razertool.rules.example \
-		-e 's:ACTION=="add", ::;s:BUS=:SUBSYSTEMS=:;s:SYSFS{:ATTRS{:g' \
-		|| die
-
-	# plugdev group may not exist (created by hal), default to usb
-	sed -i razertool.rules.example \
-		-e 's:plugdev:usb:' \
-		|| die
-
 	eautoreconf
 }
 
@@ -52,8 +44,7 @@ src_configure() {
 src_install() {
 	default
 
-	insinto /lib/udev/rules.d
-	newins razertool.rules.example 90-razertool.rules
+	udev_newrules razertool.rules.example 90-razertool.rules
 
 	# Icon and desktop entry
 	if use gtk; then
@@ -63,6 +54,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	udev_reload
+
 	elog "Razer Copperhead mice need firmware version 6.20 or higher"
 	elog "to work properly. Running ${PN} on mice with older firmwares"
 	elog "might lead to random USB-disconnects."
@@ -72,3 +65,7 @@ pkg_postinst() {
 	elog "   /etc/udev/rules.d/90-razertool.rules"
 	elog "Then unplug and plug in the mouse."
 }
+
+pkg_postrm() {
+	udev_reload
+}