Version bump, bugfixes only. Remove some 3.1.1 versions

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key C74525F2)

4 files changed, 9 insertions, 126 deletions

diff --git a/net-misc/x2goserver/ChangeLog b/net-misc/x2goserver/ChangeLog
index 5af8fc1f95ae..20f598222bcf 100644
--- a/net-misc/x2goserver/ChangeLog
+++ b/net-misc/x2goserver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/x2goserver
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.14 2012/11/15 09:40:22 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.15 2012/11/26 10:09:09 voyageur Exp $
+
+*x2goserver-3.1.1.9 (26 Nov 2012)
+
+  26 Nov 2012; Bernard Cafarelli <voyageur@gentoo.org>
+  -x2goserver-3.1.1.3.ebuild, -x2goserver-3.1.1.4.ebuild,
+  -x2goserver-3.1.1.6.ebuild, +x2goserver-3.1.1.9.ebuild:
+  Version bump, bugfixes only. Remove some 3.1.1 versions
 
 *x2goserver-3.1.1.6 (15 Nov 2012)
 
diff --git a/net-misc/x2goserver/x2goserver-3.1.1.3.ebuild b/net-misc/x2goserver/x2goserver-3.1.1.3.ebuild
deleted file mode 100644
index a5c591bd60bf..000000000000
--- a/net-misc/x2goserver/x2goserver-3.1.1.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-3.1.1.3.ebuild,v 1.2 2012/07/11 08:33:22 voyageur Exp $
-
-EAPI=4
-inherit eutils multilib user
-
-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=""
-RDEPEND="dev-perl/Config-Simple
-	net-misc/nx
-	virtual/ssh
-	fuse? ( sys-fs/sshfs-fuse )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )"
-
-pkg_setup() {
-	enewuser x2gouser -1 -1 /var/lib/x2go
-	enewuser x2goprint -1 -1 /var/spool/x2goprint
-}
-
-src_prepare() {
-	# Multilib clean
-	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i */Makefile || die "multilib sed failed"
-	# Use nxagent directly
-	sed -i -e "s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-
-	fowners root:x2goprint /usr/bin/x2goprint
-	fperms 2755 /usr/bin/x2goprint
-	dosym /usr/share/applications /etc/x2go/applications
-
-	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
-}
-
-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 databse, 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"
-}
diff --git a/net-misc/x2goserver/x2goserver-3.1.1.4.ebuild b/net-misc/x2goserver/x2goserver-3.1.1.4.ebuild
deleted file mode 100644
index baf7ded03031..000000000000
--- a/net-misc/x2goserver/x2goserver-3.1.1.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-3.1.1.4.ebuild,v 1.1 2012/09/28 12:56:27 voyageur Exp $
-
-EAPI=4
-inherit eutils multilib user
-
-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=""
-RDEPEND="dev-perl/Config-Simple
-	net-misc/nx
-	virtual/ssh
-	fuse? ( sys-fs/sshfs-fuse )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )"
-
-pkg_setup() {
-	enewuser x2gouser -1 -1 /var/lib/x2go
-	enewuser x2goprint -1 -1 /var/spool/x2goprint
-}
-
-src_prepare() {
-	# Multilib clean
-	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i */Makefile || die "multilib sed failed"
-	# Use nxagent directly
-	sed -i -e "s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-
-	fowners root:x2goprint /usr/bin/x2goprint
-	fperms 2755 /usr/bin/x2goprint
-	dosym /usr/share/applications /etc/x2go/applications
-
-	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
-}
-
-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 databse, 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"
-}
diff --git a/net-misc/x2goserver/x2goserver-3.1.1.6.ebuild b/net-misc/x2goserver/x2goserver-3.1.1.9.ebuild
index b32f1fa0ee0c..3f235d6d7a0c 100644
--- a/net-misc/x2goserver/x2goserver-3.1.1.6.ebuild
+++ b/net-misc/x2goserver/x2goserver-3.1.1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-3.1.1.6.ebuild,v 1.1 2012/11/15 09:40:22 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-3.1.1.9.ebuild,v 1.1 2012/11/26 10:09:09 voyageur Exp $
 
 EAPI=4
 inherit eutils multilib toolchain-funcs user