gentoo resync : 30.04.2018

3 files changed, 1 insertions, 178 deletions

diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index 7a62a7023490..36d8accb5ba0 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -1,5 +1,3 @@
-DIST gtk-vnc-0.7.1.tar.xz 444380 BLAKE2B bad577dbc759f824d0ef342572363314d493cfcf7822db6356c6766422ecc46cc890ef54167bd3e215bb56a5059a2014c1c28b6e63c2451b21e5a923d7005cf1 SHA512 5d62f60e1c9fe70f93a9d21c529145459f0d59d588631597d533ecba94864271d1095599db9447ac4843814be61af7a7c947f69e5a9cd26db7e811f2c4e95f0c
 DIST gtk-vnc-0.7.2.tar.xz 447088 BLAKE2B 539cc9214735cf73c6e578029b33892c3e2d0d1dc402f82fa6d8d107c9a410e551020d9201192b69e50b75bb8297919ab0961752251dcf0bd75823d7426e01b5 SHA512 b95b1da6ff512c466feaa6efc831e9c36c5a77390b518c647c60fddda9dd850eea8658174682ae135b95bfca7bf2b4e85a5e5ac9adb43e3ddd7aa690288655ce
-EBUILD gtk-vnc-0.7.1.ebuild 4276 BLAKE2B 7118d021766212cd964f1170b9ba46feb5373dbeb511f780ff9ab6f1f8febfe716c56bda31dc94d5306e8a09501dd1d86f6345d778bd3f1237f6f098eeb28e3a SHA512 94196da045c3fd846101aa8cf650089b55442cd3bb71a71f1014802dd2535626aef18c1a3bf57aed456ed41c03c1f45f16fc6e2b64355a43fa5e3bba7985a229
 EBUILD gtk-vnc-0.7.2.ebuild 1487 BLAKE2B 4aafa14d0d026398814a54f15dafd16d2ed594f31be836d6e1c31a8250fc5b55777e72b0bf191e14acbe382fee29ce41497cf5d18345055ff2e9be6eae7885ab SHA512 fa79e09cc5ef8d380f56a8c1bff4b498caf6348d32ba6e0862cd64458db489d923dae423897c846de4a73976fd81d9d079bdef7cc5960a2858d8a0e76765dadf
