Version bump and support Xorg-server-1.14.2 wrt bug #473518

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xF6AD3240

3 files changed, 210 insertions, 6 deletions

diff --git a/net-misc/tigervnc/ChangeLog b/net-misc/tigervnc/ChangeLog
index a913d54c67eb..a9ce13318311 100644
--- a/net-misc/tigervnc/ChangeLog
+++ b/net-misc/tigervnc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/tigervnc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.157 2013/01/15 15:45:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.158 2013/07/07 17:47:24 armin76 Exp $
+
+*tigervnc-1.2.80_p5065 (07 Jul 2013)
+
+  07 Jul 2013; Raúl Porcel <armin76@gentoo.org> +tigervnc-1.2.80_p5065.ebuild:
+  Version bump and support Xorg-server-1.14.2 wrt bug #473518
 
   15 Jan 2013; Raúl Porcel <armin76@gentoo.org> tigervnc-1.1.0-r7.ebuild:
   Use xorg-server-1.12.4
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 05097a10bb22..f63eaa0dc5f5 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -11,17 +11,21 @@ DIST tigervnc-1.1.0_xorg-1.11.patch.bz2 2140 SHA256 f529f2e8f898fbea99b543d58965
 DIST tigervnc-1.1.0_xorg-1.12.patch.bz2 2290 SHA256 110a630a57c5f284ad4644310f7f8f9efdc240d8e1de7124457c523a9122164f SHA512 9d9293b40eb16bb60d61e4415532dda2ee7aa8b8c0950fa71d74959e804d6c9e305ad90ad92fa3c6ad6afe68b3656e5c6a7958d36c0bd1baf232c9cfda7b874c WHIRLPOOL 570b15ba8994482a3ca36cffe7def4424e30f74c7383ebd6725f736e21aa04df355da9bfa51673e5f78566cc7de0fb5c5ef92fd7c40490a3af9233541f04726b
 DIST tigervnc-1.2.0-patches-0.1.tar.bz2 10194 SHA256 cf58845892b50f1a9f01567747d262ba0619df85fe3bd67e61ebcb3229f75ff5 SHA512 f4061c85572901b160b41107960a46b7faea59d8bee9301bfb62ade26678711b4e86951bda74ca3ce0e51ba1fcddb37404da8e8e469353e8620a72d450fd816a WHIRLPOOL 80a40306cb138a137155b848f471a2bc54f8973eb869cbc90753a23a53361469f0c793389d2dcb341d3cf8bf403c5636f7c1f34722c7a86f7ff58f5afd80dbe9
 DIST tigervnc-1.2.0.tar.gz 2487050 SHA256 6e0910f1ff1681bc8b52e7ea805e586b88b352c88f66e4c2cc31aa39c4a32f53 SHA512 a1ffe59f0db394455859a8de0551819f15f976689565fffc72c5eff9953e9678ff02f10dc0fc51931e251b6b8aee27c5c75c008ee6a7557f3db42911a90a27e5 WHIRLPOOL 5d2fc9be4cf9e281a29d27fc14362471d98b83bf3c396521ab267ad6fea24ed5c5ebeb81775af11ed06f3d0977fcda6976ea6dd16cfe798ed828442ef76a2c78
+DIST tigervnc-1.2.80-20130314svn5065.tar.bz2 1048377 SHA256 bdb1b4ded129ca45e0ad9b9616851ae6f86ffed83e961991dc04bfef767a3b68 SHA512 ca2662864e8cd4d059bc8efbc755ee8db336e7491a098cc891fded67637d6a63c5e4ce1a9eabe6904d0c73b4238e0d0fcd3444c472eb8affb40f51e316b909a2 WHIRLPOOL d76a928efdf1e6be46b4237cce41c58dddaaff1164410d556b0badbbc1e8d9904348f2feb311abfeb7d4332c11cc08f3d47f7465ec021997954b0dd481c166ff
+DIST tigervnc-1.2.80_p5065-patches-0.1.tar.bz2 6912 SHA256 16d3f5feeb017dfaccbb536c391fc66cd35465a56fb7b702c621a06cc0f8ca49 SHA512 cd04d6bfa1b64db0a964ab04fb813ad370855ff7ad4ebfe377a74bcd0dbfe1603bb8bc908befab038c428830ea286fbcceff2f3ac992d8f1aaeabc9ee952f640 WHIRLPOOL dec7b0c485302236375cc4abfe5409b2d3e0ea02b27ff5ed048e30ab1e51ef54fdad713850de6d7445e3e0b5eb9d4b483d61f7079069a301c6dccea6b9dbdbbd
 DIST tigervnc.png 4958 SHA256 e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e SHA512 97f9a42e9b9f50f1c91de3b7d7991aa8965240fe4958d6da4e9f72f9baa4510ad615765f7c59d6e0a90c9d4b5fe53ad1547c766f2da45e4a6b6e29b03ced2b8b WHIRLPOOL bbf01f6702724bc4329d053bd3fbf856103371abce20f6f74aa3c2e5eed0eebcdcccd287788b1efbb8de3008cb484a8da5ccd1bd667727e4b0861f3bb550529c
 DIST xorg-server-1.12.4.tar.bz2 5444761 SHA256 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7 SHA512 70997e8ba4f948829c158e52924753c5691a783dd14e5a86fdce4fc601638dd4e0b281590876b0315a303bf8d5195bdf43ede7113d1d569415a41ab03d938d85 WHIRLPOOL bfee61329ca85ecedb991ca933de6e3a1e94e34a04d9a723a0e9c90a36e067824701c38e8a0034498ed28dfca82eb653d1e1ab5c0223020f5da69cbbf80bbf98
 DIST xorg-server-1.13.0.tar.bz2 5469168 SHA256 548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a SHA512 840a341f796386156ff4eb599c4b3b96090d3fda9cdbe70c45ff175c8d01b62cb9ba04a6c73ddde90996f8b96be1a3d925c9803a3b629cb4bc317374b7b1e014 WHIRLPOOL f52984556237f7c1dd4537727050e6b8347592ef5cd8e6787c65c3fee9bdcadb9709315929636fdc89a2fb4cdfd30f5224072954ed091eafb10fd8cd64a5ac30
+DIST xorg-server-1.14.2.tar.bz2 5490488 SHA256 f6ddfb3f1cfff2d69d45657aec626ebe8b5847810154ff7df7ed2072b076c86b SHA512 5a8caf61039b1605a85da9cba36ff525ccf9deda2f52be2b3f6360171d058b929a3a49e97db24b0587c4933009b2c479514f31d364eba54918a20a7e26a9060c WHIRLPOOL e20b6f60a806065184bb51d718eb50cad5b2809b7e0fe322f865ad5db3ed53cd3e9c7e6f8b577becde9c0cbec171435370087d1a19f496ed8645d4f93e2bac50
 EBUILD tigervnc-1.1.0-r7.ebuild 5214 SHA256 c503a6bbcb485ea64678b52b8d497486f04f8a54f75bc1b2788456a7d7ce686d SHA512 a0da49bc29c4340f34fee8cf5a0a5ab3f5b0adcc219cd2a7524d9929a1dddbb4b92e0cfdda25ee6e52c5a45c353482effd5ba4810861ca6d54f9f94a28274ae2 WHIRLPOOL 768a28f4edfcd4dfc2dc7693bed03ecd0b74630efd95a0a713dae26807cd5e77ddf9c86be0985a934e546e1f0b276ae7c27fa621edbeb87be6552f9c77b540a2
 EBUILD tigervnc-1.2.0.ebuild 4881 SHA256 a17d99f14d540bb6403603e4a684b6e7da850aea8bc0f42e890d9ca7acc108c6 SHA512 63d142129fafececf893539b1ab78b8f8df2c5429dcf2bef43e7f75853e9a23ad38fa6e938111018b14bf7f51df3fb180f00a812eeae1404f56cb75c5d3c3355 WHIRLPOOL de083b54e1135643e46fe362862557e6046a680ba7189d43f5942425779a9489eb045f384b2cced0a22b1298732b3e5e35f0b4a3c89234c09b2804829b9c50c8
