diff options
author | 2008-11-24 14:14:11 +0000 | |
---|---|---|
committer | 2008-11-24 14:14:11 +0000 | |
commit | ffde408f5a5aca5a802ed7664a9f6c2c2769a915 (patch) | |
tree | c2b13c3ed855efb5d9b9f209529286952871d37f /net-misc | |
parent | 3.3.0 version bump, remove old versions (diff) | |
download | gentoo-2-ffde408f5a5aca5a802ed7664a9f6c2c2769a915.tar.gz gentoo-2-ffde408f5a5aca5a802ed7664a9f6c2c2769a915.tar.bz2 gentoo-2-ffde408f5a5aca5a802ed7664a9f6c2c2769a915.zip |
Allow nxagent 3.3.0 usage
(Portage version: 2.2_rc16/cvs/Linux 2.6.26-gentoo x86_64)
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/nxserver-freenx/ChangeLog | 6 | ||||
-rw-r--r-- | net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r1.ebuild | 8 | ||||
-rw-r--r-- | net-misc/nxserver-freenx/nxserver-freenx-0.7.3.ebuild | 120 |
3 files changed, 10 insertions, 124 deletions
diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog index df3d1e54be83..178dd283ca83 100644 --- a/net-misc/nxserver-freenx/ChangeLog +++ b/net-misc/nxserver-freenx/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/nxserver-freenx # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.53 2008/08/25 18:36:05 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.54 2008/11/24 14:14:11 voyageur Exp $ + + 24 Nov 2008; Bernard Cafarelli <voyageur@gentoo.org> + -nxserver-freenx-0.7.3.ebuild, nxserver-freenx-0.7.3-r1.ebuild: + Allow nxagent 3.3.0 usage *nxserver-freenx-0.7.3-r1 (25 Aug 2008) diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r1.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r1.ebuild index 7a1ff342b767..3358794e625f 100644 --- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r1.ebuild +++ b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 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-r1.ebuild,v 1.1 2008/08/25 18:36:05 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r1.ebuild,v 1.2 2008/11/24 14:14:11 voyageur Exp $ inherit multilib eutils @@ -51,8 +51,10 @@ src_unpack() { epatch "${FILESDIR}"/${P}-roundrobin.patch epatch "${FILESDIR}"/${PN}-0.7.2-cups.patch - sed -i "/PATH_LIB=/s/lib/$(get_libdir)/g" nxloadconfig || die - sed -i "/REAL_PATH_BIN=/s/lib/$(get_libdir)/g" nxloadconfig || die + sed -e "s/3\.\[012\]/3.[0123]/g" \ + -e "/PATH_LIB=/s/lib/$(get_libdir)/g" \ + -e "/REAL_PATH_BIN=/s/lib/$(get_libdir)/g" \ + -i nxloadconfig || die "nxloadconfig sed failed" # Change the defaults in nxloadconfig to meet the users needs. if use arts ; then diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3.ebuild deleted file mode 100644 index 7deec58928ec..000000000000 --- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2008 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.ebuild,v 1.1 2008/08/22 13:04:53 voyageur Exp $ - -inherit multilib eutils - -MY_PN="freenx-server" -DESCRIPTION="Free Software Implementation of the NX Server" -HOMEPAGE="http://freenx.berlios.de/" -SRC_URI="mirror://berlios/freenx/${MY_PN}-${PV}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -RESTRICT="strip" -IUSE="arts cups esd nxclient" -DEPEND="virtual/ssh - dev-tcltk/expect - sys-apps/gawk - net-analyzer/gnu-netcat - nxclient? ( net-misc/nxclient ) - !nxclient? ( !net-misc/nxclient - || ( x11-misc/xdialog - x11-apps/xmessage ) ) - >=net-misc/nx-2.1.0 - arts? ( kde-base/arts ) - cups? ( net-print/cups ) - esd? ( media-sound/esound ) - !net-misc/nxserver-freeedition - !net-misc/nxserver-2xterminalserver" - -RDEPEND="${DEPEND} - media-fonts/font-misc-misc - media-fonts/font-cursor-misc - x11-apps/xauth - x11-apps/xrdb - x11-apps/sessreg" - -S=${WORKDIR}/${MY_PN}-${PV} - -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}-nxloadconfig.patch - epatch "${FILESDIR}"/${PN}-0.7.2-cups.patch - - sed -i "/PATH_LIB=/s/lib/$(get_libdir)/g" nxloadconfig || die - sed -i "/REAL_PATH_BIN=/s/lib/$(get_libdir)/g" nxloadconfig || die - - # Change the defaults in nxloadconfig to meet the users needs. - if use arts ; then - einfo "Enabling arts support." - sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' nxloadconfig || die - sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' node.conf.sample || die - fi - if use esd ; then - einfo "Enabling esd support." - sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' nxloadconfig || die - sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' node.conf.sample || die - fi - if use cups ; then - einfo "Enabling cups support." - sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' nxloadconfig || die - sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' node.conf.sample || die - fi -} - -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 -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 --clean --purge" - elog "This will use the default Nomachine SSH key" -} |