gentoo resync : 05.04.2018

3 files changed, 26 insertions, 126 deletions

diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 69e92f95213f..3d87c30b0cbb 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -1,7 +1,5 @@
 DIST nx-libs-3.5.0.33-full.tar.gz 6811378 BLAKE2B f20de5f9f7214fa38f290b2a200481aeb80461b07839a19ca54059d0fb26de769f0d11720b6d443dd618b6ac5ce590a086a21745420411e6a09bfad65e8f8d79 SHA512 cfaa201e5422ddd8d1f12d3f0711d6d7a05fcd92379e5108c7c066ce8ae748f2f80f3bbbbba093d73cfe671fffc912443eb3ced0eeca1ab5a221c46488aa8bc5
-DIST nx-libs-3.5.99.15-full.tar.gz 5269081 BLAKE2B 79301870463aae8e71eaf8cad64ad03376c33d42c76884313ca78d439a070d41fff91af4894b60e38bbcc97c3e08e167b45675641cd8d06959fc68f1fece9de4 SHA512 b292e938bc8da7456418ef5356ebe04910ad306d6bb16d6befa3bb875f82b11a2a3f07488e42c6379bef60fc9e150695a8ec84e7af2f594fbd94883d90030e3f
 DIST nx-libs-3.5.99.16-full.tar.gz 5269745 BLAKE2B c968b8dde07e397e84786131cede0dd82979c52069a653de540ec833e5189751db15347aa34cf68db523207aa13ae7507cce0b28b09e897606becdc6effd7fcc SHA512 6b80530345da879e62f9ea506a04c77bd918d3c48d46a22548d1534dab14cae5a715290942fdd5c77708f119522312cd667b6b9f286f106463c5a0debbb0451c
 EBUILD nx-3.5.0.33.ebuild 2338 BLAKE2B 164bedd551b5be5ed917122cfff26069d411c5c5b0829ef9cf6712dbfca350209127d93fa36c18bbc6bdf2445b19d2ecc3bea91b0f9e867652e574655eede677 SHA512 e1f88b0e03f4066df1ef97cabcadd759cf80ed27619a3bbe228bed67a82ce287898cd47ac5f31c4de2e250441cf6eb5e69f6750609c978c56dd476c767828199
-EBUILD nx-3.5.99.15.ebuild 2865 BLAKE2B 5c879460dae9bbf80b0587f4adaa8a06aa714b5cddc6d8797e78a2aae80a99e16e58eb0b327381780ed3142ea11e8e3e40c23c8193080a109ca341a6bea7584e SHA512 709f42b523eb2ed4a45ce1d2a2da4e9ea40b8449f367512a843cabc2e4e08a31428e5fad6c78d8fae9529cd684d6b708107bbef715b06fc265c5e1e3bb2b6c31
-EBUILD nx-3.5.99.16.ebuild 2865 BLAKE2B 5c879460dae9bbf80b0587f4adaa8a06aa714b5cddc6d8797e78a2aae80a99e16e58eb0b327381780ed3142ea11e8e3e40c23c8193080a109ca341a6bea7584e SHA512 709f42b523eb2ed4a45ce1d2a2da4e9ea40b8449f367512a843cabc2e4e08a31428e5fad6c78d8fae9529cd684d6b708107bbef715b06fc265c5e1e3bb2b6c31
+EBUILD nx-3.5.99.16.ebuild 3145 BLAKE2B a3fb6b8a12b81b915cde401fcf4abe9f576266c684f9c1008bed0e32385156929d31f7f7f29ace2b404d7ac65d0bdbafe87c20c446d57b478c8c9cc84cf6bc78 SHA512 a57320258bbb6358577ebeb8c774a3baf09aa56014c7dbe3e5a8530ed1199814050198a7fe0c6a32e323d0cea78b92d66749f39488242bd1913dc0b94df89597
 MISC metadata.xml 347 BLAKE2B 8a7badffb3f49b006ec80af7a13bb111d0a34b2b45b9b20a7eb575f74f426eb18eb6dda48ae614a2fa134a5f80260bcf07c9af74731e7a45f131a08e18f5b12f SHA512 95db9d7a6f2869d74b0f960845dcaff0490bd5d137bd3df477d6fc5ba7eef910c46b3dd16fd2508830024fa56f27ff1c479b47ec7b766d15103449b2c01485b4
diff --git a/net-misc/nx/nx-3.5.99.15.ebuild b/net-misc/nx/nx-3.5.99.15.ebuild
deleted file mode 100644
index f051eba5a3cb..000000000000
--- a/net-misc/nx/nx-3.5.99.15.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="NX compression technology core libraries"
-HOMEPAGE="http://www.x2go.org/doku.php/wiki:libs:nx-libs"
-
-SRC_URI="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-full.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="elibc_glibc"
-
-RDEPEND="media-libs/freetype:2
-	>=media-libs/libpng-1.2.8:*
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg:*"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-libs/libfontenc
-	x11-libs/libXfont2
-	x11-misc/gccmakedep
-	x11-misc/imake
-	x11-proto/inputproto
-	x11-proto/xextproto"
-
-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
-
-	# run autoreconf in all needed folders
-	for i in nxcomp nx-X11/lib nxcompshad nxproxy ; do
-		pushd ${i} || die
-		eautoreconf
-		popd || die
-	done
-
-	# 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}
-}
-
-src_configure() {
-	for i in nxcomp nxcompshad nxproxy ; do
-		pushd ${i} || 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 FONT_DEFINES="-DHAS_XFONT2"
-	emake -C nx-X11 World USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" SHLIBDIR="/usr/$(get_libdir)" FONT_DEFINES="-DHAS_XFONT2" XFONTLIB="-lXfont2"
-
-	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
-}
diff --git a/net-misc/nx/nx-3.5.99.16.ebuild b/net-misc/nx/nx-3.5.99.16.ebuild
index f051eba5a3cb..e073af44a604 100644
--- a/net-misc/nx/nx-3.5.99.16.ebuild
+++ b/net-misc/nx/nx-3.5.99.16.ebuild
@@ -14,15 +14,29 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="elibc_glibc"
 
-RDEPEND="media-libs/freetype:2
-	>=media-libs/libpng-1.2.8:*
+RDEPEND="
+	dev-libs/libxml2
+	>=media-libs/libpng-1.2.8:0=
 	>=sys-libs/zlib-1.2.3
-	virtual/jpeg:*"
+	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}
 	virtual/pkgconfig
 	x11-libs/libfontenc
-	x11-libs/libXfont2
 	x11-misc/gccmakedep
 	x11-misc/imake
 	x11-proto/inputproto
@@ -38,14 +52,15 @@ src_prepare() {
 	sed 's@which quilt@false@' -i mesa-quilt || die
 
 	# run autoreconf in all needed folders
-	for i in nxcomp nx-X11/lib nxcompshad nxproxy ; do
-		pushd ${i} || die
+	local subdir
+	for subdir in nxcomp nx-X11/lib nxcompshad nxproxy ; do
+		pushd ${subdir} || die
 		eautoreconf
 		popd || die
 	done
 
 	# From xorg-x11-6.9.0-r3.ebuild
-	pushd nx-X11  || die
+	pushd nx-X11 || die
 	HOSTCONF="config/cf/host.def"
 	echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
 	echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
@@ -58,8 +73,9 @@ src_prepare() {
 }
 
 src_configure() {
-	for i in nxcomp nxcompshad nxproxy ; do
-		pushd ${i} || die
+	local subdir
+	for subdir in nxcomp nxcompshad nxproxy ; do
+		pushd ${subdir} || die
 		econf
 		popd || die
 	done