gentoo resync : 02.09.2020

4 files changed, 132 insertions, 55 deletions

diff --git a/sys-power/nvclock/Manifest b/sys-power/nvclock/Manifest
index 4e62e795a4fb..8f28a38a9f8a 100644
--- a/sys-power/nvclock/Manifest
+++ b/sys-power/nvclock/Manifest
@@ -1,9 +1,10 @@
 AUX nvclock-0.8_p20110102-buffers.patch 5181 BLAKE2B b81a50603032dfc38d950397466deabe3f5897369bf6169906c9473e5e953630b5ad3db807476008658c7417f50ae88e45de8b0403725f8eb61e3c7e7e2d3f70 SHA512 bca744826c3b3d12e4e694d692d58cc6b1004c6198ea65af765dacce717e523e0ae4f48fc7b95cadd377160e4c41a311ca901c0a269d0781705fb25ce2919924
 AUX nvclock-0.8_p20110102-desktop.patch 544 BLAKE2B 9c2ae5c07d971df66d446230de515d6f387aabb970319b088e64552349690ae5480cdb3f2ccdca3cb959478c8d7ccd869eada2ed8fd5e3127c28710483a73f6a SHA512 4816780a6fc1770853d547de3f4e7b1533086b69ac380e99df47ba23dff696f1bd9644de9fac25ed82cb86284f2af28323245249d9372a6064499cdfc84618c2
-AUX nvclock-0.8_p20110102-r1-make.patch 2788 BLAKE2B aff5388fb9bb3cdf2171fa9d4beca191ce73785b2094e37c01c6664ff8183aca4db86c0663e6d67a04df89d5dd68c98b4ec9dd79cacb7100cf31e083dac76224 SHA512 fa1b6591efd950d90501a72ecd1232fdac878cd6126eb15528526a90f4b99c7fe4348a6382a0c111b5af849f678b0a59b143a8ea74653e6d78114887c632a0a6
+AUX nvclock-0.8_p20110102-fno-common.patch 304 BLAKE2B e662980be6b63a46d8e175e0c9645aab3be6a4e723d40c8b076fc66f855de3b4d129b17150e37ff98efb54524ff70650b51b6ea0c37acb7f09937c7b5a4c92c3 SHA512 428cb270846b7aefffb845572a229557843977d5a53b3100ebeee7d6084f827d5bbbf4ac3f7f9b0c6c54b9fe990d210aa26c765161667f80ae9870557cad2977
+AUX nvclock-0.8_p20110102-r1-make.patch 4309 BLAKE2B c7bd8db246a16d9c4b7691440150485e43bad226850adb8452bd5fc93ae13817d5f5a5f85cb79f18c22b3ef76d94a317e5f12d3deb054bf8951b10526eb91fa4 SHA512 b1dd7e910b9f08bd04531d57528d655c8b7e95dd735a98413400c4fb2be90dbab43bbd2577f09f01654887cef2415e5d226e4978ff84076df2c55d944d4c60bb
 AUX nvclock-0.8_p20110102-usleep.patch 295 BLAKE2B a900bceebca6422d99689a51d4cfbfd0917331bb2a3747fe6944a7a432e984beaf5a2a42346b3468a07ab04ec29009bbb767037ad27477dfaa43898e61c4672e SHA512 6681f08788d79b0534734cc09fef5df3686c5fe6664f5e7bd634ee8e45a3e49821201895f221cd42e7cab2be88330febd57f069a24e09da4c60ef2b1fd6ee206
 AUX nvclock_confd 360 BLAKE2B 7aa4edd182d4dcb62cd16b3cd6d62ece10f0454cac047aab211423e781739b24fae3429f971cab3e355523480d8b57e6d9006f41f6e7050aadec766efd12d0f6 SHA512 9a5ebc91fe1346677b982d178099d577ad285b104c38720a975fc6b25190ec86e00ffbc165e7409b8aba5d8d9c1d336508579deb573c5ba7495b84fa28900519
 AUX nvclock_initd 145 BLAKE2B ef01d1f81821e64117d77b2908a48cf99b351dcc12339bbcb26bab760ef6fcb03e94d8fdb068a7909845655644eb0151adb71ff3f00ca597806e2cdfeb520d92 SHA512 348601da9728e2d726504bf23da944859813e52999ef1c716561523d6de61c1726be89b3f57e1a27d4ab641eda19b4dddc6eb8588a0ae1f64b4b418cc14876b1
 DIST nvclock-0.8_p20110102.tar.bz2 285043 BLAKE2B f1a524b6841a7eedcfbb9b0cd449f1af10c40cee11a814221d0cdcb42e507763313de112eea948dc05508fbd439a3dac504297c723fe4f0f821241204f5ccf89 SHA512 01bf7faed83acdf2390e1f410b2f8b697ff647b15562a6960a99666ec5121b532cbf4380137c9ee24221ccafff641bcdef4748dcad7ac92fb25fa15e735dd140
