* [gentoo-commits] proj/gnome:master commit in: dev-util/anjuta/files/, dev-util/anjuta/
@ 2012-12-18 22:23 Gilles Dartiguelongue
0 siblings, 0 replies; 4+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-18 22:23 UTC (permalink / raw
To: gentoo-commits
commit: 26e14d423ab5d9cac28b92a88b223385d75ddaf6
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 18 22:23:00 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Dec 18 22:23:00 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=26e14d42
dev-util/anjuta: moved to gx86
* USE=introspection is now global.
---
dev-util/anjuta/anjuta-3.6.2.ebuild | 137 --------------------
.../anjuta/files/anjuta-3.5.91-cxx-check.patch | 28 ----
dev-util/anjuta/metadata.xml | 2 -
3 files changed, 0 insertions(+), 167 deletions(-)
diff --git a/dev-util/anjuta/anjuta-3.6.2.ebuild b/dev-util/anjuta/anjuta-3.6.2.ebuild
deleted file mode 100644
index e086a47..0000000
--- a/dev-util/anjuta/anjuta-3.6.2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2"
-# libanjuta-language-vala.so links to a specific slot of libvala; we want to
-# avoid automagic behavior.
-VALA_MIN_API_VERSION="0.18"
-VALA_MAX_API_VERSION="${VALA_MIN_API_VERSION}"
-
-inherit autotools eutils gnome2 flag-o-matic multilib python vala
-
-DESCRIPTION="A versatile IDE for GNOME"
-HOMEPAGE="http://www.anjuta.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="debug devhelp doc glade +introspection packagekit subversion test vala"
-
-# FIXME: documentation fails to build when USE=test. But why?
-REQUIRED_USE="test? ( !doc )"
-
-COMMON_DEPEND=">=dev-libs/glib-2.32:2
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.4:3
- >=x11-libs/vte-0.27.6:2.90
- >=dev-libs/libxml2-2.4.23
- >=dev-libs/gdl-3.5.5:3
- >=x11-libs/gtksourceview-3:3.0
-
- sys-devel/autogen
-
- >=gnome-extra/libgda-5:5
- dev-util/ctags
-
- x11-libs/libXext
- x11-libs/libXrender
-
- devhelp? ( >=dev-util/devhelp-3.4.2 )
- glade? ( >=dev-util/glade-3.12:3.10 )
- introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
- subversion? (
- >=dev-vcs/subversion-1.5.0
- >=net-libs/neon-0.28.2
- >=dev-libs/apr-1
- >=dev-libs/apr-util-1 )
- vala? ( $(vala_depend) )
-"
-RDEPEND="${COMMON_DEPEND}
- packagekit? ( app-admin/packagekit-base )
-"
-DEPEND="${COMMON_DEPEND}
- app-text/yelp-tools
- >=dev-lang/perl-5
- >=dev-util/gtk-doc-am-1.4
- >=dev-util/intltool-0.40.1
- sys-devel/bison
- sys-devel/flex
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- !!dev-libs/gnome-build
- test? (
- app-text/docbook-xml-dtd:4.1.2
- app-text/docbook-xml-dtd:4.5 )
-
- dev-libs/gobject-introspection-common
- gnome-base/gnome-common
-"
-# eautoreconf requires: gtk-doc-am, gnome-common, gobject-introspection-common
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- # COPYING is used in Anjuta's help/about entry
- DOCS="AUTHORS ChangeLog COPYING FUTURE MAINTAINERS NEWS README ROADMAP THANKS TODO"
-
- G2CONF="${G2CONF}
- --disable-static
- --disable-schemas-compile
- --docdir=/usr/share/doc/${PF}
- $(use_enable debug)
- $(use_enable devhelp plugin-devhelp)
- $(use_enable glade plugin-glade)
- $(use_enable introspection)
- $(use_enable packagekit)
- $(use_enable subversion plugin-subversion)
- $(use_enable vala)"
-
- # Conflicts with -pg in a plugin, bug #266777
- filter-flags -fomit-frame-pointer
-
- # python2.7-configure in Fedora vs. python-configure in Gentoo
- sed -e 's:$PYTHON-config:$PYTHON$PYTHON_VERSION-config:g' \
- -i plugins/am-project/tests/anjuta.lst || die "sed failed"
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=684758
- epatch "${FILESDIR}/${PN}-3.5.91-cxx-check.patch"
- eautoreconf
-
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_install() {
- # COPYING is used in Anjuta's help/about entry
- docompress -x "/usr/share/doc/${PF}/COPYING"
-
- # Anjuta uses a custom rule to install DOCS, get rid of it
- gnome2_src_install
- rm -rf "${ED}"/usr/share/doc/${PN} || die "rm failed"
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- elog ""
- elog "Some project templates may require additional development"
- elog "libraries to function correctly. It goes beyond the scope"
- elog "of this ebuild to provide them."
-
- if use vala; then
- elog ""
- elog "To create a generic vala project you will need to specify"
- elog "desired valac versioned binary to be used, to do that you"
- elog "will need to:"
- elog "1. Go to 'Build' -> 'Configure project'"
- elog "2. Add 'VALAC=/usr/bin/valac-X.XX' (respecting quotes) to"
- elog "'Configure options'."
- fi
-}
diff --git a/dev-util/anjuta/files/anjuta-3.5.91-cxx-check.patch b/dev-util/anjuta/files/anjuta-3.5.91-cxx-check.patch
deleted file mode 100644
index db844e0..0000000
--- a/dev-util/anjuta/files/anjuta-3.5.91-cxx-check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4d59f47b7f42951638f4390ef1a4a3373486d083 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 25 Sep 2012 02:32:31 -0400
-Subject: [PATCH] configure: fix C++ compiler check
-
-AC_PROG_CXX sets CXX, not ac_ct_CXX
-
-https://bugzilla.gnome.org/show_bug.cgi?id=684758
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 106c1b4..21e9386 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -80,7 +80,7 @@ fi
- AC_LANG([C])
- AC_LANG([C++])
- AC_PROG_CXX
--if test "x$ac_ct_CXX" = "x"
-+if test "x$CXX" = "x"
- then
- AC_MSG_ERROR([C++ Compiler required to compile Anjuta])
- fi
---
-1.7.12
-
diff --git a/dev-util/anjuta/metadata.xml b/dev-util/anjuta/metadata.xml
index 66d648a..f319fe3 100644
--- a/dev-util/anjuta/metadata.xml
+++ b/dev-util/anjuta/metadata.xml
@@ -5,8 +5,6 @@
<use>
<flag name="devhelp">Enable devhelp integration</flag>
<flag name="glade">Build glade plugin for anjuta</flag>
- <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
- for introspection</flag>
<flag name="packagekit">Use packagekit to search for missing tools</flag>
<flag name="vala">Enable support for the Vala programming
language</flag>
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] proj/gnome:master commit in: dev-util/anjuta/files/, dev-util/anjuta/
@ 2012-09-25 6:59 Alexandre Rostovtsev
0 siblings, 0 replies; 4+ messages in thread
From: Alexandre Rostovtsev @ 2012-09-25 6:59 UTC (permalink / raw
To: gentoo-commits
commit: a117d69529b37565cfc6cafb8390e8d296a40051
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 25 05:49:00 2012 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Tue Sep 25 06:58:41 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a117d695
dev-util/anjuta: add 3.5.91
---
dev-util/anjuta/anjuta-3.5.91.ebuild | 140 ++++++++++++++++++++
.../anjuta/files/anjuta-3.5.91-cxx-check.patch | 28 ++++
2 files changed, 168 insertions(+), 0 deletions(-)
diff --git a/dev-util/anjuta/anjuta-3.5.91.ebuild b/dev-util/anjuta/anjuta-3.5.91.ebuild
new file mode 100644
index 0000000..39d7182
--- /dev/null
+++ b/dev-util/anjuta/anjuta-3.5.91.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2"
+# libanjuta-language-vala.so links to a specific slot of libvala; we want to
+# avoid automagic behavior.
+VALA_MIN_API_VERSION="0.18"
+VALA_MAX_API_VERSION="${VALA_MIN_API_VERSION}"
+
+inherit autotools eutils gnome2 flag-o-matic multilib python vala
+
+DESCRIPTION="A versatile IDE for GNOME"
+HOMEPAGE="http://www.anjuta.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="debug devhelp doc glade +introspection packagekit subversion test vala"
+
+# FIXME: tests are fragile and may require a specific set of USE flags
+# FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=684761
+RESTRICT="test"
+
+# FIXME: documentation fails to build when USE=test. But why?
+REQUIRED_USE="test? ( !doc )"
+
+COMMON_DEPEND=">=dev-libs/glib-2.32:2
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-3.4:3
+ >=x11-libs/vte-0.27.6:2.90
+ >=dev-libs/libxml2-2.4.23
+ >=dev-libs/gdl-3.5.4:3
+ >=x11-libs/gtksourceview-3:3.0
+
+ sys-devel/autogen
+
+ >=gnome-extra/libgda-5:5
+ dev-util/ctags
+
+ x11-libs/libXext
+ x11-libs/libXrender
+
+ devhelp? ( >=dev-util/devhelp-3.4.2 )
+ glade? ( >=dev-util/glade-3.12:3.10 )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+ subversion? (
+ >=dev-vcs/subversion-1.5.0
+ >=net-libs/neon-0.28.2
+ >=dev-libs/apr-1
+ >=dev-libs/apr-util-1 )
+ vala? ( $(vala_depend) )"
+RDEPEND="${COMMON_DEPEND}
+ packagekit? ( app-admin/packagekit-base )"
+DEPEND="${COMMON_DEPEND}
+ >=app-text/gnome-doc-utils-0.18
+ >=app-text/scrollkeeper-0.3.14-r2
+ >=dev-lang/perl-5
+ >=dev-util/intltool-0.40.1
+ sys-devel/bison
+ sys-devel/flex
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+ !!dev-libs/gnome-build
+ doc? ( >=dev-util/gtk-doc-1.4 )
+ test? (
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/docbook-xml-dtd:4.5 )
+
+ dev-libs/gobject-introspection-common
+ dev-util/gtk-doc-am
+ gnome-base/gnome-common"
+# eautoreconf requires: gtk-doc-am, gnome-common, gobject-introspection-common
+
+pkg_setup() {
+ # COPYING is used in Anjuta's help/about entry
+ DOCS="AUTHORS ChangeLog COPYING FUTURE MAINTAINERS NEWS README ROADMAP THANKS TODO"
+
+ G2CONF="${G2CONF}
+ --disable-static
+ --disable-schemas-compile
+ --docdir=/usr/share/doc/${PF}
+ $(use_enable debug)
+ $(use_enable devhelp plugin-devhelp)
+ $(use_enable glade plugin-glade)
+ $(use_enable introspection)
+ $(use_enable packagekit)
+ $(use_enable subversion plugin-subversion)
+ $(use_enable vala)"
+
+ # Conflicts with -pg in a plugin, bug #266777
+ filter-flags -fomit-frame-pointer
+
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ # python2.7-configure in Fedora vs. python-configure in Gentoo
+ sed -e 's:$PYTHON-config:$PYTHON$PYTHON_VERSION-config:g' \
+ -i plugins/am-project/tests/anjuta.lst || die "sed failed"
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=684758
+ epatch "${FILESDIR}/${P}-cxx-check.patch"
+ eautoreconf
+
+ use vala && vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_install() {
+ # COPYING is used in Anjuta's help/about entry
+ docompress -x "/usr/share/doc/${PF}/COPYING"
+
+ # Anjuta uses a custom rule to install DOCS, get rid of it
+ gnome2_src_install
+ rm -rf "${ED}"/usr/share/doc/${PN} || die "rm failed"
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ elog ""
+ elog "Some project templates may require additional development"
+ elog "libraries to function correctly. It goes beyond the scope"
+ elog "of this ebuild to provide them."
+
+ if use vala; then
+ elog ""
+ elog "To create a generic vala project you will need to specify"
+ elog "desired valac versioned binary to be used, to do that you"
+ elog "will need to:"
+ elog "1. Go to 'Build' -> 'Configure project'"
+ elog "2. Add 'VALAC=/usr/bin/valac-X.XX' (respecting quotes) to"
+ elog "'Configure options'."
+ fi
+}
diff --git a/dev-util/anjuta/files/anjuta-3.5.91-cxx-check.patch b/dev-util/anjuta/files/anjuta-3.5.91-cxx-check.patch
new file mode 100644
index 0000000..db844e0
--- /dev/null
+++ b/dev-util/anjuta/files/anjuta-3.5.91-cxx-check.patch
@@ -0,0 +1,28 @@
+From 4d59f47b7f42951638f4390ef1a4a3373486d083 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 25 Sep 2012 02:32:31 -0400
+Subject: [PATCH] configure: fix C++ compiler check
+
+AC_PROG_CXX sets CXX, not ac_ct_CXX
+
+https://bugzilla.gnome.org/show_bug.cgi?id=684758
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 106c1b4..21e9386 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -80,7 +80,7 @@ fi
+ AC_LANG([C])
+ AC_LANG([C++])
+ AC_PROG_CXX
+-if test "x$ac_ct_CXX" = "x"
++if test "x$CXX" = "x"
+ then
+ AC_MSG_ERROR([C++ Compiler required to compile Anjuta])
+ fi
+--
+1.7.12
+
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] proj/gnome:master commit in: dev-util/anjuta/files/, dev-util/anjuta/
@ 2011-06-24 17:35 Alexandre Restovtsev
0 siblings, 0 replies; 4+ messages in thread
From: Alexandre Restovtsev @ 2011-06-24 17:35 UTC (permalink / raw
To: gentoo-commits
commit: ec467aa894cfabcabe1325d460ae2479b5185267
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Jun 15 14:00:16 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Jun 19 02:21:56 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ec467aa8
dev-util/anjuta: 3.0.2.0 → 3.0.3.0
Version bump. Autogen patch has been applied upstream, eutils no longer
needs to be inherited. Use the .xz tarball instead of .bz2 (it's
almost 2MB smaller).
---
...anjuta-3.0.2.0.ebuild => anjuta-3.0.3.0.ebuild} | 14 ++--
.../anjuta/files/anjuta-3.0.2.0-autogen-5.11.patch | 70 --------------------
2 files changed, 6 insertions(+), 78 deletions(-)
diff --git a/dev-util/anjuta/anjuta-3.0.2.0.ebuild b/dev-util/anjuta/anjuta-3.0.3.0.ebuild
similarity index 92%
rename from dev-util/anjuta/anjuta-3.0.2.0.ebuild
rename to dev-util/anjuta/anjuta-3.0.3.0.ebuild
index 068b562..fca3ecf 100644
--- a/dev-util/anjuta/anjuta-3.0.2.0.ebuild
+++ b/dev-util/anjuta/anjuta-3.0.3.0.ebuild
@@ -3,11 +3,12 @@
# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-2.32.1.1.ebuild,v 1.2 2011/01/24 15:51:47 eva Exp $
EAPI="3"
+GNOME_TARBALL_SUFFIX="xz"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes"
PYTHON_DEPEND="2"
-inherit eutils gnome2 flag-o-matic multilib python
+inherit gnome2 flag-o-matic multilib python
DESCRIPTION="A versatile IDE for GNOME"
HOMEPAGE="http://www.anjuta.org"
@@ -82,7 +83,7 @@ pkg_setup() {
G2CONF="${G2CONF} VALAC=$(type -P valac-0.12)"
fi
- # Conflics wiht -pg in a plugin, bug #266777
+ # Conflics with -pg in a plugin, bug #266777
filter-flags -fomit-frame-pointer
python_set_active_version 2
@@ -93,11 +94,8 @@ pkg_setup() {
die "For ${P}, doc USE flag must be disabled when FEATURES=test"
}
-src_prepare() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=650930
- epatch "${FILESDIR}/${PN}-3.0.2.0-autogen-5.11.patch"
-
- gnome2_src_prepare
+#src_prepare() {
+# gnome2_src_prepare
# Needed to preserve introspection configure option, see bgo#633730
# eautoreconf needs introspection.m4
@@ -107,7 +105,7 @@ src_prepare() {
# cp "${WORKDIR}"/introspection.m4 . || die
# intltoolize --force --copy --automake || die "intltoolize failed"
# AT_M4DIR="." eautoreconf
-}
+#}
src_install() {
# Anjuta uses a custom rule to install DOCS, get rid of it
diff --git a/dev-util/anjuta/files/anjuta-3.0.2.0-autogen-5.11.patch b/dev-util/anjuta/files/anjuta-3.0.2.0-autogen-5.11.patch
deleted file mode 100644
index 04cd467..0000000
--- a/dev-util/anjuta/files/anjuta-3.0.2.0-autogen-5.11.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From a251ee54ebe822f1d92fc9434674b22623000233 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Tue, 24 May 2011 16:43:55 -0400
-Subject: [PATCH] Support autogen-5.11.x detection, v3 (bug #650930)
-
-The latest versions of autogen-5.11.x use a different version string
-format that autogen-5.9.x or earlier releases of 5.11.x:
-autogen (GNU AutoGen) 5.11.9
-vs.
-autogen (GNU AutoGen) - The Automated Program Generator - Ver. 5.9.7
-
-Replace version matching code with a regex that should, hopefully,
-match everything from autogen-5.5.x to the latest 5.11.x (including
-the releases that don't have a micro version number).
----
- plugins/project-wizard/autogen.c | 38 +++++++++++++++++++++++++-------------
- 1 files changed, 25 insertions(+), 13 deletions(-)
-
-diff --git a/plugins/project-wizard/autogen.c b/plugins/project-wizard/autogen.c
-index ca6492a..d38241b 100644
---- a/plugins/project-wizard/autogen.c
-+++ b/plugins/project-wizard/autogen.c
-@@ -95,19 +95,31 @@ npw_check_autogen (void)
- if (g_spawn_sync (NULL, args, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL,
- NULL, NULL, &output, NULL, NULL, NULL))
- {
-- gint ver[3];
-- gchar* ptr;
--
-- /* Check autogen */
-- if (strstr(output, "The Automated Program Generator") == NULL) return FALSE;
--
-- /* Get version number */
-- ptr = strstr(output, "Ver. ");
-- if (ptr == NULL) return FALSE;
-- ptr += 5;
-- sscanf(ptr,"%d.%d.%d", &ver[0], &ver[1], &ver[2]);
--
-- return (ver[0] == 5);
-+ GRegex *re;
-+ GMatchInfo *minfo;
-+ gboolean result = FALSE;
-+
-+ /* Check autogen 5 version string
-+ * Examples:
-+ * autogen - The Automated Program Generator - Ver. 5.5.7
-+ * autogen (GNU AutoGen) - The Automated Program Generator - Ver. 5.11
-+ * autogen (GNU AutoGen) 5.11.9
-+ */
-+ re = g_regex_new ("autogen.* (\\d)\\.(\\d+)(?:\\.(\\d+))?", 0, 0, NULL);
-+ g_regex_match (re, output, 0, &minfo);
-+ if (g_match_info_matches (minfo)) {
-+ gchar **match_strings;
-+
-+ match_strings = g_match_info_fetch_all (minfo);
-+ /* if major version is 5 */
-+ if (g_ascii_strtoll (match_strings[1], 0, 10) == 5)
-+ result = TRUE;
-+
-+ g_strfreev (match_strings);
-+ }
-+ g_match_info_free (minfo);
-+ g_regex_unref (re);
-+ return result;
- }
-
- return FALSE;
---
-1.7.5.rc3
-
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] proj/gnome:master commit in: dev-util/anjuta/files/, dev-util/anjuta/
@ 2011-05-30 17:11 Nirbheek Chauhan
0 siblings, 0 replies; 4+ messages in thread
From: Nirbheek Chauhan @ 2011-05-30 17:11 UTC (permalink / raw
To: gentoo-commits
commit: b8d65b33e0a62392d71cbeb0ce675c896409f1c7
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue May 24 02:26:32 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon May 30 15:44:27 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b8d65b33
dev-util/anjuta-3.0.2.0 version bump
* Version bump
* Add patch for correct sys-devel/autogen-5.11.x detection
(upstream bug 650930)
* Disable building documentation together with tests (fails with
a strange relaxng error. Can't figure out why.)
Signed-off-by: Nirbheek Chauhan <nirbheek <AT> gentoo.org>
---
...anjuta-3.0.1.0.ebuild => anjuta-3.0.2.0.ebuild} | 14 ++++++--
.../anjuta/files/anjuta-3.0.2.0-autogen-5.11.patch | 33 ++++++++++++++++++++
2 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/dev-util/anjuta/anjuta-3.0.1.0.ebuild b/dev-util/anjuta/anjuta-3.0.2.0.ebuild
similarity index 89%
rename from dev-util/anjuta/anjuta-3.0.1.0.ebuild
rename to dev-util/anjuta/anjuta-3.0.2.0.ebuild
index abcd59e..8c93752 100644
--- a/dev-util/anjuta/anjuta-3.0.1.0.ebuild
+++ b/dev-util/anjuta/anjuta-3.0.2.0.ebuild
@@ -86,10 +86,18 @@ pkg_setup() {
filter-flags -fomit-frame-pointer
python_set_active_version 2
+
+ # FIXME: documentation fails to build when USE=test. But why?
+ # FIXME: change this to REQUIRED_USE when python.eclass allows EAPI4.
+ use test && use doc &&
+ die "For ${P}, doc USE flag must be disabled when FEATURES=test"
}
-#src_prepare() {
-# gnome2_src_prepare
+src_prepare() {
+ # https://bugzilla.gnome.org/show_bug.cgi?id=650930
+ epatch "${FILESDIR}/${PN}-3.0.2.0-autogen-5.11.patch"
+
+ gnome2_src_prepare
# Needed to preserve introspection configure option, see bgo#633730
# eautoreconf needs introspection.m4
@@ -99,7 +107,7 @@ pkg_setup() {
# cp "${WORKDIR}"/introspection.m4 . || die
# intltoolize --force --copy --automake || die "intltoolize failed"
# AT_M4DIR="." eautoreconf
-#}
+}
src_install() {
# Anjuta uses a custom rule to install DOCS, get rid of it
diff --git a/dev-util/anjuta/files/anjuta-3.0.2.0-autogen-5.11.patch b/dev-util/anjuta/files/anjuta-3.0.2.0-autogen-5.11.patch
new file mode 100644
index 0000000..92f9acc
--- /dev/null
+++ b/dev-util/anjuta/files/anjuta-3.0.2.0-autogen-5.11.patch
@@ -0,0 +1,33 @@
+From 21dbcf252598da91237abbbb60442f95662cd522 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Mon, 23 May 2011 22:02:23 -0400
+Subject: [PATCH] Support autogen-5.11 detection (bug #650930)
+
+Autogen-5.11 uses a different version string format that autogen-5.9:
+autogen (GNU AutoGen) 5.11.9
+vs.
+autogen (GNU AutoGen) - The Automated Program Generator - Ver. 5.9.7
+
+Fortunately, all versions of autogen use the longer version of the
+string in their usage description. So we can detect modern versions
+of autogen simply by replacing autogen -v with autogen -u.
+---
+ plugins/project-wizard/autogen.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/plugins/project-wizard/autogen.c b/plugins/project-wizard/autogen.c
+index ca6492a..0135cb8 100644
+--- a/plugins/project-wizard/autogen.c
++++ b/plugins/project-wizard/autogen.c
+@@ -89,7 +89,7 @@ struct _NPWAutogen
+ gboolean
+ npw_check_autogen (void)
+ {
+- gchar* args[] = {"autogen", "-v", NULL};
++ gchar* args[] = {"autogen", "-u", NULL};
+ gchar* output;
+
+ if (g_spawn_sync (NULL, args, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL,
+--
+1.7.5.rc3
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-12-18 22:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-18 22:23 [gentoo-commits] proj/gnome:master commit in: dev-util/anjuta/files/, dev-util/anjuta/ Gilles Dartiguelongue
-- strict thread matches above, loose matches on Subject: below --
2012-09-25 6:59 Alexandre Rostovtsev
2011-06-24 17:35 Alexandre Restovtsev
2011-05-30 17:11 Nirbheek Chauhan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox