Finally found how to respect AR/RANLIB, fix some missing CC/CXX, bug #445794

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

4 files changed, 211 insertions, 5 deletions

diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog
index 7a58a6939c38..d49f7d2e3c63 100644
--- a/net-misc/nx/ChangeLog
+++ b/net-misc/nx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/nx
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.75 2013/01/08 10:47:02 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.76 2013/01/09 14:54:45 voyageur Exp $
+
+*nx-3.5.0.17-r1 (09 Jan 2013)
+
+  09 Jan 2013; Bernard Cafarelli <voyageur@gentoo.org> +nx-3.5.0.17-r1.ebuild,
+  +files/nx-3.5.0.17-cflags_ar_ranlib.patch:
+  Finally found how to respect AR/RANLIB, fix some missing CC/CXX, bug #445794
 
 *nx-3.5.0.17 (08 Jan 2013)
 
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index d60e534e6cc0..20221e5c4854 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -5,6 +5,7 @@ AUX 1.5.0/nx-x11-1.5.0-tmp-exec.patch 349 SHA256 bbaeeb4e04c04da96f37dfb7ab5e494
 AUX 1.5.0/nxcomp-1.5.0-pic.patch 522 SHA256 d4fb814d5ee3bd13c39e535b731caab0acb9e552cea471c602c8ff9c8e6d535e SHA512 14e5dc5ea280704d867af971bced585adfd805f49ed70162c4b1691b81926b144720e5df1fc1257e0b3a9e5841fed0deea3a7096d92a210476c1bfd89112c52f WHIRLPOOL b4341346200fb951342535f566d5849183655a6f014be6f9f985e1da087222491b9503f9548506927ec240eaece7829828e1a8690aaf8bcb0d5d402c6c207d34
 AUX nx-3.2.0-nxproxy_read_from_stdin.patch 1382 SHA256 7674e887e1be1134110e2219a96b413efa2b32d9be50de77d15b9dcbad8a4d76 SHA512 d7ae8eb5e43371b913ebb182436284c3a7526b1485bd2e4a969e0e02299315d6a4f036f54f477ebb4299138ba23d830aea46ef2ff6e90ada2a74ef6e95948924 WHIRLPOOL 940299b85e79c6e2e23d2255acf8d37d3f38606d084dd51347dbf67e00283ad8993b6281095d499d4a78e9de11bbf866120ab42ca0d1dcf65590eb53f71f61db
 AUX nx-3.3.0-cflags.patch 1322 SHA256 88e9506a5809e1357c29b4f0ec1777b69335e35e90a22ab14f98fd616d67fc6e SHA512 ae85b1084b0226c14fdf2aae8f3a3c2fcb6d2fd2a1a14d931ddb51657b91c5c4296036332f7e0cde3c26d715061d68cfe685883162440663e07496b9fc2862ae WHIRLPOOL e4ab646c3a9dd97d886f6aca64096c0bf2ad32d8bae72596e81d5d2aa7f1a70cf5eb9e0c7cd4737dc843ad68cdba54c5f4693649741ddd9247ce0a19d8b07039
