public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mart Raudsepp" <leio@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/gtk-vnc/
Date: Fri, 20 Apr 2018 10:36:23 +0000 (UTC)	[thread overview]
Message-ID: <1524220531.c77b89c644242e01711086e831642be67c2ac759.leio@gentoo> (raw)

commit:     c77b89c644242e01711086e831642be67c2ac759
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 20 10:35:07 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Apr 20 10:35:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c77b89c6

net-libs/gtk-vnc-0.7.2: remove gtk2 support, simplify ebuild

Remove gtk2 library, which isn't used by anything in tree anymore.
This also removes IUSE=gtk3, which should be fine as all consumers
were adjusted to require gtk3(+); only an older gnome-boxes version
doesn't yet, but matching ~arch version does have it, and it'll
be stabilized before gtk-vnc-0.7.2 is, so should be fine.

This greatly simplifies the ebuild because we don't need to use
multibuild.eclass anymore. Additionally it fixes the lack of
installed docs (NEWS, README, etc), which were broken due to
multibuild usage - after its removal, the default einstalldocs
without DOCS set kicks in and installs exactly what we need.

Also remove VALA_USE_DEPEND="vapigen", as vala versions that had
the USE flag are long gone (eclass generates an unnecessary
[vapigen(+)] USE dep if VALA_USE_DEPEND is set like this).

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 net-libs/gtk-vnc/gtk-vnc-0.7.2.ebuild | 73 +++++------------------------------
 1 file changed, 9 insertions(+), 64 deletions(-)

diff --git a/net-libs/gtk-vnc/gtk-vnc-0.7.2.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.7.2.ebuild
index 3d93adf9794..3cbb2e545e7 100644
--- a/net-libs/gtk-vnc/gtk-vnc-0.7.2.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-0.7.2.ebuild
@@ -4,9 +4,8 @@
 EAPI=6
 GNOME2_LA_PUNT="yes"
 VALA_MIN_API_VERSION="0.16"
-VALA_USE_DEPEND="vapigen"
 
-inherit gnome2 multibuild vala
+inherit vala gnome2
 
 DESCRIPTION="VNC viewer widget for GTK"
 HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
@@ -14,29 +13,26 @@ 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 sasl vala"
+IUSE="examples +introspection pulseaudio sasl vala"
 REQUIRED_USE="
-	vala? ( gtk3 introspection )
+	vala? ( 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="
+RDEPEND="
 	>=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?] )
+	>=x11-libs/gtk+-3.0.0:3[introspection?]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.4:= )
 	pulseaudio? ( media-sound/pulseaudio )
 	sasl? ( dev-libs/cyrus-sasl )
 "
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
 	>=dev-util/intltool-0.40
 	sys-devel/gettext
@@ -47,24 +43,7 @@ DEPEND="${COMMON_DEPEND}
 "
 # eautoreconf requires gnome-common
 
-compute_variants() {
-	MULTIBUILD_VARIANTS=( 2.0 )
-	use gtk3 && MULTIBUILD_VARIANTS+=( 3.0 )
-}
-
 src_prepare() {
-	prepare() {
-		mkdir -p "${BUILD_DIR}" || die
-	}
-
-	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
 }
@@ -79,43 +58,9 @@ src_configure() {
 		--without-libview
 		--disable-static
 		--disable-vala
+		--with-gtk=3.0
+		--without-python
 	)
 
-	configure_normal() {
-		ECONF_SOURCE="${S}" gnome2_src_configure \
-			${myconf[@]} \
-			--with-gtk=${MULTIBUILD_VARIANT} \
-			--without-python
-	}
-
-	local MULTIBUILD_VARIANTS
-	compute_variants
-	multibuild_foreach_variant run_in_build_dir configure_normal
-}
-
-src_compile() {
-	compile_normal() {
-		gnome2_src_compile
-	}
-
-	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_normal() {
-		gnome2_src_install
-	}
-
-	local MULTIBUILD_VARIANTS
-	compute_variants
-	multibuild_foreach_variant run_in_build_dir install_normal
+	gnome2_src_configure ${myconf[@]}
 }


             reply	other threads:[~2018-04-20 10:36 UTC|newest]

Thread overview: 63+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-20 10:36 Mart Raudsepp [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-12-04 18:10 [gentoo-commits] repo/gentoo:master commit in: net-libs/gtk-vnc/ Joonas Niilola
2024-12-04 18:10 Joonas Niilola
2024-08-26 22:57 Sam James
2024-08-09 17:19 Sam James
2024-08-09 17:19 Sam James
2024-08-06  0:20 Eli Schwartz
2024-06-10 13:55 Stefan Strogin
2024-06-03  7:00 Sam James
2024-01-04 18:11 Arthur Zamarin
2023-09-24  9:02 WANG Xuerui
2022-10-31 14:28 Matt Turner
2022-10-14 14:29 Matt Turner
2022-09-19  1:38 Sam James
2022-09-12 16:01 Sam James
2022-09-12 16:00 Sam James
2022-07-21  2:04 Matt Turner
2022-07-16 21:28 Matt Turner
2022-07-10 23:52 Sam James
2022-07-10 23:15 Sam James
2022-07-10 22:28 Sam James
2022-07-10 19:59 Sam James
2022-01-24  3:39 Sam James
2022-01-20 10:02 Jakov Smolić
2021-12-31  3:42 Yixun Lan
2021-12-17  1:22 Matt Turner
2021-05-08 20:27 Matt Turner
2021-05-07 13:29 Sam James
2021-05-07 13:28 Sam James
2021-04-28  4:21 Matt Turner
2021-04-28  4:21 Matt Turner
2020-07-04 15:07 Mart Raudsepp
2020-06-29 15:42 Mikle Kolyada
2020-06-28 14:19 Thomas Deutschmann
2020-04-05 13:23 Mart Raudsepp
2020-04-04 21:15 Mart Raudsepp
2020-04-04 20:48 Mart Raudsepp
2019-08-04 19:26 Aaron Bauman
2019-05-18 23:05 Mart Raudsepp
2019-03-22 13:29 Mart Raudsepp
2019-03-07 21:14 Mart Raudsepp
2018-12-09 16:04 Gilles Dartiguelongue
2018-12-02 17:27 Mart Raudsepp
2018-12-02 14:29 Mikle Kolyada
2018-12-02 10:12 Mikle Kolyada
2018-11-02 12:54 Mart Raudsepp
2018-08-02 13:50 Mart Raudsepp
2018-04-29  0:08 Mart Raudsepp
2018-04-26 22:32 Aaron Bauman
2018-04-26 17:15 Thomas Deutschmann
2018-04-20 10:36 Mart Raudsepp
2018-04-20 10:36 Mart Raudsepp
2018-04-14 22:41 Mart Raudsepp
2017-10-28  8:43 Pacho Ramos
2017-10-20 14:51 Manuel Rüger
2017-10-03  0:42 Thomas Deutschmann
2017-09-12  6:51 Gilles Dartiguelongue
2017-05-24  8:38 Pacho Ramos
2017-05-24  8:38 Pacho Ramos
2016-10-19 22:02 Gilles Dartiguelongue
2016-09-11 19:00 Gilles Dartiguelongue
2016-09-11 19:00 Gilles Dartiguelongue
2015-09-14 17:18 Pacho Ramos

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1524220531.c77b89c644242e01711086e831642be67c2ac759.leio@gentoo \
    --to=leio@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox