Support python 3.4

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

3 files changed, 39 insertions, 34 deletions

diff --git a/app-editors/gedit-plugins/ChangeLog b/app-editors/gedit-plugins/ChangeLog
index 97f9a4e3eb6c..81d58f636435 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.49 2014/07/23 15:13:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/ChangeLog,v 1.50 2014/11/24 12:03:30 pacho Exp $
+
+*gedit-plugins-3.12.1-r1 (24 Nov 2014)
+
+  24 Nov 2014; Pacho Ramos <pacho@gentoo.org> +gedit-plugins-3.12.1-r1.ebuild,
+  -gedit-plugins-3.10.1.ebuild:
+  Support python 3.4
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> gedit-plugins-3.12.1.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index ee8f1c2ed2b0..cbfcdc16cdb0 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,26 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST gedit-plugins-3.10.1.tar.xz 1253800 SHA256 b30e30d5a0efb9a711c6583748b37c1ed3e45222505e08f920b78c6de0bc4a9d SHA512 bb63986c1a2c431443191bf1855a54125c9c1b500a4764bf13f597cb8ea09e588ee101d2856938ee229bc9bbba9bd107c60c643fb09f001afa26f0ef90baa2fa WHIRLPOOL d148f654c0b4de0caab3b26ae8334d2ed9344a3b08eed4b45b8458a1f3efd9c909edd8dbf015c951aadaaa0953abe81365324077c81e5d18d1b7c412d148cd46
 DIST gedit-plugins-3.12.1.tar.xz 1291692 SHA256 431adb6c8327d755329061f59d9f06e94819e398b7910751bbe46bc96679c67f SHA512 6ed7265b90ed6ef2fcde65a5cec807a6583110b33a1255ed71fa1dd0c3d4ffa9874a5304d9e0f957151cfe0b58cef21b1af842dd066a04c865e5483e98f885a2 WHIRLPOOL a937ea666a9249696d640d1b288bfae526898db961f5fffbd99ebc9e925660081be17e208c7086df5e58c082f5322d3889e0dfb4021cc0b929caf1a937530c74
-EBUILD gedit-plugins-3.10.1.ebuild 2135 SHA256 b1acebba76d4fa4c688e9dde1fd34b6c98ba647bdd74e6a3f5c0e783584fd1c5 SHA512 bce7cc335d41ab49ec727cf0bc5f00e0d0dab2cd3e5cdacc0c199e9fdc0d71caf271e431891398ace3861ad71ec41546a64e8e0c7821f87565d9dbed8f103ce9 WHIRLPOOL a29a82b712a5e7c3dbe9decd6a402da788271ed5a49e6f8e10a72c99976d62fed8f7c711030bc36f0d7bf2df623cf75f949420d040017a7a05702a564fb89e15
+EBUILD gedit-plugins-3.12.1-r1.ebuild 2122 SHA256 dfb3b8327340725257fce3b4c3c2af91ea3b614067c15e0388577d75298fbe04 SHA512 af80ad4f9115fb0dfecc32e9d6ed9dc13c20af47b7ddbac5fcd769749cda9c879c2a8abaea5669f44ed9a8d2e03d52d4fc5a56ccb8ae2f60347a7056b6239ae6 WHIRLPOOL bb66288985e812a0c3a60e5df3348c55bb44475cc2975c2223a1221fa1a41d4c878766b58d286cd35f7106139c99b157763d3c539eca0aa2f11cf816ca0f0ac7
 EBUILD gedit-plugins-3.12.1.ebuild 2115 SHA256 75d1f493699fde79ed6cb2b83d8c26a2cf6d8e5cb221e4e1a7c324a8eda74014 SHA512 963dab2d8bb0b3f1aa8ee22f409754af9edea4f1f578ffa72a8d34b4846bcb525167c11f72a3fa9f80dcfa8e2fd3ff81a811146d99b7cf5d484951ec6584d927 WHIRLPOOL a8608db9f48817474f39a01a1e8b765c5c50266e762e0be50b8ef6b0fb63c46a2f131a80b14b1ab9ecca40a665941f2a8d39e53ed1446b5be730bd7def7b6b5d
