Version bump, drop some old versions

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key C74525F2)

6 files changed, 24 insertions, 391 deletions

diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog
index 7eed9bf4a079..a8db1a3f852c 100644
--- a/net-misc/nx/ChangeLog
+++ b/net-misc/nx/ChangeLog
@@ -1,6 +1,13 @@
 # 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.83 2013/09/04 11:18:34 voyageur Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.84 2014/01/06 12:36:47 voyageur Exp $
+
+*nx-3.5.0.22 (06 Jan 2014)
+
+  06 Jan 2014; Bernard Cafarelli <voyageur@gentoo.org> -nx-3.5.0.14-r1.ebuild,
+  -nx-3.5.0.15.ebuild, -nx-3.5.0.16.ebuild, -nx-3.5.0.17.ebuild,
+  -nx-3.5.0.17-r1.ebuild, +nx-3.5.0.22.ebuild:
+  Version bump, drop some old versions
 
 *nx-3.5.0.21 (04 Sep 2013)
 
diff --git a/net-misc/nx/nx-3.5.0.14-r1.ebuild b/net-misc/nx/nx-3.5.0.14-r1.ebuild
deleted file mode 100644
index 7b121b2dc586..000000000000
--- a/net-misc/nx/nx-3.5.0.14-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2012 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.14-r1.ebuild,v 1.3 2012/10/17 03:01:24 phajdan.jr 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
-	# Respect CFLAGS/CXXFLAGS
-	epatch "${FILESDIR}"/${PN}-3.3.0-cflags.patch
-	# Run autoreconf in all neeed folders
-	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"
-
-	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*
-}
diff --git a/net-misc/nx/nx-3.5.0.15.ebuild b/net-misc/nx/nx-3.5.0.15.ebuild
deleted file mode 100644
index 4c658003e1cb..000000000000
--- a/net-misc/nx/nx-3.5.0.15.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2012 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.15.ebuild,v 1.3 2012/12/16 16:29:05 ago 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
-	# Respect CFLAGS/CXXFLAGS
-	epatch "${FILESDIR}"/${PN}-3.3.0-cflags.patch
-	# Run autoreconf in all neeed folders
-	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"
-
-	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*
-}
diff --git a/net-misc/nx/nx-3.5.0.16.ebuild b/net-misc/nx/nx-3.5.0.16.ebuild
deleted file mode 100644
index 8842c6f964bb..000000000000
--- a/net-misc/nx/nx-3.5.0.16.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2012 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.16.ebuild,v 1.1 2012/11/15 09:27:50 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
-	# Respect CFLAGS/CXXFLAGS
-	epatch "${FILESDIR}"/${PN}-3.3.0-cflags.patch
-	# Run autoreconf in all neeed folders
-	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"
-
-	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*
-}
diff --git a/net-misc/nx/nx-3.5.0.17.ebuild b/net-misc/nx/nx-3.5.0.17.ebuild
deleted file mode 100644
index 714e864512a5..000000000000
--- a/net-misc/nx/nx-3.5.0.17.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.ebuild,v 1.1 2013/01/08 10:47:02 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 and run autoreconf in all neeed folders
-	for i in nxcomp nxcompext nxcompshad nxproxy; do
-		cd "${S}"/${i}
-		sed -e "s/-O3//" -i configure.in ||  die "$i configure sed failed"
-		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"
-
-	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*
-}
diff --git a/net-misc/nx/nx-3.5.0.17-r1.ebuild b/net-misc/nx/nx-3.5.0.22.ebuild
index 0a062311e127..bf04969b9a2a 100644
--- a/net-misc/nx/nx-3.5.0.17-r1.ebuild
+++ b/net-misc/nx/nx-3.5.0.22.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.5.0.22.ebuild,v 1.1 2014/01/06 12:36:47 voyageur Exp $
 
-EAPI=4
-inherit autotools eutils multilib
+EAPI=5
+inherit autotools eutils multilib readme.gentoo
 
 DESCRIPTION="NX compression technology core libraries"
 HOMEPAGE="http://www.nomachine.com/developers.php
@@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="elibc_glibc"
 
 RDEPEND="elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) )
+	media-libs/freetype:2
 	>=media-libs/libpng-1.2.8
 	>=sys-libs/zlib-1.2.3
 	virtual/jpeg"
@@ -28,6 +29,9 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/nx-libs-${PV}
 
+DOC_CONTENTS="If you get problems with rendering gtk+ apps, enable the xlib-xcb
+useflag on x11-libs/cairo."
+
 src_prepare() {
 	# For nxcl/qtnx
 	cd "${S}"/nxproxy
@@ -40,7 +44,7 @@ src_prepare() {
 	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
+	epatch "${FILESDIR}"/${PN}-3.5.0.17-cflags_ar_ranlib.patch
 	for i in nxcomp nxcompext nxcompshad nxproxy; do
 		cd "${S}"/${i}
 		eautoreconf ${i}
@@ -90,9 +94,14 @@ src_install() {
 	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*
+
+	insinto /etc/nxagent
+	newins etc/keystrokes.cfg keystroke.cfg
+	doicon nx-X11/programs/Xserver/hw/nxagent/x2go.xpm
+
+	readme.gentoo_create_doc
 }