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

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

7 files changed, 17 insertions, 195 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/Manifest b/app-editors/gedit-plugins/Manifest
index e0a4e588b3dd..bdbce6729ce3 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,19 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX gedit-plugins-3.8.3-terminal-background.patch 521 SHA256 6f6b04f8849bbcb98036a9f42780717448be3d46cbe9527f114f15eaca47a5fe SHA512 07d230d769c8e9908c1f06d3675ccf1e6b0b2a0794336c5f530ec68bf5699e256abb7682181d0f9183f7eeb6a9327b32a0e9a7ad4c5d773e829c89cb1a6bf31c WHIRLPOOL 9cbf6311ee22b43f175c8b3fae613906cfac9246cf792b571aa0263b06bf434b1bd426c4fa4462f79e8cd72c076c3ee3a3a41152fe9d30dd4bcca536447dd0f5
-DIST gedit-plugins-2.32.0.tar.bz2 616927 SHA256 2ef7bf48e9500556d84ae4c2950f4eadcc3f9cb9c58c90f2c83956b0ddad1107 SHA512 c00535a8a166752ef764319eb79fd7dd5a55df495bf0f3de32e287214f5da8ddd32a52c5538d5e8714843e7e724d24aab9f6fca0f1f339fe299a1ffdf264761b WHIRLPOOL d7385fe3682efaeaa5fbc57a8e8fb68480983140daf78643392b6a7b335a2a5e8ce21cc8f04136efcfac6133dd1c1cd65c50eab0b0cbde766eebb850889796eb
 DIST gedit-plugins-3.10.1.tar.xz 1253800 SHA256 b30e30d5a0efb9a711c6583748b37c1ed3e45222505e08f920b78c6de0bc4a9d SHA512 bb63986c1a2c431443191bf1855a54125c9c1b500a4764bf13f597cb8ea09e588ee101d2856938ee229bc9bbba9bd107c60c643fb09f001afa26f0ef90baa2fa WHIRLPOOL d148f654c0b4de0caab3b26ae8334d2ed9344a3b08eed4b45b8458a1f3efd9c909edd8dbf015c951aadaaa0953abe81365324077c81e5d18d1b7c412d148cd46
