Remove old net-misc/vnc dep, spotted by ago. Also remove previous stable ebuild

Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64

diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index 55011d197424878d4135b9e1e3f825fb6bebab27..8f809e2aa346eedc578ef471c1324aa264ae9802 100644 (file)
--- a/net-misc/nxserver-freenx/ChangeLog
+++ b/net-misc/nxserver-freenx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/nxserver-freenx
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.80 2011/11/13 14:59:02 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.81 2011/11/24 21:00:12 voyageur Exp $
+
+  24 Nov 2011; Bernard Cafarelli <voyageur@gentoo.org>
+  -nxserver-freenx-0.7.3_p104-r5.ebuild, nxserver-freenx-0.7.3_p104-r6.ebuild:
+  Remove old net-misc/vnc dep, spotted by ago. Also remove previous stable
+  ebuild
 
   13 Nov 2011; Markus Meier <maekke@gentoo.org>
   nxserver-freenx-0.7.3_p104-r6.ebuild:

diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index 22e0bd2b4d4305fa6e750ab46097628dba679044..4c608a82d79b9b5051b3413f23e4792be71e45ff 100644 (file)
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX nxserver-freenx-0.7.2-cups.patch 1312 RMD160 c6f0a0675fe7902cc2e53123e708f17e36c44dcd SHA1 3bcd5c4a8bd5ed560f91a705c5f45d3f756c16e9 SHA256 50d0ae81b1bf86aecb0eec82920db481633ae0181dfe2894ac1b10faf5b8644d
 AUX nxserver-freenx-0.7.3_p102-cflags.patch 925 RMD160 d735fffcac7500ed1329e273a97d4b5da5a3d825 SHA1 a28ad4001ec8a28b33a4646e48a453bd2e89ba02 SHA256 ca99ad30acaf356ece570ebbc0ca4e52e40590533173bc028872dffc1055066b
@@ -10,14 +10,13 @@ AUX nxserver-freenx-0.7.3_p104-nxnode_setup_samba.patch 2709 RMD160 973befb2e3c3
 AUX nxserver-freenx-0.7.3_p104-pam_ssh.patch 441 RMD160 f1adcb881d23cb7f950f67210f5842fc91a27b01 SHA1 bfac4b1cdf01ad3b3886dba631b733e8ec7ba2a8 SHA256 854d17b3656ac2382d84b32ed9de893b291217648f08f1f496e3d09a32b8d857
 AUX nxserver.init 568 RMD160 a48a0d4853fcd28c0ec6dd2e0366bc69ac1e4b28 SHA1 3980df2e35c594a806b18062e781fa5e52131ff9 SHA256 eda452183da56f6ef5730f1f9e7c968c462b2d3ad31c58ed6100d90c7533c4f2
 DIST freenx-server_0.7.3+teambzr104.orig.tar.gz 118242 RMD160 6dc846efa3953516110a212fe6030ba4936ad21d SHA1 47046b08b1f329a00feaccd3fff9129b1aee0b9e SHA256 0d8b8ea883d67551f40c6e1c3a4a280d5bd663f27147a054e879c58b31873c71
