More strict dependencies, taking those from the respective xorg-server version, bug #338930

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

4 files changed, 63 insertions, 62 deletions

diff --git a/net-misc/tigervnc/ChangeLog b/net-misc/tigervnc/ChangeLog
index 4eac7d266e83..018716697bd9 100644
--- a/net-misc/tigervnc/ChangeLog
+++ b/net-misc/tigervnc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.140 2012/09/16 17:46:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.141 2012/09/16 18:14:10 armin76 Exp $
+
+  16 Sep 2012; Raúl Porcel <armin76@gentoo.org> tigervnc-1.1.0-r7.ebuild,
+  tigervnc-1.2.0.ebuild:
+  More strict dependencies, taking those from the respective xorg-server
+  version, bug #338930
 
   16 Sep 2012; Raúl Porcel <armin76@gentoo.org> files/tigervnc.initd:
   Do a source /etc/profile, bug #307773
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index bf147bbc0ee6..d39d69bcb57b 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -14,14 +14,14 @@ DIST tigervnc-1.2.0.tar.gz 2487050 SHA256 6e0910f1ff1681bc8b52e7ea805e586b88b352
 DIST tigervnc.png 4958 SHA256 e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e SHA512 97f9a42e9b9f50f1c91de3b7d7991aa8965240fe4958d6da4e9f72f9baa4510ad615765f7c59d6e0a90c9d4b5fe53ad1547c766f2da45e4a6b6e29b03ced2b8b WHIRLPOOL bbf01f6702724bc4329d053bd3fbf856103371abce20f6f74aa3c2e5eed0eebcdcccd287788b1efbb8de3008cb484a8da5ccd1bd667727e4b0861f3bb550529c
 DIST xorg-server-1.12.2.tar.bz2 5431841 SHA256 ca9f9e22f432f1ccbf8e7a21e746e02be4081a0f3975eb7cff276483193cc5f5 SHA512 28cc392b9183d0586cac40d349a8390bc90a240fceac689bd6a00a315c9d3ab115c37d3b283c892652f53106190707d1d74bacf256a1543741f555310a7c1ca1 WHIRLPOOL b22cf671d1dd55ff2c2c5713cdceb02cbd7a611dcd9ed63a0a80e5e0ab7677295ed73177034059422c79e5891516546c501ea54108637ef00d9bb977f2f75716
 DIST xorg-server-1.13.0.tar.bz2 5469168 SHA256 548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a SHA512 840a341f796386156ff4eb599c4b3b96090d3fda9cdbe70c45ff175c8d01b62cb9ba04a6c73ddde90996f8b96be1a3d925c9803a3b629cb4bc317374b7b1e014 WHIRLPOOL f52984556237f7c1dd4537727050e6b8347592ef5cd8e6787c65c3fee9bdcadb9709315929636fdc89a2fb4cdfd30f5224072954ed091eafb10fd8cd64a5ac30
