summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2008-05-21 22:35:34 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2008-05-21 22:35:34 +0000
commitb2e8f50d9b17892d1823b7e45dd5a84541e1a252 (patch)
tree0f37c70c5fa3351d555ca3c81d7cd6c375b528fd /dev-util/meld
parentbump to 0.29. Bug fixes, eds integration and use of loudmouth 1.3.4. (diff)
downloadgentoo-2-b2e8f50d9b17892d1823b7e45dd5a84541e1a252.tar.gz
gentoo-2-b2e8f50d9b17892d1823b7e45dd5a84541e1a252.tar.bz2
gentoo-2-b2e8f50d9b17892d1823b7e45dd5a84541e1a252.zip
don't create empty /usr/doc/meld, bug #206453
(Portage version: 2.1.5)
Diffstat (limited to 'dev-util/meld')
-rw-r--r--dev-util/meld/ChangeLog6
-rw-r--r--dev-util/meld/meld-1.1.5.1-r1.ebuild7
2 files changed, 10 insertions, 3 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 18fa735de3ee..9cb3335d56d1 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/meld
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.73 2008/02/11 22:40:50 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.74 2008/05/21 22:35:34 eva Exp $
+
+ 21 May 2008; Gilles Dartiguelongue <eva@gentoo.org>
+ meld-1.1.5.1-r1.ebuild:
+ don't create empty /usr/doc/meld, bug #206453
*meld-1.1.5.1-r1 (11 Feb 2008)
diff --git a/dev-util/meld/meld-1.1.5.1-r1.ebuild b/dev-util/meld/meld-1.1.5.1-r1.ebuild
index ff2deb26c313..fc0d02708437 100644
--- a/dev-util/meld/meld-1.1.5.1-r1.ebuild
+++ b/dev-util/meld/meld-1.1.5.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.5.1-r1.ebuild,v 1.1 2008/02/11 22:40:50 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.5.1-r1.ebuild,v 1.2 2008/05/21 22:35:34 eva Exp $
inherit python gnome2 eutils multilib
@@ -33,6 +33,9 @@ src_unpack() {
sed -i -e 's:/usr/local:/usr:' INSTALL
sed -i -e "s:\$(prefix)/lib:\$(prefix)/$(get_libdir):" INSTALL
+ # don't install anything to /usr/share/doc/meld
+ sed -i -e "s:\$(docdir)/meld:\$(docdir)/${PF}:" INSTALL
+
# let the python eclass handle python objects
sed -i -e '/$(PYTHON) .* .import compileall;/s/\t/&#/g' GNUmakefile
@@ -45,7 +48,7 @@ src_compile() {
}
pkg_postinst() {
- python_mod_optimize /usr/$(get_libdir)/meld
+ python_mod_optimize "${ROOT}"/usr/$(get_libdir)/meld
}
pkg_postrm() {