+AUX nx-3.5.0.17-cflags_ar_ranlib.patch 3518 SHA256 a129ea9d774997d946babe09d431e21ee4eaf5538b52a6a8a4fe2f9ff7c78f25 SHA512 df036cafc3526526e6768976f6ddca97584dbea2f7008c9c6a977922389e0e12901fd399794a10e2050380e5ad4066f364c2ebd5bd6e94e65143ccb100000400 WHIRLPOOL 6a6c909699ff9be60ecba4990b131cdd68d44959d35f95bd166846517065ee044784a48b2eec0fad6c80ecef0b821e75953a7189275a3e69bb88eaa573de61b2
 DIST nx-libs-3.5.0.14-full.tar.gz 21888558 SHA256 afdc51cfe0a881492517bfead58358d57191c9f2f3220e44bc85605a6cfe7b8d SHA512 2b3d9f7b18a4a07cad826c6b3f0c47085922ed9642f743c1ba8b3a2ecc621a3d95d24cfd70fb1c14f6b4252dd16c56e3c86d2b12f1a6a703d336243e466a39ee WHIRLPOOL cd0aaecc0cd969f48ef9a77515b4e98ff5b14669495b4efbcb36985578a6985045e4208c1ca08ff731b589c3a8fe0223e33af9d52307632222426a0721b43009
 DIST nx-libs-3.5.0.15-full.tar.gz 21887518 SHA256 0edfe8031e917bec5f9b1fb3750022b9460c0321d53fcd08111c69f49fa6837e SHA512 1d221c3a6cd970a092a368f1fe5a129401f21894785b2df5a243e7dea91edf7a36d937dc0ad498698b5d6ead5e79488c433594907b2244eb7f134b7f2fe3b9da WHIRLPOOL 9ed089bbb2c793109b056075a19ae5e5c9124b2bd42f2c7db6140b80a70342a78becb48e29f132e58d87a59bdac2b53d3fa05244d07431068ef64460cdb7b491
 DIST nx-libs-3.5.0.16-full.tar.gz 21892581 SHA256 f0f1ac10ce64072df99a11617e3bbd61b71fb93db590236ce4d0b031cf3eae5c SHA512 9b8dc9885906e191c8874a265aabccd18c2423a15b929f2c68243343e72497861c246de61cd87476e30fa2ae54bfe8b3947c6efb752596b2ee2b401044295b60 WHIRLPOOL e9399827420cc36f1b2f46fbe30d6a2519357f4f4278edada93ddf434c9be17dcb1db59ca99026230c51be0c29558948f768eb9b69c71a9fda9e4045a6755f7a
@@ -12,13 +13,14 @@ DIST nx-libs-3.5.0.17-full.tar.gz 21873898 SHA256 199bbcb0efd400b0c9440c1fca2d73
 EBUILD nx-3.5.0.14-r1.ebuild 2583 SHA256 e925145052a03be959747dc211d456083f9f42cf2d4ac8a30f4f252d1856cf99 SHA512 7d6018c5eb4c640de63ad50116de8fc4d4a37e39932d5c4bcbd6764030fadf072dc94e7e629b4635dbcefa6ed1a77c609e07870c06c7019475d94b9092392af3 WHIRLPOOL 95ab93868ceff0c0ff954d8580eed2ba2b8bcca1a5fd94aeeb2bd9a290caa7f6cf059c3a8026e90dc9bef9e3b301723c08ea48aeb4534abfbf825b9e16db4813
 EBUILD nx-3.5.0.15.ebuild 2573 SHA256 d6c4be35c34c53eac912d8c8b9b5337286208ae50b188375d041869d5dee9b12 SHA512 d92e15144ad86eb29e4e74b05dda1d8dcf3644e21d63cc24c28eec4f560b2dfa231e7d1e59485dd0812012ffb31ce5a5337479be7e56158a8fdb10676ddb34b2 WHIRLPOOL d3ebc23e01f33b890fdd3a758622c7cc73a37740bf2dacb8edb84132825b4d3c61ef1f8948d762a1340c172d75d0841583d9241e7f69ee28213c392642eec517
 EBUILD nx-3.5.0.16.ebuild 2580 SHA256 6178bdf080ecd1e650596e073bce03d1d3a6e6bfb4f77e6b6f95d860b021b22c SHA512 c3e9b38075f24cf32e0d0cde98b9f95c43b43788d90f208bbb2b4299875d1e5364b5e2c562858761f6049db061df31f5ce0caa22e680578272979752bd9ba6db WHIRLPOOL e34eb74540ae9c04c3aad2140fd129eae91394ee184cb31c5afae396cd7a3f23e3d7f04b6e4496910de48fce0c2b92ffc1593545f76a40107910ea43d57e0b36
+EBUILD nx-3.5.0.17-r1.ebuild 2686 SHA256 0ee40e5aa6402a64e1d864ab2c6f77551dc55ace008b1750dce174d4cb0d0b3e SHA512 291afbfd8746cb4e09e92fede454292f0674928eeb43ebd5238581c2655d89d770492a39cb752e24d3f2fbf4e1d76060240cc1f85c9e3c308e4e19689daa06b9 WHIRLPOOL 5f390acf3389de6f949b8d6064b291e2e30ab1ddeda4050c2346c4abf0bb909f3e272c1eeb948ba47ae194b73f697d4999a08eb960650f526721c27f04a0c23e
 EBUILD nx-3.5.0.17.ebuild 2594 SHA256 e3ece940a0fcd8794e0f8a28e203be8285db900a752b877dd8bc3526891f4c0f SHA512 9b26323fe9a5ce032e3d78a6fc669341e734d7309d2983b2a4f0be565f62c61125a2b5dc8d55edf5cbe5a1daaf2dc6541af4de3d14c568d199fbc01333d719e6 WHIRLPOOL 8278e288adcf56ae8e63fabd450e815163134d421cd79cffce9517d10280eeccb691511b8c3d7157c867c9862f44a235c9f24fd5265287e34d2316b1e7e8e495
