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

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

4 files changed, 10 insertions, 193 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/Manifest b/net-misc/vnc/Manifest
index 2765ba641599..4b3cb1538dd9 100644
--- a/net-misc/vnc/Manifest
+++ b/net-misc/vnc/Manifest
@@ -2,12 +2,9 @@ AUX vnc-4.1.2-freebsd.patch 806 RMD160 fa025702ed01fac452f55cb93bff0d8b93d5271e
 AUX vnc.confd 341 RMD160 3ec4bdfd3fd2c5938c3969305f04020342e9263d SHA1 4b7f5f708cb92f5fc82508141422003ab05c1452 SHA256 3463105ab7f4aec95b9a72bcfcb9808b3acdcad0c1e5b608f1408faa79f3d4a0
 AUX vnc.initd 1538 RMD160 935834931e769ddc58235917d4c891cd495c4d8b SHA1 42760322ae58b74ce0848a0962ef574ba624a9a3 SHA256 1b5c4c2cb3cfd45f712136a671d0450addb9c77aa992874027b05652afd6f438
 AUX vncviewer.png 1048 RMD160 ad99643d65a77044cac96a31dc46b16f8273b4c7 SHA1 e463d04d7fbbece2495ad424feec1fe009e20a16 SHA256 0780cf53e78b43849bdb9f31ad0103bb4dd98489ed59c76e5c50cf0a6ff3db41
-DIST vnc-4.1.2-r4-patches-0.5.tar.bz2 16721 RMD160 2f65ff144daca9af4f0fb3a20997d467ca1d677a SHA1 4985f1b16e3f19c680a809eab186200193156ffb SHA256 f9c0b0d77d2f266f0cac3aef95adb35ba8c9418f21bbb096bc1411a5ffb34ef2
 DIST vnc-4.1.2-r5-patches-0.1.tar.bz2 25955 RMD160 60fbcfff846fdd8762bbc0cf8cfeb1b449393906 SHA1 c8636bc2b7e019dd2ce8a4859f25f50704041f65 SHA256 9dbfe26b206c74d69984214f6048fcebea57b406ce6d72d0c1f0f805230a02b3
 DIST vnc-4_1_3-unixsrc.tar.gz 550870 RMD160 9ef5a3b6f13d1227e5b9399c4d56884639cf9686 SHA1 fd4ebf2bf8945b5a419ab69059a98fe3bc6698ef SHA256 a5897cbeaef74e02f23d43b89905f5a218041292743ed469f45092073c2bc047
-DIST xorg-server-1.3.0.0.tar.bz2 5968263 RMD160 1a4fecd73aed0d5adabe84066c24ce69dc2c2dc1 SHA1 6f9645fe70da5b6a121f3e8fa6c2fc1e4307390c SHA256 93c656f142f37607c15372dd24c5de9eab82cd79c5d60449174a928d345c2975
 DIST xorg-server-1.5.3.tar.bz2 5622625 RMD160 dc0c552e031963070b7a315ea4499810021d0eed SHA1 177529b6d7191a73df6abf2990cd7708398a8d81 SHA256 a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
-EBUILD vnc-4.1.3-r2.ebuild 5535 RMD160 1042dea0ab032800f730b5f1e48fa575a983e3ff SHA1 a6bbc582ac1343519083b5718cf60df05648947a SHA256 d2ac3454dbc15c26e1456a261c96365cadd263839579b2d3a7f473f96268b5b1
-EBUILD vnc-4.1.3.ebuild 4747 RMD160 29491a6c295a6808129b23f1a4e0b089b281baac SHA1 90d562631f7b53899253362205906187013576bb SHA256 d636a6f037f5e07e9ebd0f3f23431d0a6b2ce8c6b6848cf985148d8c913128db
-MISC ChangeLog 18561 RMD160 c2e3a79b67b627237a5f2457582f7f61016c0566 SHA1 5045c019f681b3f53102a1dc064568c57a70d4b4 SHA256 0f2e1ddabccf378fd70f19bb0bee42c9a8ad369e00ac6a83e3770cd3e556857b
+EBUILD vnc-4.1.3-r2.ebuild 5561 RMD160 361a1b42dd08ae4820819c6ed9a86b5dec709821 SHA1 ef7d6aaf421511d466ba6faf5f6a7a2c9ce3be36 SHA256 00b81e899edc545e5841ef72ddb858f48a9487a06bfd9f6de1a1383044add45c
+MISC ChangeLog 18710 RMD160 2537930a3a423fce87b3f39e96f2be7b4d4c0db3 SHA1 eed44eb83773acc5c9402870338a018b351487e9 SHA256 2adc563db6f65ae9000a02b48d12e8274ebc76b58f47336a2463f40b3ef2ecca
 MISC metadata.xml 353 RMD160 9182601f0c747cc5b0ca5ef851d3badb9df4373b SHA1 446fcb655f047d6c01ed222ab1f22242596eb539 SHA256 1f140f4c66f228965291c2e2945c7ac573a0fb3630bf1c76d012c17240084740
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}
-}