-MISC ChangeLog 21163 SHA256 2849ad558b783a7c6852edc57e9d2440c57a3b36902d5aa914b4ec055f8d15c3 SHA512 d3ba23027f8dc677079275782355df7ea74643a49a30ff445bf93c0b490076b294cfe1ab10c86dbcd3a0793892752ee89021c0804248e8288b56639ef748ef48 WHIRLPOOL c016d86fae9fd823a35e881205e166ccea04d1b9601c004e1186139198a78bc3d4688b5e6eee608520b5b4f7df5279481bfec4f0382ff214fde09591f1ff43de
+EBUILD tigervnc-1.2.80_p5065.ebuild 4906 SHA256 a00e782621188fdc506e58fc6a1e0152e2e0d88feeb190600a00d3a9d851895b SHA512 4595609391f24e96738a8ba8dbcc89dcb0ec1972eb64cb1e6a7adc6d6f27c82f5f8dd5a78b6d5af0ed1bf8a009039036f5fcf9fb88683bbf63e3a32bfd30c01e WHIRLPOOL 7c056b235b60cdcc43c9e61b1e6512e94a671bac1287e6bceffa3692f4ee66714c48ecaf9b0c43b0d4550246e41389bd509048d00f69bf7dff76a11bde67f6f9
+MISC ChangeLog 21344 SHA256 6e668e760a23016613edd79de1b56b1f49a5cf3b5cfadf9ae977a566cbae54d7 SHA512 473a8d7ef680febc8cd44d30e0d40c0d81b12d55a53f68b156943e1e20ebe7d6fa30996fd7653159f1926711f9e7e566dbef52108e689186e1dd0a48d8ee9d3e WHIRLPOOL 2624c64eacdebeb087b08bbb556b1c4c84df2973eb5e5fef13cdcde70103a0c9da2fcdf9c141e484a57e8ec006f3cd952ed64f89010ec0c6bfc76b91ab997065
 MISC metadata.xml 419 SHA256 86dbc1cfbd6cbb2e25c6e597dd377f99e50f315eaaebcc4402df4a3196e14042 SHA512 994d090964ed1dfd0404a7fd0abea328472587617cfb86c76fb73525479fa4c1db65d33d9413935df5472ab834bc27687793ad84b0996e82e3894aef456ae9a3 WHIRLPOOL 8bf5c41547ac54c04042cf22c4fc7d432842997e8530a72e4c8f0a508c4fc1f0e77689f382290824c1d3b83510447d1763e36db8606a875ab0e5af845ea2efcf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlD1eYAACgkQuQc30/atMkBmnACgv2lB66zT1QK/ZqBeiNO4gubI
