From f1b983c7b0c71f361b8894fa78e46be685599655 Mon Sep 17 00:00:00 2001
From: audiodef <audiodef11@gmail.com>
Date: Wed, 3 May 2023 16:36:39 -0400
Subject: [PATCH] Replaced existing ntk files with updates files for python
 3.10

---
 x11-libs/ntk/Manifest                         |  5 +-
 .../ntk/files/ntk-configurable-libdir.patch   | 70 +++++++++++++++++++
 x11-libs/ntk/metadata.xml                     |  8 ++-
 x11-libs/ntk/ntk-1.3.1001-r1.ebuild           |  1 +
 x11-libs/ntk/ntk-9999.ebuild                  | 11 +--
 5 files changed, 85 insertions(+), 10 deletions(-)
 create mode 100644 x11-libs/ntk/files/ntk-configurable-libdir.patch
 create mode 120000 x11-libs/ntk/ntk-1.3.1001-r1.ebuild

diff --git a/x11-libs/ntk/Manifest b/x11-libs/ntk/Manifest
index 10481b7..96470ab 100644
--- a/x11-libs/ntk/Manifest
+++ b/x11-libs/ntk/Manifest
@@ -1,4 +1 @@
-AUX ntk-dont-run-ldconfig.patch 1354 BLAKE2B a70f46dd152f4c41e1028331fa31310855448b927cbd49b95f366b0164423192fe0cd47b24a1c35c89e9076a6bdc792b52904dad4e19039412f61aca7e2e2d2e SHA512 7616aeb5d5c1987a5c038486f26407e17dfa3f193b95dbcd95ec20921a1ce829d6569ad20e9387f57415e57cac33ac9543565dd6a95cf3095880d8ae40a82dd9
-AUX ntk-no-default-cflags-optimizations.patch 1094 BLAKE2B f128bf35edb45783df4d8a6fa3ebbf3d392d4575755a5ad133d97ffb388270187db3c0a52c6ea5e9b12ab8dd4742369e685c35a5d1685cbd2395acc98216f34c SHA512 55ca3c532837f6bc32459ab7f78d2c225426cbe7423d39529dff7932c381cec88cd699d1e24e67673c462846388820fc7421ffafb522f8193a3688ea81f591d1
-EBUILD ntk-9999.ebuild 1082 BLAKE2B e1974dc4c1947d8b52acc1b7685ec8922193ad2fc985fb0b9b1f775bda1a4185b1227491277611ffd61cdb546fa135bc360f7ac699763d724f94864f17205aad SHA512 a20e9469b380c50f23ef184728ac88adf084dc80ffd7d7a723f45b6e4ccba3bb3887f010913667fef8caddbd51b26bd167ba5e4d3ea99c0698bc7f7ae5f6e390
-MISC metadata.xml 254 BLAKE2B 5157182c1aea2538d0d43fd96a00a8ae26977f4231cdcce7dd069cf64265b896e05c2be046294407b04f4123e452cd5fd0ffed7c52b886ccef01082212eaf7a4 SHA512 5ffa571f0331354be35ba9fcfced9384965d27d926a0f16811d3d731157014b5cb3beb5ed4d520c0c0fa43a0238f78c7d8f3ea0716b744064ece431ecf3ff779
+DIST ntk-1.3.1001.tar.gz 2747575 BLAKE2B d60784188112499c2cc4de5e30fefa4959b4e6ea0f04a43390ece35da72d474e24659a8f17aa76f63eab4dcca724873e9798bf99a7dc4438e1b9b6d88daf294b SHA512 b1c1b4ad87c74b11da52c90b6167602286b7d46c2a0217bf24972415400e922714dcec1908116b0daeb1bc2f07f89d591aa21cca404d59ddbb7f1fa831417fa5
diff --git a/x11-libs/ntk/files/ntk-configurable-libdir.patch b/x11-libs/ntk/files/ntk-configurable-libdir.patch
new file mode 100644
index 0000000..4bcb9aa
--- /dev/null
+++ b/x11-libs/ntk/files/ntk-configurable-libdir.patch
@@ -0,0 +1,70 @@
+Index: b/ntk.pc.in
+===================================================================
+--- a/ntk.pc.in
++++ b/ntk.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@LIBDIR@
+ includedir=${prefix}/include
+ 
+ Name: ntk
+Index: b/ntk_gl.pc.in
+===================================================================
+--- a/ntk_gl.pc.in
++++ b/ntk_gl.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@LIBDIR@
+ includedir=${prefix}/include
+ 
+ Name: ntk_images
+Index: b/ntk_images.pc.in
+===================================================================
+--- a/ntk_images.pc.in
++++ b/ntk_images.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@LIBDIR@
+ includedir=${prefix}/include
+ 
+ Name: ntk_images
+Index: b/wscript
+===================================================================
+--- a/wscript
++++ b/wscript
+@@ -456,7 +456,8 @@ src/Fl_Gl_Window.cxx
+          install_path = '${LIBDIR}/pkgconfig',
+          CFLAGS = ' '.join( CFLAGS ),
+          VERSION = VERSION,
+-         PREFIX = bld.env.PREFIX )
++         PREFIX = bld.env.PREFIX,
++         LIBDIR = bld.env.LIBDIR )
+ 
+     bld( features = 'subst',
+          source = 'ntk_images.pc.in',
+@@ -465,7 +466,8 @@ src/Fl_Gl_Window.cxx
+          install_path = '${LIBDIR}/pkgconfig',
+          CFLAGS = ' '.join( CFLAGS ),
+          VERSION = VERSION,
+-         PREFIX = bld.env.PREFIX )
++         PREFIX = bld.env.PREFIX,
++         LIBDIR = bld.env.LIBDIR )
+ 
+     bld( features = 'subst',
+          source = 'ntk_gl.pc.in',
+@@ -474,7 +476,8 @@ src/Fl_Gl_Window.cxx
+          install_path = '${LIBDIR}/pkgconfig',
+          CFLAGS = ' '.join( CFLAGS ),
+          VERSION = VERSION,
+-         PREFIX = bld.env.PREFIX )
++         PREFIX = bld.env.PREFIX,
++         LIBDIR = bld.env.LIBDIR )
+ 
+     bld( features = 'subst',
+          source = 'ntk-uninstalled.pc.in',
diff --git a/x11-libs/ntk/metadata.xml b/x11-libs/ntk/metadata.xml
index 6bb2f9a..211d795 100644
--- a/x11-libs/ntk/metadata.xml
+++ b/x11-libs/ntk/metadata.xml
@@ -2,7 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>webmaster@gentoostudio.org</email>
-		<name>Damien Moody</name>
+		<email>simon.vanderveldt+audio-overlay@gmail.com</email>
+		<name>Simon van der Veldt</name>
+	</maintainer>
+	<maintainer type="person">
+		<name>Adrian Schollmeyer</name>
+		<email>nex+b-g-o@nexadn.de</email>
 	</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/ntk/ntk-1.3.1001-r1.ebuild b/x11-libs/ntk/ntk-1.3.1001-r1.ebuild
new file mode 120000
index 0000000..c2c874d
--- /dev/null
+++ b/x11-libs/ntk/ntk-1.3.1001-r1.ebuild
@@ -0,0 +1 @@
+ntk-9999.ebuild
\ No newline at end of file
diff --git a/x11-libs/ntk/ntk-9999.ebuild b/x11-libs/ntk/ntk-9999.ebuild
index 6d9024b..44c424d 100644
--- a/x11-libs/ntk/ntk-9999.ebuild
+++ b/x11-libs/ntk/ntk-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 # Required by waf
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{9..10} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-any-r1 waf-utils
@@ -34,8 +34,11 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}"
 BDEPEND="${PYTHON_DEPS}"
 
-PATCHES=( "${FILESDIR}/${PN}-dont-run-ldconfig.patch"
-	"${FILESDIR}/${PN}-no-default-cflags-optimizations.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-configurable-libdir.patch"
+	"${FILESDIR}/${PN}-dont-run-ldconfig.patch"
+	"${FILESDIR}/${PN}-no-default-cflags-optimizations.patch"
+)
 
 src_configure() {
 	local mywafconfargs=(