From 672c6e01e91848283cc6d1fb0a1c525af325ebe3 Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Tue, 26 Jan 2010 12:25:50 +0000 Subject: x2goserver version bump with sqlite support, thanks to Heiko Baumann svn path=/testing/; revision=241 --- metadata/cache/net-misc/eagleeye-0.0.1_p76 | 2 +- metadata/cache/net-misc/tacix-0.1.0 | 4 +- metadata/cache/net-misc/x2goclient-3.01.3 | 22 ++++++++ .../cache/net-misc/x2gogroupadministration-2.0.1.3 | 10 ++-- .../cache/net-misc/x2gogroupadministration-2.0.1.4 | 10 ++-- .../cache/net-misc/x2gohostadministration-2.0.1.4 | 10 ++-- metadata/cache/net-misc/x2goprint-3.0.0.1 | 22 ++++++++ metadata/cache/net-misc/x2goserver-3.0.1.1 | 22 ++++++++ .../net-misc/x2gosessionadministration-2.0.1.10 | 10 ++-- .../net-misc/x2gosystemadministration-2.0.1.4 | 10 ++-- .../net-misc/x2gosystemadministration-2.0.1.5 | 10 ++-- metadata/cache/net-misc/x2gousbmount-1.0.1.1 | 22 ++++++++ .../cache/net-misc/x2gouseradministration-2.0.1.7 | 10 ++-- .../cache/net-misc/x2gouseradministration-2.0.1.8 | 10 ++-- net-misc/x2goserver/Manifest | 5 +- .../files/x2gomountdirs_no_desktop_icon.patch | 65 ++++++++++++++++++++++ net-misc/x2goserver/x2goserver-3.0.1.1.ebuild | 41 ++++++++++---- 17 files changed, 230 insertions(+), 55 deletions(-) create mode 100644 metadata/cache/net-misc/x2goclient-3.01.3 create mode 100644 metadata/cache/net-misc/x2goprint-3.0.0.1 create mode 100644 metadata/cache/net-misc/x2goserver-3.0.1.1 create mode 100644 metadata/cache/net-misc/x2gousbmount-1.0.1.1 create mode 100644 net-misc/x2goserver/files/x2gomountdirs_no_desktop_icon.patch diff --git a/metadata/cache/net-misc/eagleeye-0.0.1_p76 b/metadata/cache/net-misc/eagleeye-0.0.1_p76 index d235c4b..3b194d0 100644 --- a/metadata/cache/net-misc/eagleeye-0.0.1_p76 +++ b/metadata/cache/net-misc/eagleeye-0.0.1_p76 @@ -1,5 +1,5 @@ +dev-python/pygtk >=app-admin/eselect-python-20090804 virtual/python dev-python/pygtk virtual/python -dev-python/pygtk 0 https://launchpad.net/~marceloshima/+archive/tacix/+files/eagleeye_0.0.1+ubuntubzr76~jaunty-1.tar.gz diff --git a/metadata/cache/net-misc/tacix-0.1.0 b/metadata/cache/net-misc/tacix-0.1.0 index 7babf4b..47ae778 100644 --- a/metadata/cache/net-misc/tacix-0.1.0 +++ b/metadata/cache/net-misc/tacix-0.1.0 @@ -1,5 +1,5 @@ -virtual/python -net-misc/nx sys-apps/dbus sys-auth/consolekit +>=app-admin/eselect-python-20090804 virtual/python +net-misc/nx sys-apps/dbus sys-auth/consolekit virtual/python 0 http://launchpad.net/tacix/0.1/0.1.0/+download/tacix-0.1.0.tar.gz diff --git a/metadata/cache/net-misc/x2goclient-3.01.3 b/metadata/cache/net-misc/x2goclient-3.01.3 new file mode 100644 index 0000000..0b68905 --- /dev/null +++ b/metadata/cache/net-misc/x2goclient-3.01.3 @@ -0,0 +1,22 @@ +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 +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 +0 +http://x2go.obviously-nice.de/deb/pool-lenny/x2goclient/x2goclient_3.01-3.tar.gz + +http://x2go.berlios.de +GPL-2 +The X2Go Qt client +~amd64 ~x86 +base eutils multilib portability qt4 toolchain-funcs versionator +ldap + + + +2 + +compile configure install postinst prepare setup unpack + + + + + diff --git a/metadata/cache/net-misc/x2gogroupadministration-2.0.1.3 b/metadata/cache/net-misc/x2gogroupadministration-2.0.1.3 index a7e9861..e6aadc4 100644 --- a/metadata/cache/net-misc/x2gogroupadministration-2.0.1.3 +++ b/metadata/cache/net-misc/x2gogroupadministration-2.0.1.3 @@ -1,5 +1,5 @@ -=kde-base/kdelibs-3.5* =x11-libs/qt-3* =sys-devel/automake-1.9* >=sys-devel/autoconf-2.61 sys-devel/libtool sys-devel/make dev-util/pkgconfig dev-lang/perl x11-libs/libXt x11-proto/xf86vidmodeproto xinerama? ( x11-proto/xineramaproto ) arts? ( kde-base/arts ) -=kde-base/kdelibs-3.5* =x11-libs/qt-3* xinerama? ( x11-libs/libXinerama ) arts? ( kde-base/arts ) + + 0 http://x2go.obviously-nice.de/deb/pool/x2gogroupadministration/x2gogroupadministration_2.0.1.orig.tar.gz http://x2go.obviously-nice.de/deb/pool/x2gogroupadministration/x2gogroupadministration_2.0.1-3.diff.gz @@ -7,14 +7,14 @@ http://x2go.berlios.de GPL-2 The X2Go KControl group administration module ~amd64 ~x86 -autotools base eutils flag-o-matic kde kde-functions libtool multilib portability qt3 toolchain-funcs versionator -debug elibc_FreeBSD arts xinerama +kde versionator + -compile install postinst postrm preinst setup unpack +unpack diff --git a/metadata/cache/net-misc/x2gogroupadministration-2.0.1.4 b/metadata/cache/net-misc/x2gogroupadministration-2.0.1.4 index f542058..ce73d48 100644 --- a/metadata/cache/net-misc/x2gogroupadministration-2.0.1.4 +++ b/metadata/cache/net-misc/x2gogroupadministration-2.0.1.4 @@ -1,5 +1,5 @@ -=kde-base/kdelibs-3.5* =x11-libs/qt-3* =sys-devel/automake-1.9* >=sys-devel/autoconf-2.61 sys-devel/libtool sys-devel/make dev-util/pkgconfig dev-lang/perl x11-libs/libXt x11-proto/xf86vidmodeproto xinerama? ( x11-proto/xineramaproto ) arts? ( kde-base/arts ) -=kde-base/kdelibs-3.5* =x11-libs/qt-3* xinerama? ( x11-libs/libXinerama ) arts? ( kde-base/arts ) + + 0 http://x2go.obviously-nice.de/deb/pool-lenny/x2gogroupadministration/x2gogroupadministration_2.0.1-4.tar.gz @@ -7,14 +7,14 @@ http://x2go.berlios.de GPL-2 The X2Go KControl group administration module ~amd64 ~x86 -autotools base eutils flag-o-matic kde kde-functions libtool multilib portability qt3 toolchain-funcs versionator -debug elibc_FreeBSD arts xinerama +kde versionator + -compile install postinst postrm preinst setup unpack +postinst unpack diff --git a/metadata/cache/net-misc/x2gohostadministration-2.0.1.4 b/metadata/cache/net-misc/x2gohostadministration-2.0.1.4 index 790dc62..be450aa 100644 --- a/metadata/cache/net-misc/x2gohostadministration-2.0.1.4 +++ b/metadata/cache/net-misc/x2gohostadministration-2.0.1.4 @@ -1,5 +1,5 @@ -=kde-base/kdelibs-3.5* =x11-libs/qt-3* =sys-devel/automake-1.9* >=sys-devel/autoconf-2.61 sys-devel/libtool sys-devel/make dev-util/pkgconfig dev-lang/perl x11-libs/libXt x11-proto/xf86vidmodeproto xinerama? ( x11-proto/xineramaproto ) arts? ( kde-base/arts ) -=kde-base/kdelibs-3.5* =x11-libs/qt-3* xinerama? ( x11-libs/libXinerama ) arts? ( kde-base/arts ) + + 0 http://x2go.obviously-nice.de/deb/pool-lenny/x2gohostadministration/x2gohostadministration_2.0.1-4.tar.gz @@ -7,14 +7,14 @@ http://x2go.berlios.de GPL-2 The X2Go KControl group administration module ~amd64 ~x86 -autotools base eutils flag-o-matic kde kde-functions libtool multilib portability qt3 toolchain-funcs versionator -debug elibc_FreeBSD arts xinerama +kde versionator + -compile install postinst postrm preinst setup unpack +postinst unpack diff --git a/metadata/cache/net-misc/x2goprint-3.0.0.1 b/metadata/cache/net-misc/x2goprint-3.0.0.1 new file mode 100644 index 0000000..181c585 --- /dev/null +++ b/metadata/cache/net-misc/x2goprint-3.0.0.1 @@ -0,0 +1,22 @@ + + +0 +http://x2go.obviously-nice.de/deb/pool-lenny/x2goprint/x2goprint_3.0.0-1_all.deb + +http://x2go.berlios.de +GPL-2 +The X2Go usb mount tool +~amd64 ~x86 +eutils multilib portability toolchain-funcs versionator + + + + +1 + +install unpack + + + + + diff --git a/metadata/cache/net-misc/x2goserver-3.0.1.1 b/metadata/cache/net-misc/x2goserver-3.0.1.1 new file mode 100644 index 0000000..a8157f4 --- /dev/null +++ b/metadata/cache/net-misc/x2goserver-3.0.1.1 @@ -0,0 +1,22 @@ + +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 ) ) +0 +http://x2go.obviously-nice.de/deb/pool-lenny/x2goserver/x2goserver_3.0.1-1_all.deb + +http://x2go.berlios.de +GPL-2 +The X2Go server +~amd64 ~x86 +versionator ++fuse kde ldap postgresql sqlite + + + +1 + +install postinst unpack + + + + + diff --git a/metadata/cache/net-misc/x2gosessionadministration-2.0.1.10 b/metadata/cache/net-misc/x2gosessionadministration-2.0.1.10 index 7508b01..8729f27 100644 --- a/metadata/cache/net-misc/x2gosessionadministration-2.0.1.10 +++ b/metadata/cache/net-misc/x2gosessionadministration-2.0.1.10 @@ -1,5 +1,5 @@ -net-nds/openldap arts? ( kde-base/arts ) =kde-base/kdelibs-3.5* =x11-libs/qt-3* =sys-devel/automake-1.9* >=sys-devel/autoconf-2.61 sys-devel/libtool sys-devel/make dev-util/pkgconfig dev-lang/perl x11-libs/libXt x11-proto/xf86vidmodeproto xinerama? ( x11-proto/xineramaproto ) arts? ( kde-base/arts ) -net-nds/openldap arts? ( kde-base/arts ) =kde-base/kdelibs-3.5* =x11-libs/qt-3* xinerama? ( x11-libs/libXinerama ) arts? ( kde-base/arts ) +net-nds/openldap arts? ( kde-base/arts ) +net-nds/openldap arts? ( kde-base/arts ) 0 http://x2go.obviously-nice.de/deb/pool-lenny/x2gosessionadministration/x2gosessionadministration_2.0.1-10.tar.gz @@ -7,14 +7,14 @@ http://x2go.berlios.de GPL-2 The X2Go session administration (kcontrol module) ~amd64 ~x86 -autotools base eutils flag-o-matic kde kde-functions libtool multilib portability qt3 toolchain-funcs versionator -debug elibc_FreeBSD arts xinerama +kde versionator + 2 -compile configure install postinst postrm preinst prepare setup unpack +configure postinst prepare diff --git a/metadata/cache/net-misc/x2gosystemadministration-2.0.1.4 b/metadata/cache/net-misc/x2gosystemadministration-2.0.1.4 index 9ff0227..5064d03 100644 --- a/metadata/cache/net-misc/x2gosystemadministration-2.0.1.4 +++ b/metadata/cache/net-misc/x2gosystemadministration-2.0.1.4 @@ -1,5 +1,5 @@ -=kde-base/kdelibs-3.5* =x11-libs/qt-3* =sys-devel/automake-1.9* >=sys-devel/autoconf-2.61 sys-devel/libtool sys-devel/make dev-util/pkgconfig dev-lang/perl x11-libs/libXt x11-proto/xf86vidmodeproto xinerama? ( x11-proto/xineramaproto ) arts? ( kde-base/arts ) -=kde-base/kdelibs-3.5* =x11-libs/qt-3* xinerama? ( x11-libs/libXinerama ) arts? ( kde-base/arts ) + + 0 http://x2go.obviously-nice.de/deb/pool-lenny/x2gosystemadministration/x2gosystemadministration_2.0.1-4.tar.gz @@ -7,14 +7,14 @@ http://x2go.berlios.de GPL-2 The X2Go KControl system administration module ~amd64 ~x86 -autotools base eutils flag-o-matic kde kde-functions libtool multilib portability qt3 toolchain-funcs versionator -debug elibc_FreeBSD arts xinerama +kde versionator + -compile install postinst postrm preinst setup unpack +- diff --git a/metadata/cache/net-misc/x2gosystemadministration-2.0.1.5 b/metadata/cache/net-misc/x2gosystemadministration-2.0.1.5 index 7ba016c..cf4f99f 100644 --- a/metadata/cache/net-misc/x2gosystemadministration-2.0.1.5 +++ b/metadata/cache/net-misc/x2gosystemadministration-2.0.1.5 @@ -1,5 +1,5 @@ -=kde-base/kdelibs-3.5* =x11-libs/qt-3* =sys-devel/automake-1.9* >=sys-devel/autoconf-2.61 sys-devel/libtool sys-devel/make dev-util/pkgconfig dev-lang/perl x11-libs/libXt x11-proto/xf86vidmodeproto xinerama? ( x11-proto/xineramaproto ) arts? ( kde-base/arts ) -=kde-base/kdelibs-3.5* =x11-libs/qt-3* xinerama? ( x11-libs/libXinerama ) arts? ( kde-base/arts ) + + 0 http://x2go.obviously-nice.de/deb/pool-lenny/x2gosystemadministration/x2gosystemadministration_2.0.1-5.tar.gz @@ -7,14 +7,14 @@ http://x2go.berlios.de GPL-2 The X2Go KControl group administration module ~amd64 ~x86 -autotools base eutils flag-o-matic kde kde-functions libtool multilib portability qt3 toolchain-funcs versionator -debug elibc_FreeBSD arts xinerama +kde versionator + -compile install postinst postrm preinst setup unpack +postinst unpack diff --git a/metadata/cache/net-misc/x2gousbmount-1.0.1.1 b/metadata/cache/net-misc/x2gousbmount-1.0.1.1 new file mode 100644 index 0000000..86f8a49 --- /dev/null +++ b/metadata/cache/net-misc/x2gousbmount-1.0.1.1 @@ -0,0 +1,22 @@ + + +0 +http://x2go.obviously-nice.de/deb/pool-lenny/x2gousbmount/x2gousbmount_1.0.1-1_all.deb + +http://x2go.berlios.de +GPL-2 +The X2Go usb mount tool +~amd64 ~x86 +eutils multilib portability toolchain-funcs versionator + + + + +1 + +install unpack + + + + + diff --git a/metadata/cache/net-misc/x2gouseradministration-2.0.1.7 b/metadata/cache/net-misc/x2gouseradministration-2.0.1.7 index 07b2e9a..aeb0b03 100644 --- a/metadata/cache/net-misc/x2gouseradministration-2.0.1.7 +++ b/metadata/cache/net-misc/x2gouseradministration-2.0.1.7 @@ -1,5 +1,5 @@ -=kde-base/kdelibs-3.5* =x11-libs/qt-3* =sys-devel/automake-1.9* >=sys-devel/autoconf-2.61 sys-devel/libtool sys-devel/make dev-util/pkgconfig dev-lang/perl x11-libs/libXt x11-proto/xf86vidmodeproto xinerama? ( x11-proto/xineramaproto ) arts? ( kde-base/arts ) -=kde-base/kdelibs-3.5* =x11-libs/qt-3* xinerama? ( x11-libs/libXinerama ) arts? ( kde-base/arts ) + + 0 http://x2go.obviously-nice.de/deb/pool-lenny/x2gouseradministration/x2gouseradministration_2.0.1-7.tar.gz @@ -7,14 +7,14 @@ http://x2go.berlios.de GPL-2 The X2Go KControl user administration module ~amd64 ~x86 -autotools base eutils flag-o-matic kde kde-functions libtool multilib portability qt3 toolchain-funcs versionator -debug elibc_FreeBSD arts xinerama +kde versionator + -compile install postinst postrm preinst setup unpack +- diff --git a/metadata/cache/net-misc/x2gouseradministration-2.0.1.8 b/metadata/cache/net-misc/x2gouseradministration-2.0.1.8 index be656cb..cbbb5c4 100644 --- a/metadata/cache/net-misc/x2gouseradministration-2.0.1.8 +++ b/metadata/cache/net-misc/x2gouseradministration-2.0.1.8 @@ -1,5 +1,5 @@ -=kde-base/kdelibs-3.5* =x11-libs/qt-3* =sys-devel/automake-1.9* >=sys-devel/autoconf-2.61 sys-devel/libtool sys-devel/make dev-util/pkgconfig dev-lang/perl x11-libs/libXt x11-proto/xf86vidmodeproto xinerama? ( x11-proto/xineramaproto ) arts? ( kde-base/arts ) -=kde-base/kdelibs-3.5* =x11-libs/qt-3* xinerama? ( x11-libs/libXinerama ) arts? ( kde-base/arts ) + + 0 http://x2go.obviously-nice.de/deb/pool-lenny/x2gouseradministration/x2gouseradministration_2.0.1-8.tar.gz @@ -7,14 +7,14 @@ http://x2go.berlios.de GPL-2 The X2Go KControl group administration module ~amd64 ~x86 -autotools base eutils flag-o-matic kde kde-functions libtool multilib portability qt3 toolchain-funcs versionator -debug elibc_FreeBSD arts xinerama +kde versionator + -compile install postinst postrm preinst setup unpack +postinst unpack diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest index 975ddee..155c525 100644 --- a/net-misc/x2goserver/Manifest +++ b/net-misc/x2goserver/Manifest @@ -1,9 +1,10 @@ +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 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 1907 RMD160 c9af82dee9fcaafdd2cb4dfd9d2b0da8dbac500a SHA1 6ba6ba32c83f5dd91b690b23358a1fda420f29e2 SHA256 56d0f6abe3e26f3b1b1e8aeff94ade69109a348f893d4cf803a0db236b5d45a9 -MISC ChangeLog 684 RMD160 0863db42b5601dad9309026596c8351a309bd42b SHA1 ddaef3fa042f5c58e96ed27215b0455bffe2d44e SHA256 ec7c27a24e2a69ee4e492a62de3578f76ec7521286804c420cbc2aecceade238 +EBUILD x2goserver-3.0.1.1.ebuild 2459 RMD160 feff1484fb45feb243ede856cdb36a5b1797f672 SHA1 fc568f4fa11ec4a4b943d81a6e8eb7d8dd2ec952 SHA256 a794dafedae53d4b64e0e73aa5b53e7cb3d6e9a9720e0402df02b9107cd09e93 +MISC ChangeLog 940 RMD160 222ce9374438f397398e15a3779d395d84a0b5a8 SHA1 a76894cac93fb7ed9fc22609d8c71d014c0581ce SHA256 496ee609b90614440335bab159657ae9930dcdb009284dee629d253c3441e602 MISC metadata.xml 307 RMD160 0172cd4fc792a41fde528ec788ab0dd98f3d21bc SHA1 953412d99904e25f4845fdfda587298e7cbc7f2a SHA256 b19b0330b6614bc27421032b94f6ade24661e38c818140c598d50cb91e82bce6 diff --git a/net-misc/x2goserver/files/x2gomountdirs_no_desktop_icon.patch b/net-misc/x2goserver/files/x2gomountdirs_no_desktop_icon.patch new file mode 100644 index 0000000..0fb7e0a --- /dev/null +++ b/net-misc/x2goserver/files/x2gomountdirs_no_desktop_icon.patch @@ -0,0 +1,65 @@ +--- usr/bin/x2gomountdirs.org 2010-01-18 22:18:16.000000000 +0100 ++++ usr/bin/x2gomountdirs 2010-01-18 22:16:33.000000000 +0100 +@@ -144,34 +144,34 @@ + if(system("sshfs -o Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident $user\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 2>>~/mounts.log")==0) + { + print "mount @dirs[$i] ok\n"; +- if(! $printspool) +- { +- my $fname="$ENV{'HOME'}/Desktop"; +- my $p=@dirs[$i]; +- $p=~s/\/cygdrive\///g; +- $p=~s/\//_/g; +- $fname="$fname/$p"; +- if($type eq "dir") +- { +- $fname="$fname(sshfs-disk)"; +- } +- else +- { +- if($fname =~ m/CDROM/) +- { +- $fname="$fname(sshfs-cdrom)"; +- } +- else +- { +- $fname="$fname(sshfs-removable)"; +- } +- $fname=~s/_ramdrive_mnt_//; +- } +- print "fname: $fname\n"; +- open(F,">$fname"); +- print F "$mntpath\n$session\n\n\0"; +- close(F); +- } ++# if(! $printspool) ++# { ++# my $fname="$ENV{'HOME'}/Desktop"; ++# my $p=@dirs[$i]; ++# $p=~s/\/cygdrive\///g; ++# $p=~s/\//_/g; ++# $fname="$fname/$p"; ++# if($type eq "dir") ++# { ++# $fname="$fname(sshfs-disk)"; ++# } ++# else ++# { ++# if($fname =~ m/CDROM/) ++# { ++# $fname="$fname(sshfs-cdrom)"; ++# } ++# else ++# { ++# $fname="$fname(sshfs-removable)"; ++# } ++# $fname=~s/_ramdrive_mnt_//; ++# } ++# print "fname: $fname\n"; ++# open(F,">$fname"); ++# print F "$mntpath\n$session\n\n\0"; ++# close(F); ++# } + } + else + { diff --git a/net-misc/x2goserver/x2goserver-3.0.1.1.ebuild b/net-misc/x2goserver/x2goserver-3.0.1.1.ebuild index 777d4bd..83c2290 100644 --- a/net-misc/x2goserver/x2goserver-3.0.1.1.ebuild +++ b/net-misc/x2goserver/x2goserver-3.0.1.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: $ @@ -14,14 +14,15 @@ SRC_URI="http://x2go.obviously-nice.de/deb/pool-lenny/${PN}/${PN}_${FULL_PV}_all LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="+fuse kde ldap" +IUSE="+fuse kde ldap postgresql sqlite" DEPEND="" RDEPEND="app-admin/sudo net-misc/nx - virtual/postgresql-server 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 @@ -40,6 +41,12 @@ src_unpack() { # 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() { @@ -48,21 +55,35 @@ src_install() { 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 - newinitd "${FILESDIR}"/${PN}.init ${PN} + 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() { - 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" + 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 also need to give sudo rights on x2gopgwrapper to your users" + 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, " -- cgit v1.2.3-65-gdbad