Remove dep on vnc and remove old version

Package-Manager: portage-2.1.6.13/cvs/Linux ia64

4 files changed, 11 insertions, 68 deletions

diff --git a/net-misc/xrdp/ChangeLog b/net-misc/xrdp/ChangeLog
index 1c18d7c22903..b9dea96a4396 100644
--- a/net-misc/xrdp/ChangeLog
+++ b/net-misc/xrdp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/xrdp
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/ChangeLog,v 1.5 2009/12/21 14:09:33 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/ChangeLog,v 1.6 2010/01/25 17:33:35 armin76 Exp $
+
+  25 Jan 2010; Raúl Porcel <armin76@gentoo.org> -xrdp-0.3.1.ebuild,
+  xrdp-0.4.1.ebuild:
+  Remove dep on vnc and remove old version
 
   21 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> xrdp-0.4.1.ebuild,
   +files/xrdp-0.4.1-asneeded.patch:
diff --git a/net-misc/xrdp/Manifest b/net-misc/xrdp/Manifest
index 245fc62e03f4..60e592656c82 100644
--- a/net-misc/xrdp/Manifest
+++ b/net-misc/xrdp/Manifest
@@ -5,9 +5,7 @@ AUX xrdp-0.4.1-asneeded.patch 2391 RMD160 39c173efba5e1ff746bda0d3682f17e8a9b6a6
 AUX xrdp-0.4.1-curdir.patch 1871 RMD160 5621d4a59d0956e1435ae0ad9037a5d6f2885ff9 SHA1 0bc5273020d8d44e2dd962d0045790ad61d1c72a SHA256 1f8c2b573969493137649c8f40a0777f7af3017ddeeca93c1290a16cd5e72c48
 AUX xrdp-confd 140 RMD160 c04cd60eff7d3f5de1427ce87bc1f34b4befefe3 SHA1 e0c4a8b089f1e556c3fcd42c5c42327c24bc3634 SHA256 f25c9c409096f71ab2d66d8ee2de47702456367d7a25efeb8ec3b3a84ff7cf4f
 AUX xrdp-initd 979 RMD160 1040d4145236de910892d479b564e6157d584c13 SHA1 b147ccd38c6d9cfd1b26d4c6f8851836678dadb2 SHA256 a5e36c24c93ab813d0fe91d1edcb0199d159a09a0b76b3f11026991dd1201c41
-DIST xrdp-0.3.1.tar.gz 163622 RMD160 3b780bc84d4aa903c30fabc6a4e0026c3c4c6b71 SHA1 b5e4a52653e99f88da9c23f32ca1cbd7ca59fefe SHA256 e1d48bef8d26ff4383df4455ef1d0e3e284b45cb07421b44d374011c71e13f11
 DIST xrdp-0.4.1.tar.gz 238850 RMD160 67e3bbeeed13e491bf626efd80bf25c4b59f87f9 SHA1 bbe320c049c47c28d3250627ad72481215a8763e SHA256 275cb009cb837c5d59a0d1a2d062d137c8d8ed781cfc699d59ff5452891c18f0
-EBUILD xrdp-0.3.1.ebuild 1653 RMD160 9c589941bbbf98d86931397e756a57ec4b342ec8 SHA1 a31db6478cab4783e0eeeeb65e9d8a92e48633bb SHA256 a30b93c6b858361e4c06cf8ee172be733f6e81bf153926d9b8c6445ab28bdd35
-EBUILD xrdp-0.4.1.ebuild 1767 RMD160 c5688ac5f565598d5ceb685e2108dc85c669bc8b SHA1 16aa04ce8575b0682553c6e6d0cd845b827cf285 SHA256 7d40915eead813e62cc20758ba140ec358a57bbd49a109ad3cee01d46170e841
-MISC ChangeLog 1126 RMD160 b625bdf8452408fa74417b5c425a2389f5bf41ff SHA1 09047494b3ed16b65dc3a6ac5cc475640ce324da SHA256 b0d80289fe6eee015f70d9b4e4213b0f6dfda2430b3de8a8776dabc80d83f9f3
+EBUILD xrdp-0.4.1.ebuild 1738 RMD160 2b5225502e81120bfb21ddb9f8937d780c528603 SHA1 7db9aec2c462e490fe84e0bd5401ad0787504cc0 SHA256 a0b0aae6927c23609e350ba259bbac7b6077cfb7ffaf1d2742bf9fe4ead84b33
+MISC ChangeLog 1258 RMD160 09e62411249734e66f6278b4edf582040f76b590 SHA1 cdb280c1910c2f7bed996397c6cb20e2f2fe6b4b SHA256 40b44a6dfad2c1be81bf1be5591e0449145f99b5b8097376459b4c242b074506
 MISC metadata.xml 251 RMD160 9f6c5022895c245c7b1fdbaa24ae19cab04502c8 SHA1 4f7b27e3a8043f87fea8d4bc308e4b947f0e8675 SHA256 fd85d2faaf1d0c0eab6a4d2ab9eaa493e087a6108aafd0a5db6436bfc181783b
