summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Grozin <grozin@gentoo.org>2009-07-26 16:11:06 +0000
committerAndrey Grozin <grozin@gentoo.org>2009-07-26 16:11:06 +0000
commit214e632439cc2e31e91cd38051ee133bcb451f98 (patch)
treed93d52a527b06dc5335f89dd89e256497b4bd6f8 /dev-util
parentAdded missing eautoreconf. (diff)
downloadgentoo-2-214e632439cc2e31e91cd38051ee133bcb451f98.tar.gz
gentoo-2-214e632439cc2e31e91cd38051ee133bcb451f98.tar.bz2
gentoo-2-214e632439cc2e31e91cd38051ee133bcb451f98.zip
Blocking sci-chemistry/tinker (file collision, bug #279018)
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/diffuse/ChangeLog5
-rw-r--r--dev-util/diffuse/diffuse-0.3.4.ebuild10
2 files changed, 11 insertions, 4 deletions
diff --git a/dev-util/diffuse/ChangeLog b/dev-util/diffuse/ChangeLog
index 1a81c26a2146..f7122f370fdd 100644
--- a/dev-util/diffuse/ChangeLog
+++ b/dev-util/diffuse/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/diffuse
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/diffuse/ChangeLog,v 1.3 2009/07/22 21:18:09 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/diffuse/ChangeLog,v 1.4 2009/07/26 16:11:06 grozin Exp $
+
+ 26 Jul 2009; Andrey Grozin <grozin@gentoo.org> diffuse-0.3.4.ebuild:
+ Blocking sci-chemistry/tinker (file collision, bug #279018)
22 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
diffuse-0.3.4.ebuild:
diff --git a/dev-util/diffuse/diffuse-0.3.4.ebuild b/dev-util/diffuse/diffuse-0.3.4.ebuild
index e333b44fe42d..8c2a03c25ead 100644
--- a/dev-util/diffuse/diffuse-0.3.4.ebuild
+++ b/dev-util/diffuse/diffuse-0.3.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/diffuse/diffuse-0.3.4.ebuild,v 1.3 2009/07/22 21:18:09 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/diffuse/diffuse-0.3.4.ebuild,v 1.4 2009/07/26 16:11:06 grozin Exp $
EAPI="2"
@@ -16,7 +16,8 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="dev-python/pygtk"
-DEPEND=""
+# file collision, bug #279018
+DEPEND="!sci-chemistry/tinker"
src_compile() {
:
@@ -26,14 +27,17 @@ src_install() {
${python} install.py \
--prefix=/usr \
--files-only \
- --destdir="${D}"
+ --destdir="${D}" \
+ || die "Installation failed"
dodoc AUTHORS ChangeLog README
}
pkg_postinst() {
+ distutils_pkg_postinst
fdo-mime_desktop_database_update
}
pkg_postrm() {
+ distutils_pkg_postrm
fdo-mime_desktop_database_update
}