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

Package-Manager: portage-2.1.10.36/cvs/Linux x86_64

diff --git a/x11-libs/gtksourceview/ChangeLog b/x11-libs/gtksourceview/ChangeLog
index 62c4c9420aee5c1ea072737d7dfc4b9bc453a2b4..89b6a8de32d6c42b2bd5e29644f0c8147303df03 100644 (file)
--- 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/Manifest b/x11-libs/gtksourceview/Manifest
index 9c66451de1d756a2645d9c6dbfc4538443c25639..59fb56b62ce9c4306744d51972c6307ad80bf9fe 100644 (file)
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -4,17 +4,15 @@ Hash: SHA1
 AUX 2.0/gentoo.lang 3910 RMD160 43b51212ec2787b9d95e9d4f512342b920d6c355 SHA1 22ce79797f654f1f7b6894de8cb12bbdcdf70bee SHA256 fcb5133892038174826d9ee1a720ec7204f3842c7bd3e9aabf0532b408e663d1
 AUX gentoo.lang 2607 RMD160 a6532326c5ee395500726e434a36e1270c0e411a SHA1 6f859400d569c3d39fe02e6dc426d0b4caf6fe75 SHA256 3a51831952ae3661232de4ace1eae5182039d82a6d45c97ccbe9cab73519c707
 DIST gtksourceview-2.10.5.tar.bz2 1253321 RMD160 081679debc8ca021749136e952329bb3ea0aa4f2 SHA1 5081dc7a081954d0af73852c22e874a746bda30e SHA256 c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
-DIST gtksourceview-3.2.2.tar.xz 1212912 RMD160 14f4002be0a865a83eeab759b0debf2db13d82f9 SHA1 cb36ec611f4f48a0b092eb06d36870fa57f182ce SHA256 52447d85b57b1413e699a4a27a8c4ba7df737347e9f5b4c5406e6393ca02982c
 DIST gtksourceview-3.2.3.tar.xz 1215836 RMD160 f814af3e3d54794175706a7cbb05d6adca9446de SHA1 22e9e3c38a10e3ffdec7d5e1179571364e4d3653 SHA256 73d9c6702ccecd06846132cfb50191092cb50a4bcb3ff810a5605868f0855947
-EBUILD gtksourceview-2.10.5-r1.ebuild 1698 RMD160 667be48027bbf4b93d53099ad961979e75902842 SHA1 032cd305519ec184cb0d27abd8cdd2b91c5d4b2d SHA256 4444047f9c032aadd37b4b474fc069a46438fa59c1e8ad6a8f012f3867cf79a8
-EBUILD gtksourceview-3.2.2.ebuild 1656 RMD160 465792655a796b99ad8d2815a59cba32db21433b SHA1 0fc23ee48f928d57981cfa1ee650cd584fccb104 SHA256 0d8125fe394d8a52c2456d4cb20215cd1d14cdc620a75e685056412ba913211b
+EBUILD gtksourceview-2.10.5-r1.ebuild 1774 RMD160 2981c056e504c9f819893a92e352e5480996bb3f SHA1 37e6576f0e32129fd41d9797e9b2e73ff862800d SHA256 a83a3020eec85f261831ad50d7f4e77585d5f876f943b2dd46272760f763180b
 EBUILD gtksourceview-3.2.3.ebuild 1602 RMD160 a04474a4d22d098b7d1254e3d132714a28f980e1 SHA1 d2d17ae68bb96f1bed75e4a84678dc4798fecdf9 SHA256 ec95e48d0f41388ad6db7c9f6318b6b382be04d0dab8d99c3f6e86745fcaac5d
-MISC ChangeLog 28546 RMD160 1ee73332e34d20972c2d66281242453c71344dc2 SHA1 90f770308caeb05273e35be046d7a4fcfd044f89 SHA256 dbbcca79f14ef193641ee7451ea2277f8d7175982bd24c1307f1ab33252124b2
+MISC ChangeLog 28722 RMD160 471a5eca656fdc10c73a6b159f97231ed126d165 SHA1 ac98c46d63f4a24368c5afa0387c63d3018846ba SHA256 fbbd6754aa1ad4faf97d3c1091e062f9688b075d617332e22043c2bfcd12496d
 MISC metadata.xml 331 RMD160 08926ed65e29552e8c76b80d909ee6811365a06d SHA1 b3c2f924c66a46ddae95523e41833b768cc8c94c SHA256 579046b73f8ef7347b584cd716724289934c347aa1498fd47c3dba227623c279
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk61j0EACgkQCaWpQKGI+9R7MwCfZOAGUMsWpzz0OD2DB0BCGV7+
-oCYAoIJn+3+jBT4czuY8wDxYQb14h56D
-=ixRs
+iEYEARECAAYFAk7K6bsACgkQCaWpQKGI+9TumACfeLnVQWqvgFKQz16q5MQEVQiO
+2wUAmwTaUWum552JTj7hqJQ4wwB8L/83
+=36Do
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/gtksourceview/gtksourceview-2.10.5-r1.ebuild b/x11-libs/gtksourceview/gtksourceview-2.10.5-r1.ebuild
index 730ca60e31870210dc0287c2ddd927e4be0b714c..c7d18e9e642bb8f6c1c8ba1904ddb741cd81af09 100644 (file)
--- 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 (file)
index 33eab78..0000000
--- 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
-}