Remove versions that are no longer installable after dropping vulnerable xorg-server versions, bug #412609.

Package-Manager: portage-2.2.0_alpha109/cvs/Linux x86_64

5 files changed, 8 insertions, 578 deletions

diff --git a/net-misc/tigervnc/ChangeLog b/net-misc/tigervnc/ChangeLog
index a7cc790e27d5..30719fce96a1 100644
--- a/net-misc/tigervnc/ChangeLog
+++ b/net-misc/tigervnc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tigervnc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.128 2012/06/09 18:56:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.129 2012/06/10 08:44:35 chithanh Exp $
+
+  10 Jun 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -tigervnc-1.0.1_p20110618-r1.ebuild, -tigervnc-1.1.0-r4.ebuild,
+  -tigervnc-1.1.0-r5.ebuild:
+  Remove versions that are no longer installable after dropping vulnerable xorg-
+  server versions, bug #412609.
 
   09 Jun 2012; Raúl Porcel <armin76@gentoo.org> tigervnc-1.1.0-r6.ebuild:
   alpha/arm/ia64/sh/sparc/x86 stable wrt #419549
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 8f0414127b8e..64b157518421 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,32 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.1.0-export_missing_symbol.patch 606 RMD160 e3e907c4a83525f7547ed4827e7f64e6703da434 SHA1 d648e51b49f43f22122529a8f2bffe11006a707f SHA256 92559d7154c9f204fd9c2dfca1f836c19ff613bff3bd9687f60f7bde5b023bc3
 AUX 1.1.0-gethomedir.patch 889 RMD160 1013329bea6f2be77246025fbbebd26b0a9fa27a SHA1 6f2227d502470ed3a6f815a99736d5dee923b8b3 SHA256 4b85a9ddb9980e88c2f66c0cb56f6e8f00e4789ba2ab4b99f7246c5f131e6d79
 AUX 1.1.0-xorg-1.12_fix.patch 829 RMD160 b068fd9cbac50f7b5775a40339db9c62da22ed4d SHA1 af04b8538e3aaf28d793e2ec34bd9c3bbd97f0af SHA256 250b4cece83917026b958aaf625b458232027e176c97047be959f091a25c2abf
 AUX tigervnc.confd 346 RMD160 07a4541c0d9ef5611afafa8db75d2caf2e7ab051 SHA1 a3b00e99fc68844a7d0be29c4a8caae3a8b5a491 SHA256 48b6ae4f3e9e528b3cd4bc1349ceed3cd1a403ab0f3a2a8dd57a4769f88ceafc
 AUX tigervnc.initd 1585 RMD160 2fb536e85fa490df5450bf6e9f0296beb17921b1 SHA1 389d095ce1c18b323208ac059992cbd539d5a6b4 SHA256 a705a1aacdc3149a52b222fb990c654a5b5b5133d24be675ab327ec9a0c6f0e6
-DIST tigervnc-1.0.1_p20110618.tar.bz2 9307564 RMD160 c86f8d47a48082d5162e58bb469e3e470f2caedd SHA1 5b6d710b0d86ec2ef68d67012eb7eede8635eac5 SHA256 38f95f824fc697728f1f13c3f31dbf85b559307824df14f962f642f05e68b5fd
 DIST tigervnc-1.1.0.tar.gz 2742707 RMD160 692ce76f38c229485ae75acb87f39f8844575e35 SHA1 a678745c231a37eea92c7c7c259f7495061a9a0d SHA256 594b70825a2c24863afd7b8dd2a5bc1935807118c6726e1d98396dee44d060f4
 DIST tigervnc-1.1.0_xorg-1.11.patch.bz2 2140 RMD160 b13286eef0289979ce947986b44df77cbf8882a2 SHA1 0fb7f572386c50d9387b8ca7fb3101896de47180 SHA256 f529f2e8f898fbea99b543d58965c2f53a29787b2bce4d649b84ef16ca2c3d75
 DIST tigervnc-1.1.0_xorg-1.12.patch.bz2 2290 RMD160 4d4953da529580349e209b5e8e646c8b9081ad34 SHA1 d12f3a0d60cb4653fdb0da2eeec5bc0bf7d7fc01 SHA256 110a630a57c5f284ad4644310f7f8f9efdc240d8e1de7124457c523a9122164f
 DIST tigervnc.png 4958 RMD160 24ca257dac5de8d97672d943ee47f310af4fe837 SHA1 2f12a12a0f105c6f2ecc9aa306c63719f07b0062 SHA256 e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e
-DIST xorg-server-1.10.4.tar.bz2 5386174 RMD160 13eeaf7497e63ecddba46010c075d27121e18aae SHA1 857d6377025c77851a3cc5f8ec2ce84164a2fdc6 SHA256 fafc16b97b9a61b62dfaa74e8d336baa0cea752ce9ed8103c4d212baa8031ca5
-DIST xorg-server-1.11.2.tar.bz2 4945939 RMD160 cc69cfd86a5a870d1433262dd1445a8603a9266a SHA1 b4de5c599c90bd08d3122866ba68152cd59a880e SHA256 fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2
 DIST xorg-server-1.11.4.tar.bz2 4900810 RMD160 26eafdda9e7c9e21e606281dacc13e67d0144eef SHA1 adb5b0bf95a943385c08f826a647871aa1d8d6eb SHA256 3e2935bc400612df58d5b5e6840829e2c63af02c2e7d2893092500358a4366fc
-DIST xorg-server-1.12.1.tar.bz2 5349351 RMD160 f52d2ba58999bc8bfbe5f37a29256046014fdbd2 SHA1 922b963901f4711449b53fb32ce3e14f5b642766 SHA256 d21dc1dac767975cf9872984c78dd0bff928a74420fbcb415267c6bdbd41b45a
 DIST xorg-server-1.12.2.tar.bz2 5431841 RMD160 47530836ebe44e8823848fb87ef979c7dd805f66 SHA1 2edb151d39571dc0fcdedc299ea0a77fe6bfc076 SHA256 ca9f9e22f432f1ccbf8e7a21e746e02be4081a0f3975eb7cff276483193cc5f5
-EBUILD tigervnc-1.0.1_p20110618-r1.ebuild 4550 RMD160 5362609ee5bb47b23ba8fe3219791a697ef49fb1 SHA1 57ccdc74bb801a13d9c431b2c46f3667fcca4087 SHA256 ffbddf412c8e445ebfc03e0a407857fea2422f4639f0fb24c0c5dc7e028e7133
-EBUILD tigervnc-1.1.0-r4.ebuild 4871 RMD160 2b410e5ddd4a89c38af08c761da8da99b5b616ea SHA1 00b5b3659e91934395e8ecec2e20cb87d26855c4 SHA256 4146b17a89e725b33b68dffc6ae1598bc36a7dffd98c8ff50c0432be39d6be73
-EBUILD tigervnc-1.1.0-r5.ebuild 5049 RMD160 befba3154a4e6a54b958bd41cc354adf0419431f SHA1 e65e86e1e75a15a96813dfb505e1711593c81c66 SHA256 69522567b5b43da590a936ebc6e591f48a392b3682cfb458bc6ee5d99785a4bf
 EBUILD tigervnc-1.1.0-r6.ebuild 4868 RMD160 745a6da7468d7783d1cbfd87e55557520e4175e7 SHA1 7e1f90c7bd65da97ba3aaa34ac851a85d242dbaa SHA256 57be0b2793e440e2b1b075f0d75b1689598433d8ef29e52f6b1400be447e9b8a
 EBUILD tigervnc-1.1.0-r7.ebuild 5049 RMD160 d1c9714fb547a0934bfa001faa6965d3e85bd7b2 SHA1 c36bd6df0547d23524700a7adfa75b1231fa31e6 SHA256 076cef73f48b20e7bb545b7af62f5d33b3e1f898af0d9d173272548dba3aa781
