x11-libs/gtksourceview: Fix compilation against GTK 3.1.x (bug #380387)

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

3 files changed, 76 insertions, 8 deletions

diff --git a/x11-libs/gtksourceview/ChangeLog b/x11-libs/gtksourceview/ChangeLog
index d71bb2fa6a0b..33f6293d8e2a 100644
--- a/x11-libs/gtksourceview/ChangeLog
+++ b/x11-libs/gtksourceview/ChangeLog
@@ -1,6 +1,12 @@
 # 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.205 2011/07/24 13:23:46 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/ChangeLog,v 1.206 2011/08/26 21:49:45 sping Exp $
+
+*gtksourceview-3.0.5-r1 (26 Aug 2011)
+
+  26 Aug 2011; Sebastian Pipping <sping@gentoo.org>
+  +gtksourceview-3.0.5-r1.ebuild:
+  Fix compilation against GTK 3.1.x (bug #380387, thanks to tetromino!)
 
 *gtksourceview-3.0.5 (24 Jul 2011)
 
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index 5feaf0a45726..ed97d764079b 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -6,19 +6,20 @@ AUX gentoo.lang 2607 RMD160 a6532326c5ee395500726e434a36e1270c0e411a SHA1 6f8594
 DIST gtksourceview-1.8.5.tar.bz2 785000 RMD160 978c59d5f99baeb5d8b9c3c14246ffc48ce150f8 SHA1 4e61b6cda043c44dc918edecd2bd9ccfc5438d2c SHA256 19c6575457fb99764f3e71197503e4c275bd03e35245afe1cf3b584e70bf0f8d
 DIST gtksourceview-2.10.5.tar.bz2 1253321 RMD160 081679debc8ca021749136e952329bb3ea0aa4f2 SHA1 5081dc7a081954d0af73852c22e874a746bda30e SHA256 c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
 DIST gtksourceview-3.0.3.tar.bz2 1408570 RMD160 dc84e266bcd9d6c2ea819f659beb3e7c2b1e2dde SHA1 2774712359fa78f581f22fca2d99c924d0c1abf8 SHA256 582765d4ff9ec2141eaaa96d52596bee71af798bf5bc1e5fed686c60331b6de7
-DIST gtksourceview-3.0.4.tar.xz 1181120 RMD160 99ae25058f27da2cce59b7e6ce7834516687e3f0 SHA1 5f151da6ee091c285a418b2104f5f846944ca4d1 SHA256 12b39125b650e70bc3ab958f071e35537d4b2136ec5497829d38b5565e7280a0
-DIST gtksourceview-3.0.5.tar.xz 1181668 RMD160 03117a9370bd219611fa1fdb35979f3257fe2ffe SHA1 cf0b9813d0748628047774a1e3ad80e1084be873 SHA256 3502fb5da443f687fdba228e3c015429874b4286e19670a87055866800f985c5
+DIST gtksourceview-3.0.4.tar.bz2 1399298 RMD160 2447dfc48d33067167110d8f24333324af3c97e2 SHA1 6e5aa7692455ceeb509859e1372b9c0d5081ac25 SHA256 41147908dc24b91c1b70e82909aa604798f9146ae6dbceefe3f4e5dedb68d8a1
+DIST gtksourceview-3.0.5.tar.bz2 1400039 RMD160 ba591068ca92eef35a778508b6d5c26b082d3b19 SHA1 018806a3df3e3152dfd762db4176d0ac7e2e9f36 SHA256 71eae1b0008d03f8c3c6c4fa6473e3e4e9fa06d438a77bc35d6d33474c88f403
 EBUILD gtksourceview-1.8.5-r1.ebuild 1230 RMD160 4476b8f4cad432b3ffdbffa81da0f28705ef6053 SHA1 e44107e3d5954b23f219816cdec699bffa17c4ef SHA256 aca485236b04472892a119ae01920a51aa8b08c5c837de6df2a5fb435f5c9399
 EBUILD gtksourceview-2.10.5-r1.ebuild 1698 RMD160 667be48027bbf4b93d53099ad961979e75902842 SHA1 032cd305519ec184cb0d27abd8cdd2b91c5d4b2d SHA256 4444047f9c032aadd37b4b474fc069a46438fa59c1e8ad6a8f012f3867cf79a8
 EBUILD gtksourceview-3.0.3.ebuild 1682 RMD160 397c882b8caaf99a0d1d93d787b9532d99ed91a1 SHA1 1ccd50d4b7505bc8d972c01ecda8e845af971e4c SHA256 d3078f04360e657efe9bbef29bc273095f97aa3a31d995274f1bfe52537120fd
 EBUILD gtksourceview-3.0.4.ebuild 1656 RMD160 024882d1789ad744c903df2fc9071ad174b73509 SHA1 983dbf7887cbc507c183879350726f0ec293a7fc SHA256 2b5af2cfe11d271eed71545d068d3244b951574fe0ab8134e8c031ff3aac4da0
+EBUILD gtksourceview-3.0.5-r1.ebuild 1687 RMD160 e5bc47361f8c16f40124a60fe5954b0aff52cbce SHA1 291cad1d98574ff0e76cf3c250994673ef72da97 SHA256 42ab622ceac5cedc2a1e64ebb1801f6d159f79eb94d6342285581c7716d1b870
 EBUILD gtksourceview-3.0.5.ebuild 1654 RMD160 7cc757b186dd903b721f8d2c9defe931a1732a35 SHA1 347fe2b777d4ad1a937db88246a41b67265029cd SHA256 ef2af452c934386339768a16fecef23e240fd2ed3b0c878103cccba66726d62e
-MISC ChangeLog 27416 RMD160 6eb55d0b3bc274b0fc477fe8a45039c2bb52946b SHA1 4e55699735d3349b9e49c6e563d6330059998dec SHA256 cfe88b92ad3f3bc6d2ddffe170d76cf25391ca87c6b5ed53deebb0dbb812d47d
+MISC ChangeLog 27616 RMD160 6798bafde45d5d6873f17eb70e4b117cece44206 SHA1 2cf89831bea7bf5d21fbe9ff10d0cd49de42c4ef SHA256 a8317a6c30a3f5bfb5ef3f0c915d4dd5eee7b486d16b4c3c89f98ee94f6d7db0
 MISC metadata.xml 331 RMD160 08926ed65e29552e8c76b80d909ee6811365a06d SHA1 b3c2f924c66a46ddae95523e41833b768cc8c94c SHA256 579046b73f8ef7347b584cd716724289934c347aa1498fd47c3dba227623c279
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4sHOcACgkQ1fmVwcYIWAaFkACfUcq8Yn9Cb4jpqGeuef+8hIYP
-3dIAn1cbXuaBvbr0GXL8jtTmLOUrMTyl
-=biB0
+iEYEARECAAYFAk5YFPwACgkQsAvGakAaFgBZWQCgpOg6P3jl35WEaidsCOtI9vzm
+sBMAnR3OGudMVsZf559H8f9Etaz4Hczc
+=aKrk
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtksourceview/gtksourceview-3.0.5-r1.ebuild b/x11-libs/gtksourceview/gtksourceview-3.0.5-r1.ebuild
new file mode 100644
index 000000000000..7fa7b7b516ee
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-3.0.5-r1.ebuild
@@ -0,0 +1,61 @@
+# 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.5-r1.ebuild,v 1.1 2011/08/26 21:49:45 sping 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
+		--disable-maintainer-mode
+		--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
+}