Version bump, new homepage and source, clean ebuild, new versioning. Bug #408105

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

6 files changed, 75 insertions, 93 deletions

diff --git a/net-misc/x2goclient/ChangeLog b/net-misc/x2goclient/ChangeLog
index cd8634da3720..42df08e45b99 100644
--- a/net-misc/x2goclient/ChangeLog
+++ b/net-misc/x2goclient/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/x2goclient
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/ChangeLog,v 1.6 2011/08/19 09:55:55 voyageur Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/ChangeLog,v 1.7 2012/03/14 22:27:01 voyageur Exp $
+
+*x2goclient-3.0.1.18 (14 Mar 2012)
+
+  14 Mar 2012; Bernard Cafarelli <voyageur@gentoo.org>
+  +x2goclient-3.0.1.18.ebuild, -x2goclient-3.01.5.ebuild,
+  -files/x2goclient-3.01.5-noldap.patch:
+  Version bump, new homepage and source, clean ebuild, new versioning. Bug
+  #408105
 
   19 Aug 2011; Bernard Cafarelli <voyageur@gentoo.org>
   x2goclient-3.01.5.ebuild:
diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index a92b4443cd59..e74a09a58ae4 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -1,15 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX x2goclient-3.01.5-noldap.patch 829 RMD160 3cd3e19685ed3d4336c064f629adee9dfb858f68 SHA1 c6a0628ca1550be88e1fa6fe3993118df646d55f SHA256 a9e7e17768d07f26554e810615f1f98e416212f81e90daa638b9c721a46b6d81
-DIST x2goclient_3.01-5.tar.gz 10274153 RMD160 d0cd000d6d235e29dbd17da292b6784ada000f64 SHA1 916a02a78febbfd6fe3d74e101e1eb46597e7bde SHA256 ce671a628b17614bdcf443bd5ff22f644ceca1dad634c8823fcad8438a3751e3
-EBUILD x2goclient-3.01.5.ebuild 1347 RMD160 b230efca0c5e4604308f4d436c170c1a99d73f80 SHA1 59e34e5743f41896410531211fed9ca36711157c SHA256 176e81052ecb652ce5bbca0b56c9235f7898f62a8e49bfceeb724dc996c7e499
-MISC ChangeLog 1401 RMD160 652c5a0ea56c1854792c6d1c0f6394e600e8d939 SHA1 0656b492b13e3bdf1cd7c3be67342a901661b8d0 SHA256 5aa92c30bad0d8c89182ae9a39dadb3f99499c7e0a28d486a2646d34478d3949
+DIST x2goclient_3.0.1.18.tar.gz 1070652 RMD160 248d444d7ab77d067c0dee670d6721b9aeb6abd6 SHA1 367eeb26783063232e3b730211c847f108a22aca SHA256 92f5f9de071b47c381ddbfcbe90e0ed9fc615c128ab7c1b80a67f167a97826f3
+EBUILD x2goclient-3.0.1.18.ebuild 1087 RMD160 e9d4feef3042dd6d6327a4f9a0f34dd78a29b080 SHA1 48f3992a52675af8549ef5da1d9180b91f2fa2c0 SHA256 03f1e7b628953a98a7b2a4ba4457bf6834bce20a3271065cfd6f46e262135cc3
+MISC ChangeLog 1677 RMD160 2065341d2344e793046da9b246904d8fc4b41717 SHA1 8474f99d38b703b0a2f5afd2b63db45c3fdf58c0 SHA256 c30c06a94d32f6df2a665e4140c7e243c62bb977b5e2cbcc8cc6b7fe0061b65d
 MISC metadata.xml 211 RMD160 7569a339443bfffd41ebdb1db3683d6bbcd2fe5b SHA1 84050eff2270b3218cf8eb00363fe12ecdadfe2e SHA256 a6b5a5387c7e7f441d794c61edf1718caa3c58ffbf9b595ec536ff9617a7471f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk5OMzcACgkQFYEBGcdFJfL03AD/d9IJ3SUBfSxH7uYYIksbr7cs
-htZnXDtABdGYqt2/PkoA/3eTU6rr7Fv+yd7vrtiabPeaB58fQ8m9svlkQfEufyaD
-=u28d
+iF4EAREIAAYFAk9hG0MACgkQFYEBGcdFJfI+nwD+MZFqQ5p+6BoLBvLcUPRWz9+4
+XPl3mehWTTLLnvsEQOoA/R3ibCzFw/Li6G9SuW39mEZVlUXWSt50IXVdzeLbdCDf
+=67Uz
 -----END PGP SIGNATURE-----
