Remove dep on vnc and remove old version

(Portage version: 2.1.6.13/cvs/Linux ia64)

3 files changed, 9 insertions, 64 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/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}"