Remove older version and enable USE=gtk3 to be on by default from 0.5.2 and on.

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

4 files changed, 20 insertions, 194 deletions

diff --git a/net-libs/gtk-vnc/ChangeLog b/net-libs/gtk-vnc/ChangeLog
index 1e5bc06b6b5f..a639c502dad1 100644
--- a/net-libs/gtk-vnc/ChangeLog
+++ b/net-libs/gtk-vnc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/gtk-vnc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/ChangeLog,v 1.108 2013/08/08 09:41:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/ChangeLog,v 1.109 2013/08/10 20:19:35 cardoe Exp $
+
+  10 Aug 2013; Doug Goldstein <cardoe@gentoo.org> -gtk-vnc-0.5.0-r1.ebuild,
+  gtk-vnc-0.5.2.ebuild:
+  Remove older version and enable USE=gtk3 to be on by default from 0.5.2 and
+  on.
 
   08 Aug 2013; Agostino Sarubbo <ago@gentoo.org> gtk-vnc-0.5.2.ebuild:
   Stable for amd64, wrt bug #480150
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index 52a6777dea80..55691f9449b3 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -1,30 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX gtk-vnc-0.5.0-pod.patch 3441 SHA256 921b8347907bee39caff14c80c3b576618fe7ac2a7d679500769f797cab8fb66 SHA512 22a01832e04d3a6e5887e533d1477fa62593cfea2066d8a61e0856000897a6e481cbf4a692d2cf33f66a853583b07cb5d99465050c545605bbbaf4ab181b9404 WHIRLPOOL b44becccb00fd190c208596807b6b665acf5904e5c6bb461d99d0b4da8b1b3ec91bd9d8764faa286b9aa94f39073dda2b3399e6f7b39bb8e3a87b4626dd46c4c
 AUX gtk-vnc-0.5.0-pulseaudio-automagic.patch 2001 SHA256 5ea9f09c341b656efaf54e5c9114f6ce04ac056212615b01ba68911d0085f2aa SHA512 f91e5a5fe8223540eb964647d4ae409e243ff9f381fbae40eb6fb37e3a6634b7823025ce6a89329f4857f6d1b2a023189a66d6ab50581522498ec01cae00d80d WHIRLPOOL 13818a8d0230ae65035debb0a9ceaa7c3d3e0cb548d926696ed57682e75fed4299a4c821373bc7aebcce6401fee26a0d7385381d4b222172732e9e9916388f41
-DIST gtk-vnc-0.5.0.tar.xz 386068 SHA256 1de65d8ffa8c25a61a8e8c4b7e5963d4a826f4fcf7120d66ed027f5f70cc8f81 SHA512 343959e4fa3b8a1a8752e47e02c2b55db6b201b4593f09365a240862e64bbd081b6e2c6804b3b2c1b3480f402519c1d109dc5c72a2dcc8cd7b1bae8326efb095 WHIRLPOOL 65a1b8dc41c7cf571353477bcf81eefb339745663713ca7737569ef2f4916bd4dd35462d7931fe9da71050ecfe81f103eebfa0772db76ed9d904ece009e2af13
 DIST gtk-vnc-0.5.1.tar.xz 413652 SHA256 1ad1847a23f8ea8fbf2396de46c51ec0900ee3698cde4e205760518cd1e01a40 SHA512 b801e1e4a0c7df055fb2beab65026b9a282409930efdd7b8c5d8b8f108e15b460ed10dffb3dc3e44904d10856cdce9fdf330cbeaa2224c8b47523b59afe237fd WHIRLPOOL ed41f62efbb28ce349756645ce787fc284f1de2bdb97b73d455ea2fb17111be434ce54baeac907fde6d4ff4a7b323cc7742f9d5903668d3d326d928787d27c44
 DIST gtk-vnc-0.5.2.tar.xz 388112 SHA256 b51bda7edebb82ab142c292bd1b1493406bc8225a5c834d854bbafef9e9a471f SHA512 e58a0bbb4c5d1802d51936d5869ccad55cd405f6939f49445e224863866a33173e47e055d88f50e60b3f864a7e393faf0c78a219a08ee8a8c1fc8fe108f9824a WHIRLPOOL 339260787cb7970fde2a660186e46977d0a5f6e2966e859ebfb632cf29310c1957e0e3c9b0ac06a3d420caa4a20900ad168658c49ae0da0115cd40b8ece6990c
-EBUILD gtk-vnc-0.5.0-r1.ebuild 4541 SHA256 22011a079999c2b10422176a44e08acff21fd48492e55343731fdf83a576bbca SHA512 47acae813bf425cef0674bdacdc9632a83e9e8df934125fed921a4802e6e93e59559d00acc7dafb0e12eb8f5a9bbcb0e6d247d84f72f57db5484e61efea87515 WHIRLPOOL 47835bb624ecca13a0c9f5d1d79c08748accf804b47d601d79a5c28397033f237cb29208be8f7ad40c8e40535ff8c015d07a3a494ca7bc9e969ef947ea60b915
 EBUILD gtk-vnc-0.5.1.ebuild 3920 SHA256 8a1d9991867a636846e5689c6308a1448a23d587b5af358e8c149fb3ae43c70e SHA512 954a3d412dd09dbbd8d28b26c9f3d7bbf574ba82c3f43503592cf68f53a2452ccd36b1d3668d34b8272f219aa9849f60ba6c755e00faad42a296b9bebbb2b066 WHIRLPOOL 12ff1c69ed38ea2653430a8a806a2f89fbd49018c009a004f7991c135755942f487d4ad64a17b8cd0efa13c51331ca36ba8f59d8dbea4cbcfa0444ec24ea8f16
-EBUILD gtk-vnc-0.5.2.ebuild 4903 SHA256 70ede6c8872d587990e603ae434873b58eae23b28c48ae73bba2a66dccdf91fd SHA512 8ef4c214ca2c88f6cef2679f23cfcbf3178319bb9bc43e7258c7c3427065b15442213da4917ab0f6836b32a570cb3b2a68a62857329e6bf7771ac12a12bb2d26 WHIRLPOOL 807cbda94e8d7398713dd9c7f74ba2910b5eefc5bd240cbf34f4807c8d961a29e5e62ed7ff3a4ba0d8f4ee0c41c40e5e3c46c9debbece2b9f4df0143abd2173b
-MISC ChangeLog 15927 SHA256 a429795e3d5acfff1cb6dfc999fdad7a06bcabde4faaa8083a9c207518462585 SHA512 7e75c13dbe51476aab0e0044bd21f14134cbb8bf3d5d75fece24592ee6ae93cd6a6202fe42cbafac78d8670c150869d46cee5bd24aaeb9d27bb7d2f825a1c686 WHIRLPOOL 31d93643e33dfd186abcce346056b1e9341a75e96200c01ae559cd65f04e4d480776aa9ff1cd828d9c16dfa73c322ba12152af6a9a68f742e15b22429cea35a5
+EBUILD gtk-vnc-0.5.2.ebuild 4907 SHA256 26902cc4b6ba848707124dff1a65be3650247fdcc8f389a5d2baff007891a30d SHA512 4c65cfb6210bbb64d37d7ffa2f3f5a2ced8f16982d102d176fa2ca941ef26de1fa7938ed152f43fc6601d9d80409e203ed03a737976203d4808914c32a4eb0d5 WHIRLPOOL 8109273adfaf8e07af03609f94d56a58f555e1f0e97211d00bb0bc70b6a96b7c0fe8b2e4e9513b8c3130375dbee953081165b609474b831a5fa641141b437d85
+MISC ChangeLog 16115 SHA256 cb7563d2559c16d827e24993790014557c6f2f386f92e83e43d495b53cc5d552 SHA512 bc200db07a1bf0f47d2d3fc93743ad3c12e21e8325aa530e3aaab115fe9581315e941ed1dbe93842617051dcb1c5a50f46bebea511d3a22535f542c2997af9df WHIRLPOOL a4d10c67e26afe1ce77c034d0ae000f932242333aa9df37515648b5b79dcccebfbd0af75616349ff33e5d4352bd97858e3bde02c136bbbd1d39f2baf802c0da0
 MISC metadata.xml 437 SHA256 12e7181f2d8a5bbe8c21a5c7cd2d346e4c6af226fd138d1935314b6dac644ce3 SHA512 faaafd28513949435c063d9945c861f7ee792e1ba1bd09518ec735142e7bf61b676dcd858026989d377feb8503a129d9649f542153ff5a273bf8bdc68f0d3c12 WHIRLPOOL f55bcb48a6a6b81cbcca890feec882dd5e6552adccf93df264b66399e5640173ff3624c5e2d3d3ca7c52a5a8c5213f1fb972b4c29e44813271ca6924c5ad45de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSA2fcAAoJELp701BxlEWfTxQQAIc4YTq2tQDhaqklIOLCFfZt