-MISC ChangeLog 17324 RMD160 1762a04a09f4b98dcc7ca20aafbbf9c3ed0dee15 SHA1 ecaadd30054bb1f27e85d180327217507d6ae761 SHA256 4cafa5fa228b92a4ce1d9ca7585d671aed54bb21630ede75bd4ef0b850a55abd
+MISC ChangeLog 17603 RMD160 d36c7ca35aefb9d05486c8086692225809c0895b SHA1 5967b84e610d6a621c7a8893cd99eec3a6df2e4d SHA256 cf03ea1d7e0177307a295fea04a6c59d11fa970c2486146aa65e363e9ee016e1
 MISC metadata.xml 335 RMD160 a1f13f76a1f6b93bfcda75e10afa92831f24e1a4 SHA1 7030f47cbe62c52bde156cacf6f123487ea7bee3 SHA256 821ea06553b929fa98b219ad2f17ca84dda361965182f46e030ddd3b2d950209
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk/TnHAACgkQuQc30/atMkBq4QCeIZ61gkJSN42/QNd1JED21dDy
-JNQAnAw+tnx4T+tmpYgpHaXxGQ8IGE1Z
-=RdoY
------END PGP SIGNATURE-----
diff --git a/net-misc/tigervnc/tigervnc-1.0.1_p20110618-r1.ebuild b/net-misc/tigervnc/tigervnc-1.0.1_p20110618-r1.ebuild
deleted file mode 100644
index ab51267dd952..000000000000
--- a/net-misc/tigervnc/tigervnc-1.0.1_p20110618-r1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.0.1_p20110618-r1.ebuild,v 1.8 2011/11/05 18:55:14 armin76 Exp $
-
-EAPI="1"
-
-inherit eutils toolchain-funcs multilib autotools
-
-XSERVER_VERSION="1.10.4"
-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
-	mirror://gentoo/${PN}.png
-	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 ppc ppc64 sh sparc x86"
-IUSE="nptl +opengl server +xorgmodule"
-
-RDEPEND="virtual/jpeg
-	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
-		x11-misc/xkeyboard-config
-		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}
-	amd64? ( dev-lang/nasm )
-	x86? ( dev-lang/nasm )
-	>=x11-proto/inputproto-1.5
-	>=x11-proto/xextproto-7.0.3
-	>=x11-proto/xproto-7.0.13
-	server?	(
-		x11-misc/util-macros
-		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
-	fi
-
-	eautoreconf
-	cd unix
-
-	if use server ; then
-		epatch xserver110.patch
-		cd xserver
-		eautoreconf
-	fi
-}
-
-src_compile() {
-	econf --without-included-zlib --with-system-jpeg || die "econf failed"
-	emake || die "emake failed"
-
-	if use server ; then
-		cd unix/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 \
-			--with-xmlto=no \
-			$(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
-
-	newicon "${DISTDIR}"/tigervnc.png 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
-}
diff --git a/net-misc/tigervnc/tigervnc-1.1.0-r4.ebuild b/net-misc/tigervnc/tigervnc-1.1.0-r4.ebuild
deleted file mode 100644
index c9906cc4a34b..000000000000
--- a/net-misc/tigervnc/tigervnc-1.1.0-r4.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.1.0-r4.ebuild,v 1.2 2012/05/15 04:33:22 mr_bones_ Exp $
-
-EAPI="1"
-
-inherit eutils toolchain-funcs multilib autotools
-
-XSERVER_VERSION="1.11.2"
-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
-SRC_URI="mirror://sourceforge/tigervnc/${P}.tar.gz
-	mirror://gentoo/${PN}.png
-	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2
-		mirror://gentoo/tigervnc-1.1.0_xorg-1.11.patch.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 sh sparc x86"
-IUSE="nptl +opengl server +xorgmodule"
-
-RDEPEND="virtual/jpeg
-	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
-		x11-misc/xkeyboard-config
-		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}
-	amd64? ( dev-lang/nasm )
-	x86? ( dev-lang/nasm )
-	>=x11-proto/inputproto-1.5
-	>=x11-proto/xextproto-7.0.3
-	>=x11-proto/xproto-7.0.13
-	server?	(
-		virtual/pkgconfig
-		media-fonts/font-util
-		x11-misc/util-macros
-		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
-	fi
-
-	eautoreconf
-	cd unix
-
-	if use server ; then
-		epatch xserver110.patch
-		epatch "${WORKDIR}"/${P}_xorg-1.11.patch
-		cd xserver
-		epatch "${FILESDIR}"/1.1.0-export_missing_symbol.patch
-		epatch "${FILESDIR}"/1.1.0-gethomedir.patch
-		eautoreconf
-	fi
-}
-
-src_compile() {
-	econf --without-included-zlib --with-system-jpeg || die "econf failed"
-	emake || die "emake failed"
-
-	if use server ; then
-		cd unix/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 \
-			--with-xmlto=no \
-			--disable-unit-tests \
-			$(use_enable opengl glx) \
-			$(use_enable nptl glx-tls) \
-			|| die "econf server failed"
-		emake || die "emake server failed"
-	fi
-}
-
-src_install() {
-	dodoc README.txt
-
-	cd unix
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newman vncviewer/vncviewer.man vncviewer.1
-
-	newicon "${DISTDIR}"/tigervnc.png 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
-}
diff --git a/net-misc/tigervnc/tigervnc-1.1.0-r5.ebuild b/net-misc/tigervnc/tigervnc-1.1.0-r5.ebuild
deleted file mode 100644
index bab2060aa90a..000000000000
--- a/net-misc/tigervnc/tigervnc-1.1.0-r5.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.1.0-r5.ebuild,v 1.1 2012/05/13 19:28:52 armin76 Exp $
-
-EAPI="1"
-
-inherit eutils toolchain-funcs multilib autotools
-
-XSERVER_VERSION="1.12.1"
-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
-SRC_URI="mirror://sourceforge/tigervnc/${P}.tar.gz
-	mirror://gentoo/${PN}.png
-	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2
-		mirror://gentoo/tigervnc-1.1.0_xorg-1.11.patch.bz2
-		mirror://gentoo/tigervnc-1.1.0_xorg-1.12.patch.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="nptl +opengl server +xorgmodule"
-
-RDEPEND="virtual/jpeg
-	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
-		x11-misc/xkeyboard-config
-		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}
-	amd64? ( dev-lang/nasm )
-	x86? ( dev-lang/nasm )
-	>=x11-proto/inputproto-1.5
-	>=x11-proto/xextproto-7.0.3
-	>=x11-proto/xproto-7.0.13
-	server?	(
-		virtual/pkgconfig
-		media-fonts/font-util
-		x11-misc/util-macros
-		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
-	fi
-
-	eautoreconf
-	cd unix
-
-	if use server ; then
-		epatch xserver110.patch
-		epatch "${WORKDIR}"/${P}_xorg-1.11.patch
-		epatch "${WORKDIR}"/${P}_xorg-1.12.patch
-		cd xserver
-		epatch "${FILESDIR}"/1.1.0-export_missing_symbol.patch
-		epatch "${FILESDIR}"/1.1.0-gethomedir.patch
-		epatch "${FILESDIR}"/1.1.0-xorg-1.12_fix.patch
-		eautoreconf
-	fi
-}
-
-src_compile() {
-	econf --without-included-zlib --with-system-jpeg || die "econf failed"
-	emake || die "emake failed"
-
-	if use server ; then
-		cd unix/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 \
-			--with-xmlto=no \
-			--disable-unit-tests \
-			--disable-devel-docs \
-			$(use_enable opengl glx) \
-			$(use_enable nptl glx-tls) \
-			|| die "econf server failed"
-		emake || die "emake server failed"
-	fi
-}
-
-src_install() {
-	dodoc README.txt
-
-	cd unix
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newman vncviewer/vncviewer.man vncviewer.1
-
-	newicon "${DISTDIR}"/tigervnc.png 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
-}