Version bump, drop old

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

diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index ede777d8a98b9b7e4bbdc15736145d74d13316bd..9893fe916bbb9ba794b537331cd816388b7cc70f 100644 (file)
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/gedit
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.379 2015/01/02 22:20:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.380 2015/02/06 12:34:37 pacho Exp $
+
+*gedit-3.14.3 (06 Feb 2015)
+
+  06 Feb 2015; Pacho Ramos <pacho@gentoo.org> +gedit-3.14.3.ebuild,
+  -gedit-3.12.2.ebuild:
+  Version bump, drop old
 
   02 Jan 2015; Michał Górny <mgorny@gentoo.org> gedit-3.12.2-r1.ebuild,
   gedit-3.14.2.ebuild:

diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 9f2565a01533346a0affebba54461dd5c3d52723..cc45f9fdfc129c1ec71eb14738d58e43ae0cc427 100644 (file)
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -3,27 +3,16 @@ Hash: SHA256
 
 DIST gedit-3.12.2.tar.xz 2850716 SHA256 75460b112bed459a0f9db60e7fb0b9e6341dc8e5c20088d929597ba030d7b653 SHA512 8b15c7293a68727e478e67801a65d779a753e8751edd9808e15f5cee8a7c8509ca6ce03127334f84f60fde164daa6f1f031d236daee57ef8323b45f26dba70ac WHIRLPOOL 72c9fe02428986a514af3da43755aba6aa6fe4fb455293317da2a44552eb847941b66fd045e9e412c101860b7cbc7e0251b1eadd03ff9b1908882757657d40b9
 DIST gedit-3.14.2.tar.xz 2884188 SHA256 e5174147180721485c4c3791628bfdc8452efbed120c6b6b2e4210299caf71c0 SHA512 cc926fc18843955db7181ea12f75b9f43239b540dcd5cc0575c1545fa3ed5749d480098e9fcff9d7523e110ad6943b18a3f8a41d689525f7062f33a3c873ada0 WHIRLPOOL 6c13773140e785b501b428f152a3a46885b4f75e9ea4034e1c5766968f5a292c28f2932dbf1b6a014f99398ccf6fd48221520220fe3c3a7d87521c9d0917408f
+DIST gedit-3.14.3.tar.xz 2875192 SHA256 cd6c9f556ec12001e4b250091a1d7405cd807cce7fe767bc89ed2c25aa96a319 SHA512 2237ad697161cff5755336775cf128136d7cefdece0d335246735b3ae1b9d2cadb29ae36be2000cd7fb02d6a4187aac1d2ff7935bec5c64b5b880fe84f330b01 WHIRLPOOL 39ffa7ece00f712f052c78107b3f95cd0e3a744932d22f5e946141b3bc8954643ae091f75508d9761761fb041a18b43e50b23ed1c0ff3d7ac0bdce9464cc71cd
 EBUILD gedit-3.12.2-r1.ebuild 2962 SHA256 5b65f8ab71775102e8d5fe9f3b22b9901b38fbbe86b24cf4785c2758a7d66a56 SHA512 2f01a255014bc44b18c58e4c3060a788119756eabad5f491b5e11a8d090aa1fed01b7c141976f533d1b65756df3fa243437718eece39e6b0b89e1ddf2c41b291 WHIRLPOOL e97630ba38b91d646dbee88ba7ac6c0d18e12c21994c80d2a8ba05f87ab28473e19d55f75c5ff4f3d8b058d043e77ed61b95db99bc066438a7e77d23a6071c84
-EBUILD gedit-3.12.2.ebuild 2512 SHA256 e1ca6908f58292b1921f95b842d05dc35a32263b1881466859e282e4543783ed SHA512 09bbb4b2a56e4d0d0e6d3f61eae9a2aaaba7ecb76b9252095f9b487d6acf44e37d5ab7a30fb758d159bbe339d1d7e1c1bc50ee47c731998c42a6cdc6d0cdf8d8 WHIRLPOOL cac6d845124a52d400a2301d96b64a688f336e2a7f3617978b9afd25a754caf539ef5626b8a3d92160736d84154ddf755ef1014bc5ba152cc35007f22bdb92e4
 EBUILD gedit-3.14.2.ebuild 2883 SHA256 966cfca18421c696028107690a9c5655fe4876b5c5b36d0972cd723762a7a6c8 SHA512 a048e77d0d4013d30e45470f37227db7b0081cbfe2debd685c1cfc75bfa9ae177b247debe8e92c8541824fe7c6ce860d256f9fb4d2ef1ee54d5b74396a840db0 WHIRLPOOL 2dc7b5258f435c188fa32075f44a435fac9cf033656913233cb7e6024c6877d52f61f6e2c4b631bfb617b4268acec57d509c23620accff8b34bb94536a0cb3bf
