commit:     b4f378c45f7ec73e11682288b993df98ce637086
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 11 18:34:21 2016 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Sep 11 19:00:01 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4f378c4

net-libs/gtk-vnc: version bump 0.5.4 → 0.6.0

Ebuild rewritten to use multibuild, should make it easier to maintain.

Package-Manager: portage-2.3.0

 net-libs/gtk-vnc/Manifest             |   1 +
 net-libs/gtk-vnc/gtk-vnc-0.6.0.ebuild | 173 ++++++++++++++++++++++++++++++++++
 2 files changed, 174 insertions(+)

diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index 05d09ae..d2cdcea 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -1,2 +1,3 @@
 DIST gtk-vnc-0.5.3.tar.xz 408336 SHA256 
d490a6c8f40e550d43aef0043ce3bec498ec220d5eb3dc5cdcff8fd561149caf SHA512 
a5d81fcb8ee04f033a3aec2eed334e4237c8f4d7334e4875a149b5b385b0f0f0948d2d5227fbbfdccec8d192ba8bbc5f93dd83bb0d6604da25675662a9858cf2
 WHIRLPOOL 
c2b6dc272843e0fce795fb4e082330f252a6f8413806e77b4ace78d63fead48634e647df96e2d6436b3c7a16013f6c2d18d377c762607ed2fd4dbd21e3f62fe3
 DIST gtk-vnc-0.5.4.tar.xz 418104 SHA256 
488aa97a76ce6868160699cd45d4a0ee0fe6f0ad4631737c6ddd84450f6c9ce7 SHA512 
068f7e29d40c677c9453364e33ab3a57e155dd0715299c8dee3f9933ecdb2e3bc4aea6dd722f5bc846d9b883e4f5a6de7b46742f004b348a551100ea7720da61
 WHIRLPOOL 
4d29f394a3ac5ea10584369f4a2290274a4be95c5d68c13e84e7ce990bf907243f16afc9b610ba973eebb3d137ca0fc4dce04df5f79afa1327a1c7aadcafaf5b
+DIST gtk-vnc-0.6.0.tar.xz 439104 SHA256 
9559348805e64d130dae569fee466930175dbe150d2649bb868b5c095f130433 SHA512 
38d37753bd8c88d112c046eb8430383b073b6516c72660b3e53612986a6772b72e3e6037f61e7a3700980ab1509c1f44fbfe0b80594c8a5e5520df166212f158
 WHIRLPOOL 
e156f368a9d70e90077253b031db49f5f58e2f248b3e15bc11340f01f6bcbd342cf08dd9810c8ee447ab372159d09c3353aa5ce6195f67c677e7c43a563a75c0

diff --git a/net-libs/gtk-vnc/gtk-vnc-0.6.0.ebuild 
b/net-libs/gtk-vnc/gtk-vnc-0.6.0.ebuild
new file mode 100644
index 00000000..8539c17
--- /dev/null
+++ b/net-libs/gtk-vnc/gtk-vnc-0.6.0.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="GPL-2"
+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
+       >=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? (
+               ${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() {
+               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
+}
+
+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() {
+               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
+}
+
+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() {
+               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
+}

Reply via email to