Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gucharmap/
Date: Sun, 09 Oct 2016 12:02:05
Message-Id: 1476014276.45ba9bad940dc95121cb082d5dacd4b4a0cddc86.pacho@gentoo
1 commit: 45ba9bad940dc95121cb082d5dacd4b4a0cddc86
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 9 11:57:56 2016 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 9 11:57:56 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45ba9bad
7
8 gnome-extra/gucharmap: Bump eapi and update ebuild
9
10 Package-Manager: portage-2.3.1
11
12 gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild | 47 +++++++++++------------
13 1 file changed, 23 insertions(+), 24 deletions(-)
14
15 diff --git a/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild b/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
16 index 4c578c7..e08d151 100644
17 --- a/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
18 +++ b/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
19 @@ -1,57 +1,56 @@
20 -# Copyright 1999-2012 Gentoo Foundation
21 +# Copyright 1999-2016 Gentoo Foundation
22 # Distributed under the terms of the GNU General Public License v2
23 # $Id$
24
25 -EAPI="4"
26 -GCONF_DEBUG="yes"
27 +EAPI=6
28 GNOME2_LA_PUNT="yes"
29 GNOME_TARBALL_SUFFIX="bz2"
30
31 inherit gnome2
32
33 DESCRIPTION="Unicode character map viewer library"
34 -HOMEPAGE="https://live.gnome.org/Gucharmap"
35 +HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
36
37 LICENSE="GPL-3"
38 SLOT="0"
39 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
40 -IUSE="cjk doc +introspection"
41 +IUSE="cjk debug doc +introspection"
42
43 -RDEPEND=">=dev-libs/glib-2.16.3:2
44 +RDEPEND="
45 + >=dev-libs/glib-2.16.3:2
46 >=x11-libs/pango-1.2.1[introspection?]
47 >=x11-libs/gtk+-2.14.0:2[introspection?]
48 -
49 - introspection? ( >=dev-libs/gobject-introspection-0.9.0 )"
50 + introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
51 +"
52 DEPEND="${RDEPEND}
53 - app-text/scrollkeeper
54 - virtual/pkgconfig
55 + dev-util/gtk-doc-am
56 >=dev-util/intltool-0.40
57 -
58 sys-devel/gettext
59 -
60 - doc? ( >=dev-util/gtk-doc-1.0 )"
61 + virtual/pkgconfig
62 +"
63
64 src_prepare() {
65 - G2CONF="${G2CONF}
66 - --disable-static
67 - --with-gtk=2.0
68 - --disable-charmap
69 - --disable-gconf
70 - $(use_enable introspection)
71 - $(use_enable cjk unihan)"
72 - # gconf is only needed for the gucharmap program
73 - DOCS="AUTHORS ChangeLog NEWS README TODO"
74 -
75 # .desktop and schema files are only needed for the gucharmap program
76 sed -e 's:desktop_DATA\s*=.*:desktop_DATA = :' \
77 -e 's:schema_DATA\s*=.*:schema_DATA = :' \
78 -i Makefile.* || die "sed Makefile.* failed"
79
80 - epatch "${FILESDIR}/${PN}-3.4.1.1-fix-doc.patch" # bug 436710, fixed in 3.6
81 + eapply "${FILESDIR}/${PN}-3.4.1.1-fix-doc.patch" # bug 436710, fixed in 3.6
82
83 gnome2_src_prepare
84 }
85
86 +src_configure() {
87 + gnome2_src_configure \
88 + --disable-static \
89 + --with-gtk=2.0 \
90 + --disable-charmap \
91 + --disable-gconf \
92 + $(use_enable cjk unihan) \
93 + $(use_enable debug) \
94 + $(use_enable introspection)
95 +}
96 +
97 pkg_postinst() {
98 gnome2_pkg_postinst
99 if ! has_version "gnome-extra/gucharmap:2.90" ; then