public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Alexandre Restovtsev" <tetromino@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:gnome-next commit in: x11-libs/gtksourceview/
Date: Sun, 24 Jul 2011 18:24:19 +0000 (UTC)	[thread overview]
Message-ID: <fc29963d282702188bb793f16099683fca7aacc0.tetromino@gentoo> (raw)

commit:     fc29963d282702188bb793f16099683fca7aacc0
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sun Jul 24 18:09:24 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Jul 24 18:09:24 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fc29963d

x11-libs/gtksourceview: add 3.1.3

Add gnome-3.1.x version, sync with gx86, update the live ebuild
accordingly.

---
 ...view-9999.ebuild => gtksourceview-3.1.3.ebuild} |   32 +++++++++++--------
 x11-libs/gtksourceview/gtksourceview-9999.ebuild   |   32 +++++++++++--------
 2 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/x11-libs/gtksourceview/gtksourceview-9999.ebuild b/x11-libs/gtksourceview/gtksourceview-3.1.3.ebuild
similarity index 59%
copy from x11-libs/gtksourceview/gtksourceview-9999.ebuild
copy to x11-libs/gtksourceview/gtksourceview-3.1.3.ebuild
index 8a846a0..6b0f80c 100644
--- a/x11-libs/gtksourceview/gtksourceview-9999.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.1.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-2.10.4.ebuild,v 1.1 2010/06/23 12:08:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-3.0.4.ebuild,v 1.1 2011/06/20 11:45:03 pacho Exp $
 
-EAPI="2"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 DESCRIPTION="A text widget implementing syntax highlighting and other features"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="http://projects.gnome.org/gtksourceview/"
 
 LICENSE="GPL-2"
 SLOT="3.0"
@@ -20,44 +20,48 @@ IUSE="doc glade +introspection"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 fi
 
 # Note: has native OSX support, prefix teams, attack!
 RDEPEND=">=x11-libs/gtk+-3.0:3[introspection?]
-	>=dev-libs/libxml2-2.6
-	>=dev-libs/glib-2.28
+	>=dev-libs/libxml2-2.6:2
+	>=dev-libs/glib-2.28:2
 	glade? ( >=dev-util/glade-3.9:3.10 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )"
 DEPEND="${RDEPEND}
-	sys-devel/gettext
+	>=sys-devel/gettext-0.17
 	>=dev-util/intltool-0.40
 	>=dev-util/pkgconfig-0.9
 	doc? ( >=dev-util/gtk-doc-1.11 )"
 
-DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README"
-
-pkg_config() {
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README"
 	G2CONF="${G2CONF}
 		--disable-deprecations
-		--enable-completion-providers
+		--enable-providers
 		$(use_enable glade glade-catalog)
 		$(use_enable introspection)"
 }
 
 src_prepare() {
-	sed -i -e 's:--warn-all::' gtksourceview/Makefile.in
+	sed -i -e 's:--warn-all::' gtksourceview/Makefile.in || die
+
+	# Skip broken test until upstream bug #621383 is solved
+	sed -e "/guess-language/d" \
+		-e "/get-language/d" \
+		-i tests/test-languagemanager.c || die
 
 	gnome2_src_prepare
 }
 
 src_test() {
-	Xemake check || die "Test phase failed"
+	Xemake check
 }
 
 src_install() {
 	gnome2_src_install
 
 	insinto /usr/share/${PN}-3.0/language-specs
-	doins "${FILESDIR}"/2.0/gentoo.lang || die "doins failed"
+	doins "${FILESDIR}"/2.0/gentoo.lang
 }

diff --git a/x11-libs/gtksourceview/gtksourceview-9999.ebuild b/x11-libs/gtksourceview/gtksourceview-9999.ebuild
index 8a846a0..6b0f80c 100644
--- a/x11-libs/gtksourceview/gtksourceview-9999.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-2.10.4.ebuild,v 1.1 2010/06/23 12:08:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-3.0.4.ebuild,v 1.1 2011/06/20 11:45:03 pacho Exp $
 
-EAPI="2"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 DESCRIPTION="A text widget implementing syntax highlighting and other features"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="http://projects.gnome.org/gtksourceview/"
 
 LICENSE="GPL-2"
 SLOT="3.0"
@@ -20,44 +20,48 @@ IUSE="doc glade +introspection"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 fi
 
 # Note: has native OSX support, prefix teams, attack!
 RDEPEND=">=x11-libs/gtk+-3.0:3[introspection?]
-	>=dev-libs/libxml2-2.6
-	>=dev-libs/glib-2.28
+	>=dev-libs/libxml2-2.6:2
+	>=dev-libs/glib-2.28:2
 	glade? ( >=dev-util/glade-3.9:3.10 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )"
 DEPEND="${RDEPEND}
-	sys-devel/gettext
+	>=sys-devel/gettext-0.17
 	>=dev-util/intltool-0.40
 	>=dev-util/pkgconfig-0.9
 	doc? ( >=dev-util/gtk-doc-1.11 )"
 
-DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README"
-
-pkg_config() {
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README"
 	G2CONF="${G2CONF}
 		--disable-deprecations
-		--enable-completion-providers
+		--enable-providers
 		$(use_enable glade glade-catalog)
 		$(use_enable introspection)"
 }
 
 src_prepare() {
-	sed -i -e 's:--warn-all::' gtksourceview/Makefile.in
+	sed -i -e 's:--warn-all::' gtksourceview/Makefile.in || die
+
+	# Skip broken test until upstream bug #621383 is solved
+	sed -e "/guess-language/d" \
+		-e "/get-language/d" \
+		-i tests/test-languagemanager.c || die
 
 	gnome2_src_prepare
 }
 
 src_test() {
-	Xemake check || die "Test phase failed"
+	Xemake check
 }
 
 src_install() {
 	gnome2_src_install
 
 	insinto /usr/share/${PN}-3.0/language-specs
-	doins "${FILESDIR}"/2.0/gentoo.lang || die "doins failed"
+	doins "${FILESDIR}"/2.0/gentoo.lang
 }



             reply	other threads:[~2011-07-24 18:24 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-24 18:24 Alexandre Restovtsev [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-08-09 16:15 [gentoo-commits] proj/gnome:gnome-next commit in: x11-libs/gtksourceview/ Alexandre Restovtsev
2011-08-23 17:40 Alexandre Restovtsev
2011-09-26 23:58 Alexandre Restovtsev
2011-09-28 21:18 Alexandre Restovtsev

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=fc29963d282702188bb793f16099683fca7aacc0.tetromino@gentoo \
    --to=tetromino@gmail.com \
    --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