summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Grozin <grozin@gentoo.org>2011-11-04 07:12:46 +0000
committerAndrey Grozin <grozin@gentoo.org>2011-11-04 07:12:46 +0000
commit6a27eb6d9564a8175619c05b7648e6246c6412fa (patch)
tree958a79c07285cd472c4dc66ba69d152863145ee7 /dev-util/diffuse
parentBump to 3.1.0 from the gnome overlay. Move to EAPI4. Changes: recognizes yelp... (diff)
downloadhistorical-6a27eb6d9564a8175619c05b7648e6246c6412fa.tar.gz
historical-6a27eb6d9564a8175619c05b7648e6246c6412fa.tar.bz2
historical-6a27eb6d9564a8175619c05b7648e6246c6412fa.zip
Version bump
Package-Manager: portage-2.2.0_alpha72/cvs/Linux i686
Diffstat (limited to 'dev-util/diffuse')
-rw-r--r--dev-util/diffuse/ChangeLog9
-rw-r--r--dev-util/diffuse/Manifest4
-rw-r--r--dev-util/diffuse/diffuse-0.4.6.ebuild46
3 files changed, 56 insertions, 3 deletions
diff --git a/dev-util/diffuse/ChangeLog b/dev-util/diffuse/ChangeLog
index 4500dfcb84c4..4b14c0c62463 100644
--- 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.13 2010/11/03 16:10:32 grozin Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/diffuse/ChangeLog,v 1.14 2011/11/04 07:12:46 grozin Exp $
+
+*diffuse-0.4.6 (04 Nov 2011)
+
+ 04 Nov 2011; Andrey Grozin <grozin@gentoo.org> +diffuse-0.4.6.ebuild:
+ Version bump
*diffuse-0.4.4 (03 Nov 2010)
diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index b79e5cb44392..a300b58e8ab1 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1,6 +1,8 @@
DIST diffuse-0.4.3.tar.bz2 124313 RMD160 905375e998380a2ad59b46c73b7113237f63dc5e SHA1 7d9f52f5c7f503add3cd965f6e82abedd28a7009 SHA256 1ecc0d9beb66b32ddbfad19449f40f7a374d20138d914be41f54249fdb6bfd1d
DIST diffuse-0.4.4.tar.bz2 146351 RMD160 e507ca2c9002cd7e66d42de0d592c4c283fb0aa9 SHA1 4689c13a11a182f9230bd394f4050b656d3d1476 SHA256 9dae1aad1aff538fbd571c6ce40e07bbe81530c5d4ebe959b25995be68c462f5
+DIST diffuse-0.4.6.tar.bz2 170246 RMD160 4545012a068d71292c7382cda41559472968777f SHA1 29439e2a069ec00bc50347a59ec410d79ab3735e SHA256 748922902573de316a4829f1ccc2cb6fab218b4aaf69a1a4aadba7fd8f8fd916
EBUILD diffuse-0.4.3.ebuild 959 RMD160 f1c718428e99f826778c873588e6fdf6c8d42d22 SHA1 d51e91eebdf42d638238f75c3ecc33cbc2b968ce SHA256 e3970ccfc387db8c989c24f95cbad6a75272b62224ac2812ed352205f9e3601d
EBUILD diffuse-0.4.4.ebuild 957 RMD160 e8211071add031cced796fc42fe582e21af03312 SHA1 438cc7a7b80acbe1a4d40cb019dc9756e4e239c3 SHA256 4c2f328a0326cd3fca459a9385a80eefd8975e2eaae7f8cb0eb54a6d0f1f3bae
-MISC ChangeLog 1769 RMD160 199776ddbc5b4e26efd4e8b954da8468c0fd99e4 SHA1 08ed871ecb14f9d501874b52fa9c3e0fec140293 SHA256 5138faea166d9acb3081caf149edfb93de25e105a7a3f75dfaa16e09e1794f9c
+EBUILD diffuse-0.4.6.ebuild 957 RMD160 97eab8f7527c1129a0ca8c7a268e563cb7f01f01 SHA1 ea7ba391142fbfa97d07f152e0c2184314a4441a SHA256 14d71a1e5470646f2749787ba077ddbda839e0ba09e7cc493f90c2120bb60b1d
+MISC ChangeLog 1887 RMD160 13bfcab0a57394142af76323fca48873c65beb46 SHA1 9c71f548063f51a978e2c0c463daa796b3a00d43 SHA256 31d804369ce1eacf0fd0eb3df70e9cdfe1144c61089f229e642ed35eba5227c0
MISC metadata.xml 338 RMD160 45bd51a57e16f69f704d64b7b0fc199b153556f7 SHA1 f12cce12b1d35ee2a8c0319f1617eb283b61559c SHA256 958b6d00a0ebc6892dfdcb40efe99af43ef1aad31927d7b395fd2571e0bf52e4
diff --git a/dev-util/diffuse/diffuse-0.4.6.ebuild b/dev-util/diffuse/diffuse-0.4.6.ebuild
new file mode 100644
index 000000000000..226e2d96098c
--- /dev/null
+++ b/dev-util/diffuse/diffuse-0.4.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/diffuse/diffuse-0.4.6.ebuild,v 1.1 2011/11/04 07:12:46 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
+}