-MISC ChangeLog 11744 SHA256 2f50b66464f987e981c00b8a20d687cf25bbc1697d01dbe8b6b1196b79af0546 SHA512 f008111d1f1ac9a47c78c29882335cb68d0f31c916286366029db093813ec3bb4327f16e725f0396b7af4e0dffcff0d2b3806f4a36b54d05c9c4ab092b43ca5b WHIRLPOOL f6d5d9c0d74387d2a2c02c9aa2ed1cb735c89688c8ecc190f242dbec28ff0981b16c49541802b73a20e81680bae2cda974f03d4bab6ed8760af864ba64137957
+MISC ChangeLog 11979 SHA256 a995f7a21dfc64b6f695188491e36f461ec68d7dcd0543133b2402c1f60617de SHA512 fdab07381ef24d62f9fc7a46738ffb45672620b59df1a5665737266ed38ffb37546540a04548471e8c0dfcf70814240f1f0d0c39b4aaee28752447ce763ef071 WHIRLPOOL 539176ce9818ba4fb284e6bfe7c4c56200ea30ebb10ba28dafaa751e3644d8efe07bc07464e59bd7e0d39b3586d2a7fac1966f0b83ef4fdf6e14944cc0f10661
 MISC metadata.xml 254 SHA256 2952f5071f21b100d9704142bb38a3e126a2ed3f41b4232e213ce607f7780033 SHA512 ec6af573e67162251786be7ef21a5ea10a4c5ca8b9f080828fa5b72f5d20862150b5033f80afdb6665b243bd24d1c82348b65c91855f4756c5585738a7ce4286 WHIRLPOOL 4456b9fe62e80868740cabd66c246a77ebdab37904be853b977a38a974f07e89d3abcd82e3502e741bc7004016b455768b08ba9cda76bd42a535b1d3ac6ca2ec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlDr+SwACgkQFYEBGcdFJfJVaAEAkL6B6UI90To5DXXxHFxodYff
-ci6MakErikGsdlSmhRcA/3nwxj4fJfBunm7dUXpEEf0lDiwWnCTRhTNCBGBxwook
-=VVxQ
+iF4EAREIAAYFAlDthMIACgkQFYEBGcdFJfJ+KAD+NBqDANadI9dHTJowwM90a9PX
+JDcbp4punpCvtcZGGdcBAIoytGi0afc4OMq0WmAMJtTkBuQr2VGgqZRlwKEAXFyc
+=fcCx
 -----END PGP SIGNATURE-----
