Version bump (bug #551824, thanks to José Romildo Malaquias). Drop old.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

4 files changed, 40 insertions, 12 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 98c4fe97a791..01d2a7e9c878 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/meld
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.197 2015/04/29 14:54:50 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.198 2015/06/12 23:47:38 tetromino Exp $
+
+*meld-3.13.1 (12 Jun 2015)
+
+  12 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org> -meld-3.12.2.ebuild,
+  meld-3.12.3.ebuild, +meld-3.13.1.ebuild:
+  Version bump (bug #551824, thanks to José Romildo Malaquias). Drop old.
 
   29 Apr 2015; Mart Raudsepp <leio@gentoo.org> meld-3.12.2.ebuild,
   meld-3.12.3.ebuild:
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index c52e666144c5..05a4bbfbf1f5 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,6 +1,28 @@
-DIST meld-3.12.2.tar.xz 461932 SHA256 0938e6e6b4de59dbf66947f67c8c5c3d3c834feb8dabae3a047154af9544a101 SHA512 90158658fb620d3471aec8d093ef11d9bba60bd3bf14023c8ae5d685ac61aba41ca9beff9fff02c4b5e256d446752bdf27e3a23b56146c74ae4a24776c30c759 WHIRLPOOL 6bb2bf575d483f7d07d462fa675b085947d7e0717efdd606d6a43bd4dc7c5db9cdb6fb1fee0cf08b3ee94a8a840f3ecb5ccf23d0b630d729a1133959a073bf68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST meld-3.12.3.tar.xz 462856 SHA256 db3572c5c6905b09f4fc28415a7f6f223014391492dd2165ed1bc8512ac4e6fd SHA512 ea462ece2dcc1a6843ac6ce557aa0ed09c320078b1945d40f2436bbd9f953bf2d826043fc5ee18e4840210cb1da8dd6031f2922109f457400b292d044fd3d27e WHIRLPOOL e1a84aafc16b0cdf4f64f524abd4972b32a37504b9810252161e03feb27a975f29f6d3926d66a99cd9e005613fdb77dabb7367243a1d3d137585c8829e2ec28e
-EBUILD meld-3.12.2.ebuild 1010 SHA256 af5aadc831a947ac7b37230eba586fd18a5d5b03452aef51971cc032796b41d6 SHA512 e343d48875d42471213fb5e1ee761cb20215e4356493828fdf0f76ea0b6e67a1d24205e22b0d541c12235b79bd8bd08611c0304b86c544029ed92e08dfadb75c WHIRLPOOL 9e6ab30107c4dab2998357ebf8c44b8cca1b946b085ffe4fad90b7a2d667834dc54c03b9d132d0d1e5669cf4de13d951be5904f1478fbb01ba1dc6a4a04db781
-EBUILD meld-3.12.3.ebuild 1010 SHA256 deca31b0b4064e98d50d54410aef92233f8fc4fd3bc1812481343eabcf082834 SHA512 e230c412f01bca12fc86ecc1ad9215e93e96fe91c55fd1379c3242e343e1a522a23866c3c774bdc9c8be86ef18d4a2b64435122a99d4b00c1e0ef139d1370e6d WHIRLPOOL 16ab4ac763e18dbf77d89478c6915b33db59181ff1df0ef6c9e01b27bdb599261120c116d570e0d9e530a3f8694a882e97adb8e1d5bf178c024a47ea0bdb4e65
-MISC ChangeLog 25124 SHA256 baee609e08998cbde93ce48aeee65033ecf24d438725bc38c722ea3ad315702c SHA512 f8e1e2cd2b63a3cc6934ef44e121ccebbc4d36846f35e307ee18e83a8ec5b903ccf35dee05bcebdefac7630417ee3ac22be2f0dbbca90797df5706311b4fb979 WHIRLPOOL a571e5cb321c17fab6cd68ca85b93f1a7551153007b11719fc730c1a3cb5d58c0ba0f5afdccb0808fe4cbec6be7a6cdd3fc13f42dccb62d9b1bbaebca5d7371c
+DIST meld-3.13.1.tar.xz 489972 SHA256 bc52f4a073f5288e42116ab95c7564e56119b8a9070c2590c3968726cf441831 SHA512 3d821c34833157ea0d81189335cd5a9557b6004620ce282ddba9729df40f158e7a11070fcc1622e0d50d9700d73261bcb5700fea9949057723ccfb8e1c5579f6 WHIRLPOOL d86b200f3372888bea540e374ebc0daabf7038d58e3af104cd9248dc925b7970e916cf8bf54aafc626b8a587c890686e65667f58d22336b4a744799e737182fa
+EBUILD meld-3.12.3.ebuild 1016 SHA256 743f1618d6c78e68bad8c02046540f25fe74569b557d71359ffe399bfd576c10 SHA512 6b8f57524a1a65a91d1cc769da282ca027efa51eac85a75f584e8f4b837967619259c318b1fc7fc102270a48cbed34f5f2c3b639519f5f0688445866e9383ab0 WHIRLPOOL 7f287f432df73e7962cc6cfc20cc9177ccac94bdfc14bada09dcf09c766fad704c6a1c850beb421fba3187fd9f70c033b488d75c4a939fe7f481cc5b6607c3a1
+EBUILD meld-3.13.1.ebuild 1019 SHA256 76e1a70c00ea058bbffa7c35ef9de66cd8e4a046007670e058b6e2f82f3986c2 SHA512 7e3f3fd460242dbf2ffc4d4b15219d3ef75b765a56b67277f7a99a27aa1eb613fd5537ba4ec20c79fb1d7d80523ef17a319cd989ff442a4b316ba9faf622f3cc WHIRLPOOL afdc3b61db3d5d241ddca02e51d7b078ce8923618422b6d59c0fe90713ad858bcd07d94fb4e938e318d97020f53da64e106967185b9a2f80c4fa46a18a1a2e8e
+MISC ChangeLog 25356 SHA256 07202109f143b2ece7c93c03308fedcbb612bf42d5054e989b972904f29af535 SHA512 3215aceef0fc73f4ab0de9df5953731c3be81134b38c9656734c0f24932f9edcd7be916c54c78c2ed8934587e3febd5288e621cc898f698f9947ee9c7df10a38 WHIRLPOOL 6f8e626d199b8ca5800d32994b333b3631889c0b15a4daeec85781a1d72cf7a6b949bbd6ca365cd9fabf2b347f5d0814ccb9e1b2f2d5148be5956ab693b68f72
 MISC metadata.xml 159 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b SHA512 9408846d0f3194f62043b64e325aed9e8cce9a74b556865acf71facc3ad59a092dccbbb3c608ada40b73625eaac93a7bcc976858c6a47426bb8fadb6f830fe2b WHIRLPOOL 4700c8b71899b5acffcc46580315d4d116b478cfa283e0ea0569ab180e46850ce85d73c7370d989e53dd8aecb69ed843d2716bfebd3c5d74a7b5c3d4b94b96bb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCABmBQJVe2+fXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNF3YQANcaG4o5Pqk4IJBus0rYKkuf
+OTAMHcJYMYIh6AqTiHVNQscdOC+u2qrSbWCllfD704k0AY+ao/5aICe2onRmzYYg
+oRDGRy2wZ2n6yhUAGFCiIlmF9g2VKO3lqwC2m6JtNn0+AWH1FGKOVxgcFBdsq68I
+/x0DZNm5CRZEYVHOh48KsMQrOK1nHASZUcWCCCG7JsrkmwkKPgy347zbd5tRthQ6
+iPDyqiMYTa+r0MM5AKi5hCgM8vXuj+KjRTFMqTpo7p9AbpAFK3S/rDxRvPdMToUN
+dY0DpUl62Ec+Hb9h6Gv2pN2QW2ylWPO6gB0VSSQ46cAz0jTMuHTmttHaLX+VtUfe
+/2bFFglHTENp0WjqSP2DcKRAUjc4epFMaKZKZkV4G5fnOH/coI7JymyDY8XYfaiu
+WnaUz8xFl9Rhs+g4g45D0LvJIsdn20BtDSIpI4rQh+P6vb9L2Ja5rEZrzbaEDcQV
+ua+n26xULIt4eZ0kBLg5qA6V9HU0UFVzIkd3aYWMj7t4mLvjXDlamHHlDoWnwUdj
+t7bNB/2gkVmB2LxPmEeh8boXpmPU1RHqMzW7UnlaZJMgWoZxDlkC4cr/iewaD/Kb
+XxefRQPXGMU/ucRsM02jAkflvl1YbS+XoDcBJGZ4x+5WlS3orJrsyIZTGO5yH69Z
++N3AjvU39Qwga4LoQYsI
+=f1kk
+-----END PGP SIGNATURE-----
diff --git a/dev-util/meld/meld-3.12.3.ebuild b/dev-util/meld/meld-3.12.3.ebuild
index 4902c4dbd7ba..8d3c09188a89 100644
--- a/dev-util/meld/meld-3.12.3.ebuild
+++ b/dev-util/meld/meld-3.12.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-3.12.3.ebuild,v 1.4 2015/04/29 14:54:50 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-3.12.3.ebuild,v 1.5 2015/06/12 23:47:38 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ inherit gnome2 distutils-r1
 DESCRIPTION="A graphical diff and merge tool"
 HOMEPAGE="http://meldmerge.org/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
diff --git a/dev-util/meld/meld-3.12.2.ebuild b/dev-util/meld/meld-3.13.1.ebuild
index ee60001fc0ff..7e0d6eb67075 100644
--- a/dev-util/meld/meld-3.12.2.ebuild
+++ b/dev-util/meld/meld-3.13.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-3.12.2.ebuild,v 1.4 2015/04/29 14:54:50 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-3.13.1.ebuild,v 1.1 2015/06/12 23:47:38 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -13,9 +13,9 @@ inherit gnome2 distutils-r1
 DESCRIPTION="A graphical diff and merge tool"
 HOMEPAGE="http://meldmerge.org/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
@@ -25,13 +25,13 @@ RDEPEND="
 	>=dev-python/pygobject-3.8:3[cairo,${PYTHON_USEDEP}]
 	gnome-base/gsettings-desktop-schemas
 	>=x11-libs/gtk+-3.6:3[introspection]
-	>=x11-libs/gtksourceview-3.6:3.0[introspection]
+	>=x11-libs/gtksourceview-3.10:3.0[introspection]
 	x11-themes/hicolor-icon-theme
 "
 DEPEND="${RDEPEND}
-	sys-devel/gettext
 	dev-util/intltool
 	dev-util/itstool
+	sys-devel/gettext
 "
 
 python_compile_all() {