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

(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key D7DFA8D318FA9AEF!)

3 files changed, 8 insertions, 176 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/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 )