[gentoo-commits] proj/gnome:master commit in: app-dicts/gnome-dictionary/

[Gilles Dartiguelongue]

commit:     45d55d2a675a30c2f0037a106c3d22927821eb7f
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 23:21:13 2018 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat May 26 23:45:04 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=45d55d2a

app-dicts/gnome-dictionary: 3.24.1 → 3.26.1

Switch build system to meson. libgdict is now private, droping subslot,
gtk-doc and introspection. Debug would only switch between options that
are not considered adequate in Gentoo right now.

 .../gnome-dictionary-3.26.1.ebuild                 | 40 ++++++++++++++++++++
 .../gnome-dictionary/gnome-dictionary-9999.ebuild  | 44 ++++++++--------------
 2 files changed, 56 insertions(+), 28 deletions(-)

diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-3.26.1.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-3.26.1.ebuild
new file mode 100644
index 00000000..6eea5908
--- /dev/null
+++ b/app-dicts/gnome-dictionary/gnome-dictionary-3.26.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome-meson
+
+DESCRIPTION="Dictionary utility for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Dictionary"
+
+LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
+SLOT="0"
+IUSE="ipv6"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.42:2[dbus]
+	x11-libs/cairo:=
+	>=x11-libs/gtk+-3.21.1:3
+	x11-libs/pango
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gsettings-desktop-schemas
+	!<gnome-extra/gnome-utils-3.4
+"
+# ${PN} was part of gnome-utils before 3.4
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/appstream-glib
+	dev-libs/libxslt
+	dev-util/itstool
+	>=dev-util/meson-0.42.0
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome-meson_src_configure \
+		-Dbuild_man=true \
+		$(meson_use ipv6 use_ipv6)
+}

diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-9999.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-9999.ebuild
index ff799821..86cf0a8a 100644
--- a/app-dicts/gnome-dictionary/gnome-dictionary-9999.ebuild
+++ b/app-dicts/gnome-dictionary/gnome-dictionary-9999.ebuild
@@ -1,31 +1,24 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
+inherit gnome-meson git-r3
 
 DESCRIPTION="Dictionary utility for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Dictionary"
+SRC_URI=""
+EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gnome-dictionary.git"
 
 LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
-SLOT="0/10" # subslot = suffix of libgdict-1.0.so
-IUSE="debug +introspection ipv6"
-if [[ ${PV} = 9999 ]]; then
-	IUSE="${IUSE} doc"
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-fi
+SLOT="0"
+IUSE="ipv6"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.39:2[dbus]
+	>=dev-libs/glib-2.42:2[dbus]
 	x11-libs/cairo:=
-	>=x11-libs/gtk+-3.20:3
+	>=x11-libs/gtk+-3.21.1:3
 	x11-libs/pango
-	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
 "
 RDEPEND="${COMMON_DEPEND}
 	gnome-base/gsettings-desktop-schemas
@@ -33,22 +26,17 @@ RDEPEND="${COMMON_DEPEND}
 "
 # ${PN} was part of gnome-utils before 3.4
 DEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-doc-am-1.15
-	>=dev-util/intltool-0.40
+	app-text/docbook-xsl-stylesheets
+	dev-libs/appstream-glib
+	dev-libs/libxslt
 	dev-util/itstool
+	>=dev-util/meson-0.42.0
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 "
 
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/yelp-tools
-		doc? ( >=dev-util/gtk-doc-1.15 )"
-fi
-
 src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable introspection) \
-		$(use_enable ipv6)
+	gnome-meson_src_configure \
+		-Dbuild_man=true \
+		$(meson_use ipv6 use_ipv6)
 }