Drop old versions, small fixes (missing eutils and update postgres USE flag in ebuild)

(Portage version: 2.2_rc67/svn/Linux x86_64)

svn path=/testing/; revision=244

6 files changed, 17 insertions, 242 deletions

diff --git a/net-misc/x2goserver/ChangeLog b/net-misc/x2goserver/ChangeLog
index 9f27bf8..0c00f0d 100644
--- a/net-misc/x2goserver/ChangeLog
+++ b/net-misc/x2goserver/ChangeLog
@@ -1,13 +1,21 @@
 # ChangeLog for net-misc/x2goserver
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Apr 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  -x2goserver-2.0.1.19.ebuild, -x2goserver-3.0.0.1.ebuild,
+  -x2goserver-3.0.1.1.ebuild, x2goserver-3.0.1.5.ebuild:
+  Drop old versions, small fixes (missing eutils and update postgres USE
+  flag in ebuild)
+
 *x2goserver-3.0.1.5 (15 Apr 2010)
 
-  15 Apr 2010 Joachim Langenbach <joachim@falaba.de>
+  15 Apr 2010; Joachim Langenbach <joachim@falaba.de>
+  +x2goserver-3.0.1.5.ebuild:
   Added x2goserver-3.0.1.5
   Removed kde useflag, because KDE3 is not supported anymore by gentoo
-  Changed postgressql to postgres useflag, because it's the official postgres useflag
+  Changed postgressql to postgres useflag, because it's the official 
+  postgres useflag
 
 *x2goserver-3.0.1.1 (02 Sep 2009)
 
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index 449326f..b2082a4 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -1,12 +1,6 @@
 AUX x2gomountdirs_no_desktop_icon.patch 1676 RMD160 6e5b9fd22a491ae6a482b82bfca51870ca1b8e2b SHA1 b81ef59db5e0844450b5fc7e232a61d053a906db SHA256 1ddd1f6a724bb5ff35e59a72d2d307a7880a3a87f777007635e4c5032e2b2957
 AUX x2goserver.init 493 RMD160 5633609c39c43c7d810712cecb89cf947329862d SHA1 a6096f59d62f9be79250accddbc912d62b6226cd SHA256 b03cffd2c4eb539cc1904c42058d18f8b389cf7ed26ea4175ee0a136249c3feb
-DIST x2goserver_2.0.1-19_all.deb 14536 RMD160 9052af7fe76051d13dbda6b8ca4dd0192e88218a SHA1 5610b16b5529ea65bd19bfee7a7a9dfc8079b716 SHA256 513173c738dfa6a4e379ccb1a99eaff46803ad08a325073fbca8b76b6be76d56
-DIST x2goserver_3.0.0-1_all.deb 15000 RMD160 ce8d06fefa8426cedaf9ac64bc60af17de8cc905 SHA1 90b6377d8e02f66bc396a4279c32f3d25266088f SHA256 99b5bd556f2cdb9bb399b9c35efa4b8406f23a8ea766d84a060a0e1671c468ba
-DIST x2goserver_3.0.1-1_all.deb 15888 RMD160 f2ec0b2ba67bcc61973adf2152f8411198a63a2e SHA1 082acf589e6c844c2705a03328a68387b39d8900 SHA256 ac2aaf6f9a90f62f76281d782ab251cca4c53ff38a5e9d6b301f3897228efd5e
 DIST x2goserver_3.0.1-5_all.deb 16806 RMD160 cdfd9cb079c7a4d4f943be6fd13e0d3ec2b04182 SHA1 735807f16e95b7897a766c484fd6f08888e08369 SHA256 408c4dc52af8b2c93c7afeab40ce0e4588e226f45cceee4f3013de93623022c9
