Repair ChangeLog, actually remove 2.x version

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/net-misc/x2goserver/ChangeLog b/net-misc/x2goserver/ChangeLog
index b8914fade3a5258e64e927461e42e367755b1da8..790c015e49cf0d9c15dc1466129fb0cb27da9442 100644 (file)
--- a/net-misc/x2goserver/ChangeLog
+++ b/net-misc/x2goserver/ChangeLog
@@ -1,6 +1,10 @@
 # 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.3 2010/04/29 12:48:01 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.4 2010/04/29 12:53:47 voyageur Exp $
+
+  29 Apr 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  -x2goserver-2.0.1.19.ebuild:
+  Repair ChangeLog, actually remove 2.x version
 
 *x2goserver-3.0.1.5 (29 Apr 2010)
 
@@ -9,3 +13,13 @@
   +x2goserver-3.0.1.5.ebuild:
   Version bump from NX overlay, drop 2.x version
 
+  05 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
+  x2goserver-2.0.1.19.ebuild:
+  Remove kde-base/kdelibs:3.5 support.
+
+*x2goserver-2.0.1.19 (13 Mar 2009)
+
+  13 Mar 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/x2goserver.init, +metadata.xml, +x2goserver-2.0.1.19.ebuild:
+  Initial portage commit, from the NX overlay
+

diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index 47aab6af20de7048f496fcb5679dc23325ae78d5..80f5cbc81295e004b6f695568961ecb510eed534 100644 (file)
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -1,8 +1,6 @@
 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_2.0.1-19_all.deb 14536 RMD160 9052af7fe76051d13dbda6b8ca4dd0192e88218a SHA1 5610b16b5529ea65bd19bfee7a7a9dfc8079b716 SHA256 513173c738dfa6a4e379ccb1a99eaff46803ad08a325073fbca8b76b6be76d56
 DIST x2goserver_3.0.1-5_all.deb 16806 RMD160 cdfd9cb079c7a4d4f943be6fd13e0d3ec2b04182 SHA1 735807f16e95b7897a766c484fd6f08888e08369 SHA256 408c4dc52af8b2c93c7afeab40ce0e4588e226f45cceee4f3013de93623022c9
-EBUILD x2goserver-2.0.1.19.ebuild 1607 RMD160 0295525d2fe4286cc48dc0c584315e8c28f0d6e1 SHA1 808571483701ee270b7ea1b3fb852152d51b8131 SHA256 133547f1117f048009ce856fbc96d5e0698212db60662b79b6fe84338747a97b
 EBUILD x2goserver-3.0.1.5.ebuild 2385 RMD160 26bc631c8de65013420c31aa1bbbc75f163363a5 SHA1 522c307f5a36e5d20b76a5a7c51561f7349cf769 SHA256 2b251e07877abac8f68f416b4aa33dea70c6e757b5d99016109b39e056f7d6e0
-MISC ChangeLog 436 RMD160 451fb6833e00dc775f2e265723aea87a6ff9f962 SHA1 af40430b76005708df19b0aab3959c11383e443d SHA256 858cf23907dc91cd682cd37e7a4fc6bc468381f2a91fa098191b390fb53a7682
+MISC ChangeLog 903 RMD160 cbfeda1873cb1090fbcdb299e0239cb52f3e53a5 SHA1 bd3e2eea2932c08640b9504ecce314190fb12466 SHA256 689e631f90f10c138349d268499828a3a0fdbc2205e43739b4c261515f6db7fe
 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 (file)
index be9dca4..0000000
--- a/net-misc/x2goserver/x2goserver-2.0.1.19.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-2.0.1.19.ebuild,v 1.2 2009/12/05 09:11:32 ssuominen Exp $
-
-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"
-
-DEPEND=""
-RDEPEND="app-admin/sudo
-       net-misc/nx
-       virtual/postgresql-server
-       virtual/ssh
-       fuse? ( sys-fs/sshfs-fuse )"
-# Still in the NX overlay for now
-#      ldap? ( net-misc/x2goldaptools )"
-
-S=${WORKDIR}
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       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"
-}
-
-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"
-}