Do not require itstool (bug #450700, thanks to Peter Wilmott). Update license.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

5 files changed, 42 insertions, 23 deletions

diff --git a/net-misc/vinagre/ChangeLog b/net-misc/vinagre/ChangeLog
index 8a86eba06c55..6a1a862cf396 100644
--- a/net-misc/vinagre/ChangeLog
+++ b/net-misc/vinagre/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/vinagre
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.86 2013/01/06 10:04:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.87 2013/01/07 13:44:54 tetromino Exp $
+
+  07 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  vinagre-2.30.3.ebuild, vinagre-3.4.2.ebuild, vinagre-3.6.2.ebuild:
+  Do not require itstool (bug #450700, thanks to Peter Wilmott). Update
+  license.
 
   06 Jan 2013; Agostino Sarubbo <ago@gentoo.org> vinagre-3.6.2.ebuild:
   Add ~sparc, wrt bug #449220
diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest
index 24524f987f8f..d476a3d37b66 100644
--- a/net-misc/vinagre/Manifest
+++ b/net-misc/vinagre/Manifest
@@ -1,8 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST vinagre-2.30.3.tar.bz2 2447388 SHA256 28bfc70a816bc3f1e71ada82e260c39ee2dac693cb7859323b06c8b1452a39f4 SHA512 3363d55f013d1477fd3270f701f717df5ffdf187d2718ab577b3acead5950bdc566bc714fd689a63c44c13160e4d0fdfc7be89b495859d721b8b3c6121443c5d WHIRLPOOL e79aa98f9252b2b50fd77f0debd622d716a4b81addc75d662ea224f876e4e718c20bbbff2c9569a16d8efb563dbe8720430907067eb0cf006261def0397f215b
 DIST vinagre-3.4.2.tar.xz 2503232 SHA256 31dfc98fef91cf692a90880377f8abf95dcf6a7d3512441655bc66b969f50d85 SHA512 c61652309e68044096aa978d48e2d4c0e791aaca71266c0fb2e24c7b7055118b9abf3efe0941680bcef0ca577ab93e3066d1b95b49fa837a8b9cb7c32a8d7c91 WHIRLPOOL fc3d397ae9185465b42104ceccec05c24f93deade5a87356f697ab80afee48a031c951400e05a90828e6a7bd7dfbfcf6931c4f17226d20026ce9f5a1380b1c16
 DIST vinagre-3.6.2.tar.xz 2497324 SHA256 dec4b24de9c372cef3efc0d3e80514c85250e01ce01325d07a4e4e956b4a8f3c SHA512 638c861273facd22e136ef68aa500a32befbd0137e4e5877e1c98c4b0e09f840f31f30175bcce78bd308f47336403899b7fd49f5249ff38174f098bf8dc49709 WHIRLPOOL cad57d8484a4bf88936571ebd4f9624efe0ee9994fbdd7dda0989de4cad0d101048e4e09c1f46d040addd03b0b6248848520500de8f46e8112fc26528b61b8c9
-EBUILD vinagre-2.30.3.ebuild 1668 SHA256 4be8196dc2a182233a02f97ddab1c2a46912b0ae4825f5e2b398e0626b82f020 SHA512 45be1c1a86b9b2a8a4c588ca7abf8e160f0645ec867b8cdc46594b3797e0121d2fa6a35255f4f32e9b1d13d36631dac5a231a30cef1d2c69734bf2fb53811511 WHIRLPOOL b1e165bf8836ab2c72792cc198484b3a0cfe22f58196085f3fd3d295d0c904bec812c583d4960a4fc6f3d63c95149a7d54dc96175cf72073561f374a02e14dfc
-EBUILD vinagre-3.4.2.ebuild 1706 SHA256 8724d061d2dbd15acdba01c69fcc6dc98033ef12eb81e286dd68cffc06122ce3 SHA512 0ff457dc99ea02235cb626f3b16a81dfecb840a421aef5cf5bc98cc9afbc04d9a910b7b5eb2817eae924842d8875769c1fb5da5cf2727067dd2d24546cab62d4 WHIRLPOOL 990c7c4a1e775d943f32278109587e93039e4eadd284350bb30e1fe558f449484610af560e21d4d7a35919c04139ef9dc52687af03932530d36a65c9f7275b2e
-EBUILD vinagre-3.6.2.ebuild 1531 SHA256 f1ad7786cc7279eaeda699f019d021beca4e5f60ffd76ae4cbbcfc54febba898 SHA512 26f4569dff914e7ba4979cde9f07e95cfc625b88cead6cb82c7453a85b4e5f412b401e48e48eb857b750b450802f7a361b4e3dca260e1123d459000d34d990a6 WHIRLPOOL 67a87cad8de2f0baf1945d76edabcf560b7149b81a9b479ff28b9261478bed110934d5a3e510ce404c5a30561ce3900b2b166a5076fc8fc4012304ab54816d3d
-MISC ChangeLog 11966 SHA256 1b790768ea813286938f8ece739b21d0f42ecc3ee88c66e22d844645aa735abf SHA512 4a0feaff6bd10108dbda9b58618a0c9c30c4b9bb957b4924a9ce07d32e97ac1c10c6379ec8612d9607079cc2fbd00cc94bf68492c9f61c1a770dd1c4f9d70ae6 WHIRLPOOL 59ecc66d9cd054683ef85314b3b00b5fef355946ece7ff194e2a20925b7feec0710e689280ac9de166e01b36fc9f0c23dce8db096e22172507e6e7565a7350d5
+EBUILD vinagre-2.30.3.ebuild 1672 SHA256 85d2f2c50609bc591cc56b62264428e3f284c0d1dccf5037bfa92f423f747b1c SHA512 b37c17cade8ffcc8358c1b755203701054d00f3bc197cc4c10b2f8ef185ad2bd2c8172e144af4d3604e34422255a2e85c857cc241627db8f23f90dea99dd7508 WHIRLPOOL 860ffcd26faf0e33ae2e790b25b137c2f45c948fb149c2f942666f3b12124b16efedfb830505a5874c0a8ee161b6ed1181324acb6b9e6371876f4a459f2f2fe5
+EBUILD vinagre-3.4.2.ebuild 1713 SHA256 d4f2ed4d51864c0c6cba09bdd33df45f55b5555fd6dac0116856c5c0948af958 SHA512 034f74f1c088258e8fbad1512a131bfd52c67367a0fa86b6b060aaeddfcde84041f3a811ebe660c9df1ed2cc04e0163b678fd3e95ecd96b5390c0810c8758f62 WHIRLPOOL b7d757ea824d9951fa9b61fd6f4f6f1004c1d6746042d41be15a177418a4403af1ff15bb3c8489190b56bb7f94fc4bd6944982f9ea957b70edcf5a9680bbd673
+EBUILD vinagre-3.6.2.ebuild 1573 SHA256 6e1e4a3117ab69424998c48ea71697db6f5cc46ca5bf1d7a29156bbce8c86e01 SHA512 9af3df24324f86c18c6eba0170d34c41fd18f17b90541fc685daad50765049f36e84a244ec0f2d6eedd419dbd22ee4ba84bee2ef9c1607131380e41cff3c019b WHIRLPOOL b4714a228052cd7a12326771a1b70470d984a10424ede79e32e847855d0c4bf29c48582317a3522a65d79ebb6d3f20bfac0f39d797c9a7a4a564d933a40bdb07
+MISC ChangeLog 12184 SHA256 dcb0480e1de1daaf94229da2d17a6efe3e66fbdabe93c92e132c27a827d09b1e SHA512 71f8e581900acb4bb05fe87fa2bd3801b88bcc9c6e48039de0ec30d336d6ddd80a5337685001b482a1d773c84362e1dc03d23c65d5d6ee6c16558126aac78dbd WHIRLPOOL 9f07cb53bf2b34eb1ec778e6eeacfb132cf9b29684a8ce2d62deabcae77ea21b446ea6c846b5c347019989e44071a2504ad9620a2e2e2be2601693129e0f1509
 MISC metadata.xml 633 SHA256 a6ad796117ba8acfa7a4751bfab866713d1b5861eba7eef0a5ed239ebc236363 SHA512 1e5eb8f97a57f6d19aaacc15e468bb0388d7bd0c331efa65cff2b843ef61f4a5971c89b0c2745f86d59d27a454211a2e38744f976d0bb2699298506627922ce3 WHIRLPOOL c6deceea983d4d2b215846ff97fd7aaac03e1d2fd8f51c7ce006236baea39fe5aa2b4834ea7be81cb05262a93eca33dd79ed8d98cac1048994b47130060b46d3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQ6tFXAAoJEJ0WA1zPCt1hJ/gH/1abUKeB8vyj2lqMwBdUrMLA
+A895Wvxt+hxC4jd25BTi2ObUIHccBvhB+YqsaLqS6DEAq9pF6zo6kNgjJtWjZvee
+PZg+pHsFnALGEXw7BcIGOhA7hmGS9ITM2f2uYHq4QdQtFW5RUTbVVHZUGvMpJq0F
+F1wDmUuNTOC2up4GNXEeWFnWyQpeUKuMwhkqPr9XGSjxz42l7C2aYryk2hVbNkMn
+V4DJYn/sMflnOIXvXv4lPJqL+M3MKNf1uL4mKv92JxKgK+Ja6DtsAUZD9XETLy2q
+2Wb8ejbuxaK2E0u5wUGn8R+/pjkURRnIoCoqfk7l4ebSEE+pU/X8DhHKH+bMgLg=
+=k0mO
+-----END PGP SIGNATURE-----
diff --git a/net-misc/vinagre/vinagre-2.30.3.ebuild b/net-misc/vinagre/vinagre-2.30.3.ebuild
index 13f701c00b38..f250fbec1dca 100644
--- a/net-misc/vinagre/vinagre-2.30.3.ebuild
+++ b/net-misc/vinagre/vinagre-2.30.3.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-2.30.3.ebuild,v 1.10 2012/05/05 03:20:44 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-2.30.3.ebuild,v 1.11 2013/01/07 13:44:54 tetromino Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
 
 inherit gnome2
 
-DESCRIPTION="VNC Client for the GNOME Desktop"
+DESCRIPTION="VNC client for the GNOME desktop"
 HOMEPAGE="http://www.gnome.org/projects/vinagre/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="applet avahi +ssh +telepathy test"
diff --git a/net-misc/vinagre/vinagre-3.4.2.ebuild b/net-misc/vinagre/vinagre-3.4.2.ebuild
index 00fa7d9e9373..8a1a25aa285b 100644
--- a/net-misc/vinagre/vinagre-3.4.2.ebuild
+++ b/net-misc/vinagre/vinagre-3.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-3.4.2.ebuild,v 1.2 2012/10/25 21:39:22 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-3.4.2.ebuild,v 1.3 2013/01/07 13:44:54 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -8,10 +8,10 @@ GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
-DESCRIPTION="VNC Client for the GNOME Desktop"
+DESCRIPTION="VNC client for the GNOME desktop"
 HOMEPAGE="http://www.gnome.org/projects/vinagre/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="avahi rdp +ssh spice +telepathy test"
diff --git a/net-misc/vinagre/vinagre-3.6.2.ebuild b/net-misc/vinagre/vinagre-3.6.2.ebuild
index f65cdfbe5310..f744e55970c5 100644
--- a/net-misc/vinagre/vinagre-3.6.2.ebuild
+++ b/net-misc/vinagre/vinagre-3.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-3.6.2.ebuild,v 1.6 2013/01/06 10:04:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-3.6.2.ebuild,v 1.7 2013/01/07 13:44:54 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -8,7 +8,7 @@ GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
-DESCRIPTION="VNC Client for the GNOME Desktop"
+DESCRIPTION="VNC client for the GNOME desktop"
 HOMEPAGE="http://live.gnome.org/Vinagre"
 
 LICENSE="GPL-3+"
@@ -45,14 +45,14 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
-	G2CONF="${G2CONF}
-		VALAC=$(type -P valac-0.18)
-		$(use_with avahi)
-		$(use_enable rdp)
-		$(use_enable ssh)
-		$(use_enable spice)
-		$(use_with telepathy)"
-	gnome2_src_configure
+	G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+	gnome2_src_configure \
+		VALAC=$(type -P valac-0.18) \
+		$(use_with avahi) \
+		$(use_enable rdp) \
+		$(use_enable ssh) \
+		$(use_enable spice) \
+		$(use_with telepathy)
 }
 
 src_install() {