Version bump

Package-Manager: portage-2.2.0_alpha174/cvs/Linux i686
Manifest-Sign-Key: 0x3AFFCE974D34BD8C!

4 files changed, 35 insertions, 55 deletions

diff --git a/dev-util/diffuse/ChangeLog b/dev-util/diffuse/ChangeLog
index 22bdfcf0bd18..30231c3a300c 100644
--- a/dev-util/diffuse/ChangeLog
+++ b/dev-util/diffuse/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/diffuse
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/diffuse/ChangeLog,v 1.16 2012/02/24 14:42:27 phajdan.jr Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/diffuse/ChangeLog,v 1.17 2013/05/15 11:15:23 grozin Exp $
+
+*diffuse-0.4.7 (15 May 2013)
+
+  15 May 2013; Andrey Grozin <grozin@gentoo.org> -diffuse-0.4.3.ebuild,
+  -diffuse-0.4.4.ebuild, +diffuse-0.4.7.ebuild:
+  Version bump
 
   24 Feb 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> diffuse-0.4.6.ebuild:
   x86 stable wrt bug #404731
diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index 0009a849f03c..e01af15809d0 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1,8 +1,28 @@
-DIST diffuse-0.4.3.tar.bz2 124313 SHA256 1ecc0d9beb66b32ddbfad19449f40f7a374d20138d914be41f54249fdb6bfd1d SHA512 e529d9b4babc538881e5eae374b6b0f9ea1752cc43a0a98d4d2fa3322373be52bbfaecca4c0a8a7d254e2958e72ad736f0ce59fe17c9c7bc6548e2788b9ed59f WHIRLPOOL 91b03c24aa0383a32a1c8805bf10626f8aba494daf4598f8565a11397a8439fcf26ca09b9cedff1ca4d25cf1b05d9180af88625e20de64a1a5c712961f84c27c
-DIST diffuse-0.4.4.tar.bz2 146351 SHA256 9dae1aad1aff538fbd571c6ce40e07bbe81530c5d4ebe959b25995be68c462f5 SHA512 5e783ea1259102303cf06567cfc03d0e5060a400e121493a7370bbea1ba69351bdb73e35ec7311dbbb930cc6c2839e3165f9c67619fb71688dbcf8d4d85956ec WHIRLPOOL 98cd338b54d9d07034e6dfe6d7498fb705d96f5f271e7001baf23023a7220f23ed6538425c084945e69d9c8c4dccad69124bdc87da4dcf5446e6d5da074d8da1
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST diffuse-0.4.6.tar.bz2 170246 SHA256 748922902573de316a4829f1ccc2cb6fab218b4aaf69a1a4aadba7fd8f8fd916 SHA512 ddde5e6c06ecaeb9b164de47590f22074e52d32a9969764466aa09a2a24925b6fa6aa3a098816c83d4fdef34ff1d2d88eab963a3bb8de3f403e40d797d497ae6 WHIRLPOOL cc8cc5e43cf1c098a4b92f8e33c7aeb48e82bbe9ad2bf7de833ec0c29b150938e4b10c90de19d142d771bd3720d686d9d3bb4e8521311d5f4f771e273c27edce
-EBUILD diffuse-0.4.3.ebuild 959 SHA256 e3970ccfc387db8c989c24f95cbad6a75272b62224ac2812ed352205f9e3601d SHA512 d6a20c7fc81ced63e377590b3abcb6604b83b0c63e4b10530ad8768ba0ff461767bb1944335d2287c0a7e3162dd240b15a65e924257ec3db7706f9130e41c4e3 WHIRLPOOL 6725be45ccfc11da8273c1e01e5672bddfd4e24f027b397c4be5ca4f94cfddf041010c319835c4624ccc3cfc93d71d8967404bde922041ba256194ae05c5df44
-EBUILD diffuse-0.4.4.ebuild 957 SHA256 4c2f328a0326cd3fca459a9385a80eefd8975e2eaae7f8cb0eb54a6d0f1f3bae SHA512 8834e30352119f3f700660d22adfe170b2580a9e99dca70e325b21f9b5711c69c9289242833a7f262829a3245a08b847c6cdf43c2c16e3b5a6c7620d8e8f469a WHIRLPOOL df8f01dba1048bb6c317733cb0dffff429af79ba6bc2f368c3f7bde371210cb70f45d518fb183317e02c4ee622b23501370b491d621188d1be27fb8b975d4fd1
+DIST diffuse-0.4.7.tar.bz2 189257 SHA256 b0f56acbd246f4b9a692ef51aab167134ae6650423a68d8e5f4ff4c8938f39ac SHA512 3db665ec2f05d8fd8b30f391a53e75ae0ef271d3f35f0c89f20226bda296ca46e88491a741cd3bcaa1159b9d5d2581931362ca600176b6d599351f4a34f56e2f WHIRLPOOL 3a0c382ffcb598f0d3aba8c9e45914a83d41a9f946f6cf10aab73320fdf8f6b8cc4f5f84ad6c86ca61e2ed33d00faa50d3846a560ebd4b7e9588402eefa055d2
 EBUILD diffuse-0.4.6.ebuild 959 SHA256 e198c8c29874fa3e850a5993c86a5a390ee3d3cc653bf4dabfc88244224953b9 SHA512 3506be3ab5e3decfd1005ddd4c1dcdc3009000a249c7476f23fcfb0defcbac8d0da68fbfacd24a833ace3d17463cbe6cbb5516154839386268607b2df3ef1728 WHIRLPOOL 72ac20e08487860fae0b0ba7fe8c198a54d07924072068f07525e7aee7aeb7ad3d6efa3e759f8f5bf3bfda71e323efdac7586669c6edde8030ca2c01ed67410d
