Version bump

Package-Manager: portage-2.2_rc67/cvs/Linux i686

diff --git a/dev-util/diffuse/ChangeLog b/dev-util/diffuse/ChangeLog
index e5a523eba2b47355739b796488869ddbc5f59b3e..8cb7ca985e683c8085da2c65fe2c3d9f727f6aef 100644 (file)
--- a/dev-util/diffuse/ChangeLog
+++ b/dev-util/diffuse/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/diffuse
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/diffuse/ChangeLog,v 1.8 2010/03/02 10:31:08 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/diffuse/ChangeLog,v 1.9 2010/04/13 21:19:06 grozin Exp $
+
+*diffuse-0.4.2 (13 Apr 2010)
+
+  13 Apr 2010; Andrey Grozin <grozin@gentoo.org> +diffuse-0.4.2.ebuild:
+  Version bump
 
   02 Mar 2010; Christian Faulhammer <fauli@gentoo.org> diffuse-0.4.1.ebuild:
   stable x86, bug 303871

diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index 0ff66ed337c71f34f7f1e3445f66b00bf07a0339..4bb04a879fdfec60c98a7e56b2f6277156831858 100644 (file)
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST diffuse-0.4.1.tar.bz2 117740 RMD160 424734fedb2f154da1e640912affa5bd41d0066a SHA1 684891e7a77a5a49a7acaf4e14f69d49d70fa7d1 SHA256 782ac14e925b94feeb2c2cea2e3119c1f2e3bd82ed8e38e77178290c300132ea
+DIST diffuse-0.4.2.tar.bz2 124150 RMD160 2f70a22eb3ae9d6c8318babec19871e5669fc46b SHA1 ece6899094fd0f3808beedf371c80c75f4b59a44 SHA256 eeebc4e1959f3949899e603a5cb7863a0532bef12c4fdedb017a10871d9bd906
 EBUILD diffuse-0.4.1.ebuild 954 RMD160 fa17ab36227b82139728030caec353f868f21903 SHA1 47a2288443517b0104ac428d5432e65968f1964f SHA256 91823456465fe293f3cd8b63338f8ec377152de7b544f71f091003124e4620bb
-MISC ChangeLog 1185 RMD160 2a05f7789cd5566bb2d8887524cafa90a8d8e5f2 SHA1 5683f5820114f0fc039f1343926463e2d29080ba SHA256 567facd4a73172c9d384f48d2cb29292b37ba6f2f6e52af55b9bbfbef371d0ac
+EBUILD diffuse-0.4.2.ebuild 957 RMD160 9f3d56a439ee785a5918ab87be10b7fd465dab1e SHA1 3d9cf37bd9fa07a69136748f619f5afe3a026a1e SHA256 d5a9436f7fcc36ff089aa61006efa3ad20fb5899741e21c6fac6a98e347344f4
+MISC ChangeLog 1304 RMD160 ced91f78c20a5648f3d6e69ed068a92b77ef2b3e SHA1 b4a2f2c8fd87b6f66b5b33009195af7f95bc51f9 SHA256 e52b5cb827f7479245fff66d92d3672648765ea37e3f8be337755a27918d59cc
 MISC metadata.xml 338 RMD160 45bd51a57e16f69f704d64b7b0fc199b153556f7 SHA1 f12cce12b1d35ee2a8c0319f1617eb283b61559c SHA256 958b6d00a0ebc6892dfdcb40efe99af43ef1aad31927d7b395fd2571e0bf52e4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuM6PEACgkQNQqtfCuFneNFkgCglhQ8Az/VOvsdYe1sCPWsklvL
-PEoAmwRKROan5C3heujsIeioXSZ0/Qj/
-=W5F/
------END PGP SIGNATURE-----

diff --git a/dev-util/diffuse/diffuse-0.4.2.ebuild b/dev-util/diffuse/diffuse-0.4.2.ebuild
new file mode 100644 (file)
index 0000000..8b782c9
--- /dev/null
+++ b/dev-util/diffuse/diffuse-0.4.2.ebuild
@@ -0,0 +1,46 @@
+# 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.2.ebuild,v 1.1 2010/04/13 21:19:06 grozin 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
+}