-DIST gedit-plugins-3.8.3.tar.xz 724000 SHA256 2340910ed49acfaab7e8d30142e087f70e55c1a55f8b755d4f9014bce3923c80 SHA512 49a6b6184b73868997477607d932c3ec7b86344854446d1bf7f6a97b2dfff23918970c07fb2bc3f8380ef76874e5addad809c6dd61a0101067e16c9c3c5ea45e WHIRLPOOL b94f8cebd3d4b5e91d92a10b5610510664fb35f4fa8a0eb3dc91f714916b726e6a94a19b13f7072d9df3589241eeff3e8d51dec1090a47a3764ede5c07ce07c8
-EBUILD gedit-plugins-2.32.0.ebuild 2297 SHA256 a62ae40c5a037a1a6ee19d5a1364aabf2bb2b6a1c11b18fbedc42258bb2b1eaf SHA512 5447ec6f2d1ce3ab6e4b5861f5b676d4b10da191faf2a7d5288da71293c93e1f2516d4530834423529427cb4146fdafa2f056fb992bc480c3a4756055335c031 WHIRLPOOL 76ad4638ba488774428b0972dc53d68a06cf3dd54f745cc86717d15976fd511218f250375c3bdb287c9fb726aa688fd33eff6ba0ccd133a5461c2c1b2441d2f0
-EBUILD gedit-plugins-3.10.1.ebuild 2093 SHA256 d9d6ae73fe53d0fd2cee68af51340767d9560d49d2a22cc9b9ae6f5645f5fde5 SHA512 0314b7eae86d5e881ff8e40ab3647915b88164c6b452d36d4ebb71287b00d7a733a4ad9acc7d9babd08c53f0171b07a1be41959c42f6a0caac5b7bde1a58dbd6 WHIRLPOOL 771c876509b28d55569821d85b2cdcd59d171ce802603316dcb4fbf3cb170c8deef9ea230d2254c85abd90499fe7b1ed1657632657cd6cc7c8354311344f5788
-EBUILD gedit-plugins-3.8.3-r1.ebuild 2240 SHA256 0d3143286aa5102c28f57fb50430cda0769b1087ec7bcefa704f1ec8a28bab34 SHA512 cc17add80add6c72d82aabada39bc964367f13c98167307fac869468bacd364f403ad5d93e7a4d327a8cb1de7191ba1fea4dbbe9eade09df040db11a0876c1db WHIRLPOOL 3c84086bb26b76946dc21d031195a02e2c902950c0f2840407eab6f42db805c43a249ec25b02d38cf113d0dda42a859cd3472b936f59de3ba43c3b9f6b318ee9
-MISC ChangeLog 8498 SHA256 e81fda93d24dcbdcba5cbedfebfc5fb09779e0c1766107ab849e2f116cb6f03b SHA512 4ef738fe14687131b23e02b136c6cb8a54f807efa7b88bccbf94ec70149ac7a0d336a27b92eb19d3e5ee1aa8e8acd4da6b297cc7e4d0ac8d62a324395bff52a6 WHIRLPOOL e69eae7fe2a84fcbeb2984cd72ead73dc2180eded7efafa005d9789a7cac7b9a0954cd19efff6c2728931e13deb6cff2294feeb5e7c0eaf00619653473ae1cbd
-MISC metadata.xml 542 SHA256 212804662230f5cff0ee4a76a2edb9206df1f30365320eb21dc0c2b5d50cf141 SHA512 293f3de34d5c3307e018cb01312502574eb78c7d18de7c711422bb1398a2b73187e47d500c11b777655f57486eecb9dba3be1e055979b18fa77d6f23655d2d5f WHIRLPOOL e0fe67fd8297488a65275976ec47cd7e58bb4d5c2edb4afe7e367440956f69fe06d64d2d3bc0c298e0d167d7023a7795a62bf7b531961655a9c8b52394ce4bfa
+EBUILD gedit-plugins-3.10.1.ebuild 2135 SHA256 b1acebba76d4fa4c688e9dde1fd34b6c98ba647bdd74e6a3f5c0e783584fd1c5 SHA512 bce7cc335d41ab49ec727cf0bc5f00e0d0dab2cd3e5cdacc0c199e9fdc0d71caf271e431891398ace3861ad71ec41546a64e8e0c7821f87565d9dbed8f103ce9 WHIRLPOOL a29a82b712a5e7c3dbe9decd6a402da788271ed5a49e6f8e10a72c99976d62fed8f7c711030bc36f0d7bf2df623cf75f949420d040017a7a05702a564fb89e15
+MISC ChangeLog 8773 SHA256 ddcdc3078acad8612bd95a3b0e30444ee5665f008fdad259a8321f97e00384d4 SHA512 07d814e7e4ec9668bd4130f49910ea44f999e39a632f18bce664d6dbb64d0c2da7f858ab55ff418d2a7a95da108cf5e5d47ca7f4c6ed5284517f62d82594fe7f WHIRLPOOL 7c6aff37f0535601da97f072ee72c52eec86148b72aa410bb2edd352968284e2a4a4ea387570a80034ee4dc7fb96d023291192f1eaad020b74a8913f86b5e3a2
+MISC metadata.xml 453 SHA256 521f4e91c8d77490dc6d23e29821e9cdd37fb77a53317e3dfbdd2419344e0b8f SHA512 8ea4d32e1a333f0181a829520e1ebd44dd3c82a7bf7cef8f16b153141d0fc8e83c9bb19fd6b35a944c58e5cabfad158e888fb4b12ac7209b20af584adceee82c WHIRLPOOL a0ad9327b24eb4419d407da51a41e84211f94c0ecf866330c84876a96c1ad74bb3b439ffdd26f088ecc591a544961df6736fc9342e331f38a8504d830c05e5d0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMcVkIACgkQCaWpQKGI+9Q1IwCdFUri1yBVS+zqFVcvx5SBQI7B
-05MAn3it7OVtnZfAEcGtZzqaXFg24pj5
-=GLdH
+iEYEAREIAAYFAlNJFacACgkQCaWpQKGI+9QsSQCfWbd+S/wvK/nLRINVheENHIMo
+RykAn3b0WVMw/5oSUOeI4qwu1OLMOa0W
+=F8Ur
 -----END PGP SIGNATURE-----
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>