Clean up ebuild #146666 and move back to ~amd64 #145756.

Package-Manager: portage-2.1.1

4 files changed, 96 insertions, 89 deletions

diff --git a/net-misc/vnc/ChangeLog b/net-misc/vnc/ChangeLog
index 136c782bd723..42a5a3a7e44b 100644
--- a/net-misc/vnc/ChangeLog
+++ b/net-misc/vnc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/vnc
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.53 2006/09/01 20:39:06 genstef Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.54 2006/09/10 08:22:26 vapier Exp $
+
+  10 Sep 2006; Mike Frysinger <vapier@gentoo.org> metadata.xml,
+  vnc-4.1.2.ebuild:
+  Clean up ebuild #146666 and move back to ~amd64 #145756.
 
   01 Sep 2006; Stefan Schweizer <genstef@gentoo.org> vnc-4.1.2.ebuild:
   Make ebuild die when \<x11-base/xorg-server-1.1 is used, bug 145756
diff --git a/net-misc/vnc/Manifest b/net-misc/vnc/Manifest
index 20850a199eea..27836de6e9dd 100644
--- a/net-misc/vnc/Manifest
+++ b/net-misc/vnc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX vnc-4.0/imake-tmpdir.patch 1062 RMD160 13b17c4d33f724e27802f8f849ee713b2ce824a4 SHA1 49e5fe6384a9ac406551c9ceb22b87321031cb42 SHA256 390d3f94d014b9e428907771e6982426e69a1b4c27ef28333042ddca56ce9f78
 MD5 33601310b3a1040e1d836d1648e84b41 files/vnc-4.0/imake-tmpdir.patch 1062
 RMD160 13b17c4d33f724e27802f8f849ee713b2ce824a4 files/vnc-4.0/imake-tmpdir.patch 1062
@@ -65,21 +68,28 @@ EBUILD vnc-4.0-r1.ebuild 3033 RMD160 4460a3b0355206751d4835e61682c987c8413c2d SH
 MD5 7659aa4bd1d3fbeafb3c414995936a41 vnc-4.0-r1.ebuild 3033
 RMD160 4460a3b0355206751d4835e61682c987c8413c2d vnc-4.0-r1.ebuild 3033
 SHA256 50cb37be0d6788a63e8a0fb2e3ab27ab244047528360ebe2c600059c58907186 vnc-4.0-r1.ebuild 3033