-EBUILD nvclock-0.8_p20110102-r2.ebuild 1310 BLAKE2B 5d5865fd4bc29c66b9000b7e63f8f6d69e9a2cfc0a7cc79c4f260306cc78a0204fd51e65de65a097ceec3cc812226b5cdd33f45123d972325c7ac83e9d3b54fc SHA512 a86b3cecac20984a1bb1a066072fa8f1118cd192b9cf9cedf12ed962fd58db83c0dd7626f34b32b45f5768ac9f4fd72998cb1386e02c16e383dc8a6e342d573b
+EBUILD nvclock-0.8_p20110102-r2.ebuild 1252 BLAKE2B ee7820297a1b7c6c27c5c27a82f0f5c5e97a3d9953bc8031365a87fd6e406f5077b802cdd6cd9748db0762d3446eb6bd2d828f23251637029386046131e39fab SHA512 aa02f9448e5d93bac97af1f21c573db123e9101b2020f4d4a27dfb4fede5bac748b159f41852367d087682d3be9e1902761e62a6a44c7178065a8708ebdf7c1e
 MISC metadata.xml 399 BLAKE2B 6c23d1a832367b5ded4ae9b48591fb407f0f808289f89aa32cd833cb6ce3952496457206e6a5b289fbbb492c85aacfec8dea445c448fda1d315ccf8e70f1fefb SHA512 df14f8340f688857210010d6843e0a86d706ba3bb9edbe015ad42e36fb7eb6c8606e2ea9d5dbfea7c4f7ad3f0e94c78d7b8c2b7b2a29af88d5c161162f8befcb
diff --git a/sys-power/nvclock/files/nvclock-0.8_p20110102-fno-common.patch b/sys-power/nvclock/files/nvclock-0.8_p20110102-fno-common.patch
new file mode 100644
index 000000000000..d95053a54cc6
--- /dev/null
+++ b/sys-power/nvclock/files/nvclock-0.8_p20110102-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/nvcontrol/nvcontrol.h
++++ b/src/nvcontrol/nvcontrol.h
+@@ -42,7 +42,7 @@
+ } NVOptionList;
+ 
+ #define OPTION_LIST_SIZE 27
+-NVOptionList option_list[OPTION_LIST_SIZE];
++extern NVOptionList option_list[OPTION_LIST_SIZE];
+ int init_nvcontrol();
+ NVOptionList *nvcontrol_lookup_option(int option);
+ 
diff --git a/sys-power/nvclock/files/nvclock-0.8_p20110102-r1-make.patch b/sys-power/nvclock/files/nvclock-0.8_p20110102-r1-make.patch
index e45e2a6aa341..89a9b7c1c5e3 100644
--- a/sys-power/nvclock/files/nvclock-0.8_p20110102-r1-make.patch
+++ b/sys-power/nvclock/files/nvclock-0.8_p20110102-r1-make.patch
@@ -1,11 +1,56 @@
 - Fix building with --as-needed
 - Fix parallel make by defining two new targets
 - Fix one spelling error
-- Respect CFLAGS, LDFLAGS
+- Respect AR, CC, RANLIB, CFLAGS, LDFLAGS
 - Link GTK frontend against -lX11 since it uses XOpenDisplay all the time
 
 --- a/configure.in
 +++ b/configure.in
