Remove version depending on to-be-removed xorg-server.

Package-Manager: portage-2.2_rc78/cvs/Linux x86_64

3 files changed, 6 insertions, 197 deletions

diff --git a/net-misc/tigervnc/ChangeLog b/net-misc/tigervnc/ChangeLog
index d961d3c2b054..68242d19a23c 100644
--- a/net-misc/tigervnc/ChangeLog
+++ b/net-misc/tigervnc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/tigervnc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.62 2010/08/18 20:39:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.63 2010/09/11 10:21:47 scarabeus Exp $
+
+  11 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -tigervnc-1.0.0-r4.ebuild:
+  Remove version depending on to-be-removed xorg-server.
 
   18 Aug 2010; Markus Meier <maekke@gentoo.org>
   tigervnc-1.0.1_p20100529.ebuild:
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 4ef98aac792e..bf8953df9319 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,26 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX tigervnc.confd 346 RMD160 07a4541c0d9ef5611afafa8db75d2caf2e7ab051 SHA1 a3b00e99fc68844a7d0be29c4a8caae3a8b5a491 SHA256 48b6ae4f3e9e528b3cd4bc1349ceed3cd1a403ab0f3a2a8dd57a4769f88ceafc
 AUX tigervnc.initd 1585 RMD160 2fb536e85fa490df5450bf6e9f0296beb17921b1 SHA1 389d095ce1c18b323208ac059992cbd539d5a6b4 SHA256 a705a1aacdc3149a52b222fb990c654a5b5b5133d24be675ab327ec9a0c6f0e6
 AUX vncviewer.png 4958 RMD160 24ca257dac5de8d97672d943ee47f310af4fe837 SHA1 2f12a12a0f105c6f2ecc9aa306c63719f07b0062 SHA256 e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e
-DIST tigervnc-1.0.0.tar.bz2 2720182 RMD160 759bff85653bf68a29c2a336553bbfadada12223 SHA1 9017f31fe75d0bc49cc9d9f9f6b9f336bf306bd6 SHA256 75c54bf1f976182dd64c2cab5051fcf392091d74636014c2b74ce5b712efbfda
 DIST tigervnc-1.0.1_p20100529.tar.bz2 2455999 RMD160 e27b6b58ba408ff6d514fa651723c048061f3f07 SHA1 1cdf47a8073de7e039742527af895a3f40d45471 SHA256 65cd5bc091370615f6797a72c92f3d014c6e70220c59f314df1234c48c1768f4
 DIST tigervnc-1.0.1_pre20100306.tar.bz2 2475525 RMD160 13fbbd008fbb3b9570f6025f5dac5d1e1fc09341 SHA1 68b193fb76a9fd0e67a8894ad79074a4fd3facc5 SHA256 723e5642c8ab3b7fb321c256d2ad8632cae2680609d05a52dc35e393f493eb4e
-DIST xorg-server-1.6.5.tar.bz2 4678406 RMD160 702970358a5643dbc9205f42e39c5b8ed2ff845a SHA1 c57c80dd15d3ca492e58ae993b9015d085ec6ea6 SHA256 f3c0e43cf73e7d438350016cabd9957dc000ded9c5fdeebf84a02df61963b2ce
 DIST xorg-server-1.7.6.tar.bz2 4927689 RMD160 811ca10c01da9b4bdeb743ee90b6845971dfd4c7 SHA1 77a8c3dec86960e1be818df3a75d69b5fad6a3c0 SHA256 da372e064aa5c2a0421830941372d4fea864e69c70290d56d6ffc042a6e80760
 DIST xorg-server-1.7.7.tar.bz2 4939257 RMD160 19ab82795abe122cd267e4718152bf87af465829 SHA1 0f1b71363843b7e394d6de62d0db5b74d3e645ef SHA256 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
 DIST xorg-server-1.8.2.tar.bz2 5226285 RMD160 dee713fe677fdcccc0fec29a02b0af4ef48819f2 SHA1 825d11757b729444800e0a3afd4e98d19d286b1a SHA256 52157e12295cfb6f1553d3ce64af2b27ee5b512958d4c66d21065d2376aeace2
-EBUILD tigervnc-1.0.0-r4.ebuild 4644 RMD160 6a6ba8b8a8e02ab34e2e171e5cb9ebd9b195e9c3 SHA1 d1688c0ea1513c839c972906ddc84c177e568084 SHA256 93b98b0229f83f56eb60de4c16fc28de5c5080f9c7f0f219f80e672dfb9ff906
 EBUILD tigervnc-1.0.1_p20100529-r2.ebuild 4460 RMD160 f24a5e0ccd9718a1e8b3d87f1d8c2a7a669a2a45 SHA1 8f2dac9488b9b353e5a6760629e5d93b233a5a7b SHA256 70807f008a070143c24babd7e24632765227153e0b11ab97b7cad3e192acd74b
 EBUILD tigervnc-1.0.1_p20100529.ebuild 4424 RMD160 de94f86a767043db4a100c6f2be75c1c00163551 SHA1 2a5c9ba20df363d4d3d916a1a25a87375ba2d6a6 SHA256 bca32a910689a260c5a4d1a1fd430d902dd80f08fd6bbaeca9d7d13c18c20fae
 EBUILD tigervnc-1.0.1_pre20100306-r1.ebuild 4422 RMD160 782af9d40fb41da3d03b1cad1f8062e60c450de7 SHA1 134998a35701112002b4a0d85ba4d97bb2377b0f SHA256 572288fa551974f72c5cc1b12e1cecc938de73a21931b9f61fd1c11198f40e96
