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

[Gilles Dartiguelongue]

commit:     4af9f1c7b6cf8e84e0c1d227b531a066e5e4756f
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  9 06:58:32 2017 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Aug  9 06:58:32 2017 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=4af9f1c7

app-dicts/gnome-dictionary: sync with gentoo repository

Package-Manager: Portage-2.3.6, Repoman-2.3.3
Manifest-Sign-Key: 0x5A56C8CD0C13248A

 .../gnome-dictionary-3.20.0.ebuild                 | 42 ----------------------
 .../gnome-dictionary/gnome-dictionary-9999.ebuild  | 22 +++++-------
 2 files changed, 9 insertions(+), 55 deletions(-)

diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-3.20.0.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-3.20.0.ebuild
deleted file mode 100644
index 450e4a48..00000000
--- a/app-dicts/gnome-dictionary/gnome-dictionary-3.20.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="Dictionary utility for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Dictionary"
-
-LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
-SLOT="0/9" # subslot = suffix of libgdict-1.0.so
-IUSE="+introspection ipv6"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.39:2[dbus]
-	x11-libs/cairo:=
-	>=x11-libs/gtk+-3.16:3
-	x11-libs/pango
-	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-"
-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}
-	>=dev-util/gtk-doc-am-1.15
-	>=dev-util/intltool-0.40
-	dev-util/itstool
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		$(use_enable ipv6)
-}

diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-9999.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-9999.ebuild
index 7ac85405..ff799821 100644
--- a/app-dicts/gnome-dictionary/gnome-dictionary-9999.ebuild
+++ b/app-dicts/gnome-dictionary/gnome-dictionary-9999.ebuild
@@ -1,21 +1,18 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
 
+EAPI=6
 inherit gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
 
 DESCRIPTION="Dictionary utility for GNOME"
-HOMEPAGE="https://live.gnome.org/GnomeUtils"
+HOMEPAGE="https://wiki.gnome.org/Apps/Dictionary"
 
 LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
-SLOT="0/8" # subslot = suffix of libgdict-1.0.so
-IUSE="+introspection ipv6"
+SLOT="0/10" # subslot = suffix of libgdict-1.0.so
+IUSE="debug +introspection ipv6"
 if [[ ${PV} = 9999 ]]; then
 	IUSE="${IUSE} doc"
 	KEYWORDS=""
@@ -26,7 +23,7 @@ fi
 COMMON_DEPEND="
 	>=dev-libs/glib-2.39:2[dbus]
 	x11-libs/cairo:=
-	>=x11-libs/gtk+-3.16:3
+	>=x11-libs/gtk+-3.20:3
 	x11-libs/pango
 	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
 "
@@ -38,6 +35,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.15
 	>=dev-util/intltool-0.40
+	dev-util/itstool
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 "
@@ -49,10 +47,8 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 src_configure() {
-	local myconf=""
-	[[ ${PV} != 9999 ]] && myconf="${myconf} ITSTOOL=$(type -P true)"
 	gnome2_src_configure \
+		$(usex debug --enable-debug=yes ' ') \
 		$(use_enable introspection) \
-		$(use_enable ipv6) \
-		${myconf}
+		$(use_enable ipv6)
 }