alpha stable and add x11-libs/pixman dep, bug #274154

(Portage version: 2.1.6.13/cvs/Linux ia64)

3 files changed, 8 insertions, 188 deletions

diff --git a/net-misc/vnc/ChangeLog b/net-misc/vnc/ChangeLog
index 524842dd57b5..b5fbd94370fc 100644
--- a/net-misc/vnc/ChangeLog
+++ b/net-misc/vnc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/vnc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.131 2009/05/04 00:12:40 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.132 2009/06/25 17:04:06 armin76 Exp $
+
+  25 Jun 2009; Raúl Porcel <armin76@gentoo.org> -vnc-4.1.3.ebuild,
+  vnc-4.1.3-r2.ebuild:
+  alpha stable and add x11-libs/pixman dep, bug #274154
 
   04 May 2009; Brent Baude <ranger@gentoo.org> vnc-4.1.3-r2.ebuild:
   Marking vnc-4.1.3-r2 ppc64 for bug 264897
diff --git a/net-misc/vnc/vnc-4.1.3-r2.ebuild b/net-misc/vnc/vnc-4.1.3-r2.ebuild
index 5bd04e0e773c..e746660f94ff 100644
--- a/net-misc/vnc/vnc-4.1.3-r2.ebuild
+++ b/net-misc/vnc/vnc-4.1.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.1.3-r2.ebuild,v 1.9 2009/05/04 00:12:40 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.1.3-r2.ebuild,v 1.10 2009/06/25 17:04:06 armin76 Exp $
 
 EAPI="1"
 
@@ -20,7 +20,7 @@ SRC_URI="http://ltsp.mirrors.tds.net/pub/ltsp/tarballs/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 -arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 -arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="+opengl server +xorgmodule"
 
 RDEPEND="sys-libs/zlib
@@ -34,6 +34,7 @@ RDEPEND="sys-libs/zlib
 		x11-libs/libXmu
 		x11-libs/libxkbfile
 		x11-libs/libXrender
+		x11-libs/pixman
 		x11-apps/xauth
 		x11-apps/xsetroot
 		x11-proto/dri2proto
