Skip broken test (bug #339441) as upstream doesn't care at all.

(Portage version: 2.1.10.36/cvs/Linux x86_64)

3 files changed, 14 insertions, 68 deletions

diff --git a/x11-libs/gtksourceview/ChangeLog b/x11-libs/gtksourceview/ChangeLog
index 62c4c9420aee..89b6a8de32d6 100644
--- a/x11-libs/gtksourceview/ChangeLog
+++ b/x11-libs/gtksourceview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/gtksourceview
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/ChangeLog,v 1.212 2011/11/05 19:32:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/ChangeLog,v 1.213 2011/11/22 00:15:49 pacho Exp $
+
+  22 Nov 2011; Pacho Ramos <pacho@gentoo.org> gtksourceview-2.10.5-r1.ebuild,
+  -gtksourceview-3.2.2.ebuild:
+  Skip broken test (bug #339441) as upstream doesn't care at all.
 
 *gtksourceview-3.2.3 (05 Nov 2011)
 
diff --git a/x11-libs/gtksourceview/gtksourceview-2.10.5-r1.ebuild b/x11-libs/gtksourceview/gtksourceview-2.10.5-r1.ebuild
index 730ca60e3187..c7d18e9e642b 100644
--- a/x11-libs/gtksourceview/gtksourceview-2.10.5-r1.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-2.10.5-r1.ebuild
@@ -1,9 +1,11 @@
 # 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.5-r1.ebuild,v 1.9 2011/04/10 10:50:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-2.10.5-r1.ebuild,v 1.10 2011/11/22 00:15:49 pacho Exp $
 
-EAPI="2"
+EAPI="4"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
 
 inherit gnome2 virtualx
 
@@ -29,11 +31,9 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
 	doc? ( >=dev-util/gtk-doc-1.11 )"
 
-DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README"
-
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README"
 	G2CONF="${G2CONF}
-		--disable-maintainer-mode
 		$(use_enable glade glade-catalog)"
 }
 
@@ -42,6 +42,9 @@ src_prepare() {
 
 	# Skip broken test until upstream bug #621383 is solved
 	sed -i -e "/guess-language/d" tests/test-languagemanager.c || die
+
+	# The same for another broken test, upstream bug #631214
+	sed -i -e "/get-language/d" tests/test-languagemanager.c || die
 }
 
 src_test() {
@@ -50,8 +53,7 @@ src_test() {
 
 src_install() {
 	gnome2_src_install
-	find "${D}" -name '*.la' -exec rm -f {} +
 
 	insinto /usr/share/${PN}-2.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-3.2.2.ebuild b/x11-libs/gtksourceview/gtksourceview-3.2.2.ebuild
deleted file mode 100644
index 33eab784dae4..000000000000
--- a/x11-libs/gtksourceview/gtksourceview-3.2.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.2.2.ebuild,v 1.1 2011/10/16 16:57:30 pacho Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 virtualx
-
-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"
-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"
-
-# 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
-}