* x2goprint first added

   * x2goprint-3.0.0.1 added
 * x2gousbmount first added
   * x2gousbmount-1.0.1.1 added
 * x2goclient update
   * x2goclient-3.01.3 added
 * x2goserver update
   x2goserver-3.0.1.1


svn path=/testing/; revision=240

8 files changed, 175 insertions, 66 deletions

diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index 533c7f7..48ce26d 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -2,5 +2,6 @@ AUX x2goclient-3.00.1-ldap.patch 5046 RMD160 90aa4e09c391fed6d7770ba73d2733c3cac
 AUX x2goclient-3.00.1-noldap.patch 1352 RMD160 ea7066d0eba1d0b1bb2909dc5e7b6477ce21c5a2 SHA1 f99023279d09decb148857381b75d1f1c2d5a10f SHA256 2d89e7f57b8bfdf8a6caf89eddb7afc390ebbbda24cf59c839387998c2934283
 DIST x2goclient_3.00-1.tar.gz 664378 RMD160 89e4fd4838cd14299032bbee4d6fb0878c4ae513 SHA1 8cdb5fcc9d8c8384189dd6ed82eb0207c80d366b SHA256 95e8625e5b613082220d98c0b406b029f8420da92f83303b0040ed2f43498b45
 EBUILD x2goclient-3.00.1.ebuild 1785 RMD160 944a1bfb5849b0d793cf4272b8ab4437cca9d0e0 SHA1 247640460f8acfe8b634bbb8e09da7a57697b5ea SHA256 b5665eada8c4701fba99c3821281928a2f9f206721d87fffffba8e6d8ccf776a
+EBUILD x2goclient-3.01.3.ebuild 1785 RMD160 944a1bfb5849b0d793cf4272b8ab4437cca9d0e0 SHA1 247640460f8acfe8b634bbb8e09da7a57697b5ea SHA256 b5665eada8c4701fba99c3821281928a2f9f206721d87fffffba8e6d8ccf776a
 MISC ChangeLog 611 RMD160 71e03804a047a5d4b10d0c3537f00f1c1517a755 SHA1 83462cdff8652547ee01f8398d16705a5ced517e SHA256 c25b6652f6e3bedf7772d124b2615b3d2b118abfb60688bab8d131e4425530b6
 MISC metadata.xml 211 RMD160 7569a339443bfffd41ebdb1db3683d6bbcd2fe5b SHA1 84050eff2270b3218cf8eb00363fe12ecdadfe2e SHA256 a6b5a5387c7e7f441d794c61edf1718caa3c58ffbf9b595ec536ff9617a7471f