-EBUILD nxserver-freenx-0.7.3_p104-r5.ebuild 3855 RMD160 6027563c28843426f32926194ad01cc478752684 SHA1 8701aa9de21741347b5afefd89b5255ee57985c1 SHA256 a1b38f23e92d9a3ee85cab82cc9ee1d2efa3e0c6ae018e1b50ae56912391b85e
-EBUILD nxserver-freenx-0.7.3_p104-r6.ebuild 3858 RMD160 af5429caa39062c6f31c08edb60f6b267a5fc32f SHA1 3eb6b3163cc36bbc39ecc38cdfa1f21d34790c0e SHA256 a8cde85bb50f15154ec7f4a12c71514929ec505c28c9d934dca95959d10e1389
-MISC ChangeLog 18817 RMD160 574151913f21f603bb1f28f784cae5c6a24b85c4 SHA1 e38743f7e0b46786bab5af838c36280d8c2840e1 SHA256 86a8fef0325f06b160ebd4b785ab7a88649f92db6448703c079f2dc4c29e4c2c
+EBUILD nxserver-freenx-0.7.3_p104-r6.ebuild 3840 RMD160 5089e072bfd369d05f35e3ba3eb8466283f466bf SHA1 d99d88d88d6d58846eea3b14bf50c59c21fad9ca SHA256 3926b216f98267c05089fd4527e0e84358c3de87b6ef8afdb6984718e7131ab9
+MISC ChangeLog 19038 RMD160 b81257c5580a381e8ecdd8d561c9e5d31075e0b1 SHA1 9afab2d60c8a0b0ab9f3a5bffecd20303e1f211a SHA256 3ff93dc2521a41fd90d79a7206398c6163563c7089556ec749aed414ca463471
 MISC metadata.xml 525 RMD160 6b438e37f35775bbce33bbb1a04494049956aa04 SHA1 cf904293a398fd2acb8492d4c0a6c43045d71ea5 SHA256 50af7f059bc7dbf3a4040618c7c9bfa9a6f57ce7eeb2d135ed912a60bcc373bc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6/24sACgkQkKaRLQcq0GKYlwCfYrKZ2yi3NZ0nqc8AVsAKTiL9
-ZWwAoJYFdmtQhvrdUWuKwgpWswlX10Iw
-=/7YC
+iF4EAREIAAYFAk7OsGcACgkQFYEBGcdFJfLL2QD/cwhJvF8BBXbX+IaHjvc7O8CM
+g5sjKJ3WV04Gr2IQTFcA/RSAyKt5F76f52eBpz+Al8Mxx5Y41+NN9TP/HbKbe8Kk
+=vLqV
 -----END PGP SIGNATURE-----

diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r5.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r5.ebuild
deleted file mode 100644 (file)
index 994527a..0000000
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r5.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2011 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-r5.ebuild,v 1.4 2011/05/22 14:12:31 voyageur Exp $
-
-EAPI=2
-
-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.5.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_prepare() {
-       epatch "${FILESDIR}"/${P}-pam_ssh.patch
-       epatch "${FILESDIR}"/${P}-nxnode_setup_samba.patch
-       epatch "${FILESDIR}"/${P}-nxloadconfig.patch
-       epatch "${FILESDIR}"/${PN}-0.7.3_p102-cflags.patch
-       epatch "${FILESDIR}"/${PN}-0.7.2-cups.patch
-       epatch "${FILESDIR}"/${P}-jobserver_fix.patch
-       epatch "${FILESDIR}"/${P}-md5sum.patch
-
-       # Path to net-misc/nx files, support for nx 3.4.0
-       sed     -e "/PATH_LIB=/s/lib/$(get_libdir)/g" \
-               -e "s#REAL_PATH_LIB#/usr/$(get_libdir)/NX/bin#" \
-               -e "s#3.\[0123\].0#3.\[01234\].0#g" \
-               -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 has_version 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
-}

diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r6.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r6.ebuild
index d5507fb72ec12087461602e876c87ded5e17a5b7..271c2f5740e127557908854ae792709eaf528b30 100644 (file)
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r6.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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-r6.ebuild,v 1.3 2011/11/13 14:59:02 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r6.ebuild,v 1.4 2011/11/24 21:00:12 voyageur Exp $
 
 EAPI=2
 
@@ -36,7 +36,7 @@ RDEPEND="dev-tcltk/expect
                                          x11-apps/xmessage ) )
        rdesktop? ( net-misc/rdesktop )
        vnc? ( x11-misc/x11vnc
-                  || ( net-misc/tightvnc net-misc/vnc ) )"
+                  net-misc/tightvnc )"
 
 S=${WORKDIR}/${MY_PN}