-wIkAoJYQoEBrXq6T73k88Ivrx1ec4XQK
-=+iIh
+iEYEAREIAAYFAlHZqa0ACgkQuQc30/atMkC+hwCghqsYTThEFYmKll4fkk5NsExv
+qY0AnRGqIHY3qMd79wT3U2iIkFF+rrEX
+=fzr2
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tigervnc/tigervnc-1.2.80_p5065.ebuild b/net-misc/tigervnc/tigervnc-1.2.80_p5065.ebuild
new file mode 100644
index 000000000000..dc386b2c1bea
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.2.80_p5065.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.2.80_p5065.ebuild,v 1.1 2013/07/07 17:47:24 armin76 Exp $
+
+EAPI="4"
+
+inherit eutils cmake-utils autotools java-pkg-opt-2 flag-o-matic
+
+PATCHVER="0.1"
+XSERVER_VERSION="1.14.2"
+OPENGL_DIR="xorg-x11"
+MY_P="${PN}-1.2.80-20130314svn5065"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="http://www.tigervnc.org"
+SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/tigervnc/tigervnc-1.2.80-20130314svn5065.tar.bz2/4522c6f107dbe778f197b2294c0eb867/tigervnc-1.2.80-20130314svn5065.tar.bz2
+	mirror://gentoo/${PN}.png
+	mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2
+	http://dev.gentoo.org/~armin76/dist/${P}-patches-${PATCHVER}.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"
+IUSE="gnutls java nptl +opengl pam server +xorgmodule"
+
+RDEPEND="virtual/jpeg
+	sys-libs/zlib
+	>=x11-libs/libXtst-1.0.99.2
+	x11-libs/fltk:1
+	gnutls? ( net-libs/gnutls )
+	java? ( >=virtual/jre-1.5 )
+	pam? ( virtual/pam )
+	server? (
+		>=x11-libs/libXi-1.2.99.1
+		>=x11-libs/libXfont-1.4.2
+		>=x11-libs/libxkbfile-1.0.4
+		x11-libs/libXrender
+		>=x11-libs/pixman-0.21.8
+		>=x11-apps/xauth-1.0.3
+		x11-apps/xsetroot
+		>=x11-misc/xkeyboard-config-2.4.1-r3
+		opengl? ( >=app-admin/eselect-opengl-1.0.8 )
+		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-2.1.99.3
+	>=x11-proto/xextproto-7.1.99
+	>=x11-proto/xproto-7.0.22
+	java? ( >=virtual/jdk-1.5 )
+	server?	(
+		virtual/pkgconfig
+		media-fonts/font-util
+		x11-misc/util-macros
+		>=x11-proto/bigreqsproto-1.1.0
+		>=x11-proto/compositeproto-0.4
+		>=x11-proto/damageproto-1.1
+		>=x11-proto/fixesproto-5.0
+		>=x11-proto/fontsproto-2.0.2
+		>=x11-proto/randrproto-1.4.0
+		>=x11-proto/renderproto-0.11
+		>=x11-proto/resourceproto-1.0.2
+		>=x11-proto/scrnsaverproto-1.1
+		>=x11-proto/videoproto-2.2.2
+		>=x11-proto/xcmiscproto-1.2.0
+		>=x11-proto/xineramaproto-1.1.3
+		>=x11-libs/xtrans-1.2.2
+		>=x11-proto/dri2proto-2.8
+		opengl? ( >=media-libs/mesa-7.8_rc[nptl=] )
+	)"
+
+CMAKE_IN_SOURCE_BUILD=1
+
+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"
+	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_prepare() {
+	if use server ; then
+		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver
+	else
+		rm "${WORKDIR}"/patches/*_server_*
+	fi
+
+	EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" epatch
+
+	if use server ; then
+		cd unix/xserver
+		epatch ../xserver114.patch
+		eautoreconf
+	fi
+}
+
+src_configure() {
+
+	use arm || use hppa && append-flags "-fPIC"
+
+	mycmakeargs=(
+		-G "Unix Makefiles"
+		$(cmake-utils_use_enable gnutls GNUTLS)
+		$(cmake-utils_use_enable pam PAM)
+		$(cmake-utils_use_build java JAVA)
+	)
+
+	cmake-utils_src_configure
+
+	if use server; then
+		cd unix/xserver
+		econf \
+			$(use_enable nptl glx-tls) \
+			$(use_enable opengl glx) \
+			--disable-config-dbus \
+			--disable-config-hal \
+			--disable-config-udev \
+			--disable-devel-docs \
+			--disable-dmx \
+			--disable-dri \
+			--disable-kdrive \
+			--disable-selective-werror \
+			--disable-silent-rules \
+			--disable-static \
+			--disable-unit-tests \
+			--disable-xephyr \
+			--disable-xinerama \
+			--disable-xnest \
+			--disable-xorg \
+			--disable-xvfb \
+			--disable-xwin \
+			--enable-dri2 \
+			--with-pic \
+			--without-dtrace
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use server ; then
+		cd unix/xserver
+		emake
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newicon "${DISTDIR}"/tigervnc.png vncviewer.png
+	make_desktop_entry vncviewer vncviewer vncviewer Network
+
+	if use server ; then
+		cd unix/xserver/hw/vnc
+		emake DESTDIR="${D}" install
+		! 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
+}