-EBUILD vnc-4.1.2.ebuild 4759 RMD160 b6fbdf25e81d41d81008cfed8c60f10cd4d0482f SHA1 b3b2af633f9a28a42fdef9aba7cff89b100a1624 SHA256 603835bcf69657c333979c467b465dce7d806c76241c652b6cb30881ccfa26a0
-MD5 68dfeced37791a196b4cd059471c4d77 vnc-4.1.2.ebuild 4759
-RMD160 b6fbdf25e81d41d81008cfed8c60f10cd4d0482f vnc-4.1.2.ebuild 4759
-SHA256 603835bcf69657c333979c467b465dce7d806c76241c652b6cb30881ccfa26a0 vnc-4.1.2.ebuild 4759
-MISC ChangeLog 8834 RMD160 36021627d76fd83c8da72f36eed6a9fd5456d2d7 SHA1 2adee954db64ea9ca8139dfaf11b271cf7f3b9fa SHA256 19d0ea50288e39e0c8655a79d73dbccefa397ad94a05ba075cae25206a3d9fdb
-MD5 a4addf951e7088587bc27204409142f7 ChangeLog 8834
-RMD160 36021627d76fd83c8da72f36eed6a9fd5456d2d7 ChangeLog 8834
-SHA256 19d0ea50288e39e0c8655a79d73dbccefa397ad94a05ba075cae25206a3d9fdb ChangeLog 8834
-MISC metadata.xml 260 RMD160 b35ce05c59a27b25bb9da9b924fbc831763b03bc SHA1 b3b4000e0e1dbd0b080cca12f786f0ef74c2e10c SHA256 756af86344d6dca0063ba25898a0afd5ddbbfe689cb2339b16d0d8d3e5c694a5
-MD5 1083a3f4403360e5286be4e1105e9ce1 metadata.xml 260
-RMD160 b35ce05c59a27b25bb9da9b924fbc831763b03bc metadata.xml 260
-SHA256 756af86344d6dca0063ba25898a0afd5ddbbfe689cb2339b16d0d8d3e5c694a5 metadata.xml 260
+EBUILD vnc-4.1.2.ebuild 4530 RMD160 13793e5e658fed746bbc26f20b959bc50867ef1a SHA1 2668e29294104e5ba640d698978e9d738e7aacce SHA256 5986a60b35db76c14871a409612b14afc9e655374e37d011eb8a91a247d6e53c
+MD5 4deda2218a7139247b71b46f5cc29f08 vnc-4.1.2.ebuild 4530
+RMD160 13793e5e658fed746bbc26f20b959bc50867ef1a vnc-4.1.2.ebuild 4530
+SHA256 5986a60b35db76c14871a409612b14afc9e655374e37d011eb8a91a247d6e53c vnc-4.1.2.ebuild 4530
+MISC ChangeLog 8977 RMD160 48088e2822feec137e3d3cbc47397f8325859fa2 SHA1 9636b4e898315a14e6baa860ef263a91a95b1df4 SHA256 dcbda5fce410aace2818e9785e5c41ea3d2abd104057d044a64e30761e461170
+MD5 bfb959fbaa09e979a6fc38739ef0bc13 ChangeLog 8977
+RMD160 48088e2822feec137e3d3cbc47397f8325859fa2 ChangeLog 8977
+SHA256 dcbda5fce410aace2818e9785e5c41ea3d2abd104057d044a64e30761e461170 ChangeLog 8977
+MISC metadata.xml 368 RMD160 7efa0a810fb47607d22b2d70748ff6ae3f720d73 SHA1 3880053f5f781c739c63f8bbbee09ab0f3e5cbc2 SHA256 15a31fdb7efc5cf54a012174b301640ce901b2b5c5dbe641696e918b9d075837
+MD5 d2ff7fec546f8f3f629704747ce1445d metadata.xml 368
+RMD160 7efa0a810fb47607d22b2d70748ff6ae3f720d73 metadata.xml 368
+SHA256 15a31fdb7efc5cf54a012174b301640ce901b2b5c5dbe641696e918b9d075837 metadata.xml 368
 MD5 3905c8c5dfcf1a61e7414ff4896a21b7 files/digest-vnc-4.0-r1 450
 RMD160 a8cdc2ff6c5f0d5d7e24d4cd18e7fcdefe8fc53c files/digest-vnc-4.0-r1 450
 SHA256 4cb116e6e37a5ef5653f494fb57c8f3aa334accb80377428553c1227e2eeee28 files/digest-vnc-4.0-r1 450
 MD5 ea722f9a27864acf92cc49a65bda8065 files/digest-vnc-4.1.2 765
 RMD160 eebc91dfc511f81add65472c4e945726b410d966 files/digest-vnc-4.1.2 765
 SHA256 b77bef8261288d9fe399ed2cb9ef731c3004049bf4502e23b7640a920481dfef files/digest-vnc-4.1.2 765
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFA8tSamhnQswr0vIRApboAKChmDxm6ZZaAgIv9fQ2g07p35XXQgCffFKy
+yb8jxXddP1cIO74gruvxj3w=
+=syXI
+-----END PGP SIGNATURE-----
diff --git a/net-misc/vnc/metadata.xml b/net-misc/vnc/metadata.xml
index 5f055f1122a8..8615431b4c77 100644
--- a/net-misc/vnc/metadata.xml
+++ b/net-misc/vnc/metadata.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>maintainer-needed</herd>
+<herd>no-herd</herd>
+<maintainer>
+  <email>vapier@gentoo.org</email>
+  <description>proxy maintainer for peeps</description>
+</maintainer>
 <maintainer>
   <email>armin76@gmail.com</email>
   <name>Raúl Porcel</name>
diff --git a/net-misc/vnc/vnc-4.1.2.ebuild b/net-misc/vnc/vnc-4.1.2.ebuild
index a5976e8fee8b..17515928ef32 100644
--- a/net-misc/vnc/vnc-4.1.2.ebuild
+++ b/net-misc/vnc/vnc-4.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.1.2.ebuild,v 1.7 2006/09/01 20:39:06 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.1.2.ebuild,v 1.8 2006/09/10 08:22:26 vapier Exp $
 
 inherit eutils toolchain-funcs multilib autotools
 
@@ -16,16 +16,13 @@ SRC_URI="http://ltsp.mirrors.tds.net/pub/ltsp/tarballs/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ppc ppc64 ~sparc ~x86"
 IUSE="server"
 
 RDEPEND="sys-libs/zlib
 	media-libs/freetype
-	|| ( ( x11-libs/libSM
-			x11-libs/libXtst
-		)
-		virtual/x11
-	)
+	x11-libs/libSM
+	x11-libs/libXtst
 	server? (
 		x11-libs/libXi
 		x11-libs/libXfont
@@ -39,82 +36,76 @@ RDEPEND="sys-libs/zlib
 		media-fonts/font-alias
 		media-fonts/font-cursor-misc
 		media-fonts/font-misc-misc
-		!amd64? ( >=x11-base/xorg-server-1.1 )
+		>=x11-base/xorg-server-1.1
 	)
 	!net-misc/tightvnc"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xextproto
-		server?	( x11-proto/compositeproto
-			x11-proto/damageproto
-			x11-proto/fixesproto
-			x11-proto/fontsproto
-			x11-proto/randrproto
-			x11-proto/resourceproto
-			x11-proto/scrnsaverproto
-			x11-proto/trapproto
-			x11-proto/videoproto
-			x11-proto/xineramaproto
-			x11-proto/xf86bigfontproto
-			x11-proto/xf86dgaproto
-			x11-proto/xf86miscproto
-			x11-proto/xf86vidmodeproto )
-		)
-		virtual/x11
+	x11-proto/xextproto
+	server?	(
+		x11-proto/compositeproto
+		x11-proto/damageproto
+		x11-proto/fixesproto
+		x11-proto/fontsproto
+		x11-proto/randrproto
+		x11-proto/resourceproto
+		x11-proto/scrnsaverproto
+		x11-proto/trapproto
+		x11-proto/videoproto
+		x11-proto/xineramaproto
+		x11-proto/xf86bigfontproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86miscproto
+		x11-proto/xf86vidmodeproto
 	)"
 
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use server && has_version '<x11-base/xorg-server-1.1' \
-		&& die "you need at least version 1.1 of xorg-server, see bug 145756"
-}
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
+	cd "${S}"
 
 	# patches from Fedora
-	epatch ${WORKDIR}/${P}/vnc-viewer-reparent.patch
-	epatch ${WORKDIR}/${P}/vnc-newfbsize.patch
+	epatch "${WORKDIR}"/${P}/vnc-viewer-reparent.patch
+	epatch "${WORKDIR}"/${P}/vnc-newfbsize.patch
 
-	if use server; then
-		mv ${WORKDIR}/xorg-server-${XSERVER_VERSION} unix/
+	if use server ; then
+		mv "${WORKDIR}"/xorg-server-${XSERVER_VERSION} unix/
 
 		# patches from Fedora
-		epatch ${WORKDIR}/${P}/vnc-cookie.patch
-		epatch ${WORKDIR}/${P}/vnc-gcc4.patch
-		epatch ${WORKDIR}/${P}/vnc-use-fb.patch
-		epatch ${WORKDIR}/${P}/vnc-xclients.patch
-		epatch ${WORKDIR}/${P}/vnc-idle.patch
-		epatch ${WORKDIR}/${P}/vnc-via.patch
-		epatch ${WORKDIR}/${P}/vnc-build.patch
-		epatch ${WORKDIR}/${P}/vnc-fPIC.patch
-		epatch ${WORKDIR}/${P}/vnc-restart.patch
-		epatch ${WORKDIR}/${P}/vnc-vncpasswd.patch
-		epatch ${WORKDIR}/${P}/vnc-def.patch
-		epatch ${WORKDIR}/${P}/vnc-modular-xorg.patch
-		epatch ${WORKDIR}/${P}/vnc-nohttpd.patch
+		epatch "${WORKDIR}"/${P}/vnc-cookie.patch
+		epatch "${WORKDIR}"/${P}/vnc-gcc4.patch
+		epatch "${WORKDIR}"/${P}/vnc-use-fb.patch
+		epatch "${WORKDIR}"/${P}/vnc-xclients.patch
+		epatch "${WORKDIR}"/${P}/vnc-idle.patch
+		epatch "${WORKDIR}"/${P}/vnc-via.patch
+		epatch "${WORKDIR}"/${P}/vnc-build.patch
+		epatch "${WORKDIR}"/${P}/vnc-fPIC.patch
+		epatch "${WORKDIR}"/${P}/vnc-restart.patch
+		epatch "${WORKDIR}"/${P}/vnc-vncpasswd.patch
+		epatch "${WORKDIR}"/${P}/vnc-def.patch
+		epatch "${WORKDIR}"/${P}/vnc-modular-xorg.patch
+		epatch "${WORKDIR}"/${P}/vnc-nohttpd.patch
 
 		cd unix/xorg-server-*
