* Added x2goserver-3.0.1.5

   * Removed KDE useflag and dependencies, because of unsupported KDE 3
   * Changed postgressql to use.desc compliant postgres useflag
 * Added x2goclient-3.0.1.5
 * Make the ebuilds repoman compliant (without the kde dependencies on old ebuilds)


svn path=/testing/; revision=243

10 files changed, 196 insertions, 12 deletions

diff --git a/net-misc/x2goclient/ChangeLog b/net-misc/x2goclient/ChangeLog
index 792c9a7..028953e 100644
--- a/net-misc/x2goclient/ChangeLog
+++ b/net-misc/x2goclient/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/ChangeLog,v 1.2 2009/04/16 14:00:21 voyageur Exp $
 
+
+*x2goclient-3.01.5 (15 Apr 2010)
+
+  15 Apr 2010; Joachim Langenbach <joachim@falaba.de> x2goclient-3.01.5.ebuild:
+  Added new Ebuild
+  ldap patch is not needed anymore, because it's in sources already
+
   16 Apr 2009; Bernard Cafarelli <voyageur@gentoo.org> Manifest:
   Upstream modified source tarball, bug #266141
 
diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index 48ce26d..1cc13fa 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -1,7 +1,10 @@
 AUX x2goclient-3.00.1-ldap.patch 5046 RMD160 90aa4e09c391fed6d7770ba73d2733c3cac3cdcf SHA1 0dc0e98d9d6d4af723799e6049d5afacedbacfbe SHA256 f381a333083d400d838515d6444322497c843039e852b96315bad7f56e8b02e7
 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
+DIST x2goclient_3.01-3.tar.gz 764833 RMD160 e997dd19c3894cf48dbd15e205b7aefa65813596 SHA1 03d979b0ac7c4f24e409bd69f33f855784fe83cf SHA256 e600a2f0d1cb8cc9a0df3155d0130f90338d7466ade20e80a4ac372381c6422f
+DIST x2goclient_3.01-5.tar.gz 10274153 RMD160 d0cd000d6d235e29dbd17da292b6784ada000f64 SHA1 916a02a78febbfd6fe3d74e101e1eb46597e7bde SHA256 ce671a628b17614bdcf443bd5ff22f644ceca1dad634c8823fcad8438a3751e3
+EBUILD x2goclient-3.00.1.ebuild 1784 RMD160 06b7b09bd81a2ea1dd8ef4e2c18a41242fb5f8fd SHA1 3f7ec6ef96ad4e55ffd7b72e35dde8b5f0dd6be3 SHA256 4883bd637ca925549eda9c120a0ae579b2365fe394db514fddb7d306d5453afb
+EBUILD x2goclient-3.01.3.ebuild 1784 RMD160 06b7b09bd81a2ea1dd8ef4e2c18a41242fb5f8fd SHA1 3f7ec6ef96ad4e55ffd7b72e35dde8b5f0dd6be3 SHA256 4883bd637ca925549eda9c120a0ae579b2365fe394db514fddb7d306d5453afb
+EBUILD x2goclient-3.01.5.ebuild 1866 RMD160 f51dc5c8f0ed767ff3eeea0e897fd75222150179 SHA1 5e2852b7b556f253986d60d8ff62466b50ae46fb SHA256 a47c03b1cf5c6d0bdaee21c91f865145eaafba64674ab42b96a7ea999c61b486
+MISC ChangeLog 814 RMD160 dd2cc5bcb6e84702e420d36f699570338d8b3709 SHA1 8ded7062bbd0982e3d0e4f1b435f8e46b03b0448 SHA256 0dbfac746a8630b6c8b880932d449b7d9324eb7e737cc9464cf0ddb641033db1
 MISC metadata.xml 211 RMD160 7569a339443bfffd41ebdb1db3683d6bbcd2fe5b SHA1 84050eff2270b3218cf8eb00363fe12ecdadfe2e SHA256 a6b5a5387c7e7f441d794c61edf1718caa3c58ffbf9b595ec536ff9617a7471f
diff --git a/net-misc/x2goclient/x2goclient-3.00.1.ebuild b/net-misc/x2goclient/x2goclient-3.00.1.ebuild
index 4f9878d..d03fce5 100644
--- a/net-misc/x2goclient/x2goclient-3.00.1.ebuild
+++ b/net-misc/x2goclient/x2goclient-3.00.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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 $
 