-MISC ChangeLog 48078 SHA256 3a71070118fee987ab0e202c1a7a988c8810c67c22cd9afb7c928c5a6fb0221e SHA512 441f471918e5fed4d7219af5e7b2c61ed923378420e68f819fac09013ff749366e7baf946d49cf15ea838982b012e3f4f21f08be91ca1c1472a9230f26be717f WHIRLPOOL cba1fe3da3abd5d1f6be2f46aaf3f31ccfab99d754978fbcdecfea4916bc7517cb98ec6a2b2ff8e9ddef5a01eb92ffc3c8460d387eccbc01636a945d60bc950b
+EBUILD gedit-3.14.3.ebuild 2840 SHA256 8490c6c68868104a0158ce9bbb4150ca94b437c54de52a60189fb5868dc7b70a SHA512 a8cdf6a0559cc61db5ea6fc8fed0adf889c77a401c6ceea050edbed3079dfa28dfa0688e3192dca2755c9e6dca1cc1b8d228398405a0ab9e6b54f6cd4ea796a8 WHIRLPOOL 9ebc62e3f4b1397e7f6d337027197397e30aaefe8a24a31e0ab90ba354f3db363afea9a4ffd46aff384f968a3c39edea2c06990d51b19ceac050844a96fa96b7
+MISC ChangeLog 48224 SHA256 fe3a27cb2e2aaad0cbf22b7383958694e5cd622028cb008fb55d981a76a1d57e SHA512 eeab5d9d9618066ff300451c278540afd2930ff73a89596f5e92f6ba11103355a602979d0fad19ab6bbc8e2e7dd0b8ce811041a093ac0dc959eea0c9507b0500 WHIRLPOOL bd9c7a906fb29ff8c10444a503675a2c3a986024f146c0b216e58b7171f6f3bf6e5a251da402ac7983a90275deb63d9e7cc78583bd4b2a67c10727ee2334840d
 MISC metadata.xml 276 SHA256 8dec58657a80b4973306f2f6d5da03a819b949c3f8e93b3065eafda55f1f8465 SHA512 9c1f48389dedc905b448e4085b9fec8f37ef777aacf14e18541e39680ccf83a968c7ee8fea8b9ede61704ac174380c7cc56858182fb6f59a589ab1d70b8eea7d WHIRLPOOL 902de8d338629274e1ec7a7a6b13316e88f09847d5158a92fdc3337e33c26dcda79ff8bf425dc0de42657ba14769478335249d13cba2342f8adb247a1f40e905
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUpxm3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOBbMQAIpZXvblkrJ6KDeTP/+jgcMM
-HVNKzf7JBUrBwo8wsMlQ9W6//NXgWbGE6TVF94YKKb33PNDLakPKydVNxj/Yd42Q
-aP+MpRwVcOLzYZPvfLwQ4hOj+7wCgtXppTN8yzPsJJX3pYgVa1uKTQWShIH0sIIZ
-+WRmpxVjofPlFfYgIoI1n7nH4bYKc/9BqRU1i1fsk6s0JH851gkJLkeNmGiVyMhh
-1fNyqWBsMUw2XC7ck1OwxRGxUqkE4MrJUISxOe6Dq8ZrmNGsJKrPazEnHbasYom6
-otNbrHDizwUaWFQMP8x1JqkcJ3JfBBlfGdHjAVARFT2bNfFU4k24jK4GkOzga3lk
-AUY1DfP9MGt5NYJTpC/s0LTEq5rBm62ffIO4FoEakBJHVik3lTQncI4PxKse4cAy
-oIFzAxvVRn43FYorqmXKikB1xR6lmBTgTkC2N4xXR9giBBCi2qBsc898LcTbQD+W
-5Dn0KJLnqPut95ZzYEpaWIXIrC4Yd1yFSU9az0giXJls/nW0kAlR7OrpGMt8HDm8
-BM36ECrlGLIi2erGye2qE2Ib+twb5t1uY2u8M9316J7dWl6UmyZoux9mLhh091px
-BFYUhY8AwPKlDYUihoqt4pZs4G2PyZOYz5BasAkpX2RRecENcK2pwkOk2GDEOGXB
-E+ijjhDjdByT7sizU4w7
-=/YDj
+iEYEAREIAAYFAlTUtN4ACgkQCaWpQKGI+9RftgCgh1b2caVu0yBKgzoAYx23Mvu9
+UPMAn28oTeIaTEIhaLV3G1koscwatfGU
+=TBQx
 -----END PGP SIGNATURE-----

