cleanup + version bump

9 files changed, 18 insertions, 73 deletions

diff --git a/x11-misc/x2vnc/ChangeLog b/x11-misc/x2vnc/ChangeLog
index 997e4d612f85..ff6ac4b19943 100644
--- a/x11-misc/x2vnc/ChangeLog
+++ b/x11-misc/x2vnc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/x2vnc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2vnc/ChangeLog,v 1.22 2004/06/24 22:36:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2vnc/ChangeLog,v 1.23 2004/08/28 19:29:47 phosphan Exp $
+
+*x2vnc-1.6.1 (28 Aug 2004)
+
+  28 Aug 2004; Patrick Kursawe <phosphan@gentoo.org> -x2vnc-1.3.1.ebuild,
+  -x2vnc-1.5.1-r1.ebuild, -x2vnc-1.5.1.ebuild, +x2vnc-1.6.1.ebuild:
+  Cleanup + version bump
 
   23 Jun 2004; Aron Griffis <agriffis@gentoo.org> x2vnc-1.5.1-r1.ebuild,
   x2vnc-1.6.ebuild:
diff --git a/x11-misc/x2vnc/Manifest b/x11-misc/x2vnc/Manifest
index c83200ccffed..56dba28479bc 100644
--- a/x11-misc/x2vnc/Manifest
+++ b/x11-misc/x2vnc/Manifest
@@ -1,10 +1,6 @@
-MD5 071a687279f308a6bcb2e89bcd87f1bf x2vnc-1.3.1.ebuild 591
-MD5 df306b76e518030fe9d75c700a14854b x2vnc-1.5.1-r1.ebuild 811
+MD5 2628f1847ba0e6f1fafe0efde8506015 x2vnc-1.6.1.ebuild 743
 MD5 e3a5553b5a4f1be1c6a5c5c6a5a8afaa x2vnc-1.6.ebuild 738
-MD5 e7e59b39034c15bd17865f4f81a391bb x2vnc-1.5.1.ebuild 564
-MD5 287f95f0fba37dfd0441a1cda31fb43e ChangeLog 2562
+MD5 7195a081b9375ee913267d09bb9a68b3 ChangeLog 2758
 MD5 73306e20ac1b1ef3b82127d6585e9431 metadata.xml 229
 MD5 5a1ff77a9affda4ac794c62d056da742 files/digest-x2vnc-1.6 60
