x11-libs/gtksourceview: add 3.1.3

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

3 files changed, 88 insertions, 15 deletions

diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index 496b5c15..72d89eb2 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -1,2 +1,4 @@
 AUX 2.0/gentoo.lang 3910 RMD160 43b51212ec2787b9d95e9d4f512342b920d6c355 SHA1 22ce79797f654f1f7b6894de8cb12bbdcdf70bee SHA256 fcb5133892038174826d9ee1a720ec7204f3842c7bd3e9aabf0532b408e663d1
-EBUILD gtksourceview-9999.ebuild 1545 RMD160 8a9b86cc34dc9f35bff0f2daf4ac6901ca884482 SHA1 40a0995194a5cba09dfd6d8a780215f239d1802a SHA256 7ec01ef70b2a7f959ee685cef64cfa1441136ffcdffbf837eff7f3b21b3e37a2
+DIST gtksourceview-3.1.3.tar.xz 1175628 RMD160 d150a6c2125d18a169b545bae877767914b67c7b SHA1 402f42087a0d7d020124f960bc871c2d5ddd10d7 SHA256 244cec85efec9d4be4f83a79d0be6fb2366211f0875fdeb82750c21d29fe40b5
+EBUILD gtksourceview-3.1.3.ebuild 1758 RMD160 593b85053a5b9f46a8cb673ac007dbd2ab619d3c SHA1 73e42ac07d3a65e860d89a53d837146920541635 SHA256 75861b569a7af8fcee175b385025019d54976958e66a102de68540ebefbe7f11
+EBUILD gtksourceview-9999.ebuild 1758 RMD160 593b85053a5b9f46a8cb673ac007dbd2ab619d3c SHA1 73e42ac07d3a65e860d89a53d837146920541635 SHA256 75861b569a7af8fcee175b385025019d54976958e66a102de68540ebefbe7f11
diff --git a/x11-libs/gtksourceview/gtksourceview-3.1.3.ebuild b/x11-libs/gtksourceview/gtksourceview-3.1.3.ebuild
new file mode 100644
index 00000000..6b0f80c2
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-3.1.3.ebuild
@@ -0,0 +1,67 @@
+# 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-3.0.4.ebuild,v 1.1 2011/06/20 11:45:03 pacho Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 virtualx
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="http://projects.gnome.org/gtksourceview/"
+
+LICENSE="GPL-2"
+SLOT="3.0"
+IUSE="doc glade +introspection"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	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: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-0.17
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.9
+	doc? ( >=dev-util/gtk-doc-1.11 )"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README"
+	G2CONF="${G2CONF}
+		--disable-deprecations
+		--enable-providers
+		$(use_enable glade glade-catalog)
+		$(use_enable introspection)"
+}
+
+src_prepare() {
+	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
+}
+
+src_install() {
+	gnome2_src_install
+
+	insinto /usr/share/${PN}-3.0/language-specs
+	doins "${FILESDIR}"/2.0/gentoo.lang
+}
diff --git a/x11-libs/gtksourceview/gtksourceview-9999.ebuild b/x11-libs/gtksourceview/gtksourceview-9999.ebuild
index 8a846a01..6b0f80c2 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
 }