diff --git a/app-editors/gedit/gedit-3.12.2.ebuild b/app-editors/gedit/gedit-3.14.3.ebuild
similarity index 57%
rename from app-editors/gedit/gedit-3.12.2.ebuild
rename to app-editors/gedit/gedit-3.14.3.ebuild
index 243023e32d99868d597d0ccbd0a6973a7890187a..4d9f9f5b0d851fcee189ebeda710508eee8a04fe 100644 (file)
--- a/app-editors/gedit/gedit-3.12.2.ebuild
+++ b/app-editors/gedit/gedit-3.14.3.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.12.2.ebuild,v 1.3 2014/07/23 15:13:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.14.3.ebuild,v 1.1 2015/02/06 12:34:37 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_{2,3} )
+PYTHON_COMPAT=( python3_{3,4} )
+VALA_MIN_API_VERSION="0.26"
+VALA_USE_DEPEND="vapigen"
 
-inherit eutils gnome2 multilib python-r1 virtualx
+inherit eutils gnome2 multilib python-r1 vala virtualx
 
 DESCRIPTION="A text editor for the GNOME desktop"
 HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
@@ -15,17 +17,19 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 
-IUSE="+introspection +python spell zeitgeist"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="+introspection +python spell vala"
+# python-single-r1 would request disabling PYTHON_TARGETS on libpeas
+# we need to fix that
+REQUIRED_USE="python? ( ^^ ( $(python_gen_useflags '*') ) )"
 
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
 
 # X libs are not needed for OSX (aqua)
 COMMON_DEPEND="
        >=dev-libs/libxml2-2.5.0:2
-       >=dev-libs/glib-2.39.5:2
-       >=x11-libs/gtk+-3.11.6:3[introspection?]
-       >=x11-libs/gtksourceview-3.11.2:3.0[introspection?]
+       >=dev-libs/glib-2.40:2[dbus]
+       >=x11-libs/gtk+-3.14:3[introspection?]
+       >=x11-libs/gtksourceview-3.14.3:3.0[introspection?]
        >=dev-libs/libpeas-1.7.0[gtk]
 
        gnome-base/gsettings-desktop-schemas
@@ -40,18 +44,18 @@ COMMON_DEPEND="
                ${PYTHON_DEPS}
                >=dev-libs/gobject-introspection-0.9.3
                >=x11-libs/gtk+-3:3[introspection]
-               >=x11-libs/gtksourceview-3.6:3.0[introspection]
                dev-python/pycairo[${PYTHON_USEDEP}]
-               >=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] )
+               >=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
+               dev-libs/libpeas[${PYTHON_USEDEP}] )
        spell? (
                >=app-text/enchant-1.2:=
                >=app-text/iso-codes-0.35 )
-       zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
 "
 RDEPEND="${COMMON_DEPEND}
        x11-themes/gnome-icon-theme-symbolic
 "
 DEPEND="${COMMON_DEPEND}
+       ${vala_depend}
        app-text/docbook-xml-dtd:4.1.2
        >=app-text/scrollkeeper-0.3.11
        dev-libs/libxml2:2
@@ -62,24 +66,26 @@ DEPEND="${COMMON_DEPEND}
 "
 # yelp-tools, gnome-common needed to eautoreconf
 
-src_prepare() {
-       # FIXME: Not able to set some metadata
-       sed -e '/g_test_add_func/d' \
-               -i tests/document-loader.c || die
+pkg_setup() {
+       use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
+}
 
+src_prepare() {
+       vala_src_prepare
        gnome2_src_prepare
 }
 
 src_configure() {
        DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
+
        gnome2_src_configure \
                --disable-deprecations \
                --enable-updater \
                --enable-gvfs-metadata \
                $(use_enable introspection) \
-               $(use_enable python) \
                $(use_enable spell) \
-               $(use_enable zeitgeist) \
+               $(use_enable python) \
+               $(use_enable vala) \
                ITSTOOL=$(type -P true)
 }
 
@@ -90,3 +96,11 @@ src_test() {
        unset DBUS_SESSION_BUS_ADDRESS
        GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
 }
+
+src_install() {
+       local args=()
+       # manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations
+       use python && args+=( pyoverridesdir="$(python_get_sitedir)/gi/overrides" )
+
+       gnome2_src_install "${args[@]}"
+}