-EBUILD tigervnc-1.1.0-r7.ebuild 5046 SHA256 8a22e91d86425a50fa4b1923a7b3e665e1cee860b7de955ea64163a76ef6b62c SHA512 0caaea3bdb28baf6534af8d3da2a2f5fb195aa45df5f43c2ebfea558cbdeb855799dd0b0b960c4f3ada74ab5496bbea75461c698f8ee322c802737a1e74e7aa6 WHIRLPOOL 91f984e183f42c35c7c6ac9b1b0ab1952ba45f61ff083578374f82998c9eb0ebf276a3ad2766d0d68d3b95634b649fdbe22406b768478b0f94bcc25de86818dc
-EBUILD tigervnc-1.2.0.ebuild 4516 SHA256 b32216b1daef162e055504bbae9ef923a8f038ebed2f03c08a924ea159b54a08 SHA512 7e10d6f780ebcd80a4fade5306dfb70b73536560ea924592872d4f6dbb4948fa12251c8c6febc30f86273081fd3575b41d8a5ee60c49f2db99e4ca0bbaccc2fd WHIRLPOOL 9df700e757465a2342e0fbb9644b107635d46bc356ba902b8b08b5b20b37dbe85c0f339c83c70aab86da54a4f173a7536bb0e8d9c3eedfc24fbf0cb5fbaa646d
-MISC ChangeLog 19098 SHA256 5e2db515979e0fc719f94979a4427a42de1d131193dd45a6b6fdd06f1f4cedf1 SHA512 1b3916d3dd8c3d3ea7a7a7aa8f97460c26b6d855de666cae39f190db929671a1d680498e35e417752bec2e78298d015aaa2d894eaec56e8db01a40b8931361c8 WHIRLPOOL 971fd43f9cb43b168716ed8251c0c0602529241f28acf00ae92b76765fcfcde846fcd15d7480133a8d4383a90ca6fcc0bffaef7c701e33865a77a9b22f1c0cf3
+EBUILD tigervnc-1.1.0-r7.ebuild 5214 SHA256 bd490ff5b37e4823f8a3df8b075e9b84b0be8d0319e6e84a543660127eb732b1 SHA512 24f7e5758562a06b3625fadd0327535952fc6e18a526a792f29e6e984cf520154ec040d5069a7886de9cd8eb1247491181383e40c6f63fc51f17a0572010365c WHIRLPOOL b25d9af010e770f2c00c3df4ccbbd9191fb658cfe49110cfa9933368edaf187f327bd280ab0f57a566c62bea76144d78cf10258e4a45a40d645169cdbce262f7
+EBUILD tigervnc-1.2.0.ebuild 4718 SHA256 72052f0d97bc3ee4967a889d493b61f60ad5226ea7b82fd7414f716436cc26e8 SHA512 4f860f9367a54b3821d2f0a73e344ecaf9050010ce94046ae20712fcf92eded47f40cd349384d8868bad348ea49d784b889bf5a8604d3bce3dc7f100fd588b04 WHIRLPOOL a9c6864aa54e7afbd0bebcd4e3842a3f06081117c8650099df3e53307a02a9637d2aa6ab18083334ca75370539a6287113045023fd60058bbdc202e9264558d5
+MISC ChangeLog 19295 SHA256 5af8f445cfd829858fe96e70de54becf96d803942c3d3fe419abd905d01548ea SHA512 9d61401101b8672956c8caba4d2aa7a90b7a807eee7813d9de4a60b9952b5ebda8067e88b6f9c9bb4e33a18d3d568abf6f7d6ec07eee28f744dd63f4c9d1bee9 WHIRLPOOL 253f35519f9f14f277d65c09fef9943e33e2760982ccd5f0185279a7114bdf5b630eedde20faffe7755faa29de28a41bbfac8283057b886190912b4050d6f0d2
 MISC metadata.xml 419 SHA256 86dbc1cfbd6cbb2e25c6e597dd377f99e50f315eaaebcc4402df4a3196e14042 SHA512 994d090964ed1dfd0404a7fd0abea328472587617cfb86c76fb73525479fa4c1db65d33d9413935df5472ab834bc27687793ad84b0996e82e3894aef456ae9a3 WHIRLPOOL 8bf5c41547ac54c04042cf22c4fc7d432842997e8530a72e4c8f0a508c4fc1f0e77689f382290824c1d3b83510447d1763e36db8606a875ab0e5af845ea2efcf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEUEAREIAAYFAlBWEG0ACgkQuQc30/atMkBA7wCfeS5L9U9wanuIGyNVdfZAIjmY
-pYIAliy5nUKxi35yw1iV7VuAJEhBevo=
-=Wvex
+iEYEAREIAAYFAlBWFvgACgkQuQc30/atMkCYIQCgnLyZmfTdW6V0WiwLidxMR+GW
+ZMwAnRpitGoX2ykDsJK1T4GxD9CJhhp+
+=5Is+
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tigervnc/tigervnc-1.1.0-r7.ebuild b/net-misc/tigervnc/tigervnc-1.1.0-r7.ebuild
index 292ce7a44b5b..49f31306b7a1 100644
--- a/net-misc/tigervnc/tigervnc-1.1.0-r7.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.1.0-r7.ebuild
@@ -1,6 +1,6 @@
 # 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-r7.ebuild,v 1.10 2012/08/26 20:14:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.1.0-r7.ebuild,v 1.11 2012/09/16 18:14:10 armin76 Exp $
 
 EAPI="1"
 