+@@ -11,6 +11,9 @@
+ AC_PROG_MAKE_SET
+ AC_HEADER_STDC
+ 
++AC_CHECK_TOOL([AR], [ar])
++AC_PROG_RANLIB
++
+ 
+ HAVE_GTK2=no
+ HAVE_QT=no
+@@ -75,6 +78,7 @@
+ 
+ dnl We will only compile one NVClock gtk binary, choose the latest version availible
+ if test x"$enable_gtk" = "xyes"; then
++    PKG_CHECK_MODULES([X11], [x11])
+     PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4.0, have_gtk2=yes, have_gtk2=no)
+     GTK2_CFLAGS=$GTK_CFLAGS
+     GTK2_LIBS=$GTK_LIBS
+@@ -109,22 +113,18 @@
+ 	X11_LIBS="$X11_LIBS $XEXT_LIBS"
+ 	if test x"$X11_LIBS" != x ; then
+ 		HAVE_NVCONTROL=yes
+-	AC_SUBST(X11_CFLAGS)
+-	AC_SUBST(X11_LIBS)
+ 	AC_DEFINE([HAVE_NVCONTROL], [1], [NV-CONTROL support for changing OpenGL settings])
+ 	fi
+ fi
+ 
++AC_SEARCH_LIBS([dlsym], [dl dld], [], [
++    AC_MSG_ERROR([unable to find the dlsym() function])
++])
++
+ AC_SUBST(HAVE_GTK2)
+ AC_SUBST(HAVE_QT)
+ AC_SUBST(HAVE_NVCONTROL)
+ 
+-AC_SUBST(CFLAGS)
+-AC_SUBST(LIBS)
+-
+-RANLIB=ranlib
+-AC_SUBST(RANLIB)
+-
+ 
+ AC_OUTPUT(src/Makefile
+ 	src/backend/Makefile
 @@ -141,7 +141,7 @@
  if [test "$HAVE_NVCONTROL" = "yes"]; then
      echo "- NV-CONTROL support enabled"
@@ -15,6 +60,50 @@
  fi
  if [test "$HAVE_GTK2" = "yes"]; then
      echo "- GTK2 GUI enabled"
+--- a/src/backend/Makefile.in
++++ b/src/backend/Makefile.in
+@@ -1,11 +1,11 @@
+-CC=@CC@ -O0
+-AR=ar
++CC=@CC@
++AR=@AR@
+ RANLIB=@RANLIB@
+ 
+ system=@system@
+ HAVE_NVCONTROL=@HAVE_NVCONTROL@
+ OBJECTS=backend.o bios.o config.o error.o nv30.o nv40.o nv50.o info.o overclock.o utils.o i2c.o xf86i2c.o adt7473.o f75375.o lm99.o w83781d.o w83l785r.o libc_wrapper.o
+-CFLAGS=@X11_CFLAGS@ -I../.. -I../nvcontrol
++CFLAGS=@CFLAGS@ @X11_CFLAGS@ -I../.. -I../nvcontrol
+ 
+ ifeq ($(system), FreeBSD)
+     OBJECTS+=back_bsd.o
+--- a/src/gtk/Makefile.in
++++ b/src/gtk/Makefile.in
+@@ -20,20 +20,21 @@
+ 
+ ifeq ($(HAVE_NVCONTROL), yes)
+     DEPS=$(libbackend) $(libnvcontrol)
+-    LIBS=@GTK_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol
++    LIBS=@LIBS@ @GTK_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol
+     OBJECTS=banner.o gl.o hw.o main.o settings.o
+ else
+     DEPS=$(libbackend)
+-    LIBS=@GTK_LIBS@ -L../backend -lbackend
++    LIBS=@LIBS@ @GTK_LIBS@ -L../backend -lbackend
+     OBJECTS=banner.o hw.o main.o settings.o
+ endif
++X11_LIBS=@X11_LIBS@
+ 
+ 
+ .PHONY: clean distclean install
+ all: $(PROGRAM)
+ 
+ nvclock_gtk: $(DEPS) $(OBJECTS)
+-	$(CC) $(CFLAGS) -o nvclock_gtk $(OBJECTS) $(libbackend) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o nvclock_gtk $(OBJECTS) $(libbackend) $(LIBS) $(X11_LIBS)
+ 
+ clean:
+ 	rm -f nvclock_gtk *.core *.o *.exe
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
 @@ -16,7 +16,7 @@
@@ -46,25 +135,15 @@
  
  
  clean: clean-recursive clean-app
---- a/src/gtk/Makefile.in
-+++ b/src/gtk/Makefile.in
-@@ -27,6 +27,7 @@
-     LIBS=@GTK_LIBS@ -L../backend -lbackend
-     OBJECTS=banner.o hw.o main.o settings.o
- endif
-+LIBS += -lX11
- 
- 
- .PHONY: clean distclean install
-@@ -33,7 +33,7 @@
- all: $(PROGRAM)
- 
- nvclock_gtk: $(DEPS) $(OBJECTS)
--	$(CC) $(CFLAGS) -o nvclock_gtk $(OBJECTS) $(libbackend) $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o nvclock_gtk $(OBJECTS) $(libbackend) $(LIBS)
- 
- clean:
- 	rm -f nvclock_gtk *.core *.o *.exe
+--- a/src/nvcontrol/Makefile.in
++++ b/src/nvcontrol/Makefile.in
+@@ -1,5 +1,5 @@
+ CC=@CC@
+-AR=ar
++AR=@AR@
+ RANLIB=@RANLIB@
+ system=@system@
+ CFLAGS=@CFLAGS@
 --- a/src/qt/Makefile.in
 +++ b/src/qt/Makefile.in
 @@ -31,7 +31,7 @@
@@ -76,19 +155,3 @@
  
  clean:
  	rm -f nvclock_qt *.core *.moc *.o
---- a/src/backend/Makefile.in
-+++ b/src/backend/Makefile.in
-@@ -1,11 +1,11 @@
--CC=@CC@ -O0
-+CC=@CC@
- AR=ar
- RANLIB=@RANLIB@
- 
- system=@system@
- HAVE_NVCONTROL=@HAVE_NVCONTROL@
- OBJECTS=backend.o bios.o config.o error.o nv30.o nv40.o nv50.o info.o overclock.o utils.o i2c.o xf86i2c.o adt7473.o f75375.o lm99.o w83781d.o w83l785r.o libc_wrapper.o
--CFLAGS=@X11_CFLAGS@ -I../.. -I../nvcontrol
-+CFLAGS=@CFLAGS@ @X11_CFLAGS@ -I../.. -I../nvcontrol
- 
- ifeq ($(system), FreeBSD)
-     OBJECTS+=back_bsd.o
diff --git a/sys-power/nvclock/nvclock-0.8_p20110102-r2.ebuild b/sys-power/nvclock/nvclock-0.8_p20110102-r2.ebuild
index 92f0dd852e67..d14d2d9f9b1d 100644
--- a/sys-power/nvclock/nvclock-0.8_p20110102-r2.ebuild
+++ b/sys-power/nvclock/nvclock-0.8_p20110102-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit autotools eutils toolchain-funcs
+inherit autotools
 
 DESCRIPTION="NVIDIA Overclocking Utility"
 HOMEPAGE="http://www.linuxhardware.org/nvclock/"
@@ -19,27 +19,30 @@ RDEPEND="
 		x11-libs/gtk+:2
 		x11-libs/libX11
 	)
-	nvcontrol? ( x11-libs/libX11 x11-libs/libXext )
-"
+	nvcontrol? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)"
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-r1-make.patch
+	"${FILESDIR}"/${P}-usleep.patch
+	"${FILESDIR}"/${P}-desktop.patch
+	"${FILESDIR}"/${P}-buffers.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-r1-make.patch \
-		"${FILESDIR}"/${P}-usleep.patch \
-		"${FILESDIR}"/${P}-desktop.patch \
-		"${FILESDIR}"/${P}-buffers.patch
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_configure() {
-	sed -i \
-		-e "/^AR=ar/s:=.*:=$(tc-getAR):" \
-		src/*/Makefile.in || die
-
-	# Qt support would mean Qt 3.
+	# only <Qt-4 supported
 	econf \
-		--docdir=/usr/share/doc/${PF} \
 		--disable-qt \
 		$(use_enable gtk) \
 		$(use_enable nvcontrol)
@@ -51,8 +54,7 @@ src_compile() {
 }
 
 src_install() {
-	mkdir -p "${D}"/usr/bin || die
-
+	dodir /usr/bin
 	default
 
 	newinitd "${FILESDIR}"/nvclock_initd nvclock