-		epatch ${WORKDIR}/${P}/vnc-fontpath.patch
-		epatch ${WORKDIR}/${P}/vnc-s390.patch
+		epatch "${WORKDIR}"/${P}/vnc-fontpath.patch
+		epatch "${WORKDIR}"/${P}/vnc-s390.patch
 
 		cd ../../
 
-		epatch ${WORKDIR}/${P}/vnc-64bit.patch
-		epatch ${WORKDIR}/${P}/vnc-select.patch
-		epatch ${WORKDIR}/${P}/vnc-opengl.patch
-
-		cp -a ${S}/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
-			${S}/unix/xc/programs/Xserver/Xvnc.man \
-			${S}/unix/xc/programs/Xserver/vnc/*.{h,cc} \
-			${S}/unix/xorg-server-*/hw/vnc
-		cp -a ${S}/unix/xorg-server-*/{cfb/cfb.h,hw/vnc}
-		cp -a ${S}/unix/xorg-server-*/{fb/fb.h,hw/vnc}
-		cp -a ${S}/unix/xorg-server-*/{fb/fbrop.h,hw/vnc}
+		epatch "${WORKDIR}"/${P}/vnc-64bit.patch
+		epatch "${WORKDIR}"/${P}/vnc-select.patch
+		epatch "${WORKDIR}"/${P}/vnc-opengl.patch
+
+		cp -a "${S}"/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
+			"${S}"/unix/xc/programs/Xserver/Xvnc.man \
+			"${S}"/unix/xc/programs/Xserver/vnc/*.{h,cc} \
+			"${S}"/unix/xorg-server-*/hw/vnc
+		cp -a "${S}"/unix/xorg-server-*/{cfb/cfb.h,hw/vnc}
+		cp -a "${S}"/unix/xorg-server-*/{fb/fb.h,hw/vnc}
+		cp -a "${S}"/unix/xorg-server-*/{fb/fbrop.h,hw/vnc}
 		sed -i -e 's,xor,c_xor,' -e 's,and,c_and,' \
-			${S}/unix/xorg-server*/hw/vnc/{cfb,fb,fbrop}.h
+			"${S}"/unix/xorg-server*/hw/vnc/{cfb,fb,fbrop}.h
 	fi
 }
 
@@ -153,18 +144,16 @@ src_install() {
 	use server && dodir /usr/$(get_libdir)/modules/extensions
 
 	cd unix
-	./vncinstall ${D}/usr/bin ${D}/usr/share/man ${D}/usr/$(get_libdir)/modules/extensions || die
+	./vncinstall "${D}"/usr/bin "${D}"/usr/share/man "${D}"/usr/$(get_libdir)/modules/extensions || die
 	cd ..
 	dodoc README
 
-	use server || (
-		rm ${D}/usr/bin/vncserver
-		rm ${D}/usr/bin/x0vncserver
-		rm ${D}/usr/share/man/man1/vnc{passwd,config,server}.1
-		rm ${D}/usr/share/man/man1/x0vncserver.1
-		rm ${D}/usr/bin/vncpasswd
-		rm ${D}/usr/bin/vncconfig
-	)
-
-	ewarn "Note that the free VNC release is not designed for use on untrusted networks"
+	if ! use server ; then
+		rm "${D}"/usr/bin/vncserver
+		rm "${D}"/usr/bin/x0vncserver
+		rm "${D}"/usr/share/man/man1/vnc{passwd,config,server}.1
+		rm "${D}"/usr/share/man/man1/x0vncserver.1
+		rm "${D}"/usr/bin/vncpasswd
+		rm "${D}"/usr/bin/vncconfig
+	fi
 }