commit: a135bfb96bcb1ab9af82631ef5052ab4f4fa0571 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> AuthorDate: Fri Aug 3 14:11:09 2018 +0000 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> CommitDate: Fri Aug 3 14:11:16 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a135bfb9
net-misc/x2goserver: drop some versions Package-Manager: Portage-2.3.44, Repoman-2.3.10 .../files/x2goserver-4.1.0.0-provided_by_nx.patch | 27 ------ net-misc/x2goserver/x2goserver-4.0.1.22-r1.ebuild | 100 --------------------- net-misc/x2goserver/x2goserver-4.1.0.0.ebuild | 98 -------------------- 3 files changed, 225 deletions(-) diff --git a/net-misc/x2goserver/files/x2goserver-4.1.0.0-provided_by_nx.patch b/net-misc/x2goserver/files/x2goserver-4.1.0.0-provided_by_nx.patch deleted file mode 100644 index e189b918dbd..00000000000 --- a/net-misc/x2goserver/files/x2goserver-4.1.0.0-provided_by_nx.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur x2goserver-4.1.0.0.orig/x2goserver-x2goagent/Makefile x2goserver-4.1.0.0/x2goserver-x2goagent/Makefile ---- x2goserver-4.1.0.0.orig/x2goserver-x2goagent/Makefile 2018-02-15 23:08:27.000000000 +0100 -+++ x2goserver-4.1.0.0/x2goserver-x2goagent/Makefile 2018-02-23 14:42:03.106562501 +0100 -@@ -49,7 +49,7 @@ - clean_man2html: - rm -rf `dirname $(MAN2HTML_DEST)` - --install: install_scripts install_config install_data install_man install_version -+install: install_scripts install_config install_data install_man - - install_scripts: - $(INSTALL_DIR) $(DESTDIR)$(BINDIR) -@@ -57,14 +57,11 @@ - $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) - $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d - $(INSTALL_PROGRAM) share/x2go/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ -- $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin/ -- $(INSTALL_SYMLINK) nxagent $(DESTDIR)$(NXLIBDIR)/bin/x2goagent - - install_data: - $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/ - $(INSTALL_FILE) etc/rgb $(DESTDIR)$(SHAREDIR)/ - $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/../pixmaps/ -- $(INSTALL_FILE) share/pixmaps/x2go.xpm $(DESTDIR)$(SHAREDIR)/../pixmaps/ - $(INSTALL_SYMLINK) $(ETCDIR)/rgb $(DESTDIR)$(SHAREDIR)/ - - install_config: diff --git a/net-misc/x2goserver/x2goserver-4.0.1.22-r1.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.22-r1.ebuild deleted file mode 100644 index 3aeb90b0e70..00000000000 --- a/net-misc/x2goserver/x2goserver-4.0.1.22-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit multilib systemd toolchain-funcs user xdg-utils - -DESCRIPTION="The X2Go server" -HOMEPAGE="http://www.x2go.org"; -SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+fuse postgres +sqlite" - -REQUIRED_USE="|| ( postgres sqlite )" - -DEPEND="virtual/perl-ExtUtils-MakeMaker" -RDEPEND="dev-perl/Capture-Tiny - dev-perl/Config-Simple - dev-perl/File-BaseDir - dev-perl/File-ReadBackwards - dev-perl/File-Which - dev-perl/Try-Tiny - media-fonts/font-cursor-misc - media-fonts/font-misc-misc[nls] - >=net-misc/nx-3.5.0.25 - net-misc/openssh - >=sys-apps/iproute2-4.3.0 - x11-apps/xauth - x11-apps/xhost - x11-apps/xwininfo - fuse? ( net-fs/sshfs ) - postgres? ( dev-perl/DBD-Pg ) - sqlite? ( dev-perl/DBD-SQLite )" - -PATCHES=( - ) - -pkg_setup() { - # Force the group creation, #479650 - enewgroup x2gouser - enewgroup x2goprint - enewuser x2gouser -1 -1 /var/lib/x2go x2gouser - enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint -} - -src_prepare() { - # Do not install Xresources symlink (#521126) - sed -e '\#$(INSTALL_SYMLINK) /etc/X11/Xresources# s/^/#/' -i x2goserver-xsession/Makefile || die - # Multilib clean - sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die - sed -e "s#/lib/#/$(get_libdir)/#" -i x2goserver/bin/x2gopath || die - # Skip man2html build - sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die - # Use nxagent directly - sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die - - default -} - -src_compile() { - emake CC="$(tc-getCC)" PREFIX=/usr -} - -src_install() { - emake DESTDIR="${D}" PREFIX=/usr install - - fowners root:x2goprint /usr/bin/x2goprint - fperms 2755 /usr/bin/x2goprint - fperms 0750 /etc/sudoers.d - fperms 0440 /etc/sudoers.d/x2goserver - dosym ../../usr/share/applications /etc/x2go/applications - - newinitd "${FILESDIR}"/${PN}.init x2gocleansessions - systemd_dounit "${FILESDIR}"/x2gocleansessions.service -} - -pkg_postinst() { - if use sqlite ; then - elog "To use sqlite and create the initial database, run:" - elog " # x2godbadmin --createdb" - fi - if use postgres ; then - elog "To use a PostgreSQL database, more information is availabe here:" - elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"; - fi - - elog "For password authentication, you need to enable PasswordAuthentication" - elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)" - elog "An init script was installed for x2gocleansessions" - - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/net-misc/x2goserver/x2goserver-4.1.0.0.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.0.ebuild deleted file mode 100644 index c281ef09ff5..00000000000 --- a/net-misc/x2goserver/x2goserver-4.1.0.0.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit multilib systemd toolchain-funcs user xdg-utils - -DESCRIPTION="The X2Go server" -HOMEPAGE="http://www.x2go.org"; -SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+fuse postgres +sqlite" - -REQUIRED_USE="|| ( postgres sqlite )" - -DEPEND="virtual/perl-ExtUtils-MakeMaker" -RDEPEND="dev-perl/Capture-Tiny - dev-perl/Config-Simple - dev-perl/File-BaseDir - dev-perl/File-ReadBackwards - dev-perl/File-Which - dev-perl/Switch - dev-perl/Try-Tiny - media-fonts/font-cursor-misc - media-fonts/font-misc-misc[nls] - >=net-misc/nx-3.5.0.25 - net-misc/openssh - >=sys-apps/iproute2-4.3.0 - x11-apps/xauth - x11-apps/xhost - x11-apps/xwininfo - fuse? ( net-fs/sshfs ) - postgres? ( dev-perl/DBD-Pg ) - sqlite? ( dev-perl/DBD-SQLite )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.1.0.0-Xresources.patch - "${FILESDIR}"/${PN}-4.1.0.0-provided_by_nx.patch - "${FILESDIR}"/${PN}-4.1.0.0-skip_man2html.patch - ) - -pkg_setup() { - # Force the group creation, #479650 - enewgroup x2gouser - enewgroup x2goprint - enewuser x2gouser -1 -1 /var/lib/x2go x2gouser - enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint -} - -src_prepare() { - # Multilib clean - sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die - sed -e "s#/lib/#/$(get_libdir)/#" -i x2goserver/bin/x2gopath || die - - default -} - -src_compile() { - emake CC="$(tc-getCC)" PREFIX=/usr -} - -src_install() { - emake DESTDIR="${D}" PREFIX=/usr install - - fowners root:x2goprint /usr/bin/x2goprint - fperms 2755 /usr/bin/x2goprint - fperms 0750 /etc/sudoers.d - fperms 0440 /etc/sudoers.d/x2goserver - dosym ../../usr/share/applications /etc/x2go/applications - - newinitd "${FILESDIR}"/${PN}.init x2gocleansessions - systemd_dounit "${FILESDIR}"/x2gocleansessions.service -} - -pkg_postinst() { - if use sqlite ; then - elog "To use sqlite and create the initial database, run:" - elog " # x2godbadmin --createdb" - fi - if use postgres ; then - elog "To use a PostgreSQL database, more information is availabe here:" - elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"; - fi - - elog "For password authentication, you need to enable PasswordAuthentication" - elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)" - elog "An init script was installed for x2gocleansessions" - - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_mimeinfo_database_update - xdg_desktop_database_update -}