diff --git a/net-misc/nx/files/nx-3.5.0.17-cflags_ar_ranlib.patch b/net-misc/nx/files/nx-3.5.0.17-cflags_ar_ranlib.patch
new file mode 100644
index 000000000000..668a6bf4c310
--- /dev/null
+++ b/net-misc/nx/files/nx-3.5.0.17-cflags_ar_ranlib.patch
@@ -0,0 +1,100 @@
+diff -Naur nx-libs-3.5.0.17.orig/nxcomp/Makefile.in nx-libs-3.5.0.17/nxcomp/Makefile.in
+--- nx-libs-3.5.0.17.orig/nxcomp/Makefile.in	2013-01-09 15:03:33.152952758 +0100
++++ nx-libs-3.5.0.17/nxcomp/Makefile.in	2013-01-09 15:05:39.771898159 +0100
+@@ -243,8 +243,8 @@
+ 
+ $(LIBARCHIVE):	 $(CXXOBJ) $(COBJ)
+ 		 rm -f  $(LIBARCHIVE)
+-		 ar clq $(LIBARCHIVE) $(CXXOBJ) $(COBJ)
+-		 ranlib $(LIBARCHIVE)
++		 $(AR) $(LIBARCHIVE) $(CXXOBJ) $(COBJ)
++		 $(RANLIB) $(LIBARCHIVE)
+ 
+ $(LIBCYGSHARED): $(LIBARCHIVE)
+ 		 $(CC) -shared -o $(LIBCYGSHARED) \
+diff -Naur nx-libs-3.5.0.17.orig/nxcomp/configure.in nx-libs-3.5.0.17/nxcomp/configure.in
+--- nx-libs-3.5.0.17.orig/nxcomp/configure.in	2013-01-09 15:03:33.151952758 +0100
++++ nx-libs-3.5.0.17/nxcomp/configure.in	2013-01-09 15:04:03.312940892 +0100
+@@ -7,8 +7,7 @@
+ 
+ dnl Set our default compilation flags.
+ 
+-CXXFLAGS="$CXXFLAGS -O3 -fno-rtti -fno-exceptions"
+-CFLAGS="$CFLAGS -O3"
++CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
+ 
+ dnl Reset default linking directives.
+ 
+diff -Naur nx-libs-3.5.0.17.orig/nxcompext/Makefile.in nx-libs-3.5.0.17/nxcompext/Makefile.in
+--- nx-libs-3.5.0.17.orig/nxcompext/Makefile.in	2013-01-09 15:03:33.164952753 +0100
++++ nx-libs-3.5.0.17/nxcompext/Makefile.in	2013-01-09 15:06:08.747879052 +0100
+@@ -125,8 +125,8 @@
+ 
+ $(LIBARCHIVE):	 $(CXXOBJ) $(COBJ)
+ 		 rm -f  $(LIBARCHIVE)
+-		 ar clq $(LIBARCHIVE) $(CXXOBJ) $(COBJ)
+-		 ranlib $(LIBARCHIVE)
++		 $(AR) $(LIBARCHIVE) $(CXXOBJ) $(COBJ)
++		 $(RANLIB) $(LIBARCHIVE)
+ 
+ $(LIBCYGSHARED): $(LIBARCHIVE)
+ 		 $(CC) -shared -o $(LIBCYGSHARED) \
+diff -Naur nx-libs-3.5.0.17.orig/nxcompext/configure.in nx-libs-3.5.0.17/nxcompext/configure.in
+--- nx-libs-3.5.0.17.orig/nxcompext/configure.in	2013-01-09 15:03:33.164952753 +0100
++++ nx-libs-3.5.0.17/nxcompext/configure.in	2013-01-09 15:04:16.247935801 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(NXlib.h)
+ AC_PREREQ(2.13)
+ 
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="$CXXFLAGS -O3"
+-CFLAGS="$CFLAGS -O3"
+-
+ dnl Reset default linking directives.
+ 
+ LIBSTATIC=""
+diff -Naur nx-libs-3.5.0.17.orig/nxcompshad/Makefile.in nx-libs-3.5.0.17/nxcompshad/Makefile.in
+--- nx-libs-3.5.0.17.orig/nxcompshad/Makefile.in	2013-01-09 15:03:33.163952754 +0100
++++ nx-libs-3.5.0.17/nxcompshad/Makefile.in	2013-01-09 15:06:16.933873660 +0100
+@@ -158,8 +158,8 @@
+ 
+ $(LIBARCHIVE):	$(CXXOBJ) $(COBJ)
+ 		rm -f  $(LIBARCHIVE)
+-		ar clq $(LIBARCHIVE) $(CXXOBJ) $(COBJ)
+-		ranlib $(LIBARCHIVE)
++		$(AR) $(LIBARCHIVE) $(CXXOBJ) $(COBJ)
++		$(RANLIB) $(LIBARCHIVE)
+ 
+ $(LIBDLL): $(LIBARCHIVE)
+ 		$(CC) -o $@ \
+diff -Naur nx-libs-3.5.0.17.orig/nxcompshad/configure.in nx-libs-3.5.0.17/nxcompshad/configure.in
+--- nx-libs-3.5.0.17.orig/nxcompshad/configure.in	2013-01-09 15:03:33.163952754 +0100
++++ nx-libs-3.5.0.17/nxcompshad/configure.in	2013-01-09 15:04:20.073934295 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(Shadow.h)
+ AC_PREREQ(2.13)
+ 
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="$CXXFLAGS -O3"
+-CPPFLAGS="$CPPFLAGS -O3"
+-
+ dnl Reset default linking directives.
+ 
+ LIBSTATIC=""
+diff -Naur nx-libs-3.5.0.17.orig/nxproxy/configure.in nx-libs-3.5.0.17/nxproxy/configure.in
+--- nx-libs-3.5.0.17.orig/nxproxy/configure.in	2013-01-09 15:03:33.163952754 +0100
++++ nx-libs-3.5.0.17/nxproxy/configure.in	2013-01-09 15:04:24.842932418 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(Main.c)
+ AC_PREREQ(2.13)
+ 
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="$CXXFLAGS -O3"
+-CPPFLAGS="$CPPFLAGS -O3"
+-
+ dnl Prefer headers and libraries from nx-X11 if present.
+ 
+ if test -d "../nx-X11/exports/include" ; then
diff --git a/net-misc/nx/nx-3.5.0.17-r1.ebuild b/net-misc/nx/nx-3.5.0.17-r1.ebuild
new file mode 100644
index 000000000000..0a062311e127
--- /dev/null
+++ b/net-misc/nx/nx-3.5.0.17-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.5.0.17-r1.ebuild,v 1.1 2013/01/09 14:54:45 voyageur Exp $
+
+EAPI=4
+inherit autotools eutils multilib
+
+DESCRIPTION="NX compression technology core libraries"
+HOMEPAGE="http://www.nomachine.com/developers.php
+	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="elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) )
+	>=media-libs/libpng-1.2.8
+	>=sys-libs/zlib-1.2.3
+	virtual/jpeg"
+
+DEPEND="${RDEPEND}
+		x11-misc/gccmakedep
+		x11-misc/imake
+		x11-proto/inputproto"
+
+S=${WORKDIR}/nx-libs-${PV}
+
+src_prepare() {
+	# For nxcl/qtnx
+	cd "${S}"/nxproxy
+	epatch "${FILESDIR}"/${PN}-3.2.0-nxproxy_read_from_stdin.patch
+
+	cd "${S}"
+	# Fix sandbox violation
+	epatch "${FILESDIR}"/1.5.0/nx-x11-1.5.0-tmp-exec.patch
+	# -fPIC
+	epatch "${FILESDIR}"/1.5.0/nxcomp-1.5.0-pic.patch
+	# Drop force -O3, set AR/RANLIB and
+	# run autoreconf in all neeed folders
+	epatch "${FILESDIR}"/${P}-cflags_ar_ranlib.patch
+	for i in nxcomp nxcompext nxcompshad nxproxy; do
+		cd "${S}"/${i}
+		eautoreconf ${i}
+		cd "${S}"
+	done
+
+	# From xorg-x11-6.9.0-r3.ebuild
+	cd "${S}/nx-X11"
+	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}
+}
+
+src_configure() {
+	cd "${S}"/nxproxy
+	econf
+}
+
+src_compile() {
+	cd "${S}/nx-X11"
+	FAST=1 emake World WORLDOPTS="" MAKE="make" \
+		AR="$(tc-getAR) clq" RANLIB="$(tc-getRANLIB)" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+
+	cd "${S}"/nxproxy
+	emake
+}
+
+src_install() {
+	NX_ROOT=/usr/$(get_libdir)/NX
+
+	for x in nxagent nxauth nxproxy; do
+		make_wrapper $x ./$x ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||
+			die " $x wrapper creation failed"
+	done
+
+	into ${NX_ROOT}
+	dobin "${S}"/nx-X11/programs/Xserver/nxagent
+	dobin "${S}"/nx-X11/programs/nxauth/nxauth
+	dobin "${S}"/nxproxy/nxproxy
+
+	for lib in X11 Xau Xcomposite Xdamage Xdmcp Xext Xfixes Xinerama Xpm Xrandr Xrender Xtst;
+	do
+		dolib.so "${S}"/nx-X11/lib/${lib}/libNX_${lib}.so*
+	done
+	dolib.so "${S}"/nx-X11/lib/freetype2/libNX_freetype.so*
+
+	dolib.so "${S}"/nxcomp/libXcomp.so*
+	dolib.so "${S}"/nxcompext/libXcompext.so*
+	dolib.so "${S}"/nxcompshad/libXcompshad.so*
+}