diff --git a/net-misc/vnc/vnc-4.1.3.ebuild b/net-misc/vnc/vnc-4.1.3.ebuild
deleted file mode 100644
index 38782946a8f6..000000000000
--- a/net-misc/vnc/vnc-4.1.3.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.1.3.ebuild,v 1.8 2009/01/19 16:25:41 ranger Exp $
-
-inherit eutils toolchain-funcs multilib autotools
-
-XSERVER_VERSION="1.3.0.0"
-PATCH="${PN}-4.1.2-r4-patches-0.5"
-
-MY_P="vnc-4_1_3-unixsrc"
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.realvnc.com/"
-SRC_URI="http://ltsp.mirrors.tds.net/pub/ltsp/tarballs/${MY_P}.tar.gz
-	http://ftp.plusline.de/FreeBSD/distfiles/xc/${MY_P}.tar.gz
-	mirror://gentoo/${PATCH}.tar.bz2
-	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 -arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="server"
-
-RDEPEND="sys-libs/zlib
-	media-libs/freetype
-	x11-libs/libSM
-	x11-libs/libXtst
-	server? (
-		x11-libs/libXi
-		x11-libs/libXfont
-		x11-libs/libXmu
-		x11-libs/libxkbfile
-		x11-libs/libXrender
-		x11-apps/xauth
-		x11-apps/xsetroot
-		media-fonts/font-adobe-100dpi
-		media-fonts/font-adobe-75dpi
-		media-fonts/font-alias
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc
-		~x11-base/xorg-server-${XSERVER_VERSION}
-	)
-	!net-misc/tightvnc
-	!net-misc/xf4vnc"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/xextproto
-	server?	(
-		x11-proto/bigreqsproto
-		x11-proto/compositeproto
-		x11-proto/damageproto
-		x11-proto/fixesproto
-		x11-proto/fontsproto
-		x11-proto/randrproto
-		~x11-proto/renderproto-0.9.2
-		x11-proto/resourceproto
-		x11-proto/scrnsaverproto
-		x11-proto/trapproto
-		x11-proto/videoproto
-		x11-proto/xcmiscproto
-		x11-proto/xineramaproto
-		x11-proto/xf86bigfontproto
-		x11-proto/xf86dgaproto
-		x11-proto/xf86miscproto
-		x11-proto/xf86vidmodeproto
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if ! use server ; then
-		echo
-		einfo "The 'server' USE flag will build vnc's server."
-		einfo "If '-server' is chosen only the client is built to save space."
-		einfo "Stop the build now if you need to add 'server' to USE flags.\n"
-		ebeep
-		epause 5
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if use server ; then
-		mv "${WORKDIR}"/xorg-server-${XSERVER_VERSION} unix/xorg-x11-server-source
-	else
-		rm -f "${WORKDIR}"/patch/*vnc-server*
-	fi
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-
-	cd common
-	eautoreconf
-	cd ../unix
-	eautoreconf
-
-	if use server ; then
-		cp -RPp xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
-			xc/programs/Xserver/Xvnc.man \
-			xc/programs/Xserver/vnc/*.{h,cc} \
-			xorg-x11-server-source/hw/vnc
-		cp -RPp xorg-x11-server-source/{cfb/cfb.h,hw/vnc}
-		cp -RPp xorg-x11-server-source/{fb/fb.h,hw/vnc}
-		cp -RPp xorg-x11-server-source/{fb/fbrop.h,hw/vnc}
-		sed -i -e 's,xor,c_xor,' -e 's,and,c_and,' \
-			xorg-x11-server-source/hw/vnc/{cfb,fb,fbrop}.h
-		cd xorg-x11-server-source
-		eautoreconf
-	fi
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-4.1.2-freebsd.patch
-}
-
-src_compile() {
-	cd common
-	econf || die "econf failed"
-	emake || die "emake failed"
-	cd ../unix
-	econf || die "econf failed"
-	emake || die "emake failed"
-
-	if use server ; then
-		cd xorg-x11-server-source
-		econf \
-			--enable-xorg \
-			--disable-xnest --disable-xvfb --disable-dmx \
-			--disable-xwin --disable-xephyr --disable-kdrive \
-			--with-pic \
-			--disable-xorgcfg \
-			--disable-xprint \
-			--disable-static \
-			--enable-composite \
-			--enable-xtrap \
-			--enable-xcsecurity \
-			--with-xkb-output=/usr/share/X11/xkb \
-			--with-rgb-path=/usr/share/X11/rgb.txt \
-			--disable-xevie \
-			--disable-dri \
-			--enable-glx \
-			--with-int10=stub \
-			--with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 \
-			|| die "econf server failed"
-		emake || die "emake server failed"
-	fi
-}
-
-src_install() {
-	cd common
-	emake DESTDIR="${D}" install || die "emake install failed"
-	cd ../unix
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newman vncviewer/vncviewer.man vncviewer.1
-	cd ..
-	dodoc README
-
-	doicon "${FILESDIR}"/vncviewer.png
-	make_desktop_entry vncviewer vncviewer vncviewer Network
-
-	if use server ; then
-		cd unix
-		dobin vncserver || die "dobin failed"
-		for f in vncviewer/vncviewer vncpasswd/vncpasswd \
-			vncconfig/vncconfig vncserver x0vncserver/x0vncserver; do
-			mv $f.man $f.1
-			doman $f.1
-		done
-
-		cd xorg-x11-server-source/hw/vnc
-		emake DESTDIR="${D}" install || die "emake install failed"
-
-		newman Xvnc.man Xvnc.1
-		newconfd "${FILESDIR}"/vnc.confd vnc
-		newinitd "${FILESDIR}"/vnc.initd vnc
-
-		rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la
-	else
-		cd "${D}"
-		rm usr/bin/x0vncserver
-		rm usr/bin/vncpasswd
-		rm usr/bin/vncconfig
-	fi
-
-	rm "${D}"/usr/$(get_libdir)/librfb.{a,la,so}
-}