diff --git a/net-misc/x2goclient/files/x2goclient-3.01.5-noldap.patch b/net-misc/x2goclient/files/x2goclient-3.01.5-noldap.patch
deleted file mode 100644
index ccb27e6ae728..000000000000
--- a/net-misc/x2goclient/files/x2goclient-3.01.5-noldap.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur x2goclient-3.01.orig/x2goclientconfig.h x2goclient-3.01/x2goclientconfig.h
---- x2goclient-3.01.orig/x2goclientconfig.h	2010-04-19 20:19:56.000000000 +0200
-+++ x2goclient-3.01/x2goclientconfig.h	2010-04-19 20:21:05.000000000 +0200
-@@ -8,10 +8,6 @@
- 
- //#define LOGFILE QDir::homePath()+"/x2goclient.log"
- 
--#if !defined Q_OS_WIN
--#define USELDAP
--#endif
--
- #ifdef Q_OS_WIN
- #undef USELDAP
- #endif
-diff -Naur x2goclient-3.01.orig/x2goclient.pro x2goclient-3.01/x2goclient.pro
---- x2goclient-3.01.orig/x2goclient.pro	2010-04-19 20:19:57.000000000 +0200
-+++ x2goclient-3.01/x2goclient.pro	2010-04-19 20:21:30.000000000 +0200
-@@ -70,7 +70,7 @@
- 
- linux-g++ {
-     message(building x2goclient with ldap and cups)
--    LIBS += -lldap -lcups
-+    LIBS += -lcups
- }
- macx {
-     message(building x2goclient with ldap and cups)
diff --git a/net-misc/x2goclient/x2goclient-3.0.1.18.ebuild b/net-misc/x2goclient/x2goclient-3.0.1.18.ebuild
new file mode 100644
index 000000000000..9a22de2b16e5
--- /dev/null
+++ b/net-misc/x2goclient/x2goclient-3.0.1.18.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/x2goclient-3.0.1.18.ebuild,v 1.1 2012/03/14 22:27:01 voyageur Exp $
+
+EAPI=4
+inherit qt4-r2
+
+DESCRIPTION="The X2Go Qt client"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P/-/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap"
+
+DEPEND="net-libs/libssh
+	net-print/cups
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	x11-libs/qt-svg:4
+	ldap? ( net-nds/openldap )"
+RDEPEND="${DEPEND}
+	net-misc/nx"
+
+S=${WORKDIR}/${P/-/_}
+
+src_prepare() {
+	# qmake looks for these files in the main directory
+	mv x2goclient/* . && rmdir x2goclient || die
+	sed -e "s#cups/cups.h#cups/ppd.h#" -i cupsprint.h || die
+	if ! use ldap; then
+		sed -e "s/-lldap//" -i x2goclient.pro || die
+		sed -e "s/#define USELDAP//" -i x2goclientconfig.h || die
+	fi
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/pixmaps/x2goclient
+	doins -r icons/*
+
+	make_desktop_entry ${PN} "X2go client" ${PN} "Network"
+}
diff --git a/net-misc/x2goclient/x2goclient-3.01.5.ebuild b/net-misc/x2goclient/x2goclient-3.01.5.ebuild
deleted file mode 100644
index 277c88d985c1..000000000000
--- a/net-misc/x2goclient/x2goclient-3.01.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/x2goclient-3.01.5.ebuild,v 1.2 2011/08/19 09:55:55 voyageur Exp $
-
-EAPI="3"
-inherit qt4-r2 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="cups ldap"
-
-DEPEND="net-misc/nx
-	net-print/cups
-	x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	x11-libs/qt-svg:4
-	ldap? ( net-nds/openldap )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}-${MAJOR_PV}
-
-src_prepare() {
-	use ldap ||	epatch "${FILESDIR}"/${P}-noldap.patch
-}
-
-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 ${PN} "X2go client" ${PN} "Network"
-}
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index 8f53488933e7..23694a5743be 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -1,7 +1,15 @@
-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 1337 RMD160 31034cb28bf0c9eb6a41c5bb70643d49ed299534 SHA1 448ee26f161a5e558a294e16cd2fb307ca3b6f2c SHA256 97525c5f50913e87947de0bee84479f6032bfb00d242fee19888499ca63a1b78
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX x2goserver.init 557 RMD160 10ef29543a560b43e4a0a6ad5f1e5992c81ec392 SHA1 8d9de94a46e36a96d47afe55d77b939fca90a00f SHA256 121f02b72abe528046adb60870ed1643f1de121ec09961679466ecde757ca723
+DIST x2goserver_3.1.0.1.tar.gz 57696 RMD160 17e5dee97ec114125807bfc97f6c6aebdc8e0028 SHA1 b1ea4a0be88531f390f37d4e1c3f4e452f73f881 SHA256 5a8c5576be25ffcf147171c009962ceef3d23fe5c43b7d1f2b08d5953b8b677d
+EBUILD x2goserver-3.1.0.1.ebuild 1548 RMD160 ce575e0dfb72c9c76bc670ab43594f104d45eb31 SHA1 465850eecf5c5e16c65f96b94753168e1135d7ef SHA256 9e6974bac393eb66ae87b5713e4a118d588dba4a31a4b03787bf9aa710fb8774
+MISC ChangeLog 1680 RMD160 86a5833f9e3fe84092dc10f1402031f4501fe0e7 SHA1 ab28f533f728e7db48de6479cd971f0ea365fccc SHA256 de0b62dc524318344e6b14d2343810530a68d7b14f4163d0b2bb83a77169c04e
 MISC metadata.xml 307 RMD160 0172cd4fc792a41fde528ec788ab0dd98f3d21bc SHA1 953412d99904e25f4845fdfda587298e7cbc7f2a SHA256 b19b0330b6614bc27421032b94f6ade24661e38c818140c598d50cb91e82bce6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk9hHCMACgkQFYEBGcdFJfK40gD/UG6Ru2R2C1nZU1PFLiEotb23
+cwQ29mJjBH1l6koDA7oA/RsHFHLeL4sMn4D0aLZmdVc9jHJZcQseW+yzSz9lzbTK
+=SN8r
+-----END PGP SIGNATURE-----