-MISC ChangeLog 9323 SHA256 a7e2f0028a7be03a20fc924f0aeffc889e1b45c6803a3a655b87b267d4e6c5f7 SHA512 a0912924df0ac597a4b9b0aa31e71893b81b38b3ab246c11617d019299faf0ba5aa2accdc9e1489940272a35696cb6937afc189f8218668175671bbc0efad765 WHIRLPOOL 70763767425280ccaa53a32d5ac7e13f84ba0051d560dc1a6b66be69a58a5c0315fdacb54752894ddc7c39d63b5439b6b375eb6083bab7a6daff89684aff3762
+MISC ChangeLog 9498 SHA256 b59db810617379ca9f3f17a82189d31e414bc7c88e7773cc359854e46d7fa751 SHA512 2dabdd12350dacfe6cf3206a2bc9528ff833e39f2ae79056ecf010bd7c75eb8d5cd71f6fa953f51586ade85212645f7d2134d7f608553dda7b548ed7f63d5a77 WHIRLPOOL f7a5deb1f9e76a9f261e8a79da90d7e7eb6fb2b47f1fd2d9f71e4dbad2676552da03b12879c807fd62f322cd2c18df5cc912cdea7965d64b86fc5383ad2ee73d
 MISC metadata.xml 451 SHA256 c9f3d589eeb5cca603c8ab821303ce6b872b82deaf227be40fc8478256bfe8a3 SHA512 26c2c2b34400f6ca2e591229d47df1e1fdc308eec37dedd9d579d1646f48cd13c0e160244aa393d7e47a8390fa99b49d5ef9033ce4953b08e02d609bf66f988c WHIRLPOOL edfc68ba7da806d320358a51e78cfbc280e221871ebda8034800df8509339ec8e6eae2f7f2d15a8420f2eb8f9a364507c19ef1d603db09d0a046b6bf12eda603
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz9EKAAoJELp701BxlEWf/lIQAMfZx35z1dnaY6Mjm6ReOE/o
-nyaPbygCtF0eUmf22wXb55B1ElnKuuc6KrthW+S1EK/spOcohHu1XrfjD9Gxc25q
-GyVIa2/ZJ2HlgQUW0PkKPCwi7WCSPP7HHNH4rqYOTyoZqBqKe6pnsZRYMDXPR6HU
-RscVwMn8UZn00cWWRUGLvYbwb08RmTWuOE0xCeNMrwNzWUykxelfc1Ij96uzI+kh
-TxlA4ntVd2LRFn5P7Ntym6r20U/ezDw+ArtG5mo9COEOEoW7zyjP/DpLbbsnGimM
-4I/E8JCGZ8dp/8qfcS4l2gR2EkvAD4xTVW3a0pzBcqNxpEKfQf0O+PaanOwcjUab
-2vFJXX2EuS7jbE4UCDi3OqZ2Npx4t3cTrFSiSVsEV6J67Z6jcI55XCKeEew2nQQH
-TZa7hz8rBmW+kuUeouQZSz5XdZKSf700XNRGdFtVm2YKa59dtE1QQCM0QkynWdh0
-Oj0DpPBRROU2sKc01XBHY9pavUG4aTubEMpyYL8fGWIxqNOYFug6u5dD1IGvCehR
-MToxKmQIHb10xhwvydVIK0LTL38Bjq+NIwq22Hc7hlmw2XjDTp3ImeZXdi7fB57E
-JO8Ik6VwFw60WqR5iS6os8RwnWUT+b/EwkMLlvnqoVUmdhIKzBHHQitwriYeOpKg
-6CprRCAmwe5TaaeI46NS
-=tQRO
+iEYEAREIAAYFAlRzHpMACgkQCaWpQKGI+9RnOgCfVhAcTtYpAvhq+QAh0J1NP1dw
+48wAn1FAmb6Bd37nNphCTnrVB3ThF1eo
+=5a9V
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.10.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.12.1-r1.ebuild
index 19c7cf256ada..4dc29d00a69d 100644
--- a/app-editors/gedit-plugins/gedit-plugins-3.10.1.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-3.12.1-r1.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.6 2014/04/12 10:29:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/gedit-plugins-3.12.1-r1.ebuild,v 1.1 2014/11/24 12:03:30 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ DESCRIPTION="Official plugins for gedit"
 HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
 IUSE_plugins="charmap git terminal"
@@ -27,7 +27,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=app-editors/gedit-3.9[python?]
+	>=app-editors/gedit-3.11.3[python?]
 	>=dev-libs/glib-2.32:2
 	>=dev-libs/libpeas-1.7.0[gtk,python?]
 	>=x11-libs/gtk+-3.9:3
@@ -36,8 +36,8 @@ RDEPEND="
 		${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/dbus-python-0.82[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
 		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
 		>=x11-libs/gtk+-3.9:3[introspection]
 		>=x11-libs/gtksourceview-3.9.2:3.0[introspection]
@@ -55,19 +55,29 @@ DEPEND="${RDEPEND}
 "
 
 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) \
 		ITSTOOL=$(type -P true)
 }
+
+src_install() {
+	gnome2_src_install
+
+	# FIXME: crazy !!!
+	if use python; then
+		find "${ED}"/usr/share/gedit -name "*.py*" -delete || die
+		find "${ED}"/usr/share/gedit -type d -empty -delete || die
+	fi
+
+	# FIXME: upstream made this automagic...
+	clean_plugin charmap
+	clean_plugin git
+	clean_plugin terminal
+}
+
+clean_plugin() {
+	if use !${1} ; then
+		rm -rf "${ED}"/usr/share/gedit/plugins/${1}*
+		rm -rf "${ED}"/usr/$(get_libdir)/gedit/plugins/${1}*
+	fi
+}