-MISC ChangeLog 2106 SHA256 48d5468f096f8eee73276cbc1a9652e3328e1dbdf792ecbc929b4ae2308cb2ef SHA512 ad56d073fbb9f32a0304b05335ab0ca8ec64c74a26457ddd30cca286b949ad74666940af6947d0bc6116870a7a4cf3063574a11df40bd30d59b7fedc76f58197 WHIRLPOOL b30337696f4263484f3adac476f0ff718d8448276bfb420ebe7bd1dd0ff98d2c4dc88e6de7c5854ef58a18639477b672a5fb29521e635716987e4076cc93e2fb
+EBUILD diffuse-0.4.7.ebuild 957 SHA256 0a961a5672a64a516d1cf06aa9eccf7f053a03fd6b2ed6fe4bfa8603b38959d7 SHA512 332f4792c8e718b92c758d94ea872dfc20e9985ab96127b301a7ca42c75d6616f1b91975b2dfdf85b57d87714ac46e4898580e0ce09166edb7a9a20b648c8ddf WHIRLPOOL ba609808fb536de7a96a90e287ee26143e0c0a9f31a60fd7e69a1088661536a3cc694fb7e745973812ae3cde376298f408907eb209bd9172677ed58a1d8cbf0b
+MISC ChangeLog 2268 SHA256 aa68be9758541e958b691dd60fa26bdb1e4c4d81b054d0ce331bdecbc3beefed SHA512 49bc507a1acb4dfaa13c55aed35206403610292424168939e232888acd8333d9acf4b052d04ae273afc8bc6d3be43952179241d85eb0898081997cb4df88b18b WHIRLPOOL bd2f5455845b35d4ec568ef618587001497d79523b348afbcd289839ee03a85b524c827ffa14e338c4513263db449e4a63c00a335cbc536ef91d57e2a0437081
 MISC metadata.xml 338 SHA256 958b6d00a0ebc6892dfdcb40efe99af43ef1aad31927d7b395fd2571e0bf52e4 SHA512 bdab6a68e40c8ea8a6205944d80005b278e7f916432602fdac940e9e4abad94a9b8ade81d844d83b7869fbb54622858aedf442ac9dfdeaecc351a2cab767829d WHIRLPOOL 0213a03e9e1b0c02fd4591ed1ec8a4393872522f401eb1263ae4fcade62ba7ed8f5945cdc80a29dc9f1da758b4170046958b2eb6eb7caa2319571607f3c24802
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQJ8BAEBCABmBQJRk24SXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwOEM0RURGNjY5QzVBNjMwRkU3REVCOTQz
+QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2M/BUQAJ4C6Dr9k+oosLExUBEmtZe7
+atoFsr84hDRREKrUj6utfVWR+P2uBK+2CPH27c4ig3I3MfDXlSSbsFHqnv9Wsq0P
+1sgAuIiZbP3fAhV4PSrvNkeEwbqs8L6J21DzLAcBysRn+ECPT2xyK/K5jHU8xgqm
+ftVYq3X3JVALEVDh8c0lLoFWnCmYhqsxeAMN3YGAYMastglD+/4y1stsJv0yo4GF
+kUlKbP8WShzsR3sMz08N+SxLFY0ScUyfSYjC7pVAbnHko50BXTURW2ahkfxLK096
+ff6c5yBpJxOC3y3JX0zmm6DU2Kq7P73EYxsUZEMnSCvfTPYFiZfnVvgQ03R39cdI
+VgF9g4OZ3YH+S1xGH223hhXBjyMDZQEwCJkcNbKD1mGOqigxpIqnX9ji5NJZSSJV
+XN9y7yz0kdFIpvZCnPISr9/R8PqJ/K7gk8VehCbmRRiWqAaRL/TW2/1KxwopfW2J
+dQc+BBTCywaL3pkBBq2m8DBccZ5totOop6NeIx1qdDwoo3TXJjeBvnIuo8UP0dKq
+i5QniEejYvayVMOYBVhj6AW4aHPhp3S2TLbi/g8x8A/ZhN+ok+36rowNI/LfyT/A
+Aewhk/sgDIy/hidwI+vzQweIoxtjivlH1x3s8Odl8BfN3aupSkLT8OXt5/YFo/+8
+2AEm3M1LH7qLF+bKE918
+=bKDd
+-----END PGP SIGNATURE-----
diff --git a/dev-util/diffuse/diffuse-0.4.3.ebuild b/dev-util/diffuse/diffuse-0.4.3.ebuild
deleted file mode 100644
index cefd1ab05073..000000000000
--- a/dev-util/diffuse/diffuse-0.4.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/diffuse/diffuse-0.4.3.ebuild,v 1.3 2010/06/05 15:45:44 phajdan.jr Exp $
-
-EAPI="2"
-PYTHON_DEPEND="2"
-
-inherit fdo-mime python
-
-DESCRIPTION="A graphical tool to compare and merge text files"
-HOMEPAGE="http://diffuse.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/pygtk"
-# file collision, bug #279018
-DEPEND="!sci-chemistry/tinker"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	python_convert_shebangs 2 src/usr/bin/diffuse
-}
-
-src_install() {
-	"$(PYTHON)" install.py \
-		--prefix=/usr \
-		--files-only \
-		--destdir="${D}" \
-		|| die "Installation failed"
-	dodoc AUTHORS ChangeLog README
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/dev-util/diffuse/diffuse-0.4.4.ebuild b/dev-util/diffuse/diffuse-0.4.7.ebuild
index 72913fd763d5..37a2ca2395b4 100644
--- a/dev-util/diffuse/diffuse-0.4.4.ebuild
+++ b/dev-util/diffuse/diffuse-0.4.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/diffuse/diffuse-0.4.4.ebuild,v 1.1 2010/11/03 16:10:32 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/diffuse/diffuse-0.4.7.ebuild,v 1.1 2013/05/15 11:15:23 grozin Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"