-MISC ChangeLog 8075 RMD160 f280a0eb81254d5e5c34897bc70a3c75cbf02bbb SHA1 6e94723936d1e902abbfc06c4566f2d077a605e5 SHA256 848d2c43645b9f633c47160126cd29e0ab533149f782d222bcb13c38f2bc68bb
+MISC ChangeLog 8220 RMD160 42cf6f58432b7e9733328de02c87bba977837f0d SHA1 f17d8955d467650dd71dd2aeadcea63740fde60a SHA256 8a63b801fe52b50e41caea80d39cc8a5ec38b9264c97387e849e491d00e4a816
 MISC metadata.xml 358 RMD160 02e6829cd6be9fce91fefadf5e0c04a989f36615 SHA1 351fe95fb94b3892226413dccf261f1da0b68960 SHA256 1048c34a670204e65435b0fa3d5782658ad72d41aea92a694b2a22ebc3f61713
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkxsRMMACgkQkKaRLQcq0GKiGACdFaLjNG09REdrbBzsgiKREYWE
-l/EAoKkwSF9DGJTshkDobt5AzzleFoji
-=w06C
------END PGP SIGNATURE-----
diff --git a/net-misc/tigervnc/tigervnc-1.0.0-r4.ebuild b/net-misc/tigervnc/tigervnc-1.0.0-r4.ebuild
deleted file mode 100644
index da0c16b33cb8..000000000000
--- a/net-misc/tigervnc/tigervnc-1.0.0-r4.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.0.0-r4.ebuild,v 1.9 2010/05/29 15:22:42 armin76 Exp $
-
-EAPI="1"
-
-inherit eutils toolchain-funcs multilib autotools
-
-XSERVER_VERSION="1.6.5"
-#kPATCH="${P/_p*/}-patches-0.3"
-PATCH="${PN}-0.0.90-patches-0.3"
-OPENGL_DIR="xorg-x11"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
-	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
-
-#	mirror://gentoo/${PATCH}.tar.bz2
-#	http://dev.gentoo.org/~armin76/dist/${PATCH}.tar.bz2
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-IUSE="+opengl server +xorgmodule"
-
-RDEPEND="sys-libs/zlib
-	media-libs/freetype
-	x11-libs/libSM
-	x11-libs/libXtst
-	app-admin/eselect-opengl
-	server? (
-		x11-libs/libXi
-		x11-libs/libXfont
-		x11-libs/libXmu
-		x11-libs/libxkbfile
-		x11-libs/libXrender
-		x11-libs/pixman
-		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
-		xorgmodule? ( ~x11-base/xorg-server-${XSERVER_VERSION} )
-	)
-	!net-misc/vnc
-	!net-misc/tightvnc
-	!net-misc/xf4vnc"
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	>=x11-proto/inputproto-1.5
-	>=x11-proto/xextproto-7.0.3
-	>=x11-proto/xproto-7.0.13
-	server?	(
-		x11-proto/bigreqsproto
-		x11-proto/compositeproto
-		x11-proto/damageproto
-		x11-proto/dri2proto
-		x11-proto/fixesproto
-		x11-proto/fontsproto
-		>=x11-proto/randrproto-1.2.99
-		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/xf86driproto
-		x11-proto/xf86miscproto
-		x11-proto/xf86vidmodeproto
-		opengl? ( >=x11-proto/glproto-1.4.10 )
-		>=media-libs/mesa-7.1
-		>=x11-proto/renderproto-0.9.3
-		x11-libs/libpciaccess
-		>=x11-libs/xtrans-1.2.2
-	)"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	if ! use server ; then
-		echo
-		einfo "The 'server' USE flag will build tigervnc'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
-	else
-		ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
-		OLD_IMPLEM="$(eselect opengl show)"
-		eselect opengl set ${OPENGL_DIR}
-	fi
-}
-
-switch_opengl_implem() {
-	# Switch to the xorg implementation.
-	# Use new opengl-update that will not reset user selected
-	# OpenGL interface ...
-	echo
-	eselect opengl set ${OLD_IMPLEM}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if use server ; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver
-#	else
-#		rm -f "${WORKDIR}"/patch/*tigervnc-server*
-	fi
-
-#	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-
-	cd unix
-	eautoreconf
-	if use server ; then
-		epatch xserver16.patch
-		cd xserver
-		eautoreconf
-	fi
-}
-
-src_compile() {
-	cd unix
-	econf --without-included-zlib --with-system-jpeg || die "econf failed"
-	emake || die "emake failed"
-
-	if use server ; then
-		cd xserver
-		econf \
-			--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
-			--disable-xwin --disable-xephyr --disable-kdrive --with-pic \
-			--disable-static --disable-xinerama \
-			--disable-composite \
-			--with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 \
-			--enable-install-libxf86config \
-			--enable-dri2 \
-			--disable-config-dbus \
-			--disable-config-hal \
-			$(use_enable opengl glx) \
-			$(use_enable nptl glx-tls) \
-			|| die "econf server failed"
-		emake || die "emake server failed"
-	fi
-}
-
-src_install() {
-	cd unix
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newman vncviewer/vncviewer.man vncviewer.1
-	dodoc README
-
-	doicon "${FILESDIR}"/vncviewer.png
-	make_desktop_entry vncviewer vncviewer vncviewer Network
-
-	if use server ; then
-		cd xserver/hw/vnc
-		emake DESTDIR="${D}" install || die "emake install failed"
-		! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg
-
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-		rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la
-	else
-		cd "${D}"
-		for f in vncserver vncpasswd x0vncserver vncconfig; do
-			rm usr/bin/$f
-			rm usr/share/man/man1/$f.1
-		done
-	fi
-}
-
-pkg_postinst() {
-	use server && switch_opengl_implem
-}