-otSP7JAZXo+1FSnf9cdgFv210TwfWrqnva3qZtu/bFEnr7tpVRUAQKopY2FFM8du
-/zG1Yrt4QMjVrJUIgJCIcwgzpLoX6ww/T1Uc88zzLKvhII8ESuw0K35WhM617BPA
-WRpy7o+tI3G80PPfB/c3Rlqk1PP07T7Fwt4oAFycWUh47itDT8SHQiTcZS+0yvuK
-9j1hgNtf3kJ7lUN590uPtsXRelfoZtTAoLgUzBT6WB+Vq/1N//8CNvJWJnginzgi
-uBbrb+yrEzrkVRCQqojqlGOUBEeeH6Wgc0yqJ/86FrQjR4IDRzIn1PTZkcb/MuCY
-evyGPA4pckBA160OUPnpoSq5MpJHYoQLCe0cGHMif+QYaNkfpuKwT6rusX1fVY2R
-8HhuTcdq6uGmTLKuhVw7L1LtZwZOiohhkxb2s/Q8uOBTw4iiIM3S4P5C/hb/w7XD
-BSOR1kXjko+84gaosdZFUwMTEqhtDup3qgeKeW4e5EdX6nlKf9E4xiTxfLtwzf9N
-L0r4fDk4Vc1if64DDfd8MRwXpfkcoVpNU2Xs0OpUC+1YJsr1GSgZa0QuuRNRHKFq
-OzciN3Jubu+kY8mfpoGuRuKIsOPAW1xkbpBTbh6NQ2wJrtVXbrek4JIIjSyccP3w
-epGNvcYzihjouYhWEJat
-=H3jD
+iQF8BAEBCABmBQJSBqB0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRDMDRGNEJFMDZEQTJGRUY3NkI4MEM3NTlE
+N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prvk9wH/ibre2ZvtWpshO4G9VjM/mT8
+0yoGUF3WBpPJzL54gPmA4mfM9lmVRwar5HZ5n26NMx1QSCojBSUA9VO4k79QuVnh
+cEuoIPWppjNzckxcpRcogsGKFnqVV1ltsHoKuQHpEtWCjnrH0v/PxypFUU1ms7jH
+VmTkwFy5+9yD6H9lZV9IWzyd2EIBszR7ZCeAAumTolrbeXYoLWU5zaYXXAe3dy1G
+6YumhbkSGTXgWTvwqo1TO3uZo3M1Om0p/qlmFptBoQWELHh/QuBOP3ykVtvCJuBi
+k9zLi6JPrkdyvRmPL2flE5E54s0J533Z73N3Glp6zy5K7q3vWQrZuce+j19qrmA=
+=Tihf
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.5.0-r1.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.5.0-r1.ebuild
deleted file mode 100644
index 863a19094b7b..000000000000
--- a/net-libs/gtk-vnc/gtk-vnc-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/gtk-vnc-0.5.0-r1.ebuild,v 1.8 2012/07/15 18:14:28 armin76 Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="python? 2"
-
-inherit autotools base eutils gnome.org python
-
-DESCRIPTION="VNC viewer widget for GTK"
-HOMEPAGE="http://live.gnome.org/gtk-vnc"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="examples gtk3 +introspection pulseaudio python sasl vala"
-
-# libview is used in examples/gvncviewer -- no need
-# glib-2.30.1 needed to avoid linking failure due to .la files (bug #399129)
-# TODO: review nsplugin when it will be considered less experimental
-# XXX: automagic pulseaudio. Is it worth patching?
-COMMON_DEPEND=">=dev-libs/glib-2.30.1:2
-	>=dev-libs/libgcrypt-1.4.2
-	dev-libs/libgpg-error
-	>=net-libs/gnutls-1.4
-	>=x11-libs/cairo-1.2
-	>=x11-libs/gtk+-2.18:2
-	x11-libs/libX11
-	gtk3? ( >=x11-libs/gtk+-2.91.3:3 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.4 )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( >=dev-python/pygtk-2:2 )
-	sasl? ( dev-libs/cyrus-sasl )"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	virtual/pkgconfig
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-
-	gnome-base/gnome-common
-
-	vala? (
-		dev-lang/vala:0.14[vapigen]
-		>=dev-libs/gobject-introspection-0.9.4 )
-"
-# eautoreconf requires gnome-common
-
-GTK2_BUILDDIR="${WORKDIR}/${P}_gtk2"
-GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-
-	if use vala && ! use gtk3; then
-		ewarn "You must set USE=gtk3 to enable vala bindings support."
-	fi
-}
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=667943
-	epatch "${FILESDIR}/${PN}-0.5.0-pod.patch"
-
-	# bug #399111, https://bugzilla.gnome.org/show_bug.cgi?id=673570
-	# requires eautoreconf
-	epatch "${FILESDIR}/${PN}-0.5.0-pulseaudio-automagic.patch"
-
-	python_convert_shebangs -r 2 .
-	mkdir "${GTK2_BUILDDIR}" || die
-	mkdir "${GTK3_BUILDDIR}" || die
-
-	# Remove a few files that were autogenerated during distcheck.
-	# Having these around in srcdir breaks out of tree build since they're
-	# expected to be in builddir, which is correct for trunk builds since
-	# they're generated files, not source files. Funny false dichotomy.
-	rm -vf "${S}"/src/{vncconnectionenums.[ch],vncdisplayenums.[ch]}
-
-	# Fix incorrect codegendir check: h2def.py is in pygobject, not pygtk
-	sed -e 's/codegendir pygtk-2.0/codegendir pygobject-2.0/g' \
-		-i src/Makefile.* || die
-
-	eautoreconf
-
-	# Work around https://bugzilla.gnome.org/show_bug.cgi?id=667941
-	[[ -e GNUmakefile ]] || touch GNUmakefile
-}
-
-src_configure() {
-	local myconf
-	myconf="
-		$(use_with examples) \
-		$(use_enable introspection) \
-		$(use_with pulseaudio) \
-		$(use_with sasl) \
-		--with-coroutine=gthread \
-		--without-libview \
-		--disable-static \
-		--disable-vala"
-
-	cd ${GTK2_BUILDDIR}
-	einfo "Running configure in ${GTK2_BUILDDIR}"
-	ECONF_SOURCE="${S}" econf ${myconf} \
-		$(use_with python) \
-		--with-gtk=2.0
-
-	if use gtk3; then
-		if use vala; then
-			myconf="${myconf} \
-				--enable-introspection \
-				--enable-vala \
-				VAPIGEN=$(type -p vapigen-0.14)"
-		fi
-
-		cd ${GTK3_BUILDDIR}
-		einfo "Running configure in ${GTK3_BUILDDIR}"
-		# Python support is via gobject-introspection
-		# Ex: from gi.repository import GtkVnc
-		ECONF_SOURCE="${S}" econf ${myconf} \
-			--with-python=no \
-			--with-gtk=3.0
-	fi
-}
-
-src_compile() {
-	cd ${GTK2_BUILDDIR}
-	einfo "Running make in ${GTK2_BUILDDIR}"
-	# Work around https://bugzilla.gnome.org/show_bug.cgi?id=667941
-	rm GNUmakefile
-	emake
-
-	if use gtk3; then
-		cd ${GTK3_BUILDDIR}
-		einfo "Running make in ${GTK3_BUILDDIR}"
-		# Work around https://bugzilla.gnome.org/show_bug.cgi?id=667941
-		rm GNUmakefile
-		emake
-	fi
-}
-
-src_test() {
-	cd ${GTK2_BUILDDIR}
-	einfo "Running make check in ${GTK2_BUILDDIR}"
-	emake check
-
-	if use gtk3; then
-		cd ${GTK3_BUILDDIR}
-		einfo "Running make check in ${GTK3_BUILDDIR}"
-		emake check
-	fi
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog NEWS README
-
-	cd ${GTK2_BUILDDIR}
-	einfo "Running make install in ${GTK2_BUILDDIR}"
-	# bug #328273, try again parallel installation in next testing version
-	MAKEOPTS="${MAKEOPTS} -j1" base_src_install
-
-	if use gtk3; then
-		cd ${GTK3_BUILDDIR}
-		einfo "Running make install in ${GTK3_BUILDDIR}"
-		# bug #328273
-		MAKEOPTS="${MAKEOPTS} -j1" base_src_install
-	fi
-
-	python_clean_installation_image
-
-	# Remove .la files
-	find "${ED}" -name '*.la' -exec rm -f '{}' + || die
-}
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.5.2.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.5.2.ebuild
index 822a94ac3421..9b9887300843 100644
--- a/net-libs/gtk-vnc/gtk-vnc-0.5.2.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-0.5.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-libs/gtk-vnc/gtk-vnc-0.5.2.ebuild,v 1.5 2013/08/08 09:41:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/gtk-vnc-0.5.2.ebuild,v 1.6 2013/08/10 20:19:35 cardoe Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{6,7} )
@@ -15,7 +15,7 @@ HOMEPAGE="https://live.gnome.org/gtk-vnc"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="examples gtk3 +introspection pulseaudio python sasl vala"
+IUSE="examples +gtk3 +introspection pulseaudio python sasl vala"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	vala? ( gtk3 introspection )