Update 3.4.2's intltool dep, thanks to Matt Turner. Update license. Drop useless doc USE flag, it only regenerated api documentation. Drop old.

(Portage version: 2.2.0_alpha137/cvs/Linux x86_64)

6 files changed, 32 insertions, 85 deletions

diff --git a/x11-libs/gtksourceview/ChangeLog b/x11-libs/gtksourceview/ChangeLog
index f515c65122a5..a22bc09e64d7 100644
--- a/x11-libs/gtksourceview/ChangeLog
+++ b/x11-libs/gtksourceview/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/gtksourceview
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/ChangeLog,v 1.233 2012/10/14 23:29:27 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/ChangeLog,v 1.234 2012/10/14 23:56:51 tetromino Exp $
+
+  14 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gtksourceview-2.10.5-r1.ebuild, gtksourceview-2.10.5-r2.ebuild,
+  gtksourceview-3.2.3.ebuild, -gtksourceview-3.4.1.ebuild,
+  gtksourceview-3.4.2.ebuild:
+  Update 3.4.2's intltool dep, thanks to Matt Turner. Update license. Drop
+  useless doc USE flag, it only regenerated api documentation. Drop old.
 
   14 Oct 2012; Matt Turner <mattst88@gentoo.org> gtksourceview-3.4.2.ebuild:
   Stable on alpha, bug 427544.
diff --git a/x11-libs/gtksourceview/gtksourceview-2.10.5-r1.ebuild b/x11-libs/gtksourceview/gtksourceview-2.10.5-r1.ebuild
index 65af8539a09e..b7cbd089f1f5 100644
--- a/x11-libs/gtksourceview/gtksourceview-2.10.5-r1.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-2.10.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.11 2012/05/05 03:52:26 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-2.10.5-r1.ebuild,v 1.12 2012/10/14 23:56:51 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -12,10 +12,10 @@ inherit gnome2 virtualx
 DESCRIPTION="A text widget implementing syntax highlighting and other features"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="2.0"
 KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc glade"
+IUSE="glade"
 
 # FIXME: We could avoid the glade conditional and dep completely if upstream
 # would have a --with-glade-catalogdir that would allow to pass the system
@@ -26,10 +26,10 @@ RDEPEND=">=x11-libs/gtk+-2.12:2
 	glade? ( >=dev-util/glade-3.2:3 )
 	kernel_Darwin? ( x11-libs/ige-mac-integration )"
 DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.17
+	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.11 )"
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README"
diff --git a/x11-libs/gtksourceview/gtksourceview-2.10.5-r2.ebuild b/x11-libs/gtksourceview/gtksourceview-2.10.5-r2.ebuild
index 5d4d72ab346d..7d38c1e97a0b 100644
--- a/x11-libs/gtksourceview/gtksourceview-2.10.5-r2.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-2.10.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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-r2.ebuild,v 1.9 2012/07/15 18:59:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-2.10.5-r2.ebuild,v 1.10 2012/10/14 23:56:51 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -12,10 +12,10 @@ inherit eutils gnome2 virtualx
 DESCRIPTION="A text widget implementing syntax highlighting and other features"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="2.0"
 KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc glade"
+IUSE="glade"
 
 # FIXME: We could avoid the glade conditional and dep completely if upstream
 # would have a --with-glade-catalogdir that would allow to pass the system
@@ -26,10 +26,10 @@ RDEPEND=">=x11-libs/gtk+-2.12:2
 	glade? ( >=dev-util/glade-3.2:3 )
 	kernel_Darwin? ( x11-libs/ige-mac-integration )"
 DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.17
+	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.11 )"
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README"
diff --git a/x11-libs/gtksourceview/gtksourceview-3.2.3.ebuild b/x11-libs/gtksourceview/gtksourceview-3.2.3.ebuild
index 792b494dba85..f4acd5038d99 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.2.3.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-3.2.3.ebuild,v 1.9 2012/07/15 18:59:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-3.2.3.ebuild,v 1.10 2012/10/14 23:56:51 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -11,9 +11,9 @@ inherit gnome2 virtualx
 DESCRIPTION="A text widget implementing syntax highlighting and other features"
 HOMEPAGE="http://projects.gnome.org/gtksourceview/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="3.0"
-IUSE="doc glade +introspection"
+IUSE="glade +introspection"
 KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND=">=x11-libs/gtk+-3.0:3[introspection?]
@@ -22,10 +22,10 @@ RDEPEND=">=x11-libs/gtk+-3.0:3[introspection?]
 	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/gtk-doc-am
 	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.11 )"
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README"
diff --git a/x11-libs/gtksourceview/gtksourceview-3.4.1.ebuild b/x11-libs/gtksourceview/gtksourceview-3.4.1.ebuild
deleted file mode 100644
index 266b1d5508a2..000000000000
--- a/x11-libs/gtksourceview/gtksourceview-3.4.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-3.4.1.ebuild,v 1.4 2012/05/15 23:27:13 aballier 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 ~amd64-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.3.8: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
-	virtual/pkgconfig
-	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() {
-	gnome2_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
-}
-
-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-3.4.2.ebuild b/x11-libs/gtksourceview/gtksourceview-3.4.2.ebuild
index 4d806c7501ab..c5cb9dd50193 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.4.2.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-3.4.2.ebuild,v 1.6 2012/10/14 23:29:27 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-3.4.2.ebuild,v 1.7 2012/10/14 23:56:51 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -11,9 +11,9 @@ inherit gnome2 virtualx
 DESCRIPTION="A text widget implementing syntax highlighting and other features"
 HOMEPAGE="http://projects.gnome.org/gtksourceview/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="3.0"
-IUSE="doc glade +introspection"
+IUSE="glade +introspection"
 KEYWORDS="alpha amd64 arm ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 # Note: has native OSX support, prefix teams, attack!
@@ -23,10 +23,10 @@ RDEPEND=">=x11-libs/gtk+-3.4:3[introspection?]
 	glade? ( >=dev-util/glade-3.9:3.10 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )"
 DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50
 	>=sys-devel/gettext-0.17
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.11 )"
+	virtual/pkgconfig"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README"