Revision bump for xorg-server-1.10.4, bug #379963

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

3 files changed, 190 insertions, 5 deletions

diff --git a/net-misc/tigervnc/ChangeLog b/net-misc/tigervnc/ChangeLog
index 5b5f319a9c3c..84c096b383fd 100644
--- a/net-misc/tigervnc/ChangeLog
+++ b/net-misc/tigervnc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tigervnc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.101 2011/08/20 15:59:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.102 2011/08/25 20:56:54 armin76 Exp $
+
+*tigervnc-1.0.1_p20110618-r1 (25 Aug 2011)
+
+  25 Aug 2011; Raúl Porcel <armin76@gentoo.org>
+  +tigervnc-1.0.1_p20110618-r1.ebuild:
+  Revision bump for xorg-server-1.10.4, bug #379963
 
   20 Aug 2011; Jeroen Roovers <jer@gentoo.org> tigervnc-1.0.1_p20110618.ebuild:
   Stable for HPPA (bug #372205).
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 87218d1f0d0d..9ed7824f3f52 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -7,15 +7,17 @@ DIST tigervnc-1.0.1_p20100914.tar.bz2 2457011 RMD160 8fff3434d00e7a16f59ab9ebbe5
 DIST tigervnc-1.0.1_p20110618.tar.bz2 9307564 RMD160 c86f8d47a48082d5162e58bb469e3e470f2caedd SHA1 5b6d710b0d86ec2ef68d67012eb7eede8635eac5 SHA256 38f95f824fc697728f1f13c3f31dbf85b559307824df14f962f642f05e68b5fd
 DIST tigervnc.png 4958 RMD160 24ca257dac5de8d97672d943ee47f310af4fe837 SHA1 2f12a12a0f105c6f2ecc9aa306c63719f07b0062 SHA256 e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e
 DIST xorg-server-1.10.2.tar.bz2 5334473 RMD160 3d1ad6b236772ebe0400a69a03b9093bb210fd4b SHA1 fd831b3c6297d1a68830c602d767752d87b9ca54 SHA256 65264f6640568b9db8d738aec1ddd036c3ae21b7ba05b98d006759d11a72792c
+DIST xorg-server-1.10.4.tar.bz2 5386174 RMD160 13eeaf7497e63ecddba46010c075d27121e18aae SHA1 857d6377025c77851a3cc5f8ec2ce84164a2fdc6 SHA256 fafc16b97b9a61b62dfaa74e8d336baa0cea752ce9ed8103c4d212baa8031ca5
 DIST xorg-server-1.9.5.tar.bz2 5172054 RMD160 6383b126ed313943fc5cb0939fdae4a737aabb70 SHA1 03be24d6906f3ed3237057a5a7df2b02723c9749 SHA256 3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc
 EBUILD tigervnc-1.0.1_p20100914-r6.ebuild 4511 RMD160 5f619d07f6dbc0455157f8d88d4b55e11bbd25ec SHA1 ec6fd556c35093a7267a830c5ff0646ed316935e SHA256 ed29c5f2494158d3be726db26fab6a6eed4e556e7c4c951a462d14ae81ad8551
+EBUILD tigervnc-1.0.1_p20110618-r1.ebuild 4523 RMD160 82c905da286e3ef0766b1422c5ff70c4ee3118b6 SHA1 c6a7e12faeac5c74ff1a173e323ca44d15c0795e SHA256 60426d4c17e0844895035777f529caa6fc9dcfb8f643a557478cf5acb73ca4d7
 EBUILD tigervnc-1.0.1_p20110618.ebuild 4506 RMD160 37eb472e1648063e8b79771df4a454d41f3c921d SHA1 50dce2e3600af4b65ef3983b96ed380d2acb4b8a SHA256 7edbde63b3ddd0e16b710162d2eb15d11663167ea07cd2d11c15e0af3b8f255c
-MISC ChangeLog 13281 RMD160 96831a6d5684710ea824219be9cb30a6c92c068c SHA1 635dbfb164ce084c91b689e0bb8f11541ce3ddf0 SHA256 59d6227b0eb9736364e629468c9f4f2df386fe21733c3dfcc9245b9dc469e99a
+MISC ChangeLog 13470 RMD160 f0b3ea29219276d4c781b0de9928b444542dfdf4 SHA1 2a68f525157f728d6a67649294282d2684968091 SHA256 58036bf904c42e473bf926e17cee030ec6b8f9a96279a6b0446fad6328f6c6d2
 MISC metadata.xml 358 RMD160 02e6829cd6be9fce91fefadf5e0c04a989f36615 SHA1 351fe95fb94b3892226413dccf261f1da0b68960 SHA256 1048c34a670204e65435b0fa3d5782658ad72d41aea92a694b2a22ebc3f61713
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5P2dIACgkQVWmRsqeSphOovwCeJS7pH7hOecBzW4DAcTWfieEM
-D3kAn2nRbH3LcUBLBYGcGmtkNn5vfi1G
-=hEYc
+iEYEARECAAYFAk5WtxwACgkQuQc30/atMkC1dACcC9TGKsEI7CdYNgrc8T+76qJK
+Rq8Anir3yuTcStEdNF1ddrM7Ncng+9FL
+=tdzR
 -----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
new file mode 100644
index 000000000000..4d35d4d71f3b
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.0.1_p20110618-r1.ebuild
@@ -0,0 +1,177 @@
+# 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.1 2011/08/25 20:56:54 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="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-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
+}