diff --git a/net-misc/xrdp/xrdp-0.3.1.ebuild b/net-misc/xrdp/xrdp-0.3.1.ebuild
deleted file mode 100644
index 781744af1f0b..000000000000
--- a/net-misc/xrdp/xrdp-0.3.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/xrdp-0.3.1.ebuild,v 1.4 2007/07/12 02:52:15 mr_bones_ Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="An open source remote desktop protocol(rdp) server."
-HOMEPAGE="http://xrdp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="net-misc/vnc"
-
-DESTDIR="/usr/$(get_libdir)/${PN}"
-
-pkg_setup() {
-	if ! built_with_use net-misc/vnc server; then
-		eerror
-		eerror "You must have your VNC implementation (currently net-misc/vnc) built"
-		eerror "with the \"server\" USE flag to use ${PN}."
-		eerror
-		die "Please rebuild net-misc/vnc with USE=server"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-respect-cflags.patch"
-	epatch "${FILESDIR}/${P}-curdir.patch"
-
-	sed -ie '/instfiles\/xrdp_control1.sh/ d' Makefile
-	sed -ie "s:/usr/xrdp:${DESTDIR}:g" Makefile */Makefile
-	# fix insecure rpath
-	sed -ie "s:rpath,.:rpath,${DESTDIR}:" xrdp/Makefile
-}
-
-src_compile() {
-	emake MYCFLAGS="${CFLAGS}" DESTDIR="${DESTDIR}" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIRDEB="${D}" installdeb || die "emake installdeb failed"
-	dodoc design.txt readme.txt "${D}${DESTDIR}/startwm.sh"
-	doman "${D}/usr/man/"*/*
-	keepdir /var/log/${PN}
-	rm -rf "${D}${DESTDIR}/startwm.sh" "${D}/usr/man"
-	exeinto "${DESTDIR}"
-	doexe "${FILESDIR}/startwm.sh"
-	newinitd "${FILESDIR}/${PN}-initd" ${PN}
-	newconfd ${FILESDIR}/${PN}-confd ${PN}
-	sed -i "s:LIBDIR:$(get_libdir):" "${D}/etc/init.d/${PN}"
-}
diff --git a/net-misc/xrdp/xrdp-0.4.1.ebuild b/net-misc/xrdp/xrdp-0.4.1.ebuild
index a9f3de5aa53c..b5dd15818731 100644
--- a/net-misc/xrdp/xrdp-0.4.1.ebuild
+++ b/net-misc/xrdp/xrdp-0.4.1.ebuild
@@ -1,6 +1,6 @@
-# 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/xrdp/xrdp-0.4.1.ebuild,v 1.2 2009/12/21 14:09:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/xrdp-0.4.1.ebuild,v 1.3 2010/01/25 17:33:35 armin76 Exp $
 
 EAPI="2"
 
@@ -17,7 +17,7 @@ IUSE=""
 
 DEPEND="sys-libs/pam"
 RDEPEND="${DEPEND}
-	|| ( net-misc/vnc[server] net-misc/tightvnc )"
+	 net-misc/tightvnc"
 
 DESTDIR="/usr/$(get_libdir)/${PN}"