-EBUILD x2goserver-2.0.1.19.ebuild 1723 RMD160 08e57cc4d2389c5aa99b5896168bc494dc959fa2 SHA1 17add51024f5a5268c6cd3adff83bd2fe0fe0761 SHA256 209906e4d732e1d2ede75519efd797a847f49cffe60837f599a70dd2f6b0f8e5
-EBUILD x2goserver-3.0.0.1.ebuild 1907 RMD160 f4056c7a9c0d4c70c2f79d00ea31f0b1e5b42ecc SHA1 02636a263e61e6046c314c4c2b135a92b17876b6 SHA256 a5de705abfa04cf40500d57212ad0eb8672752de47023a11758dc361cd21164f
-EBUILD x2goserver-3.0.1.1.ebuild 2459 RMD160 feff1484fb45feb243ede856cdb36a5b1797f672 SHA1 fc568f4fa11ec4a4b943d81a6e8eb7d8dd2ec952 SHA256 a794dafedae53d4b64e0e73aa5b53e7cb3d6e9a9720e0402df02b9107cd09e93
-EBUILD x2goserver-3.0.1.5.ebuild 2540 RMD160 a2aa7d6f7c259ce2d364858b347d3d257a4c80e4 SHA1 c4e17a82e57cd025dc6175cd061433f79da1cae3 SHA256 42992abd2ce20e2150c35e500b1437f30be82dca5882ad8917b4d0a47c026fa5
-MISC ChangeLog 1213 RMD160 4226f649ada2f96a14ae6f1f2adbc0bd9c000413 SHA1 5d3ff83d8b26a467458a5ff591638331ef8c7b97 SHA256 4ce51391005fdf4c0343a5d75143b4003368f4ddefd9326dc6455debff3c4565
+EBUILD x2goserver-3.0.1.5.ebuild 2541 RMD160 971fd604a98d76de7bae10742c1383fd68bd1dbd SHA1 1647087d9da09adf949e261ba09a1f744a9f066c SHA256 70855ec4e7360b8ff2cdd74a14b3125325f085b65ac46e020b6a15690334ec8f
+MISC ChangeLog 1510 RMD160 79aab5261552113a110dd4098e90732b6907a386 SHA1 444a84cea7c9b58889f81c2b69a2b97153e4d326 SHA256 fe5a6dc38c4bc1df2b33cae59eec0d856f3e467e5c7a9a425d7c53b2df15b71b
 MISC metadata.xml 307 RMD160 0172cd4fc792a41fde528ec788ab0dd98f3d21bc SHA1 953412d99904e25f4845fdfda587298e7cbc7f2a SHA256 b19b0330b6614bc27421032b94f6ade24661e38c818140c598d50cb91e82bce6