-MISC metadata.xml 496 BLAKE2B 21e09b4a8913baf86a1f63dcfa8859ce6f9b21d63de85883880536e5ef3918ff29e16f95e4ae4cab2aab406e708f8aaf27c99f0ccbd7cee0abdc6ff986e6e135 SHA512 202c723c8a0b40f56f57c6949f3826d53cddd2a90133546863c7f2a166cffd212fe2e25275315b68fa0946e539472336ce462ea17ce5d6c032503d8726b83ad0
+MISC metadata.xml 397 BLAKE2B 0e99084e903bd50b1228c59e87a97bbec3d6c2543328b9ac42587969cc402e93537c360ca8e1df2e5a9bb1129473e8d6c698b373b3e65ee7b322bb87f01baf71 SHA512 eeedc7da2c6292330fa47841afdbf4038d1c3bec1b2803bd462ea4b13c6cd88448274a0814675d3d85ef89f2fd1aa9c45344412a9742e26214dfdf9d51a63d06
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.7.1.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.7.1.ebuild
deleted file mode 100644
index 84a5688172fc..000000000000
--- a/net-libs/gtk-vnc/gtk-vnc-0.7.1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-VALA_MIN_API_VERSION="0.16"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 multibuild python-r1 vala
-
-DESCRIPTION="VNC viewer widget for GTK"
-HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="examples +gtk3 +introspection pulseaudio python sasl vala"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	vala? ( gtk3 introspection )
-"
-
-# libview is used in examples/gvncviewer -- no need
-# glib-2.30.1 needed to avoid linking failure due to .la files (bug #399129)
-COMMON_DEPEND="
-	>=dev-libs/glib-2.30.1:2
-	>=dev-libs/libgcrypt-1.4.2:0=
-	dev-libs/libgpg-error
-	>=net-libs/gnutls-3.0:0=
-	>=x11-libs/cairo-1.2
-	>=x11-libs/gtk+-2.18:2
-	x11-libs/libX11
-	gtk3? ( >=x11-libs/gtk+-2.91.3:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.4:= )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygtk-2:2[${PYTHON_USEDEP}] )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? (
-		$(vala_depend)
-		>=dev-libs/gobject-introspection-0.9.4 )
-"
-# eautoreconf requires gnome-common
-
-compute_variants() {
-	MULTIBUILD_VARIANTS=( 2.0 )
-	use gtk3 && MULTIBUILD_VARIANTS+=( 3.0 )
-}
-
-src_prepare() {
-	prepare() {
-		mkdir -p "${BUILD_DIR}" || die
-
-		if [[ ${MULTIBUILD_ID} == 2.0 ]] && use python ; then
-			python_foreach_impl prepare
-		fi
-	}
-
-	local MULTIBUILD_VARIANTS
-	compute_variants
-	multibuild_foreach_variant prepare
-
-	# Fix incorrect codegendir check: h2def.py is in pygobject, not pygtk, upstream bug#744393
-	sed -e 's/codegendir pygtk-2.0/codegendir pygobject-2.0/g' \
-		-i src/Makefile.* || die
-
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with examples)
-		$(use_enable introspection)
-		$(use_with pulseaudio)
-		$(use_with sasl)
-		--with-coroutine=gthread
-		--without-libview
-		--disable-static
-		--disable-vala
-	)
-
-	configure_python() {
-		ECONF_SOURCE="${S}" gnome2_src_configure \
-			${myconf[@]} \
-			--with-gtk=2.0 \
-			--with-python
-	}
-
-	configure_normal() {
-		ECONF_SOURCE="${S}" gnome2_src_configure \
-			${myconf[@]} \
-			--with-gtk=${MULTIBUILD_VARIANT} \
-			--without-python
-
-		# for gtk3, python support is via gobject-introspection
-		# Ex: from gi.repository import GtkVnc
-		if [[ ${MULTIBUILD_ID} == 2.0 ]] && use python ; then
-			python_foreach_impl run_in_build_dir configure_python
-		fi
-	}
-
-	local MULTIBUILD_VARIANTS
-	compute_variants
-	multibuild_foreach_variant run_in_build_dir configure_normal
-}
-
-src_compile() {
-	compile_python() {
-		cd "${BUILD_DIR}"/src || die
-		# CPPFLAGS set to help find includes for gvnc.override
-		emake gtkvnc.la \
-			VPATH="${S}/src:${GTK2_BUILDDIR}/src:${BUILD_DIR}/src" \
-			CPPFLAGS="${CPPFLAGS} -I${GTK2_BUILDDIR}/src" \
-			gtkvnc_la_LIBADD="${GTK2_BUILDDIR}/src/libgtk-vnc-1.0.la" \
-			gtkvnc_la_DEPENDENCIES="${GTK2_BUILDDIR}/src/libgtk-vnc-1.0.la"
-	}
-
-	compile_normal() {
-		gnome2_src_compile
-
-		if [[ ${MULTIBUILD_ID} == 2.0 ]] && use python ; then
-			local GTK2_BUILDDIR="${BUILD_DIR}"
-			python_foreach_impl run_in_build_dir compile_python
-		fi
-	}
-
-	local MULTIBUILD_VARIANTS
-	compute_variants
-	multibuild_foreach_variant run_in_build_dir compile_normal
-}
-
-src_test() {
-	local MULTIBUILD_VARIANTS
-	compute_variants
-
-	multibuild_foreach_variant run_in_build_dir default
-}
-
-src_install() {
-	install_python() {
-		cd "${BUILD_DIR}"/src || die
-		emake install-pyexecLTLIBRARIES DESTDIR="${D}" \
-			VPATH="${S}/src:${GTK2_BUILDDIR}/src:${BUILD_DIR}/src" \
-			CPPFLAGS="${CPPFLAGS} -I${GTK2_BUILDDIR}/src" \
-			gtkvnc_la_LIBADD="${GTK2_BUILDDIR}/src/libgtk-vnc-1.0.la" \
-			gtkvnc_la_DEPENDENCIES="${GTK2_BUILDDIR}/src/libgtk-vnc-1.0.la"
-	}
-
-	install_normal() {
-		gnome2_src_install
-
-		if [[ ${MULTIBUILD_ID} == 2.0 ]] && use python ; then
-			local GTK2_BUILDDIR="${BUILD_DIR}"
-			python_foreach_impl run_in_build_dir install_python
-		fi
-	}
-
-	local MULTIBUILD_VARIANTS
-	compute_variants
-	multibuild_foreach_variant run_in_build_dir install_normal
-}
diff --git a/net-libs/gtk-vnc/metadata.xml b/net-libs/gtk-vnc/metadata.xml
index c977e3a032f8..350044690a5e 100644
--- a/net-libs/gtk-vnc/metadata.xml
+++ b/net-libs/gtk-vnc/metadata.xml
@@ -9,7 +9,4 @@
     <email>virtualization@gentoo.org</email>
     <name>Gentoo Virtualization Project</name>
   </maintainer>
-  <use>
-    <flag name="gtk3">Build the gtk3 gtk-vnc library and other gtk3 assets</flag>
-  </use>
 </pkgmetadata>