Adapt upstream patch from master to let terminal plugin work again

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

5 files changed, 40 insertions, 72 deletions

diff --git a/app-editors/gedit-plugins/ChangeLog b/app-editors/gedit-plugins/ChangeLog
index ea396a088a23..072374ec19ca 100644
--- a/app-editors/gedit-plugins/ChangeLog
+++ b/app-editors/gedit-plugins/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-editors/gedit-plugins
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/ChangeLog,v 1.36 2013/08/31 01:10:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/ChangeLog,v 1.37 2013/10/26 12:53:54 pacho Exp $
+
+*gedit-plugins-3.8.3-r1 (26 Oct 2013)
+
+  26 Oct 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/gedit-plugins-3.8.3-terminal-background.patch,
+  +gedit-plugins-3.8.3-r1.ebuild, -gedit-plugins-3.8.2.ebuild,
+  -gedit-plugins-3.8.3.ebuild:
+  Adapt upstream patch from master to let terminal plugin work again
 
   31 Aug 2013; Patrick Lauer <patrick@gentoo.org>
   -gedit-plugins-3.6.1-r1.ebuild:
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index 21ee83b118e0..4656a6b7a0ad 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,8 +1,17 @@
+-----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.8.2.tar.xz 722224 SHA256 ee6efad1222b0f74208b5280dbad84d16400f3fc39c227b12c8695999aa2b502 SHA512 eef94558d3782a79b62d29757942a9c0d51d20ea9dae916ed6c682ee742b1fd30bfb8c8fa84077d4879ec520fc0b6c7ed5cf025f2cc2fd17575714bca8e9185d WHIRLPOOL 29018fc347ce7e3f4d23c61273a3f216171eb0a26ce4a8da40ede5ba5cae5eac338fe0700ada8299db8158a81d875a67af3ea23cd586d0a795e8d5f9e8f8004f
 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.8.2.ebuild 1983 SHA256 dcf4143a24fffca50bfc415f12c835e4cc58667f0ad693613969a05327e1c85b SHA512 7587815a0d0c914e606ddc1fcfb328f62a96add51dd603aaac62c5a693639967b799861298a613ed8cf23647d13e3f49db59b8892d1793e98d17192fec42fcae WHIRLPOOL 523739781cb0c576def12217f3659e768ce70aa72047a02754ad3ff02b1ec47104dcb3637be3e872e3612ff7ddc4c6e00047a3d8aa75e42264848f5af6afb3d8
-EBUILD gedit-plugins-3.8.3.ebuild 2086 SHA256 9569b1f8e86362d21d99150d1985a58e58fae80fbf9c0baed8ebcb9593449622 SHA512 7b6813b152d60068efc8f36689400ba3a0c1f654359922d63df886f70b6c5da1fe66c7acbf06c9f6069a74fc5bcea30521403e5f54dc591c805e7fa5d9127fdb WHIRLPOOL 2682dfcc04fcdac2f77b865e73ca5c91879161b1d10c503363ea1655622f819ac7445ba69de6af56d5d406289e41cf06c050b649974bf4c9fb17c7f4bd78cf50
-MISC ChangeLog 7431 SHA256 1344ddcaf0263a929b24e547df2ac3210bad239577fc57d2c05697190c2865d1 SHA512 bb89e2bea90f64936a13e01ff2c241c17cbb2b3341fd5e10fdeba33949e46b872835659edc8c00d8b1f138c4135d98db230abbb10f4547d55551f28411d115b7 WHIRLPOOL 8c3374612bb2e5778f70ca77e6ef0b4a6c298dc11799f326b9f379ebe1138fe18160b127a819ddcee91a4dc067c703e3963ad950f2070f858214bfa7ec75e113
+EBUILD gedit-plugins-3.8.3-r1.ebuild 2242 SHA256 f5c6307d6ae66d5df6016dc99a9cb1d6c3207c864adf288e973ee19f96551cd0 SHA512 cc75b3fc42464b34d24596fa24e6e371628b563d61f33d3993502ea9af81b7e310f5f18bb5d201264a08ef92ec5463a69c29aa94adb8931db4a7ef536e257b7e WHIRLPOOL 422a3966e058dec9b109787df48c8dbdaa3b087de71d93ee89ee9037f55b8b8b9121fbef124958c3abe73c6b1ee6f3e74683db3418726697ebf8326ec0edeb4f
+MISC ChangeLog 7734 SHA256 277abe488591dce2c8af37dee6f9db1c465a772d5fa5c418501fec91d33a5e83 SHA512 b3877d9a4565001b9fc871c762816f068d3e88d89d2fc53be7ae13f3b6674a932d4c09bd9dde5f0a66b184a60f321701639740db5a6df03511a73fb64621da52 WHIRLPOOL efefeba311edb7605c2b4ec631a491870338479519731fa49bd7ffd961fe0f30287607ad15c0f3f6b1116e44f385ddee46ef0846a818b318daef088793bf231c
 MISC metadata.xml 542 SHA256 212804662230f5cff0ee4a76a2edb9206df1f30365320eb21dc0c2b5d50cf141 SHA512 293f3de34d5c3307e018cb01312502574eb78c7d18de7c711422bb1398a2b73187e47d500c11b777655f57486eecb9dba3be1e055979b18fa77d6f23655d2d5f WHIRLPOOL e0fe67fd8297488a65275976ec47cd7e58bb4d5c2edb4afe7e367440956f69fe06d64d2d3bc0c298e0d167d7023a7795a62bf7b531961655a9c8b52394ce4bfa
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlJru2MACgkQCaWpQKGI+9QjYwCeJB5qj/vA3p7cJe1KjDjcIg+T
+Gq4AniffmTeG75l2aJwLL3lyYk7aWHfo
+=J1fz
+-----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
new file mode 100644
index 000000000000..9dc162fd9807
--- /dev/null
+++ b/app-editors/gedit-plugins/files/gedit-plugins-3.8.3-terminal-background.patch
@@ -0,0 +1,11 @@
+--- 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-3.8.2.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.8.2.ebuild
deleted file mode 100644
index ce709bf7dd38..000000000000
--- a/app-editors/gedit-plugins/gedit-plugins-3.8.2.ebuild
+++ /dev/null
@@ -1,66 +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.2.ebuild,v 1.1 2013/05/26 11:05:42 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_2 )
-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 terminal"
-IUSE="+python ${IUSE_plugins}"
-REQUIRED_USE="charmap? ( python ) terminal? ( python )"
-
-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] )
-	terminal? ( x11-libs/vte:2.90[introspection] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-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/gedit-plugins-3.8.3.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.8.3-r1.ebuild
index 97788c96f532..4c398941bba3 100644
--- a/app-editors/gedit-plugins/gedit-plugins-3.8.3.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-3.8.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.3 2013/07/25 22:30:05 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/gedit-plugins-3.8.3-r1.ebuild,v 1.1 2013/10/26 12:53:54 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -54,6 +54,12 @@ DEPEND="${RDEPEND}
 	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"