From: "Gilles Dartiguelongue" <eva@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: app-dicts/gnome-dictionary/
Date: Sun, 3 May 2015 18:12:00 +0000 (UTC) [thread overview]
Message-ID: <1430676693.03c0abf5948a4db374baf80543625308aaebda3a.eva@gentoo> (raw)
commit: 03c0abf5948a4db374baf80543625308aaebda3a
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun May 3 17:44:24 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun May 3 18:11:33 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=03c0abf5
app-dicts/gnome-dictionary: 3.14.2 → 3.16.1
...-9999.ebuild => gnome-dictionary-3.16.1.ebuild} | 31 ++++++----------------
.../gnome-dictionary/gnome-dictionary-9999.ebuild | 11 ++++----
2 files changed, 14 insertions(+), 28 deletions(-)
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-9999.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-3.16.1.ebuild
similarity index 53%
copy from app-dicts/gnome-dictionary/gnome-dictionary-9999.ebuild
copy to app-dicts/gnome-dictionary/gnome-dictionary-3.16.1.ebuild
index 0f95981..96eedd0 100644
--- a/app-dicts/gnome-dictionary/gnome-dictionary-9999.ebuild
+++ b/app-dicts/gnome-dictionary/gnome-dictionary-3.16.1.ebuild
@@ -1,34 +1,26 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
inherit gnome2
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="Dictionary utility for GNOME"
HOMEPAGE="https://live.gnome.org/GnomeUtils"
LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
-SLOT="0/6" # subslot = suffix of libgdict-1.0.so
-IUSE="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/8" # 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
x11-libs/cairo:=
- >=x11-libs/gtk+-3:3
+ >=x11-libs/gtk+-3.14:3
x11-libs/pango
+ introspection? ( >=dev-libs/gobject-introspection-1.42 )
"
RDEPEND="${COMMON_DEPEND}
gnome-base/gsettings-desktop-schemas
@@ -42,16 +34,9 @@ DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
"
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND}
- app-text/yelp-tools
- doc? ( >=dev-util/gtk-doc-1.15 )"
-fi
-
src_configure() {
- local myconf=""
- [[ ${PV} != 9999 ]] && myconf="${myconf} ITSTOOL=$(type -P true)"
gnome2_src_configure \
+ $(use_enable introspection) \
$(use_enable ipv6) \
- ${myconf}
+ ITSTOOL=$(type -P true)
}
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-9999.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-9999.ebuild
index 0f95981..29f239d 100644
--- a/app-dicts/gnome-dictionary/gnome-dictionary-9999.ebuild
+++ b/app-dicts/gnome-dictionary/gnome-dictionary-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
inherit gnome2
if [[ ${PV} = 9999 ]]; then
@@ -15,8 +14,8 @@ DESCRIPTION="Dictionary utility for GNOME"
HOMEPAGE="https://live.gnome.org/GnomeUtils"
LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
-SLOT="0/6" # subslot = suffix of libgdict-1.0.so
-IUSE="ipv6"
+SLOT="0/8" # subslot = suffix of libgdict-1.0.so
+IUSE="+introspection ipv6"
if [[ ${PV} = 9999 ]]; then
IUSE="${IUSE} doc"
KEYWORDS=""
@@ -27,8 +26,9 @@ fi
COMMON_DEPEND="
>=dev-libs/glib-2.39:2
x11-libs/cairo:=
- >=x11-libs/gtk+-3:3
+ >=x11-libs/gtk+-3.14:3
x11-libs/pango
+ introspection? ( >=dev-libs/gobject-introspection-1.42 )
"
RDEPEND="${COMMON_DEPEND}
gnome-base/gsettings-desktop-schemas
@@ -52,6 +52,7 @@ src_configure() {
local myconf=""
[[ ${PV} != 9999 ]] && myconf="${myconf} ITSTOOL=$(type -P true)"
gnome2_src_configure \
+ $(use_enable introspection) \
$(use_enable ipv6) \
${myconf}
}
next reply other threads:[~2015-05-03 18:12 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-03 18:12 Gilles Dartiguelongue [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-12-07 23:58 [gentoo-commits] proj/gnome:master commit in: app-dicts/gnome-dictionary/ Mart Raudsepp
2018-12-07 23:58 Mart Raudsepp
2018-10-18 20:11 Remi Cardona
2018-05-26 23:45 Gilles Dartiguelongue
2017-08-09 6:59 Gilles Dartiguelongue
2016-03-30 20:08 Ole Reifschneider
2015-06-09 13:48 Gilles Dartiguelongue
2015-05-12 19:31 Gilles Dartiguelongue
2014-12-15 23:28 Gilles Dartiguelongue
2014-11-23 22:49 Gilles Dartiguelongue
2013-10-13 11:15 Gilles Dartiguelongue
2012-12-16 15:05 Gilles Dartiguelongue
2012-10-28 17:29 Gilles Dartiguelongue
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=1430676693.03c0abf5948a4db374baf80543625308aaebda3a.eva@gentoo \
--to=eva@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