diff --git a/net-misc/x2goserver/x2goserver-2.0.1.19.ebuild b/net-misc/x2goserver/x2goserver-2.0.1.19.ebuild
deleted file mode 100644
index 10e86be..0000000
--- a/net-misc/x2goserver/x2goserver-2.0.1.19.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=1
-inherit versionator
-
-MAJOR_PV="$(get_version_component_range 1-3)"
-FULL_PV="${MAJOR_PV}-$(get_version_component_range 4)"
-DESCRIPTION="The X2Go server"
-HOMEPAGE="http://x2go.berlios.de"
-SRC_URI="http://x2go.obviously-nice.de/deb/pool-lenny/${PN}/${PN}_${FULL_PV}_all.deb"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fuse kde ldap"
-
-DEPEND=""
-RDEPEND="app-admin/sudo
-	net-misc/nx
-	virtual/postgresql-server
-	virtual/ssh
-	fuse? ( sys-fs/sshfs-fuse )
-	kde? ( net-misc/x2gokdebindings
-		net-misc/x2gosessionadministration )
-	ldap? ( net-misc/x2goldaptools
-		kde? ( net-misc/x2gogroupadministration
-			net-misc/x2gohostadministration
-			net-misc/x2gosystemadministration
-			net-misc/x2gouseradministration ) )"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	tar xozf data.tar.gz || die "failure unpacking data.tar.gz"
-
-	# Needs testing, is it fully compatible with nxagent?
-	sed -i -e "s/x2goagent/nxagent/" usr/bin/x2gostartagent || die "sed failed"
-}
-
-src_install() {
-	dobin usr/bin/*
-	dosbin usr/sbin/*
-
-	exeinto /usr/share/x2go/script
-	doexe usr/lib/x2go/script/x2gocreatebase.sh
-
-	insinto /etc/x2go
-	doins etc/x2go/sql
-
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-}
-
-pkg_postinst() {
-	elog "To work, x2goserver needs a configured postgreSQL database"
-	elog "Sample script to create the database can be found here:"
-	elog "    /usr/share/x2go/script/x2gocreatebase.sh"
-	einfo ""
-	elog "You also need to give sudo rights on x2gopgwrapper to your users"
-	elog "A sudoers example for all members of the group users:"
-	elog "    %users ALL=(ALL) NOPASSWD: /usr/bin/x2gopgwrapper"
-}
diff --git a/net-misc/x2goserver/x2goserver-3.0.0.1.ebuild b/net-misc/x2goserver/x2goserver-3.0.0.1.ebuild
deleted file mode 100644
index 04fdaca..0000000
--- a/net-misc/x2goserver/x2goserver-3.0.0.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=1
-inherit versionator
-
-MAJOR_PV="$(get_version_component_range 1-3)"
-FULL_PV="${MAJOR_PV}-$(get_version_component_range 4)"
-DESCRIPTION="The X2Go server"
-HOMEPAGE="http://x2go.berlios.de"
-SRC_URI="http://x2go.obviously-nice.de/deb/pool-lenny/${PN}/${PN}_${FULL_PV}_all.deb"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fuse kde ldap"
-
-DEPEND=""
-RDEPEND="app-admin/sudo
-	net-misc/nx
-	virtual/postgresql-server
-	virtual/ssh
-	fuse? ( sys-fs/sshfs-fuse )
-	kde? ( net-misc/x2gokdebindings
-		net-misc/x2gosessionadministration )
-	ldap? ( net-misc/x2goldaptools
-		kde? ( net-misc/x2gogroupadministration
-			net-misc/x2gohostadministration
-			net-misc/x2gosystemadministration
-			net-misc/x2gouseradministration ) )"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	tar xozf data.tar.gz || die "failure unpacking data.tar.gz"
-
-	# Needs testing, is it fully compatible with nxagent?
-	sed -i -e "s/x2goagent/nxagent/" usr/bin/x2gostartagent || die "sed failed"
-}
-
-src_install() {
-	dobin usr/bin/*
-	dosbin usr/sbin/*
-
-	exeinto /usr/share/x2go/script
-	doexe usr/lib/x2go/script/x2gocreatebase.sh
-
-	insinto /etc/x2go
-	doins etc/x2go/sql
-
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-}
-
-pkg_postinst() {
-	elog "To work, x2goserver needs a configured postgreSQL database"
-	elog "To use a database on localhost:"
-	elog "	echo -n local > /etc/x2go/sql"
-	elog "Sample script to create the database can be found here:"
-	elog "    /usr/share/x2go/script/x2gocreatebase.sh"
-	einfo ""
-	elog "You also need to give sudo rights on x2gopgwrapper to your users"
-	elog "A sudoers example for all members of the group users:"
-	elog "    %users ALL=(ALL) NOPASSWD: /usr/bin/x2gopgwrapper"
-	elog "To give only a special group access to the x2goserver, "
-	elog "change %users to any other group"
-}
diff --git a/net-misc/x2goserver/x2goserver-3.0.1.1.ebuild b/net-misc/x2goserver/x2goserver-3.0.1.1.ebuild
deleted file mode 100644
index 83c2290..0000000
--- a/net-misc/x2goserver/x2goserver-3.0.1.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=1
-inherit versionator
-
-MAJOR_PV="$(get_version_component_range 1-3)"
-FULL_PV="${MAJOR_PV}-$(get_version_component_range 4)"
-DESCRIPTION="The X2Go server"
-HOMEPAGE="http://x2go.berlios.de"
-SRC_URI="http://x2go.obviously-nice.de/deb/pool-lenny/${PN}/${PN}_${FULL_PV}_all.deb"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fuse kde ldap postgresql sqlite"
-
-DEPEND=""
-RDEPEND="app-admin/sudo
-	net-misc/nx
-	virtual/ssh
-	fuse? ( sys-fs/sshfs-fuse )
-	postgresql? ( virtual/postgresql-server )
-	sqlite? ( dev-db/sqlite )
-	kde? ( net-misc/x2gokdebindings
-		net-misc/x2gosessionadministration )
-	ldap? ( net-misc/x2goldaptools
-		kde? ( net-misc/x2gogroupadministration
-			net-misc/x2gohostadministration
-			net-misc/x2gosystemadministration
-			net-misc/x2gouseradministration ) )"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	tar xozf data.tar.gz || die "failure unpacking data.tar.gz"
-
-	# Needs testing, is it fully compatible with nxagent?
-	sed -i -e "s/x2goagent/nxagent/" usr/bin/x2gostartagent || die "sed failed"
-
-	if use sqlite ; then
-		echo sqlite > etc/x2go/sql
-	fi
-
-	epatch "${FILESDIR}"/x2gomountdirs_no_desktop_icon.patch
-}
-
-src_install() {
-	dobin usr/bin/*
-	dosbin usr/sbin/*
-
-	exeinto /usr/share/x2go/script
-	doexe usr/lib/x2go/script/x2gocreatebase.sh
-	doexe usr/lib/x2go/script/x2gosqlite.sh
-
-	insinto /etc/x2go
-	doins etc/x2go/sql
-
-	if use sqlite ; then
-		elog "creating x2go sqlite database directory /var/db/x2go"
-		dodir /var/db/x2go
-	fi
-
-	if use postgresql ; then
-		newinitd "${FILESDIR}"/${PN}.init ${PN}
-	fi
-}
-
-pkg_postinst() {
-	if use postgresql ; then
-		elog "To work, x2goserver needs a configured postgreSQL database"
-		elog "	echo -n local > /etc/x2go/sql"
-		elog "Sample script to create the database can be found here:"
-		elog "    /usr/share/x2go/script/x2gocreatebase.sh"
-	fi
-	if use sqlite ; then
-		elog "To work, x2goserver needs a configured sqlite database"
-		elog "Sample script to create the database can be found here:"
-		elog "    /usr/share/x2go/script/x2gosqlite.sh"
-	fi
-	einfo ""
-	elog "You need to give sudo rights on x2gopgwrapper to your users"
-	elog "A sudoers example for all members of the group users:"
-	elog "    %users ALL=(ALL) NOPASSWD: /usr/bin/x2gopgwrapper"
-	elog "To give only a special group access to the x2goserver, "
-	elog "change %users to any other group"
-}
diff --git a/net-misc/x2goserver/x2goserver-3.0.1.5.ebuild b/net-misc/x2goserver/x2goserver-3.0.1.5.ebuild
index 7599484..fec9e77 100644
--- a/net-misc/x2goserver/x2goserver-3.0.1.5.ebuild
+++ b/net-misc/x2goserver/x2goserver-3.0.1.5.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=1
-inherit versionator
+inherit eutils versionator
 
 MAJOR_PV="$(get_version_component_range 1-3)"
 FULL_PV="${MAJOR_PV}-$(get_version_component_range 4)"
@@ -21,7 +21,7 @@ RDEPEND="app-admin/sudo
 	net-misc/nx
 	virtual/ssh
 	fuse? ( sys-fs/sshfs-fuse )
-	postgresql? ( virtual/postgresql-server )
+	postgres? ( virtual/postgresql-server )
 	sqlite? ( dev-db/sqlite )
 	ldap? ( net-misc/x2goldaptools )"
 
@@ -60,13 +60,13 @@ src_install() {
 		dodir /var/db/x2go
 	fi
 
-	if use postgresql ; then
+	if use postgres ; then
 		newinitd "${FILESDIR}"/${PN}.init ${PN}
 	fi
 }
 
 pkg_postinst() {
-	if use postgresql ; then
+	if use postgres ; then
 		elog "To work, x2goserver needs a configured postgreSQL database"
 		elog "	echo -n local > /etc/x2go/sql"
 		elog "Sample script to create the database can be found here:"