From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QaAJO-0006Iw-MO for garchives@archives.gentoo.org; Fri, 24 Jun 2011 17:36:59 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3306C1C078; Fri, 24 Jun 2011 17:35:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CAA6B1C041 for ; Fri, 24 Jun 2011 17:35:53 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DA68B2AC014 for ; Fri, 24 Jun 2011 17:35:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id DE88C80048 for ; Fri, 24 Jun 2011 17:35:51 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: Subject: [gentoo-commits] proj/gnome:master commit in: dev-util/anjuta/files/, dev-util/anjuta/ X-VCS-Repository: proj/gnome X-VCS-Files: dev-util/anjuta/anjuta-3.0.2.0.ebuild dev-util/anjuta/anjuta-3.0.3.0.ebuild dev-util/anjuta/files/anjuta-3.0.2.0-autogen-5.11.patch X-VCS-Directories: dev-util/anjuta/files/ dev-util/anjuta/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: ec467aa894cfabcabe1325d460ae2479b5185267 Date: Fri, 24 Jun 2011 17:35:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: ff2d95aa5f2fcfdf1c46de7b57198e06 commit: ec467aa894cfabcabe1325d460ae2479b5185267 Author: Alexandre Rostovtsev gmail com> AuthorDate: Wed Jun 15 14:00:16 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Sun Jun 19 02:21:56 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Dec467aa8 dev-util/anjuta: 3.0.2.0 =E2=86=92 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 =3D> 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/anju= ta-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.ebuil= d,v 1.2 2011/01/24 15:51:47 eva Exp $ =20 EAPI=3D"3" +GNOME_TARBALL_SUFFIX=3D"xz" GCONF_DEBUG=3D"yes" GNOME2_LA_PUNT=3D"yes" PYTHON_DEPEND=3D"2" =20 -inherit eutils gnome2 flag-o-matic multilib python +inherit gnome2 flag-o-matic multilib python =20 DESCRIPTION=3D"A versatile IDE for GNOME" HOMEPAGE=3D"http://www.anjuta.org" @@ -82,7 +83,7 @@ pkg_setup() { G2CONF=3D"${G2CONF} VALAC=3D$(type -P valac-0.12)" fi =20 - # Conflics wiht -pg in a plugin, bug #266777 + # Conflics with -pg in a plugin, bug #266777 filter-flags -fomit-frame-pointer =20 python_set_active_version 2 @@ -93,11 +94,8 @@ pkg_setup() { die "For ${P}, doc USE flag must be disabled when FEATURES=3Dtest" } =20 -src_prepare() { - # https://bugzilla.gnome.org/show_bug.cgi?id=3D650930 - epatch "${FILESDIR}/${PN}-3.0.2.0-autogen-5.11.patch" - - gnome2_src_prepare +#src_prepare() { +# gnome2_src_prepare =20 # 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=3D"." eautoreconf -} +#} =20 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/de= v-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 -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/a= utogen.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_STDE= RR_TO_DEV_NULL, - NULL, NULL, &output, NULL, NULL, NULL)) - { -- gint ver[3]; -- gchar* ptr; -- -- /* Check autogen */ -- if (strstr(output, "The Automated Program Generator") =3D=3D NULL) re= turn FALSE; -- -- /* Get version number */ -- ptr =3D strstr(output, "Ver. "); -- if (ptr =3D=3D NULL) return FALSE; -- ptr +=3D 5; -- sscanf(ptr,"%d.%d.%d", &ver[0], &ver[1], &ver[2]); -- -- return (ver[0] =3D=3D 5); -+ GRegex *re; -+ GMatchInfo *minfo; -+ gboolean result =3D 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.1= 1 -+ * autogen (GNU AutoGen) 5.11.9 -+ */ -+ re =3D g_regex_new ("autogen.* (\\d)\\.(\\d+)(?:\\.(\\d+))?", 0, 0, N= ULL); -+ g_regex_match (re, output, 0, &minfo); -+ if (g_match_info_matches (minfo)) { -+ gchar **match_strings; -+ -+ match_strings =3D g_match_info_fetch_all (minfo); -+ /* if major version is 5 */ -+ if (g_ascii_strtoll (match_strings[1], 0, 10) =3D=3D 5) -+ result =3D TRUE; -+ -+ g_strfreev (match_strings); -+ } -+ g_match_info_free (minfo); -+ g_regex_unref (re); -+ return result; - } -=20 - return FALSE; ---=20 -1.7.5.rc3 -