gentoo resync : 14.05.2020

3 files changed, 146 insertions, 1 deletions

diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 896168b803a0..259b6b39ee4e 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -1,5 +1,7 @@
 DIST nx-libs-3.5.99.16-full.tar.gz 5269745 BLAKE2B c968b8dde07e397e84786131cede0dd82979c52069a653de540ec833e5189751db15347aa34cf68db523207aa13ae7507cce0b28b09e897606becdc6effd7fcc SHA512 6b80530345da879e62f9ea506a04c77bd918d3c48d46a22548d1534dab14cae5a715290942fdd5c77708f119522312cd667b6b9f286f106463c5a0debbb0451c
 DIST nx-libs-3.5.99.22-full.tar.gz 5280116 BLAKE2B 1a15ba04ace5fd46b007652897aa911a883fa2840c07f4e89db970d3235556ee83600f5cd4d9c4b64f7ce4767dd448a3654412051496754d73a2815a7573692f SHA512 53e7f1ffd8bf9dfd08426e30b0a18433b64f926959ab95132c28960f9a2390e67a34b1e07c923bf11f889088711d7d97c1fd123507f39c2077211d2c3cd6857f
+DIST nx-libs-3.5.99.23.tar.gz 11073366 BLAKE2B 0e06e9c90f73a0264d8363ee3f75914ada884f469d9ba15b062675625a9922be5ec963eb7611484ef2abea83a100e58b05e6421da67d8b5c5f840737e6b37321 SHA512 b627d521f7a3c43c9c000f770bd1e228842099e794cda32b37df621ac86c650990bdc69810b7ff6117cbd60f0339dda93d1e2acdcfac03ddaa50407d71668b60
 EBUILD nx-3.5.99.16.ebuild 3118 BLAKE2B cd118b671a1b57c7ceae369431e8b23a214104bd790914d735b118e2e7d9487b096b4a08792a4006572362f0bac78015c1f868092186c22ac21d9e829674df64 SHA512 42b58a02ccba22d17b2862ea85923e8fc7f6834c667b31afcd1399d66cb21f9e6a33f98b48973305d342b6cf406504cd41a545a046a2708d77d6741d441773a5
 EBUILD nx-3.5.99.22.ebuild 3243 BLAKE2B 96efb3e409b0e6253efcc1914ae5bf5d1020999e682a729dee71c188126aed73b9abbbf62b1cfae46427c1a65c0365c94e5d321c825b4775df0b5a06ff17ffd6 SHA512 159ee29ca7dc9a1d8ee12ee5fea8a10a0bb1ac28762d08208dc15b547e8d4d15b06de001e13f36c8648c193155ba1865f02d05be7d8bf25b228f889fd509711e
-MISC metadata.xml 347 BLAKE2B 8a7badffb3f49b006ec80af7a13bb111d0a34b2b45b9b20a7eb575f74f426eb18eb6dda48ae614a2fa134a5f80260bcf07c9af74731e7a45f131a08e18f5b12f SHA512 95db9d7a6f2869d74b0f960845dcaff0490bd5d137bd3df477d6fc5ba7eef910c46b3dd16fd2508830024fa56f27ff1c479b47ec7b766d15103449b2c01485b4
+EBUILD nx-3.5.99.23.ebuild 3392 BLAKE2B 676f533494f67fe8285db1d5a4ddd715c58ae7ce78d4cf7e4bc63d330709735c1d814426cdf80303a6420686deed5be75d3d82b2d0fc65fc4e9b04052207890a SHA512 a4020facae074b7f123c165e2009d4c1b7dcf3e33c2b1917dbfd80fc5d210c0cc93886158cfc4fb8153752a9e368910bfb750eab4a43b182581c9b4645a8aa56
+MISC metadata.xml 431 BLAKE2B 0c5df628b0e1167d246de69dd43a789efd3a19257cac3c77a6e63c787e3b33df11fb46d3ee400148ed224f8c1f3a46a0a717c6945cbb5a75dbaf7db090f87d88 SHA512 919a691eca3818bbec94ce6864333f073e41808ed0e897677ec66321812998cde78cfefd6ad344b350633f315a64288476a209d9029fa4b35873d2a1f49934a2
diff --git a/net-misc/nx/metadata.xml b/net-misc/nx/metadata.xml
index 1b5df39c0204..d639b5037599 100644
--- a/net-misc/nx/metadata.xml
+++ b/net-misc/nx/metadata.xml
@@ -5,5 +5,8 @@
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">ArcticaProject/nx-libs</remote-id>
+</upstream>
 <longdescription>Special versions of the X11 libraries to support NX compression</longdescription>
 </pkgmetadata>
diff --git a/net-misc/nx/nx-3.5.99.23.ebuild b/net-misc/nx/nx-3.5.99.23.ebuild
new file mode 100644
index 000000000000..55b6eb9d8316
--- /dev/null
+++ b/net-misc/nx/nx-3.5.99.23.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="NX compression technology core libraries"
+HOMEPAGE="https://github.com/ArcticaProject/nx-libs"
+
+SRC_URI="https://github.com/ArcticaProject/nx-libs/archive/${PV}.tar.gz -> nx-libs-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="elibc_glibc"
+
+RDEPEND="dev-libs/libxml2
+	>=media-libs/libpng-1.2.8:0=
+	>=sys-libs/zlib-1.2.3
+	virtual/jpeg:*
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXfont2
+	x11-libs/libXinerama
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pixman"
+
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libfontenc
+	x11-misc/gccmakedep
+	x11-misc/imake"
+
+BDEPEND="
+	virtual/pkgconfig"
+
+S="${WORKDIR}/nx-libs-${PV}"
+
+src_prepare() {
+	default
+
+	# We want predictable behavior. So let's assume we never
+	# have quilt installed.
+	sed 's@which quilt@false@' -i mesa-quilt || die
+
+	# Do not compress man pages by default
+	sed '/^[[:space:]]*gzip.*man/d' -i Makefile || die
+
+	# run autoreconf in all needed folders
+	local subdir
+	for subdir in nxcomp nxdialog nx-X11/lib nxcompshad nxproxy ; do
+		pushd ${subdir} || die
+		eautoreconf
+		popd || die
+	done
+}
+
+src_configure() {
+	# Workaround until fixed upstream
+	# https://github.com/ArcticaProject/nx-libs/issues/907
+	append-cflags -fcommon
+
+	# From xorg-x11-6.9.0-r3.ebuild
+	pushd nx-X11 || die
+	HOSTCONF="config/cf/host.def"
+	echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
+	echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+	echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+	# Respect LDFLAGS
+	echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
+	echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
+	# Disable SunRPC, #370767
+	echo "#define HasSecureRPC NO" >> ${HOSTCONF}
+	popd || die
+
+	local subdir
+	for subdir in nxcomp nxdialog nxcompshad nxproxy ; do
+		pushd ${subdir} || die
+		econf
+		popd || die
+	done
+
+	pushd "nx-X11/lib" || die
+	econf --disable-poll
+	popd || die
+}
+
+src_compile() {
+	# First set up the build environment
+	emake build-env
+
+	# We replicate the "build-full" make target here because
+	# we cannot call "make build-full" as it
+	#  - calls autoreconf several times
+	#  - invokes make directly but we prefer our emake
+
+	emake -C nxcomp
+	emake -C nx-X11/lib
+
+	mkdir -p nx-X11/exports/lib/ || die
+	local nxlib
+	for nxlib in libNX_X11.so{,.6{,.3.0}} ; do
+		ln -s ../../lib/src/.libs/${nxlib} nx-X11/exports/lib/${nxlib} || die
+	done
+
+	emake -C nxcompshad
+
+	./mesa-quilt push -a || die
+
+	emake -C nx-X11 BuildDependsOnly
+	# Parallel make issue resurfaced, upstream working on autotools switch
+	emake -j1 -C nx-X11 World \
+		USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \
+		SHLIBDIR="/usr/$(get_libdir)"
+
+	emake -C nxproxy
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="/usr" \
+		NXLIBDIR="/usr/$(get_libdir)/${PN}" \
+		SHLIBDIR="/usr/$(get_libdir)" \
+		USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \
+		install
+
+	# Already provided by mesa & related packages
+	rm -r "${ED}"/usr/include/GL || die
+
+	# Get rid of libtool files and static libs.
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}