commit: 4b956c5d08e5a7b15bcecc356f8fc6db24bec48f Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> AuthorDate: Sun Mar 12 17:12:21 2017 +0000 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> CommitDate: Sun Mar 12 17:12:21 2017 +0000 URL: https://gitweb.gentoo.org/proj/nx.git/commit/?id=4b956c5d
net-misc/neatx: drop package, bug #610240 Dead for some time, and ebuild still uses old python eclass Package-Manager: Portage-2.3.4, Repoman-2.3.2 Manifest-Sign-Key: 00F7AB331B0F097F metadata/md5-cache/net-misc/neatx-0.3.1_p59-r4 | 12 -- net-misc/neatx/ChangeLog | 109 --------------- net-misc/neatx/Manifest | 5 - .../files/neatx-0.3.1_p59-use_libexecdir.patch | 90 ------------- net-misc/neatx/metadata.xml | 6 - net-misc/neatx/neatx-0.3.1_p59-r4.ebuild | 149 --------------------- 6 files changed, 371 deletions(-) diff --git a/metadata/md5-cache/net-misc/neatx-0.3.1_p59-r4 b/metadata/md5-cache/net-misc/neatx-0.3.1_p59-r4 deleted file mode 100644 index 3cd7087..0000000 --- a/metadata/md5-cache/net-misc/neatx-0.3.1_p59-r4 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm preinst prepare setup -DEPEND=dev-python/docutils !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 =dev-lang/python-2* -DESCRIPTION=Google implementation of NX server -EAPI=4 -HOMEPAGE=http://code.google.com/p/neatx/ -KEYWORDS=amd64 ~ppc x86 -LICENSE=GPL-2 -RDEPEND=dev-python/pexpect dev-python/simplejson >=dev-python/pygtk-2.14 >=dev-python/pygobject-2.14:2 app-portage/portage-utils media-fonts/font-misc-misc media-fonts/font-cursor-misc || ( net-analyzer/gnu-netcat net-analyzer/netcat net-analyzer/netcat6 ) net-misc/nx =dev-lang/python-2* -SLOT=0 -SRC_URI=http://dev.gentoo.org/~voyageur/distfiles/neatx-0.3.1_p59.tar.bz2 -_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils f813d23e417656bf3917483643165d5a libtool 7f78cd7d403808a350c9ae23f5821fb4 multilib 3972ca401cf7dbb430df9995f5d8d580 python 0c2c16ea4f9074d3248bd4365d03890c toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 user 906f3c8eb3a2350a4f1191a89baa3e46 -_md5_=4aefc4b55381793af31226385babcc78 diff --git a/net-misc/neatx/ChangeLog b/net-misc/neatx/ChangeLog deleted file mode 100644 index 5ad06b6..0000000 --- a/net-misc/neatx/ChangeLog +++ /dev/null @@ -1,109 +0,0 @@ -# ChangeLog for net-misc/neatx -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/neatx/ChangeLog,v 1.22 2013/01/30 18:07:25 ago Exp $ - - 30 Jan 2013; Agostino Sarubbo <[email protected]> neatx-0.3.1_p59-r4.ebuild: - Stable for x86, wrt bug #441628 - - 18 Dec 2012; Bernard Cafarelli <[email protected]> - neatx-0.3.1_p59-r1.ebuild, -neatx-0.3.1_p59-r2.ebuild, - neatx-0.3.1_p59-r4.ebuild: - Drop -Werror, spotted by ago in bug #447374 - - 16 Dec 2012; Agostino Sarubbo <[email protected]> neatx-0.3.1_p59-r4.ebuild: - Stable for amd64, wrt bug #441628 - -*neatx-0.3.1_p59-r4 (23 Aug 2012) - - 23 Aug 2012; Bernard Cafarelli <[email protected]> - -neatx-0.3.1_p59-r3.ebuild, +neatx-0.3.1_p59-r4.ebuild, - files/neatx-0.3.1_p59-use_libexecdir.patch: - Fix missing parts for libexecdir migration, thanks Damien Granger in bug - #432274 - -*neatx-0.3.1_p59-r3 (21 Aug 2012) - - 21 Aug 2012; Bernard Cafarelli <[email protected]> - neatx-0.3.1_p59-r1.ebuild, neatx-0.3.1_p59-r2.ebuild, - +neatx-0.3.1_p59-r3.ebuild, +files/neatx-0.3.1_p59-use_libexecdir.patch: - Use libexecdir instead of libdir (error in newer automake), bug #428626. - Inherit user eclass - - 05 Feb 2012; Mike Gilbert <[email protected]> neatx-0.3.1_p59-r1.ebuild, - neatx-0.3.1_p59-r2.ebuild: - Inherit multilib. - - 24 Oct 2011; Alexandre Rostovtsev <[email protected]> - neatx-0.3.1_p59-r1.ebuild, neatx-0.3.1_p59-r2.ebuild: - Depend on correct slot of pygobject. - - 30 Jun 2011; Brent Baude <[email protected]> neatx-0.3.1_p59-r2.ebuild: - Marking neatx-0.3.1_p59-r2 ~ppc for bug 344043 - - 05 Apr 2011; Arfrever Frehtes Taifersar Arahesis <[email protected]> - neatx-0.3.1_p59-r1.ebuild, neatx-0.3.1_p59-r2.ebuild: - Don't use distutils.eclass. Don't install .pyc / .pyo files in Python - site-packages directories. - - 05 Apr 2011; Arfrever Frehtes Taifersar Arahesis <[email protected]> - neatx-0.3.1_p59-r1.ebuild, neatx-0.3.1_p59-r2.ebuild: - Fix deprecation warnings. - -*neatx-0.3.1_p59-r2 (14 Mar 2011) - - 14 Mar 2011; S. Lockwood-Childs <[email protected]> - +neatx-0.3.1_p59-r2.ebuild: - Protect custom $NX_HOME_DIR/.ssh/authorized_keys from being clobbered - by an upgrade/reinstall (bug #339366) - - 05 Oct 2010; Markus Meier <[email protected]> neatx-0.3.1_p59-r1.ebuild: - x86 stable, bug #336646 - - 16 Sep 2010; Richard Freeman <[email protected]> neatx-0.3.1_p59-r1.ebuild: - amd64 stable - 336646 - -*neatx-0.3.1_p59-r1 (26 Apr 2010) - - 26 Apr 2010; Bernard Cafarelli <[email protected]> - +neatx-0.3.1_p59-r1.ebuild: - python-related enhancements, see bug #315833 for details - -*neatx-0.3.1_p59 (07 Apr 2010) - - 07 Apr 2010; Bernard Cafarelli <[email protected]> - -neatx-0.3.1_p43-r2.ebuild, +neatx-0.3.1_p59.ebuild: - Version bump, bug #308737 - -*neatx-0.3.1_p43-r2 (05 Jan 2010) - - 05 Jan 2010; Bernard Cafarelli <[email protected]> - +neatx-0.3.1_p43-r2.ebuild: - Fix documentation install path, bug #297971 - - 25 Nov 2009; Markus Meier <[email protected]> neatx-0.3.1_p43-r1.ebuild: - x86 stable, bug #291619 - - 10 Nov 2009; Richard Freeman <[email protected]> neatx-0.3.1_p43-r1.ebuild: - amd64 stable - 291619 - - 30 Sep 2009; Diego E. Pettenò <[email protected]> - neatx-0.3.1_p43-r1.ebuild: - Fix typo in RDEPEND, thanks to Tim Harder in bug #286903. - - 19 Sep 2009; Bernard Cafarelli <[email protected]> - neatx-0.3.1_p43-r1.ebuild: - Allow netcat6 too (with nc_path pointing to nc6), bug #285358 - -*neatx-0.3.1_p43-r1 (15 Sep 2009) - - 15 Sep 2009; Bernard Cafarelli <[email protected]> - -neatx-0.3.1_p43.ebuild, +neatx-0.3.1_p43-r1.ebuild: - Revision bump to fix a few things: neatx.conf default options, - netcat/gnu-netcat support, fix python objects precompilation. Thanks to - calchan for review and pointers - -*neatx-0.3.1_p43 (09 Sep 2009) - - 09 Sep 2009; Bernard Cafarelli <[email protected]> - +neatx-0.3.1_p43.ebuild, +metadata.xml: - Initial commit from the NX overlay, ebuild by ikelos and me diff --git a/net-misc/neatx/Manifest b/net-misc/neatx/Manifest deleted file mode 100644 index 13ee64d..0000000 --- a/net-misc/neatx/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX neatx-0.3.1_p59-use_libexecdir.patch 3098 SHA256 173bcf9f668ffc79d5e1feac9873dfb31a0e965be402c669b8add39c4bbfa881 SHA512 81d48ad92ff8d77b9483e38991e94194f72b01412fcff65d318417da201d775960c932c857bd5041a8742eafd71645afc54e4c4209bc663e8f9addc6924d80a6 WHIRLPOOL 9fd94db8de7dc14f73be366de7912c6cbbd52a1ed7a12dbeecafb5c278c14d1138659ebf1c5717776f2b9496f96c4d00dc6a69dbbe2ce30ef3db40efe0ba50a1 -DIST neatx-0.3.1_p59.tar.bz2 77036 SHA256 ed4eea8395ae884c9e4b206cbed0f54c4c7f4138ed608c7f6ad52c56b496e77d SHA512 62c81bbcba9ba3bdec6cd7660cf9ea431c15a700b091c3682a0d6f85b12cc22a9f730a4f57ba89ff6fda32b3502c130a5e857cb7d33c69e686dd5536247e4d9a WHIRLPOOL 5c0dfc6773fb13746c194134b269dce32e641f8716e7257824854535b366bb3dbc2c19099950b80339316ae541caabf84017d01ecafda7b86b10bd53103969e3 -EBUILD neatx-0.3.1_p59-r4.ebuild 4078 SHA256 deb7504be7d00d678834bea14c99afe0d5d3ef41794c6dba0268dab87d0039b5 SHA512 3ff1147bde5b2902eda1f873e7b9f376b527187beac7dddc5848c50d589e32bbbcc66c5baf3763c5add570668b2d05fdc64f7bc8752d68e93cca8a4434bfde8f WHIRLPOOL b47f26dfea78bff79645042d419db8ff784c72d9e8ab80a0dfb8bacfcac2856ddb3c356ac10ae31c30ed535b02ed57feec66b9daf682bf89af7cdb5882613248 -MISC ChangeLog 3966 SHA256 1e69e16b1a35de19c86dd2b9432d5a907e294d6532140ad60386bc05440801a4 SHA512 91d631b0b5f958b4b1a109c2706b7aee26872b8b6edbb9fe0ab5c4362daa4313f3413b424515950c6a9175d2bcd7fcf6800de5d8a9fb59a7ef4ad4bd0f412e89 WHIRLPOOL 0afa010fb6a0818888ac306339c02e86eca7a26012a1221413253c77227b01dc89b15e83985e44aa4558e54bb38eaf194befc62f3b48b07e590d591b9070092a -MISC metadata.xml 334 SHA256 499f67f73f4048db1c41db8e934a720dd9cdc00b6a7a48bb774993ff40eb8d8a SHA512 03cf65aeb88cf3debdea302820a60a34b356a0da678b402393408890d8ca9db1c485a6860794c2c325807d195e556a099d311a4029a3b35981855badc17c6ec9 WHIRLPOOL 238cf0971bed408f5a66ff98fb5787d30b406478b1ba5be6884e5a489018e0897b0261a4c6fd33d070f81a025f2d3a2ce9ebb48117477eb69440a787f50b564a diff --git a/net-misc/neatx/files/neatx-0.3.1_p59-use_libexecdir.patch b/net-misc/neatx/files/neatx-0.3.1_p59-use_libexecdir.patch deleted file mode 100644 index c481048..0000000 --- a/net-misc/neatx/files/neatx-0.3.1_p59-use_libexecdir.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -Naur neatx.orig/Makefile.am neatx/Makefile.am ---- neatx.orig/Makefile.am 2012-08-23 12:01:14.290018757 +0200 -+++ neatx/Makefile.am 2012-08-23 14:16:42.119497905 +0200 -@@ -16,7 +16,7 @@ - appdir = $(pkgpythondir)/app - docdir = $(datadir)/doc/$(PACKAGE) - --AM_CFLAGS = -Wall -Werror -DPKGLIBDIR=\"$(pkglibdir)\" -+AM_CFLAGS = -Wall -Werror -DPKGLIBEXECDIR=\"$(pkglibexecdir)\" - - DIRS = \ - autotools \ -@@ -70,14 +70,14 @@ - lib/app/nxserver.py \ - lib/app/nxserver_login.py - --dist_pkglib_SCRIPTS = \ -+dist_pkglibexec_SCRIPTS = \ - src/ttysetup - --nodist_pkglib_SCRIPTS = \ -+nodist_pkglibexec_SCRIPTS = \ - $(LOG_WRAPPER) \ - $(PYTHON_BOOTSTRAP) - --pkglib_PROGRAMS = \ -+pkglibexec_PROGRAMS = \ - src/fdcopy - - dist_pkgdata_DATA = \ -@@ -173,7 +173,7 @@ - echo "VERSION_FULL = '$(VERSION_FULL)'"; \ - echo "LOCALSTATEDIR = '$(localstatedir)'"; \ - echo "SYSCONFDIR = '$(sysconfdir)'"; \ -- echo "PKGLIBDIR = '$(pkglibdir)'"; \ -+ echo "PKGLIBEXECDIR = '$(pkglibexecdir)'"; \ - } > $@ - - $(REPLACE_VARS_SED): Makefile stamp-directories -@@ -182,7 +182,7 @@ - echo 's#@SYSCONFDIR@#$(sysconfdir)#g'; \ - echo 's#@LOCALSTATEDIR@#$(localstatedir)#g'; \ - echo 's#@SBINDIR@#$(sbindir)#g'; \ -- echo 's#@PKGLIBDIR@#$(pkglibdir)#g'; \ -+ echo 's#@PKGLIBEXECDIR@#$(pkglibexecdir)#g'; \ - echo 's#@PKGPYTHONDIR@#$(pkgpythondir)#g'; \ - } > $@ - -@@ -199,14 +199,14 @@ - $(LOG_WRAPPER): Makefile stamp-directories $(GEN_LOG_WRAPPER) - set -e; \ - progname=`basename $@ | sed -e 's/-wrapper//'`; \ -- $(GEN_LOG_WRAPPER) "$(pkglibdir)/$$progname" "$(DESTDIR)$(pythondir)" > $@ || rm -f $@ -+ $(GEN_LOG_WRAPPER) "$(pkglibexecdir)/$$progname" "$(DESTDIR)$(pythondir)" > $@ || rm -f $@ - chmod u+x $@ - - # We need to create symlinks because "make distcheck" will not install Python - # files when building. - srclinks: stamp-directories - set -e; \ -- for i in $(pkgpython_PYTHON) $(app_PYTHON) $(dist_pkglib_SCRIPTS); do \ -+ for i in $(pkgpython_PYTHON) $(app_PYTHON) $(dist_pkglibexec_SCRIPTS); do \ - if test ! -f $$i -a -f $(abs_top_srcdir)/$$i; then \ - $(LN_S) $(abs_top_srcdir)/$$i $$i; \ - fi; \ -diff -Naur neatx.orig/lib/constants.py neatx/lib/constants.py ---- neatx.orig/lib/constants.py 2012-08-23 12:01:14.290018757 +0200 -+++ neatx/lib/constants.py 2012-08-23 12:01:23.405734335 +0200 -@@ -40,14 +40,14 @@ - START_GNOME_COMMAND = "gnome-session" - - NXUSER = "nx" --NXSERVER = _autoconf.PKGLIBDIR + "/nxserver" --NXNODE = _autoconf.PKGLIBDIR + "/nxnode" --NXNODE_WRAPPER = _autoconf.PKGLIBDIR + "/nxnode-wrapper" --NXNC = _autoconf.PKGLIBDIR + "/nxnc" --NXDIALOG = _autoconf.PKGLIBDIR + "/nxdialog" -+NXSERVER = _autoconf.PKGLIBEXECDIR + "/nxserver" -+NXNODE = _autoconf.PKGLIBEXECDIR + "/nxnode" -+NXNODE_WRAPPER = _autoconf.PKGLIBEXECDIR + "/nxnode-wrapper" -+NXNC = _autoconf.PKGLIBEXECDIR + "/nxnc" -+NXDIALOG = _autoconf.PKGLIBEXECDIR + "/nxdialog" - NXAGENT_PKGNAME = "nxagent" --FDCOPY = _autoconf.PKGLIBDIR + "/fdcopy" --TTYSETUP = _autoconf.PKGLIBDIR + "/ttysetup" -+FDCOPY = _autoconf.PKGLIBEXECDIR + "/fdcopy" -+TTYSETUP = _autoconf.PKGLIBEXECDIR + "/ttysetup" - - NXAGENT_VERSION_SEP = ".-~" - diff --git a/net-misc/neatx/metadata.xml b/net-misc/neatx/metadata.xml deleted file mode 100644 index 18f1f87..0000000 --- a/net-misc/neatx/metadata.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <herd>nx</herd> - <longdescription>Neatx is an Open Source NX server, similar to the commercial NX server from NoMachine, originally developed by Google for an internal project</longdescription> -</pkgmetadata> diff --git a/net-misc/neatx/neatx-0.3.1_p59-r4.ebuild b/net-misc/neatx/neatx-0.3.1_p59-r4.ebuild deleted file mode 100644 index 026e3c8..0000000 --- a/net-misc/neatx/neatx-0.3.1_p59-r4.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -PYTHON_DEPEND="2" -inherit eutils autotools python user - -DESCRIPTION="Google implementation of NX server" -HOMEPAGE="http://code.google.com/p/neatx/"; -SRC_URI="http://dev.gentoo.org/~voyageur/distfiles/${P}.tar.bz2"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="" - -DEPEND="dev-python/docutils" -RDEPEND="dev-python/pexpect - dev-python/simplejson - >=dev-python/pygtk-2.14 - >=dev-python/pygobject-2.14:2 - app-portage/portage-utils - media-fonts/font-misc-misc - media-fonts/font-cursor-misc - || ( net-analyzer/gnu-netcat - net-analyzer/netcat - net-analyzer/netcat6 ) - net-misc/nx" - -S=${WORKDIR}/${PN} - -pkg_setup () { - # configure script looks for latest python2 only, - # no multiple versions support - python_set_active_version 2 - python_pkg_setup - - if [ -z "${NX_HOME_DIR}" ]; - then - export NX_HOME_DIR=/var/lib/neatx/home - fi - enewuser nx -1 -1 ${NX_HOME_DIR} -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-use_libexecdir.patch - - sed -i -e "s/rst2html]/rst2html.py]/" configure.ac \ - || die "configure.ac sed failed" - sed -e "s#/lib/neatx#/neatx#" \ - -e "/^docdir/s#\$(PACKAGE)#${PF}#" \ - -e "s#-Werror##" \ - -i Makefile.am \ - || die "Makefile.am sed failed" - sed -e "/DATA_DIR =/s#/lib/neatx#/neatx#" \ - -i lib/constants.py || die "constants.py sed failed" - - eautoreconf - - echo "#!/bin/sh" > autotools/py-compile -} - -src_compile() { - default_src_compile - # Scripts are automatically generated, fix them here - python_convert_shebangs 2 src/nx* -} - -src_install() { - emake install DESTDIR="${D}" - fperms 777 /var/lib/neatx/sessions - dodir ${NX_HOME_DIR}/.ssh - fowners nx:nx ${NX_HOME_DIR} - fowners nx:nx ${NX_HOME_DIR}/.ssh - - insinto /etc - newins doc/neatx.conf.example neatx.conf - - # nc or netcat6 or netcat? - if has_version net-analyzer/gnu-netcat; then - nc_path="/usr/bin/netcat" - elif has_version net-analyzer/netcat6; then - nc_path="/usr/bin/nc6" - else - nc_path="/usr/bin/nc" - fi - cat >> "${D}"/etc/neatx.conf << EOF - -netcat-path = ${nc_path} -use-xsession = false -start-gnome-command = /etc/X11/Sessions/Gnome -EOF - - insinto /usr/share/neatx - insopts -m 600 -o nx - newins extras/authorized_keys.nomachine authorized_keys.nomachine - - insinto ${NX_HOME_DIR}/.ssh - insopts -m 600 -o nx - newins extras/authorized_keys.nomachine authorized_keys - - # protect ssh key from getting clobbered by future upgrade (bug #339366) - echo "CONFIG_PROTECT=\"${NX_HOME_DIR}\"" > "${T}/60${PN}" - doenvd "${T}/60${PN}" -} - -pkg_preinst () { - # preserve custom ssh key if present (bug #339366) - # CONFIG_PROTECT entry created above will only work for future emerges, - # not the current one (until bug #276345 gets fixed) - if [ -e "${ROOT}/${NX_HOME_DIR}/.ssh/authorized_keys" ] ; then - einfo "Preserving existing ssh key: ${NX_HOME_DIR}/.ssh/authorized_keys" - insinto ${NX_HOME_DIR}/.ssh - insopts -m 600 -o nx - newins "${ROOT}/${NX_HOME_DIR}/.ssh/authorized_keys" authorized_keys - fi -} - -pkg_postinst () { - python_mod_optimize neatx - - # 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/libexec/neatx/nxserver-login 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!!" - 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/libexec/neatx/nxserver-login" - elog " * home directory: ${NX_HOME_DIR}" - fi - - 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 - - elog "If you want to use the default su authentication (rather than ssh)" - elog "you must ensure that the nx user is a member of the wheel group." - elog "You can add it via \"usermod -a -G wheel nx\"" -} - -pkg_postrm() { - python_mod_cleanup neatx -}
