From 46d96f4b76c993b531b5166bbf058c2a5401e8a1 Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Thu, 1 Jul 2010 13:22:10 +0000 Subject: [PATCH] Handle both sqlite/postgres USE flags disabled/enabled Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- net-misc/x2goserver/ChangeLog | 8 +- net-misc/x2goserver/Manifest | 3 +- .../x2goserver/x2goserver-3.0.1.5-r1.ebuild | 102 ++++++++++++++++++ 3 files changed, 111 insertions(+), 2 deletions(-) create mode 100644 net-misc/x2goserver/x2goserver-3.0.1.5-r1.ebuild diff --git a/net-misc/x2goserver/ChangeLog b/net-misc/x2goserver/ChangeLog index 3da1afa01bec..e1d0ca3d998f 100644 --- a/net-misc/x2goserver/ChangeLog +++ b/net-misc/x2goserver/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/x2goserver # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.6 2010/06/17 21:57:27 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.7 2010/07/01 13:22:10 voyageur Exp $ + +*x2goserver-3.0.1.5-r1 (01 Jul 2010) + + 01 Jul 2010; Bernard Cafarelli + +x2goserver-3.0.1.5-r1.ebuild: + Handle both sqlite/postgres USE flags disabled/enabled 17 Jun 2010; Patrick Lauer x2goserver-3.0.1.5.ebuild: Migrating away from deprecated postgres virtuals diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest index c6b1095fdf55..8f53488933e7 100644 --- a/net-misc/x2goserver/Manifest +++ b/net-misc/x2goserver/Manifest @@ -1,6 +1,7 @@ AUX x2goserver-mountdirs_no_desktop_icon.patch 1676 RMD160 6e5b9fd22a491ae6a482b82bfca51870ca1b8e2b SHA1 b81ef59db5e0844450b5fc7e232a61d053a906db SHA256 1ddd1f6a724bb5ff35e59a72d2d307a7880a3a87f777007635e4c5032e2b2957 AUX x2goserver.init 598 RMD160 840240b74432c7dd17d70d18a2a5956083de18d6 SHA1 528dffc8c36c6999e2276b99d1dedfe86694114d SHA256 5c6bf12ef00353ff330afaf050a8d2cb8338d1593b1b5f5ecc8ba15102887500 DIST x2goserver_3.0.1-5_all.deb 16806 RMD160 cdfd9cb079c7a4d4f943be6fd13e0d3ec2b04182 SHA1 735807f16e95b7897a766c484fd6f08888e08369 SHA256 408c4dc52af8b2c93c7afeab40ce0e4588e226f45cceee4f3013de93623022c9 +EBUILD x2goserver-3.0.1.5-r1.ebuild 2984 RMD160 238ad77bb775979e392d2e2825383a5bd08f0d91 SHA1 fd4aa8a978d0baadeb057ae31d9a467e83cb75f8 SHA256 6efa15dfe1594dc476cfd2589e1bb10f22704ae254d38586849820332c902422 EBUILD x2goserver-3.0.1.5.ebuild 2407 RMD160 8464ff1e09600483427b3672d915661265de8598 SHA1 0f443590eec9c83b4c5f6e4b7b8f6a3892e960fe SHA256 2218ff3e05ba077de27bbec57035cfd6fb2c20e8fe51a797604682bf7606ceea -MISC ChangeLog 1152 RMD160 d77fc48e2f52f3f395ebba172e02d5531da620da SHA1 99a9f78e7fa0bea533fe0ffd8c0b6e5c4693cd22 SHA256 a7456f75c9bbd47d7fa6a05352e3632a07332de66f64a1f0b8160150cc9feac2 +MISC ChangeLog 1337 RMD160 31034cb28bf0c9eb6a41c5bb70643d49ed299534 SHA1 448ee26f161a5e558a294e16cd2fb307ca3b6f2c SHA256 97525c5f50913e87947de0bee84479f6032bfb00d242fee19888499ca63a1b78 MISC metadata.xml 307 RMD160 0172cd4fc792a41fde528ec788ab0dd98f3d21bc SHA1 953412d99904e25f4845fdfda587298e7cbc7f2a SHA256 b19b0330b6614bc27421032b94f6ade24661e38c818140c598d50cb91e82bce6 diff --git a/net-misc/x2goserver/x2goserver-3.0.1.5-r1.ebuild b/net-misc/x2goserver/x2goserver-3.0.1.5-r1.ebuild new file mode 100644 index 000000000000..8cb978cb994f --- /dev/null +++ b/net-misc/x2goserver/x2goserver-3.0.1.5-r1.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-3.0.1.5-r1.ebuild,v 1.1 2010/07/01 13:22:10 voyageur Exp $ + +EAPI=3 +inherit eutils 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 postgres sqlite" + +DEPEND="" +RDEPEND="app-admin/sudo + dev-perl/Config-Simple + net-misc/nx + virtual/ssh + fuse? ( sys-fs/sshfs-fuse ) + postgres? ( dev-db/postgresql-server ) + sqlite? ( dev-db/sqlite )" +# Still in the NX overlay for now +# ldap? ( net-misc/x2goldaptools )" + +S=${WORKDIR} + +pkg_setup() { + if ! use postgres && ! use sqlite; then + echo + eerror "Either the 'postgres' or the 'sqlite' USE flag is required." + eerror "Please add it to '/etc/make.conf' or '/etc/portage/package.use'." + eerror "Use 'man 5 portage' for more info on '/etc/portage/package.use'." + echo + die "Required USE flag missing." + fi +} + +src_prepare() { + tar xozf data.tar.gz || die "failure unpacking data.tar.gz" + + # Use nxagent directly + sed -i -e "s/x2goagent/nxagent/" usr/bin/x2gostartagent || die "sed failed" + + if use sqlite ; then + echo sqlite > etc/x2go/sql + fi + + epatch "${FILESDIR}"/${PN}-mountdirs_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 + einfo "creating x2go sqlite database directory /var/db/x2go" + dodir /var/db/x2go + fi + + if use postgres ; then + newinitd "${FILESDIR}"/${PN}.init ${PN} + fi +} + +pkg_postinst() { + if use postgres && use sqlite; then + elog "You have enabled both postgreSQL and sqlite (enabled by default) database support" + elog "To use a postgreSQL database, run:" + elog " echo -n local > /etc/x2go/sql" + elog "To switch back to sqlite, run:" + elog " echo -n sqlite > /etc/x2go/sql" + fi + if use postgres ; then + elog "To work with postgreSQL, x2goserver needs a configured database" + 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 with sqlite, x2goserver needs a configured 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 "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" +} -- 2.26.2