Fix itstool dependency (#504910 by Chris Reffett), drop old.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

6 files changed, 11 insertions, 184 deletions

diff --git a/app-editors/gedit-plugins/ChangeLog b/app-editors/gedit-plugins/ChangeLog
index fae7ecb2096b..b88f7de3bcad 100644
--- a/app-editors/gedit-plugins/ChangeLog
+++ b/app-editors/gedit-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/gedit-plugins
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/ChangeLog,v 1.44 2014/03/09 11:53:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/ChangeLog,v 1.45 2014/04/12 10:29:58 pacho Exp $
+
+  12 Apr 2014; Pacho Ramos <pacho@gentoo.org>
+  -files/gedit-plugins-3.8.3-terminal-background.patch,
+  -gedit-plugins-2.32.0.ebuild, -gedit-plugins-3.8.3-r1.ebuild,
+  gedit-plugins-3.10.1.ebuild, metadata.xml:
+  Fix itstool dependency (#504910 by Chris Reffett), drop old.
 
   09 Mar 2014; Pacho Ramos <pacho@gentoo.org> gedit-plugins-3.10.1.ebuild:
   x86 stable, bug 499954
diff --git a/app-editors/gedit-plugins/files/gedit-plugins-3.8.3-terminal-background.patch b/app-editors/gedit-plugins/files/gedit-plugins-3.8.3-terminal-background.patch
deleted file mode 100644
index 9dc162fd9807..000000000000
--- a/app-editors/gedit-plugins/files/gedit-plugins-3.8.3-terminal-background.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/terminal/terminal.py~	2013-06-18 12:16:09.000000000 +0200
-+++ plugins/terminal/terminal.py	2013-10-26 14:49:48.619158171 +0200
-@@ -58,8 +58,6 @@
-         self.system_settings.connect("changed::monospace-font-name", self.font_changed)
- 
-         self._vte = Vte.Terminal()
--        self._vte.set_background_image(None)
--        self._vte.set_background_transparent(False)
-         self.reconfigure_vte()
-         self._vte.set_size(self._vte.get_column_count(), 5)
-         self._vte.set_size_request(200, 50)
diff --git a/app-editors/gedit-plugins/gedit-plugins-2.32.0.ebuild b/app-editors/gedit-plugins/gedit-plugins-2.32.0.ebuild
deleted file mode 100644
index 0848ea2ad472..000000000000
--- a/app-editors/gedit-plugins/gedit-plugins-2.32.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/gedit-plugins-2.32.0.ebuild,v 1.8 2012/12/16 21:43:34 tetromino Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="python? 2:2.6"
-PYTHON_USE_WITH="xml"
-PYTHON_USE_WITH_OPT="python"
-
-inherit gnome2 multilib python eutils
-
-DESCRIPTION="Offical plugins for gedit."
-HOMEPAGE="http://live.gnome.org/GeditPlugins"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-SLOT="0"
-
-IUSE_plugins="charmap synctex terminal"
-IUSE="+python ${IUSE_plugins}"
-
-RDEPEND=">=x11-libs/gtk+-2.14:2
-	gnome-base/gconf
-	>=x11-libs/gtksourceview-2.6:2.0
-	>=app-editors/gedit-2.29.3[python]
-	>=dev-python/pygtk-2.14:2
-	python? ( >=dev-python/pygtksourceview-2.2:2 )
-	charmap? ( >=gnome-extra/gucharmap-2.23.0:0 )
-	synctex? ( >=dev-python/dbus-python-0.82 )
-	terminal? (
-		dev-python/gconf-python
-		>=x11-libs/vte-0.19.4:0[python]
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool"
-
-pkg_setup() {
-	DOCS="AUTHORS NEWS ChangeLog*"
-
-	# DEFAULT_PLUGINS from configure.ac
-	# FIXME: 'taglist' breaks configure
-	local myplugins="bookmarks,showtabbar,drawspaces,wordcompletion"
-
-	# python plugins with no extra dependencies beyond what USE=python brings
-	use python && myplugins="${myplugins},bracketcompletion,codecomment,colorpicker,commander,joinlines,multiedit,textsize,sessionsaver,smartspaces"
-
-	# python plugins with extra dependencies
-	for plugin in ${IUSE_plugins/+}; do
-		use ${plugin} || continue
-		# FIXME: put in REQUIRED_USE when python.eclass supports EAPI4
-		if use python; then
-			myplugins="${myplugins},${plugin}"
-		else
-			ewarn "Plugin '${plugin}' auto-disabled due to USE=-python"
-		fi
-	done
-
-	G2CONF="${G2CONF}
-		--disable-dependency-tracking
-		--with-plugins=${myplugins}
-		$(use_enable python)"
-
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if use python; then
-		python_need_rebuild
-		python_mod_optimize /usr/$(get_libdir)/gedit-2/plugins
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	use python && python_mod_cleanup /usr/$(get_libdir)/gedit-2/plugins
-}
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.10.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.10.1.ebuild
index 1c042da8aad5..19c7cf256ada 100644
--- a/app-editors/gedit-plugins/gedit-plugins-3.10.1.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-3.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/gedit-plugins-3.10.1.ebuild,v 1.5 2014/03/09 11:53:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/gedit-plugins-3.10.1.ebuild,v 1.6 2014/04/12 10:29:58 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -11,7 +11,7 @@ PYTHON_REQ_USE="xml"
 inherit eutils gnome2 multilib python-r1
 
 DESCRIPTION="Official plugins for gedit"
-HOMEPAGE="http://live.gnome.org/GeditPlugins"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
 
 LICENSE="GPL-2+"
 KEYWORDS="amd64 x86"
@@ -68,5 +68,6 @@ src_configure() {
 
 	gnome2_src_configure \
 		--with-plugins=${myplugins} \
-		$(use_enable python)
+		$(use_enable python) \
+		ITSTOOL=$(type -P true)
 }
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.8.3-r1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.8.3-r1.ebuild
deleted file mode 100644
index fcdf28ce1f19..000000000000
--- a/app-editors/gedit-plugins/gedit-plugins-3.8.3-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/gedit-plugins-3.8.3-r1.ebuild,v 1.3 2013/12/08 17:40:21 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_{2,3} )
-PYTHON_REQ_USE="xml"
-
-inherit eutils gnome2 multilib python-r1
-
-DESCRIPTION="Official plugins for gedit"
-HOMEPAGE="http://live.gnome.org/GeditPlugins"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-SLOT="0"
-
-IUSE_plugins="charmap git terminal"
-IUSE="+python ${IUSE_plugins}"
-REQUIRED_USE="
-	charmap? ( python )
-	git? ( python )
-	terminal? ( python )
-	python? ( ${REQUIRED_PYTHON_USE} )
-"
-
-RDEPEND="
-	>=app-editors/gedit-3.7.1[python?]
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libpeas-1.7.0[gtk,python?]
-	>=x11-libs/gtk+-3.4:3
-	>=x11-libs/gtksourceview-3:3.0
-	python? (
-		${PYTHON_DEPS}
-		>=app-editors/gedit-3[introspection,${PYTHON_USEDEP}]
-		dev-libs/libpeas[${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/pycairo
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-		>=x11-libs/gtk+-3.4:3[introspection]
-		>=x11-libs/gtksourceview-3:3.0[introspection]
-		x11-libs/pango[introspection]
-		x11-libs/gdk-pixbuf:2[introspection]
-	)
-	charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] )
-	git? ( >=dev-libs/libgit2-glib-0.0.2 )
-	terminal? ( x11-libs/vte:2.90[introspection] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Fix terminal not loading (adapted from 'master')
-	epatch "${FILESDIR}/${PN}-3.8.3-terminal-background.patch"
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# DEFAULT_PLUGINS from configure.ac
-	local myplugins="bookmarks,drawspaces,wordcompletion"
-
-	# python plugins with no extra dependencies beyond what USE=python brings
-	use python && myplugins="${myplugins},bracketcompletion,codecomment,colorpicker,colorschemer,commander,dashboard,joinlines,multiedit,textsize,smartspaces,synctex"
-
-	# python plugins with extra dependencies
-	for plugin in ${IUSE_plugins/+}; do
-		use ${plugin} && myplugins="${myplugins},${plugin}"
-	done
-
-	gnome2_src_configure \
-		--with-plugins=${myplugins} \
-		$(use_enable python)
-}
diff --git a/app-editors/gedit-plugins/metadata.xml b/app-editors/gedit-plugins/metadata.xml
index 6c8601d7a965..570a581fa9c5 100644
--- a/app-editors/gedit-plugins/metadata.xml
+++ b/app-editors/gedit-plugins/metadata.xml
@@ -7,8 +7,6 @@
 	<flag name='charmap'>Insert special characters just by clicking on
 		  them</flag>
 	<flag name='git'>Shows document changes related to git's HEAD</flag>
-	<flag name='synctex'>Synchronize between LaTeX and PDF with gedit and
-		  evince</flag>
 	<flag name='terminal'>Embed a terminal in the bottom pane</flag>
 </use>
 </pkgmetadata>