@@ -41,7 +41,7 @@ src_compile() {
 src_install() {
 	dobin ${PN}
 	dodoc README
-	
+
 	# copying the icons
 	insinto /usr/share/pixmaps/x2goclient
 	doins icons/*
diff --git a/net-misc/x2goclient/x2goclient-3.01.3.ebuild b/net-misc/x2goclient/x2goclient-3.01.3.ebuild
index 4f9878d..d03fce5 100644
--- a/net-misc/x2goclient/x2goclient-3.01.3.ebuild
+++ b/net-misc/x2goclient/x2goclient-3.01.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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 $
 
@@ -41,7 +41,7 @@ src_compile() {
 src_install() {
 	dobin ${PN}
 	dodoc README
-	
+
 	# copying the icons
 	insinto /usr/share/pixmaps/x2goclient
 	doins icons/*
diff --git a/net-misc/x2goclient/x2goclient-3.01.5.ebuild b/net-misc/x2goclient/x2goclient-3.01.5.ebuild
new file mode 100644
index 0000000..755377c
--- /dev/null
+++ b/net-misc/x2goclient/x2goclient-3.01.5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2010 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
+	if not use ldap ; then
+		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/x2goserver/ChangeLog b/net-misc/x2goserver/ChangeLog
index 88f3221..9f27bf8 100644
--- a/net-misc/x2goserver/ChangeLog
+++ b/net-misc/x2goserver/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*x2goserver-3.0.1.5 (15 Apr 2010)
+
+  15 Apr 2010 Joachim Langenbach <joachim@falaba.de>
+  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
+
 *x2goserver-3.0.1.1 (02 Sep 2009)
 
   02 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index 155c525..449326f 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -3,8 +3,10 @@ AUX x2goserver.init 493 RMD160 5633609c39c43c7d810712cecb89cf947329862d SHA1 a60
 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
-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
+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
-MISC ChangeLog 940 RMD160 222ce9374438f397398e15a3779d395d84a0b5a8 SHA1 a76894cac93fb7ed9fc22609d8c71d014c0581ce SHA256 496ee609b90614440335bab159657ae9930dcdb009284dee629d253c3441e602
+EBUILD x2goserver-3.0.1.5.ebuild 2540 RMD160 a2aa7d6f7c259ce2d364858b347d3d257a4c80e4 SHA1 c4e17a82e57cd025dc6175cd061433f79da1cae3 SHA256 42992abd2ce20e2150c35e500b1437f30be82dca5882ad8917b4d0a47c026fa5
+MISC ChangeLog 1213 RMD160 4226f649ada2f96a14ae6f1f2adbc0bd9c000413 SHA1 5d3ff83d8b26a467458a5ff591638331ef8c7b97 SHA256 4ce51391005fdf4c0343a5d75143b4003368f4ddefd9326dc6455debff3c4565
 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
index 9cd6286..10e86be 100644
--- a/net-misc/x2goserver/x2goserver-2.0.1.19.ebuild
+++ b/net-misc/x2goserver/x2goserver-2.0.1.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
diff --git a/net-misc/x2goserver/x2goserver-3.0.0.1.ebuild b/net-misc/x2goserver/x2goserver-3.0.0.1.ebuild
index 777d4bd..04fdaca 100644
--- a/net-misc/x2goserver/x2goserver-3.0.0.1.ebuild
+++ b/net-misc/x2goserver/x2goserver-3.0.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
diff --git a/net-misc/x2goserver/x2goserver-3.0.1.5.ebuild b/net-misc/x2goserver/x2goserver-3.0.1.5.ebuild
new file mode 100644
index 0000000..7599484
--- /dev/null
+++ b/net-misc/x2goserver/x2goserver-3.0.1.5.ebuild
@@ -0,0 +1,92 @@
+# 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 ldap postgres sqlite"
+
+DEPEND=""
+RDEPEND="app-admin/sudo
+	net-misc/nx
+	virtual/ssh
+	fuse? ( sys-fs/sshfs-fuse )
+	postgresql? ( virtual/postgresql-server )
+	sqlite? ( dev-db/sqlite )
+	ldap? ( net-misc/x2goldaptools )"
+
+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
+	doins etc/x2go/x2goserver.conf
+
+	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
+	elog ""
+	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"
+	elog ""
+	elog "To avoid tons of sudo and su messages, you may redirect the"
+	elog "logging output of su and sudo messages to a special file."
+	elog "Working filters for syslog-ng may be:"
+	elog "   filter f_su { program("su"); };"
+	elog "   filter f_sudo { program("sudo"); };"
+}