-MD5 c2a74343b9025063716f8799fcd3b2b0 files/digest-x2vnc-1.5.1-r1 62
-MD5 eb06c797c1a1151b43fe899de595134a files/digest-x2vnc-1.3.1 61
-MD5 c2a74343b9025063716f8799fcd3b2b0 files/digest-x2vnc-1.5.1 62
+MD5 264f33db6a52266febcbbb6bd8b8fcdf files/digest-x2vnc-1.6.1 62
diff --git a/x11-misc/x2vnc/files/digest-x2vnc-1.3.1 b/x11-misc/x2vnc/files/digest-x2vnc-1.3.1
deleted file mode 100644
index eeb22f228786..000000000000
--- a/x11-misc/x2vnc/files/digest-x2vnc-1.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e71d7e9077b3cde64874949e50433bb0 x2vnc-1.31.tar.gz 53012
diff --git a/x11-misc/x2vnc/files/digest-x2vnc-1.5.1 b/x11-misc/x2vnc/files/digest-x2vnc-1.5.1
deleted file mode 100644
index d6f7ce72b973..000000000000
--- a/x11-misc/x2vnc/files/digest-x2vnc-1.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aaa3e3bc1dd11531f28968025b24ed3c x2vnc-1.5.1.tar.gz 60887
diff --git a/x11-misc/x2vnc/files/digest-x2vnc-1.5.1-r1 b/x11-misc/x2vnc/files/digest-x2vnc-1.5.1-r1
deleted file mode 100644
index d6f7ce72b973..000000000000
--- a/x11-misc/x2vnc/files/digest-x2vnc-1.5.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aaa3e3bc1dd11531f28968025b24ed3c x2vnc-1.5.1.tar.gz 60887
diff --git a/x11-misc/x2vnc/files/digest-x2vnc-1.6.1 b/x11-misc/x2vnc/files/digest-x2vnc-1.6.1
new file mode 100644
index 000000000000..c8216d0c799a
--- /dev/null
+++ b/x11-misc/x2vnc/files/digest-x2vnc-1.6.1
@@ -0,0 +1 @@
+MD5 659f42c26837dd4fafc27830ed2f423c x2vnc-1.6.1.tar.gz 62297
diff --git a/x11-misc/x2vnc/x2vnc-1.3.1.ebuild b/x11-misc/x2vnc/x2vnc-1.3.1.ebuild
deleted file mode 100644
index ac587257ade5..000000000000
--- a/x11-misc/x2vnc/x2vnc-1.3.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2vnc/x2vnc-1.3.1.ebuild,v 1.6 2004/07/15 00:56:41 agriffis Exp $
-
-DESCRIPTION="Control a remote computer running VNC from X"
-SRC_URI="http://www.hubbe.net/~hubbe/${PN}-1.31.tar.gz"
-HOMEPAGE="http://www.hubbe.net/~hubbe/x2vnc.html"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc "
-IUSE=""
-
-DEPEND="virtual/x11"
-
-S="${WORKDIR}/x2vnc-1.31"
-
-src_compile() {
-
-	xmkmf || die
-	make || die
-
-}
-
-src_install () {
-
-	make DESTDIR=${D} install || die
-
-}
diff --git a/x11-misc/x2vnc/x2vnc-1.5.1.ebuild b/x11-misc/x2vnc/x2vnc-1.5.1.ebuild
deleted file mode 100644
index 574489f6d01b..000000000000
--- a/x11-misc/x2vnc/x2vnc-1.5.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2vnc/x2vnc-1.5.1.ebuild,v 1.9 2004/07/15 00:56:41 agriffis Exp $
-
-DESCRIPTION="Control a remote computer running VNC from X"
-SRC_URI="http://www.hubbe.net/~hubbe/${P}.tar.gz"
-HOMEPAGE="http://www.hubbe.net/~hubbe/x2vnc.html"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 alpha ~sparc"
-
-DEPEND="virtual/x11"
-IUSE=""
-
-src_compile() {
-
-	xmkmf || die
-	make || die
-
-}
-
-src_install () {
-
-	make DESTDIR=${D} install || die
-
-}
diff --git a/x11-misc/x2vnc/x2vnc-1.5.1-r1.ebuild b/x11-misc/x2vnc/x2vnc-1.6.1.ebuild
index 54682b885c8f..1a163910c077 100644
--- a/x11-misc/x2vnc/x2vnc-1.5.1-r1.ebuild
+++ b/x11-misc/x2vnc/x2vnc-1.6.1.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2vnc/x2vnc-1.5.1-r1.ebuild,v 1.9 2004/07/15 00:56:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2vnc/x2vnc-1.6.1.ebuild,v 1.1 2004/08/28 19:29:47 phosphan Exp $
 
 DESCRIPTION="Control a remote computer running VNC from X"
-SRC_URI="http://www.hubbe.net/~hubbe/${P}.tar.gz"
-HOMEPAGE="http://www.hubbe.net/~hubbe/x2vnc.html"
+SRC_URI="http://fredrik.hubbe.net/${PN}/${P}.tar.gz"
+HOMEPAGE="http://fredrik.hubbe.net/x2vnc.html"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~alpha sparc"
+KEYWORDS="~x86 ~alpha ~sparc ~amd64"
 
 DEPEND="virtual/x11
-	tcltk? ( dev-tcltk/expect )
-	>=sys-apps/sed-4"
+	tcltk? ( dev-tcltk/expect )"
 
 IUSE="tcltk"
 
@@ -22,8 +21,8 @@ src_compile() {
 
 src_install () {
 
-	sed -i -e 's/$(\(...\)DIR)/$(DESTDIR)\/$(\1DIR)/
-			   s/\(^INSTALL.*\)/\1 -D/' Makefile
+	dodir /usr/share
+	dodir /usr/bin
 	make DESTDIR=${D} install || die
 
 	if use tcltk