Drop previous version

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 6 insertions, 165 deletions

diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index 0f3c8032b304..56d4325fb80c 100644
--- a/net-misc/nxserver-freenx/ChangeLog
+++ b/net-misc/nxserver-freenx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/nxserver-freenx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.73 2010/05/26 18:21:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.74 2010/05/26 19:15:02 voyageur Exp $
+
+  26 May 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  -nxserver-freenx-0.7.3_p104-r2.ebuild,
+  -files/nxserver-freenx-0.7.3_p102-nxloadconfig.patch:
+  Drop previous version
 
   26 May 2010; Pacho Ramos <pacho@gentoo.org>
   nxserver-freenx-0.7.3_p104-r4.ebuild:
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p102-nxloadconfig.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p102-nxloadconfig.patch
deleted file mode 100644
index 21a33260351c..000000000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p102-nxloadconfig.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- nxloadconfig.orig	2009-03-12 18:29:22.000000000 +0100
-+++ nxloadconfig	2009-03-12 18:29:53.000000000 +0100
-@@ -58,7 +58,7 @@
- # Where can different nx components be found
- NX_DIR=/usr
- PATH_BIN=$NX_DIR/bin # if you change that, be sure to also change the public keys
--PATH_LIB=$NX_DIR/lib
-+PATH_LIB=$NX_DIR/lib/NX/lib
- NX_ETC_DIR=/etc/nxserver
- NX_SESS_DIR=/var/lib/nxserver/db
- NX_HOME_DIR=/var/lib/nxserver/home
-@@ -194,11 +194,11 @@
- KILL_DEFAULT_X_WM="1"
- BOOTSTRAP_X_SESSION="0"
- USER_X_STARTUP_SCRIPT=.Xclients
--DEFAULT_X_SESSION=/etc/X11/xdm/Xsession
-+DEFAULT_X_SESSION=/etc/X11/Sessions/Xsession
- COMMAND_GDM_X_SESSION="/etc/gdm/Xsession custom"
- if [ ! -x "$COMMAND_GDM_X_SESSION" ]
- then
--	COMMAND_GDM_X_SESSION="/etc/X11/Xsession"
-+	COMMAND_GDM_X_SESSION="/etc/X11/Sessions/Xsession"
- fi
- COMMAND_START_KDE=startkde
- COMMAND_START_GNOME=gnome-session
-@@ -224,7 +224,7 @@
- COMMAND_NXSHADOWACL="$PATH_BIN/nxshadowacl"
- COMMAND_NXACL="$PATH_BIN/nxacl"
- COMMAND_NXCHECKLOAD="$PATH_BIN/nxcheckload"
--COMMAND_NXAGENT="$PATH_BIN/nxagent"
-+COMMAND_NXAGENT="REAL_PATH_LIB/nxagent"
- 
- # Guest directives
- ENABLE_GUEST_LOGIN="0"
-@@ -357,7 +357,7 @@
- [ -z "$AGENT_LIBRARY_PATH" ] && AGENT_LIBRARY_PATH=$PATH_LIB
- [ -z "$PROXY_LIBRARY_PATH" ] && PROXY_LIBRARY_PATH=$PATH_LIB
- [ -z "$APPLICATION_LIBRARY_PATH" ] && APPLICATION_LIBRARY_PATH=$PATH_LIB
--[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so.6.2:$APPLICATION_LIBRARY_PATH/libXext.so.6.4:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2"
-+[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so:$APPLICATION_LIBRARY_PATH/libXext.so:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so"
- 
- NX_BACKEND_VERSION=$(strings $COMMAND_NXAGENT 2>/dev/null | egrep 'NXAGENT - Version' | sed 's/.*Version //g')
- 
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r2.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r2.ebuild
deleted file mode 100644
index c1e5e562aa7e..000000000000
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r2.ebuild,v 1.4 2010/04/11 18:51:54 voyageur Exp $
-
-EAPI=1
-
-inherit multilib eutils toolchain-funcs versionator
-
-MAJOR_PV="$(get_version_component_range 1-3)"
-PATCH_VER="$(get_version_component_range 4)"
-MY_PN="freenx-server"
-
-DESCRIPTION="Free Software Implementation of the NX Server"
-HOMEPAGE="http://freenx.berlios.de/ https://launchpad.net/~freenx-team"
-SRC_URI="http://ppa.launchpad.net/freenx-team/ppa/ubuntu/pool/main/f/${MY_PN}/freenx-server_${MAJOR_PV}+teambzr${PATCH_VER/p}.orig.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+nxclient rdesktop vnc"
-
-DEPEND="x11-misc/gccmakedep
-	x11-misc/imake"
-RDEPEND="dev-tcltk/expect
-	media-fonts/font-cursor-misc
-	media-fonts/font-misc-misc
-	net-analyzer/gnu-netcat
-	<net-misc/nx-3.4.0
-	sys-apps/gawk
-	virtual/ssh
-	x11-apps/xauth
-	x11-apps/xrdb
-	x11-apps/sessreg
-	nxclient? ( net-misc/nxclient )
-	!nxclient? ( !net-misc/nxclient
-				 || ( x11-misc/xdialog
-					  x11-apps/xmessage ) )
-	rdesktop? ( net-misc/rdesktop )
-	vnc? ( x11-misc/x11vnc
-		   || ( net-misc/tightvnc net-misc/vnc ) )"
-
-S=${WORKDIR}/${MY_PN}
-
-export NX_HOME_DIR=/var/lib/nxserver/home
-
-pkg_setup () {
-	enewuser nx -1 -1 ${NX_HOME_DIR}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-pam_ssh.patch
-	epatch "${FILESDIR}"/${P}-nxnode_setup_samba.patch
-	epatch "${FILESDIR}"/${PN}-0.7.3_p102-nxloadconfig.patch
-	epatch "${FILESDIR}"/${PN}-0.7.3_p102-cflags.patch
-	epatch "${FILESDIR}"/${PN}-0.7.2-cups.patch
-
-	sed	-e "/PATH_LIB=/s/lib/$(get_libdir)/g" \
-		-e "s#REAL_PATH_LIB#/usr/$(get_libdir)/NX/bin#" \
-		-i nxloadconfig || die "nxloadconfig sed failed"
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) CDEBUGFLAGS="${CFLAGS}" || die "compilation failed"
-}
-
-src_install() {
-	export NX_ETC_DIR=/etc/nxserver
-	export NX_SESS_DIR=/var/lib/nxserver/db
-
-	emake DESTDIR="${D}" install || die "install failed"
-
-	# This should be renamed to remove the blocker on net-misc/nxclient
-	use nxclient && rm "${D}"/usr/bin/nxprint
-
-	mv "${D}"/etc/nxserver/node.conf.sample "${D}"/etc/nxserver/node.conf ||
-		die "cannot find default configuration file"
-
-	dodir ${NX_ETC_DIR}
-	for x in passwords passwords.orig ; do
-		touch "${D}"${NX_ETC_DIR}/$x
-		chmod 600 "${D}"${NX_ETC_DIR}/$x
-	done
-
-	dodir ${NX_HOME_DIR}
-
-	for x in closed running failed ; do
-		keepdir ${NX_SESS_DIR}/$x
-		fperms 0700 ${NX_SESS_DIR}/$x
-	done
-
-	newinitd "${FILESDIR}"/nxserver.init nxserver
-}
-
-pkg_postinst () {
-	# Other NX servers ebuilds may have already created the nx account
-	# However they use different login shell/home directory paths
-	if [[ ${ROOT} == "/" ]]; then
-		usermod -s /usr/bin/nxserver nx || die "Unable to set login shell of nx user!!"
-		usermod -d ${NX_HOME_DIR} nx || die "Unable to set home directory of nx user!!"
-		usermod -a -G utmp nx || die "Unable to add nx user to utmp group!!"
-	else
-		elog "If you had another NX server installed before, please make sure"
-		elog "the nx user account is correctly set to:"
-		elog " * login shell: /usr/bin/nxserver"
-		elog " * home directory: ${NX_HOME_DIR}"
-		elog " * supplementary groups: utmp"
-	fi
-
-	elog "To complete the installation, run:"
-	elog " nxsetup --install --setup-nomachine-key"
-	elog "This will use the default Nomachine SSH key"
-	elog "If you had older NX servers installed, you may need to add \"--clean --purge\" to the nxsetup command"
-
-	if ! built_with_use net-misc/openssh pam; then
-		elog ""
-		elog "net-misc/openssh was not built with PAM support"
-		elog "You will need to unlock the nx account by setting a password for it"
-	fi
-}