diff --git a/net-misc/x2goclient/x2goclient-3.01.3.ebuild b/net-misc/x2goclient/x2goclient-3.01.3.ebuild
new file mode 100644
index 0000000..4f9878d
--- /dev/null
+++ b/net-misc/x2goclient/x2goclient-3.01.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/x2goclient-2.99.3.ebuild,v 1.1 2009/03/13 12:36:03 voyageur Exp $
+
+EAPI="2"
+inherit qt4 versionator
+
+MAJOR_PV="$(get_version_component_range 1-2)"
+FULL_PV="${MAJOR_PV}-$(get_version_component_range 3)"
+DESCRIPTION="The X2Go Qt client"
+HOMEPAGE="http://x2go.berlios.de"
+SRC_URI="http://x2go.obviously-nice.de/deb/pool-lenny/${PN}/${PN}_${FULL_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap"
+
+DEPEND="net-misc/nx
+	|| ( ( x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-svg:4 )
+		>=x11-libs/qt-4.3:4 )
+	ldap? ( net-nds/openldap )
+	net-print/cups"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}-${MAJOR_PV}
+
+src_prepare() {
+	if use ldap ; then
+		epatch "${FILESDIR}"/${PN}-3.00.1-ldap.patch
+	else
+		epatch "${FILESDIR}"/${PN}-3.00.1-noldap.patch
+	fi
+}
+
+src_compile() {
+	eqmake4
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README
+	
+	# copying the icons
+	insinto /usr/share/pixmaps/x2goclient
+	doins icons/*
+	insinto /usr/share/pixmaps/x2goclient/16x16
+	doins icons/16x16/*
+	insinto /usr/share/pixmaps/x2goclient/32x32
+	doins icons/32x32/*
+	insinto /usr/share/pixmaps/x2goclient/64x64
+	doins icons/64x64/*
+	insinto /usr/share/pixmaps/x2goclient/128x128
+	doins icons/128x128/*
+	insinto /usr/share/pixmaps/x2goclient/hildon
+	doins icons/hildon/*
+
+	make_desktop_entry /usr/bin/${PN} ${PN} x2goclient/128x128/${PN}.png "Network"
+}
+
+pkg_postinst(){
+	if use ldap; then
+		elog "You can now specify an binddn and a"
+		elog "password which is used to login at the ldap server."
+		elog "But the password is stored in plaintext at the config file"
+		elog "at your homedirectory!!"
+		elog ""
+	fi
+}
diff --git a/net-misc/x2goprint/Manifest b/net-misc/x2goprint/Manifest
new file mode 100644
index 0000000..d8c8cda
--- /dev/null
+++ b/net-misc/x2goprint/Manifest
@@ -0,0 +1,2 @@
+DIST x2goprint_3.0.0-1_all.deb 3412 RMD160 38db22a62297c9b25e59553ed906e3edb93c7228 SHA1 6d84258de093ad6c7a09b8eebf5d3d46fdd48fb6 SHA256 51131cb01b0779fbe3f82c3d5ff1d49e86c42ca98a53c3728f9c7731471f02e0
+EBUILD x2goprint-3.0.0.1.ebuild 665 RMD160 3cc1b90e3418c7cc7138bc22dc08d9e13a63d229 SHA1 e83f0f8ff3ecc3169908d6aa716a54050ac5fef1 SHA256 91feeb9fe4ba585cec1983a0c6cedca13b864190e7f95796f1a5bbb63c6f18b9
diff --git a/net-misc/x2goprint/x2goprint-3.0.0.1.ebuild b/net-misc/x2goprint/x2goprint-3.0.0.1.ebuild
new file mode 100644
index 0000000..db9c21d
--- /dev/null
+++ b/net-misc/x2goprint/x2goprint-3.0.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="1"
+inherit versionator eutils
+
+MAJOR_PV="$(get_version_component_range 1-3)"
+FULL_PV="${MAJOR_PV}-$(get_version_component_range 4)"
+DESCRIPTION="The X2Go usb mount tool"
+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=""
+
+S=${WORKDIR}/${PN}-${MAJOR_PV}.orig
+
+src_unpack(){
+unpack ${A}
+        cd "${S}"
+
+        tar xozf data.tar.gz || die "failure unpacking data.tar.gz"
+}
+
+src_install(){
+    dobin usr/bin/*
+}
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index 135af39..975ddee 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -1,9 +1,9 @@
 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.tar.gz 21151 RMD160 d01bc4245dc8242f0afd9f4c9143931514adc1c8 SHA1 771aa9d81f6205cdd302ec9fb0a5d7134656000b SHA256 636cbe6bfa72de020255ccaca86ade3a8ffeb369fc5b51a589bb4d3c3279b61d
+DIST x2goserver_3.0.1-1_all.deb 15888 RMD160 f2ec0b2ba67bcc61973adf2152f8411198a63a2e SHA1 082acf589e6c844c2705a03328a68387b39d8900 SHA256 ac2aaf6f9a90f62f76281d782ab251cca4c53ff38a5e9d6b301f3897228efd5e
 EBUILD x2goserver-2.0.1.19.ebuild 1723 RMD160 b8bce1018b13defa02c67ecb66ce22a3cdcd9fee SHA1 26ce63cf85bd8dbfb3c02dd18534e86e8a75d58f SHA256 d10ddef4322cf7894abb98ec8b314e31c56b3ea03fb03bf3e842f1050d813e23
 EBUILD x2goserver-3.0.0.1.ebuild 1907 RMD160 c9af82dee9fcaafdd2cb4dfd9d2b0da8dbac500a SHA1 6ba6ba32c83f5dd91b690b23358a1fda420f29e2 SHA256 56d0f6abe3e26f3b1b1e8aeff94ade69109a348f893d4cf803a0db236b5d45a9
-EBUILD x2goserver-3.0.1.1.ebuild 3142 RMD160 bb5e291b6eed36b4b891480410c21c5d564e9626 SHA1 7519128bb37a0afadd1be2fbd17082676668999b SHA256 477780e9d3a71cf597766ce56c5b310db12e3989b6f589c707e90836eb2b082d
-MISC ChangeLog 940 RMD160 222ce9374438f397398e15a3779d395d84a0b5a8 SHA1 a76894cac93fb7ed9fc22609d8c71d014c0581ce SHA256 496ee609b90614440335bab159657ae9930dcdb009284dee629d253c3441e602
+EBUILD x2goserver-3.0.1.1.ebuild 1907 RMD160 c9af82dee9fcaafdd2cb4dfd9d2b0da8dbac500a SHA1 6ba6ba32c83f5dd91b690b23358a1fda420f29e2 SHA256 56d0f6abe3e26f3b1b1e8aeff94ade69109a348f893d4cf803a0db236b5d45a9
+MISC ChangeLog 684 RMD160 0863db42b5601dad9309026596c8351a309bd42b SHA1 ddaef3fa042f5c58e96ed27215b0455bffe2d44e SHA256 ec7c27a24e2a69ee4e492a62de3578f76ec7521286804c420cbc2aecceade238
 MISC metadata.xml 307 RMD160 0172cd4fc792a41fde528ec788ab0dd98f3d21bc SHA1 953412d99904e25f4845fdfda587298e7cbc7f2a SHA256 b19b0330b6614bc27421032b94f6ade24661e38c818140c598d50cb91e82bce6
diff --git a/net-misc/x2goserver/x2goserver-3.0.1.1.ebuild b/net-misc/x2goserver/x2goserver-3.0.1.1.ebuild
index c204483..777d4bd 100644
--- a/net-misc/x2goserver/x2goserver-3.0.1.1.ebuild
+++ b/net-misc/x2goserver/x2goserver-3.0.1.1.ebuild
@@ -1,97 +1,68 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI=1
 inherit versionator
 
-MY_P="${PN}_$(replace_version_separator 3 -)"
+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}/${MY_P}.tar.gz"
+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 postgres +sqlite"
+IUSE="+fuse kde ldap"
 
 DEPEND=""
 RDEPEND="app-admin/sudo
 	net-misc/nx
+	virtual/postgresql-server
 	virtual/ssh
 	fuse? ( sys-fs/sshfs-fuse )
-	postgres? ( virtual/postgresql-server )
-	sqlite? ( !postgres? ( >=dev-db/sqlite-3 ) )"
+	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}/${PN}-$(get_version_component_range 1-3)"
+S=${WORKDIR}
 
-pkg_setup() {
-	if use postgres && use sqlite ; then
-		ewarn "You have selected both PostgreSQL and SQLite. This installation of x2goserver"
-		ewarn "will default to PostgreSQL. Add USE=-postgres if you prefer SQLite."
-	fi
-	if use !postgres && use !sqlite ; then
-		ewarn "You have selected neither PostgreSQL or SQLite as a database. You will need"
-		ewarn "to use a remote PostgreSQL database."
-	fi
-}
-
-src_prepare() {
-	# Needs testing, is it fully compatible with nxagent?
-	sed -i -e 's/x2goagent/nxagent/' x2gostartagent || die "sed failed"
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
 
-	sed -i -e 's/sqlite/sqlite3/' x2gosqlite.sh || die "sed failed"
+	tar xozf data.tar.gz || die "failure unpacking data.tar.gz"
 
-	cp "${FILESDIR}"/${PN}.init .
-	if use !postgres ; then
-		sed -i -e '/need postgresql/d' ${PN}.init || die "sed failed"
-	fi
+	# Needs testing, is it fully compatible with nxagent?
+	sed -i -e "s/x2goagent/nxagent/" usr/bin/x2gostartagent || die "sed failed"
 }
 
 src_install() {
-	exeinto /usr/share/x2go/script
-	doexe x2go*.sh
-	rm x2go*.sh
+	dobin usr/bin/*
+	dosbin usr/sbin/*
 
-	dosbin x2gocleansessions
-	rm x2gocleansessions
-
-	dobin x2go*
-
-	mkdir -p "${D}/etc/x2go"
-	if use postgres ; then
-		echo -n local > "${D}/etc/x2go/sql"
-	elif use sqlite ; then
-		echo -n sqlite > "${D}/etc/x2go/sql"
-	else echo -n "Replace this with your remote PostgreSQL server's address" > "${D}/etc/x2go/sql"
-	fi
-
-	newinitd ${PN}.init ${PN}
+	exeinto /usr/share/x2go/script
+	doexe usr/lib/x2go/script/x2gocreatebase.sh
 
-	dodoc INSTALL debian/changelog
+	insinto /etc/x2go
+	doins etc/x2go/sql
 
-	keepdir /var/db/x2go
+	newinitd "${FILESDIR}"/${PN}.init ${PN}
 }
 
 pkg_postinst() {
-	if use postgres ; then
-		elog "You have selected a PostgreSQL database. If you are installing x2goserver for"
-		elog "the first time you need to create the database with the following script:"
-		elog "/usr/share/x2go/script/x2gocreatebase.sh"
-		elog "If you are changing to PostreSQL from SQLite you need to remove the old"
-		elog "database at /var/db/x2go/x2go_sessions and run the above script."
-	elif use sqlite ; then
-		elog "You have selected an SQLite database. If you are installing x2goserver for"
-		elog "the first time you need to create the database with the following script:"
-		elog "/usr/share/x2go/script/x2gosqlite.sh"
-		elog "If you are changing to SQLite from PostreSQL you need to remove the old"
-		elog "database at /var/db/x2go/x2go_sessions and run the above script."
-	else
-		elog "You have selected a remote database. You will need to specify the address of"
-		elog "your remote PostgreSQL server in /etc/x2go/sql."
-	fi
+	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 will need to give sudo rights on x2gopgwrapper to your users"
+	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, "
diff --git a/net-misc/x2gousbmount/Manifest b/net-misc/x2gousbmount/Manifest
new file mode 100644
index 0000000..94c938a
--- /dev/null
+++ b/net-misc/x2gousbmount/Manifest
@@ -0,0 +1,2 @@
+DIST x2gousbmount_1.0.1-1_all.deb 3356 RMD160 b093996916632e4f63c2125808b1a609d02d78fd SHA1 677225c92d5f0ac628c041b3a2e1de368657e0f6 SHA256 70037263ac807ac768be09f7c0fe3bf77d555adbc0ae1ad7f6a8edaed865f7a9
+EBUILD x2gousbmount-1.0.1.1.ebuild 748 RMD160 51a992deaa589cbc91eb53ebd3cacb631d339094 SHA1 0f69ec68ae0ba6ad0e93498045e91a96af739ac7 SHA256 cf301c6ab61ead1096a22fa4a67fac6b080270615d42a84e5ea6044bdb3d15aa
diff --git a/net-misc/x2gousbmount/x2gousbmount-1.0.1.1.ebuild b/net-misc/x2gousbmount/x2gousbmount-1.0.1.1.ebuild
new file mode 100644
index 0000000..4bfea91
--- /dev/null
+++ b/net-misc/x2gousbmount/x2gousbmount-1.0.1.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="1"
+inherit versionator eutils
+
+MAJOR_PV="$(get_version_component_range 1-3)"
+FULL_PV="${MAJOR_PV}-$(get_version_component_range 4)"
+DESCRIPTION="The X2Go usb mount tool"
+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=""
+
+S=${WORKDIR}/${PN}-${MAJOR_PV}.orig
+
+src_unpack(){
+unpack ${A}
+        cd "${S}"
+
+        tar xozf data.tar.gz || die "failure unpacking data.tar.gz"
+}
+
+src_install(){
+    dosbin usr/sbin/*
+    
+    insinto /etc/udev/rules.d/
+    doins etc/udev/rules.d/z60_x2gousb.rules
+}