Gentoo Archives: gentoo-commits

From: Gilles Dartiguelongue <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: dev-util/anjuta/
Date: Sun, 28 Oct 2012 19:37:01
Message-Id: 1351452983.8345e370f7895dc431a1df80e49c26429684c06f.eva@gentoo
1 commit: 8345e370f7895dc431a1df80e49c26429684c06f
2 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 28 19:26:45 2012 +0000
4 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 28 19:36:23 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8345e370
7
8 dev-util/anjuta: 3.5.91 → 3.6.1
9
10 ---
11 .../{anjuta-3.5.91.ebuild => anjuta-3.6.1.ebuild} | 31 +++++++++-----------
12 1 files changed, 14 insertions(+), 17 deletions(-)
13
14 diff --git a/dev-util/anjuta/anjuta-3.5.91.ebuild b/dev-util/anjuta/anjuta-3.6.1.ebuild
15 similarity index 89%
16 rename from dev-util/anjuta/anjuta-3.5.91.ebuild
17 rename to dev-util/anjuta/anjuta-3.6.1.ebuild
18 index 39d7182..f6d4a33 100644
19 --- a/dev-util/anjuta/anjuta-3.5.91.ebuild
20 +++ b/dev-util/anjuta/anjuta-3.6.1.ebuild
21 @@ -21,10 +21,6 @@ SLOT="0"
22 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
23 IUSE="debug devhelp doc glade +introspection packagekit subversion test vala"
24
25 -# FIXME: tests are fragile and may require a specific set of USE flags
26 -# FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=684761
27 -RESTRICT="test"
28 -
29 # FIXME: documentation fails to build when USE=test. But why?
30 REQUIRED_USE="test? ( !doc )"
31
32 @@ -52,30 +48,36 @@ COMMON_DEPEND=">=dev-libs/glib-2.32:2
33 >=net-libs/neon-0.28.2
34 >=dev-libs/apr-1
35 >=dev-libs/apr-util-1 )
36 - vala? ( $(vala_depend) )"
37 + vala? ( $(vala_depend) )
38 +"
39 RDEPEND="${COMMON_DEPEND}
40 - packagekit? ( app-admin/packagekit-base )"
41 + packagekit? ( app-admin/packagekit-base )
42 +"
43 DEPEND="${COMMON_DEPEND}
44 - >=app-text/gnome-doc-utils-0.18
45 - >=app-text/scrollkeeper-0.3.14-r2
46 + app-text/yelp-tools
47 >=dev-lang/perl-5
48 + >=dev-util/gtk-doc-am-1.4
49 >=dev-util/intltool-0.40.1
50 sys-devel/bison
51 sys-devel/flex
52 >=sys-devel/gettext-0.17
53 virtual/pkgconfig
54 !!dev-libs/gnome-build
55 - doc? ( >=dev-util/gtk-doc-1.4 )
56 test? (
57 app-text/docbook-xml-dtd:4.1.2
58 app-text/docbook-xml-dtd:4.5 )
59
60 dev-libs/gobject-introspection-common
61 - dev-util/gtk-doc-am
62 - gnome-base/gnome-common"
63 + gnome-base/gnome-common
64 +"
65 # eautoreconf requires: gtk-doc-am, gnome-common, gobject-introspection-common
66
67 pkg_setup() {
68 + python_set_active_version 2
69 + python_pkg_setup
70 +}
71 +
72 +src_prepare() {
73 # COPYING is used in Anjuta's help/about entry
74 DOCS="AUTHORS ChangeLog COPYING FUTURE MAINTAINERS NEWS README ROADMAP THANKS TODO"
75
76 @@ -94,17 +96,12 @@ pkg_setup() {
77 # Conflicts with -pg in a plugin, bug #266777
78 filter-flags -fomit-frame-pointer
79
80 - python_set_active_version 2
81 - python_pkg_setup
82 -}
83 -
84 -src_prepare() {
85 # python2.7-configure in Fedora vs. python-configure in Gentoo
86 sed -e 's:$PYTHON-config:$PYTHON$PYTHON_VERSION-config:g' \
87 -i plugins/am-project/tests/anjuta.lst || die "sed failed"
88
89 # https://bugzilla.gnome.org/show_bug.cgi?id=684758
90 - epatch "${FILESDIR}/${P}-cxx-check.patch"
91 + epatch "${FILESDIR}/${PN}-3.5.91-cxx-check.patch"
92 eautoreconf
93
94 use vala && vala_src_prepare