gentoo auto-resync : 05:11:2022 - 09:17:35

3 files changed, 69 insertions, 2 deletions

diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 65840bc9de56..ec63f50cbc72 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -1,6 +1,7 @@
 AUX nx-3.5.99.26-binutils-2.36.patch 1130 BLAKE2B 80bcb5c7fa7d4e14493a6e641dab3db393da2d20aa90cd5da68520c90b20b608c8a247ef0c85ee8f501907fe45c3b68d7c122b133c14a37d90599bcf132b22a2 SHA512 f767cb459f82c5f69fd957b42f04c51fff5fb583a2f1b47edb14a33654f5e36b8371fa9ca886fbf13ef780e403af089c055349b21f0f1cb154bb82e32980bcb3
+AUX nx-3.5.99.26-riscv64-support.patch 2204 BLAKE2B a52c4bf54edb09a73d86ecaf6daf5aeff820493c927fb6277fac4d7f514117d2f55eb38bf81539af4b8793b439ff78772cda819979e0b144b69f0d272664ba90 SHA512 a7ebfd63a54436e61c895c43290f805833d1f704b1e17cdff6607239dc84cc08cd8bcab0a5e1154ffa8bde3d28e2482d9ecf9d6697c23df6f29797b7447fc052
 DIST nx-libs-3.5.99.25.tar.gz 11065489 BLAKE2B 9210441fd2dc38fec14c90018ead4e3ddacd5ac266a26b1d985f874af0abdef3fdc2255614e45ec23816f1194ebe6ffe2beb776901eb1ed206658e8175b1ff57 SHA512 142378ae9a81542ed1bc969e9fcb2d421f1d63f7d46185c80e1e07493298e62379697ca2a367301c0f3df631acb19510113f3852922454fdc964767c36a81004
 DIST nx-libs-3.5.99.26.tar.gz 11070624 BLAKE2B f67f522b127858aa2ddf1c9723468a74722a5ef2fa1e7f438844a8e5b05b868cacac22abf2c604c67d5e83a346217b192773f5debe67945d085768ae43205cb7 SHA512 1aead6161e4d7b8d7229ff80937935b23ad1f87135a578ae483a00348d0df7de35e9f9b78c47c473fda3ab2cc896ef23e845cc5656344a43520b091af9663211
 EBUILD nx-3.5.99.25.ebuild 3394 BLAKE2B d74d201f993e24e2313b9f90f2a20ea65fbdfdc3752d28cd4cb518c5f016eb270f86d35eac8b5c58c6f32a0a6cd6c75ca06a27af2c228d28afc31e47210a7459 SHA512 01d974b6eea37e3c3e7f9a0bf7245fa30a79ce674139d5ac066ab2b295d75b48232200034d4ae030147e3539f2f747c147a017da0766dbfb1ac2e3c18f0aa128
-EBUILD nx-3.5.99.26.ebuild 3520 BLAKE2B e3a93dc274558889edb7be3eb23cd3ea9d967ae60d8c81913054034b8bc0bbf9c415ac81273529129b5b65ff92e013496f9c8cb7e718f33cd800f1879e80a326 SHA512 679b7eceabf5ad82cd828b436a58cd46538038f297ca1dd32d4214560cda69b9e564d19319c93bf7d586aa3d3d4b9718f8ad79d7727e8e8f8e03fe31d1e31d16
+EBUILD nx-3.5.99.26.ebuild 3635 BLAKE2B 385e0c3b92d179522e8396e82fcdbd9304805dbf10174e0fb7ee6900d163cf8b4d4afdfef1fa34aaaa7e9e16cf07b9c90d1ef89035108ce6c32c2aca9e8ab60c SHA512 25a550a078e88a23f9856b6d267fde21a24f4e999e170834a049593e4ed508cbcd8b97062b2cd29f52240dfe52bb820299b0b86f116b3216a58daa47e313638c
 MISC metadata.xml 333 BLAKE2B 1b2843f4928b28b0b3abea2c4b7cf046c77d8c87363672f8516c7edab36597bd2ae831f23eecbec5c38029891bd5fa5bc0dc42a407e3d656ab6cfb098262f64a SHA512 77a92a8f8cec2c2a236544dc53e58fce7e0d399d9122042ddc6a097b58d013d04bad6e2ccaafcca11ce3c2e0ddd2d6aa479776e1e37539e40e3645ed20485bfd
diff --git a/net-misc/nx/files/nx-3.5.99.26-riscv64-support.patch b/net-misc/nx/files/nx-3.5.99.26-riscv64-support.patch
new file mode 100644
index 000000000000..79ef8b9b5f18
--- /dev/null
+++ b/net-misc/nx/files/nx-3.5.99.26-riscv64-support.patch
@@ -0,0 +1,64 @@
+From 460562852eb4b1e14d2eeb81d2b96ea5de6ef683 Mon Sep 17 00:00:00 2001
+From: Alexandre Ghiti <alexandre.ghiti@canonical.com>
+Date: Fri, 10 Sep 2021 08:51:53 +0200
+Subject: [PATCH] nx-X11: Add support for riscv64 architecture
+
+Signed-off-by: Xin Yang <yangmame@icloud.com>
+---
+ nx-X11/config/cf/Imake.cf   | 5 +++++
+ nx-X11/config/cf/Imake.tmpl | 2 ++
+ nx-X11/config/cf/linux.cf   | 9 +++++++++
+ 3 files changed, 16 insertions(+)
+
+diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf
+index 9d683b85..612bc4e3 100644
+--- a/nx-X11/config/cf/Imake.cf
++++ b/nx-X11/config/cf/Imake.cf
+@@ -878,6 +878,11 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
+ #  undef __powerpc64__
+ #  undef tmp_set_big_endian
+ # endif
++# ifdef __riscv
++#  if __riscv_xlen == 64
++#   define Riscv64Architecture
++#  endif
++# endif
+ # ifdef sparc
+ #  define SparcArchitecture
+ #  undef sparc
+diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
+index de1fca93..266be8c5 100644
+--- a/nx-X11/config/cf/Imake.tmpl
++++ b/nx-X11/config/cf/Imake.tmpl
+@@ -509,6 +509,8 @@ XCOMM the platform-specific parameters - edit site.def to change
+ #define ByteOrder		X_BIG_ENDIAN
+ #elif defined(Ppc64LeArchitecture)
+ #define ByteOrder		X_LITTLE_ENDIAN
++#elif defined(Riscv64Architecture)
++#define ByteOrder		X_LITTLE_ENDIAN
+ #elif defined(HPArchitecture)
+ #define ByteOrder		X_BIG_ENDIAN
+ #elif defined(SuperHArchitecture)
+diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf
+index c3e9eaaf..6851be55 100644
+--- a/nx-X11/config/cf/linux.cf
++++ b/nx-X11/config/cf/linux.cf
+@@ -783,6 +783,15 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
+ # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
+ #endif /* PpcArchitecture */
+ 
++#ifdef Riscv64Architecture
++# ifndef OptimizedCDebugFlags
++#  define OptimizedCDebugFlags	-O3
++# endif
++# define LinuxMachineDefines	-D__riscv64__
++# define ServerOSDefines	XFree86ServerOSDefines
++# define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
++#endif /* Riscv64Achitecture */
++
+ #ifdef s390Architecture
+ # ifndef OptimizedCDebugFlags
+ #  define OptimizedCDebugFlags	-O2 -fomit-frame-pointer GccAliasingArgs
+-- 
+2.38.1
+
diff --git a/net-misc/nx/nx-3.5.99.26.ebuild b/net-misc/nx/nx-3.5.99.26.ebuild
index 7ac98b56e98d..2e50edab9c33 100644
--- a/net-misc/nx/nx-3.5.99.26.ebuild
+++ b/net-misc/nx/nx-3.5.99.26.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ArcticaProject/nx-libs/archive/${PV}.tar.gz -> nx-li
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~riscv x86"
 
 RDEPEND="dev-libs/libxml2
 	>=media-libs/libpng-1.2.8:0=
@@ -45,6 +45,8 @@ S="${WORKDIR}/nx-libs-${PV}"
 PATCHES=(
 	# https://github.com/ArcticaProject/nx-libs/pull/1012
 	"${FILESDIR}/${PN}-3.5.99.26-binutils-2.36.patch"
+	# https://github.com/ArcticaProject/nx-libs/pull/1023
+	"${FILESDIR}/${PN}-3.5.99.26-riscv64-support.patch"
 )
 
 src_prepare() {