Version bump wrt #486800, remove old

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0xF6AD3240)

2 files changed, 87 insertions, 78 deletions

diff --git a/net-misc/tigervnc/ChangeLog b/net-misc/tigervnc/ChangeLog
index b60971f9e376..bf10f51f1854 100644
--- a/net-misc/tigervnc/ChangeLog
+++ b/net-misc/tigervnc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.164 2013/10/12 13:26:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.165 2013/10/12 14:41:26 armin76 Exp $
+
+*tigervnc-1.3.0 (12 Oct 2013)
+
+  12 Oct 2013; Raúl Porcel <armin76@gentoo.org> -tigervnc-1.1.0-r7.ebuild,
+  +tigervnc-1.3.0.ebuild:
+  Version bump wrt #486800, remove old
 
   12 Oct 2013; Jeroen Roovers <jer@gentoo.org> tigervnc-1.1.0-r7.ebuild,
   tigervnc-1.2.0.ebuild:
diff --git a/net-misc/tigervnc/tigervnc-1.1.0-r7.ebuild b/net-misc/tigervnc/tigervnc-1.3.0.ebuild
index bdae7522c59e..38dfd04fb3ea 100644
--- a/net-misc/tigervnc/tigervnc-1.1.0-r7.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.3.0.ebuild
@@ -1,51 +1,49 @@
 # 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.1.0-r7.ebuild,v 1.14 2013/10/12 13:26:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.3.0.ebuild,v 1.1 2013/10/12 14:41:26 armin76 Exp $
 
-EAPI="1"
+EAPI="4"
 
-inherit eutils toolchain-funcs multilib autotools
+inherit eutils cmake-utils autotools java-pkg-opt-2 flag-o-matic
 
-XSERVER_VERSION="1.12.4"
+PATCHVER="0.1"
+XSERVER_VERSION="1.14.3"
 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="mirror://gentoo/${P}.tar.bz2
-#	http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
-SRC_URI="mirror://sourceforge/tigervnc/${P}.tar.gz
+SRC_URI="mirror://sourceforge/tigervnc/${P}.tar.bz2
 	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 )"
+	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 ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="nptl +opengl server +xorgmodule"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="gnutls java nptl +opengl pam server +xorgmodule"
 
 RDEPEND="virtual/jpeg:0
 	sys-libs/zlib
-	media-libs/freetype
-	x11-libs/libSM
 	>=x11-libs/libXtst-1.0.99.2
-	>=app-admin/eselect-opengl-1.0.8
+	>=x11-libs/fltk-1.3.1
+	gnutls? ( net-libs/gnutls )
+	java? ( >=virtual/jre-1.5 )
+	pam? ( virtual/pam )
 	server? (
+		dev-lang/perl
 		>=x11-libs/libXi-1.2.99.1
 		>=x11-libs/libXfont-1.4.2
-		>=x11-libs/libXmu-1.0.3
 		>=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
-		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} )
+		opengl? ( >=app-admin/eselect-opengl-1.0.8 )
+		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
 	)
 	!net-misc/vnc
 	!net-misc/tightvnc
@@ -53,9 +51,10 @@ RDEPEND="virtual/jpeg:0
 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
+	>=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
@@ -63,29 +62,21 @@ DEPEND="${RDEPEND}
 		>=x11-proto/bigreqsproto-1.1.0
 		>=x11-proto/compositeproto-0.4
 		>=x11-proto/damageproto-1.1
-		>=x11-proto/dri2proto-2.6
 		>=x11-proto/fixesproto-5.0
 		>=x11-proto/fontsproto-2.0.2
-		>=x11-proto/randrproto-1.2.99
+		>=x11-proto/randrproto-1.4.0
+		>=x11-proto/renderproto-0.11
 		>=x11-proto/resourceproto-1.0.2
 		>=x11-proto/scrnsaverproto-1.1
-		>=x11-proto/trapproto-3.4.3
 		>=x11-proto/videoproto-2.2.2
 		>=x11-proto/xcmiscproto-1.2.0
 		>=x11-proto/xineramaproto-1.1.3
-		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
+		>=x11-proto/dri2proto-2.8
+		opengl? ( >=media-libs/mesa-7.8_rc[nptl=] )
 	)"
 
-#S="${WORKDIR}/${PN}"
+CMAKE_IN_SOURCE_BUILD=1
 
 pkg_setup() {
 	if ! use server ; then
@@ -93,8 +84,6 @@ pkg_setup() {
 		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)"
@@ -110,68 +99,82 @@ switch_opengl_implem() {
 	eselect opengl set ${OLD_IMPLEM}
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	if use server ; then
 		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver
+	else
+		rm "${WORKDIR}"/patches/*_server_*
 	fi
 
-	eautoreconf
-	cd unix
+	EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" epatch
 
 	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
+		cd unix/xserver
+		epatch ../xserver114.patch
 		eautoreconf
 	fi
 }
 
-src_compile() {
-	econf --without-included-zlib --with-system-jpeg || die "econf failed"
-	emake || die "emake failed"
+src_configure() {
 
-	if use server ; then
+	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 \
-			--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 \
+			$(use_enable nptl glx-tls) \
+			$(use_enable opengl glx) \
 			--disable-config-dbus \
 			--disable-config-hal \
-			--with-xmlto=no \
-			--disable-unit-tests \
+			--disable-config-udev \
 			--disable-devel-docs \
-			$(use_enable opengl glx) \
-			$(use_enable nptl glx-tls) \
-			|| die "econf server failed"
-		emake || die "emake server failed"
+			--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_install() {
-	dodoc README.txt
+src_compile() {
+	cmake-utils_src_compile
 
-	cd unix
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newman vncviewer/vncviewer.man vncviewer.1
+	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 xserver/hw/vnc
-		emake DESTDIR="${D}" install || die "emake install failed"
+		cd unix/xserver/hw/vnc
+		emake DESTDIR="${D}" install
 		! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg
 
 		newconfd "${FILESDIR}"/${PN}.confd ${PN}