@@ -28,18 +28,18 @@ RDEPEND="virtual/jpeg
 	sys-libs/zlib
 	media-libs/freetype
 	x11-libs/libSM
-	x11-libs/libXtst
-	app-admin/eselect-opengl
+	>=x11-libs/libXtst-1.0.99.2
+	>=app-admin/eselect-opengl-1.0.8
 	server? (
-		x11-libs/libXi
-		x11-libs/libXfont
-		x11-libs/libXmu
-		x11-libs/libxkbfile
+		>=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
-		x11-apps/xauth
+		>=x11-libs/pixman-0.21.8
+		>=x11-apps/xauth-1.0.3
 		x11-apps/xsetroot
-		x11-misc/xkeyboard-config
+		>=x11-misc/xkeyboard-config-2.4.1-r3
 		media-fonts/font-adobe-100dpi
 		media-fonts/font-adobe-75dpi
 		media-fonts/font-alias
@@ -60,19 +60,19 @@ DEPEND="${RDEPEND}
 		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/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/resourceproto
-		x11-proto/scrnsaverproto
-		x11-proto/trapproto
-		x11-proto/videoproto
-		x11-proto/xcmiscproto
-		x11-proto/xineramaproto
+		>=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
diff --git a/net-misc/tigervnc/tigervnc-1.2.0.ebuild b/net-misc/tigervnc/tigervnc-1.2.0.ebuild
index 5f435102f8ea..10111c4e9676 100644
--- a/net-misc/tigervnc/tigervnc-1.2.0.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.2.0.ebuild
@@ -1,8 +1,8 @@
 # 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.2.0.ebuild,v 1.1 2012/09/16 16:14:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.2.0.ebuild,v 1.2 2012/09/16 18:14:10 armin76 Exp $
 
-EAPI="1"
+EAPI="4"
 
 inherit eutils cmake-utils autotools java-pkg-opt-2
 
@@ -25,7 +25,7 @@ IUSE="gnutls +internal-fltk java nptl +opengl pam server +xorgmodule"
 
 RDEPEND="virtual/jpeg
 	sys-libs/zlib
-	x11-libs/libXtst
+	>=x11-libs/libXtst-1.0.99.2
 	gnutls? ( net-libs/gnutls )
 	java? ( >=virtual/jre-1.5 )
 	pam? ( virtual/pam )
@@ -35,15 +35,15 @@ RDEPEND="virtual/jpeg
 		x11-libs/libXinerama
 		x11-libs/libXcursor )
 	server? (
-		x11-libs/libXi
-		x11-libs/libXfont
-		x11-libs/libxkbfile
+		>=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
-		x11-apps/xauth
+		>=x11-libs/pixman-0.21.8
+		>=x11-apps/xauth-1.0.3
 		x11-apps/xsetroot
-		x11-misc/xkeyboard-config
-		opengl? ( app-admin/eselect-opengl )
+		>=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
@@ -52,29 +52,29 @@ RDEPEND="virtual/jpeg
 DEPEND="${RDEPEND}
 	amd64? ( dev-lang/nasm )
 	x86? ( dev-lang/nasm )
-	x11-proto/inputproto
-	x11-proto/xextproto
-	x11-proto/xproto
+	>=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
-		x11-proto/compositeproto
-		x11-proto/damageproto
-		x11-proto/dri2proto
-		x11-proto/fixesproto
-		x11-proto/fontsproto
-		x11-proto/randrproto
-		x11-proto/renderproto
-		x11-proto/resourceproto
-		x11-proto/scrnsaverproto
-		x11-proto/videoproto
-		x11-proto/xcmiscproto
-		x11-proto/xineramaproto
-		x11-libs/xtrans
-		opengl? ( media-libs/mesa )
+		>=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
@@ -102,10 +102,7 @@ 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
@@ -119,7 +116,6 @@ src_unpack() {
 		cd unix/xserver
 		eautoreconf
 	fi
-
 }
 
 src_compile() {