diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2008-05-21 22:35:34 +0000 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2008-05-21 22:35:34 +0000 |
| commit | 29fc0131737f7fcf3714e59b6a21378a66de9990 (patch) | |
| tree | 6873d6d9653ee72e311eb04463eac491575cad49 /dev-util/meld | |
| parent | bump to 0.29. Bug fixes, eds integration and use of loudmouth 1.3.4. (diff) | |
| download | historical-29fc0131737f7fcf3714e59b6a21378a66de9990.tar.gz historical-29fc0131737f7fcf3714e59b6a21378a66de9990.tar.bz2 historical-29fc0131737f7fcf3714e59b6a21378a66de9990.zip | |
don't create empty /usr/doc/meld, bug #206453
Package-Manager: portage-2.1.5
Diffstat (limited to 'dev-util/meld')
| -rw-r--r-- | dev-util/meld/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/meld/Manifest | 12 | ||||
| -rw-r--r-- | dev-util/meld/meld-1.1.5.1-r1.ebuild | 7 |
3 files changed, 16 insertions, 9 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/Manifest b/dev-util/meld/Manifest index 097d7cfb1f04..1a5a0586327d 100644 --- a/dev-util/meld/Manifest +++ b/dev-util/meld/Manifest @@ -2,14 +2,14 @@ Hash: SHA1 DIST meld-1.1.5.1.tar.bz2 602859 RMD160 8ac6e0b6518388f188ab6a0f13ace67aad02fef4 SHA1 047bc68184ed18d490bc41658c7d2d3d8950696a SHA256 6d415c68670474e2800994bbf4162fa438fca1b1332cc34052d4cb9b8a51bc38 -EBUILD meld-1.1.5.1-r1.ebuild 1393 RMD160 a01c2041c32dd2bf2f63a109598ad457f652111d SHA1 a94d926c4f7c10ac42304331f43900ec8a994580 SHA256 5299b6ae3849bb7886f07d41c3f61f4a92ab3439b89d416d2b420a2f7f273a88 +EBUILD meld-1.1.5.1-r1.ebuild 1509 RMD160 71c745ac7a2c0ce985fb8ffe9ab97fb4b35e9919 SHA1 29c52de023c40f6b556ae70181445c9c1e0a8e79 SHA256 2e35b7b51801642e887213fad8aaaac487d337898d01d50180feae4085e6dab9 EBUILD meld-1.1.5.1.ebuild 1175 RMD160 4f18994198a61706cc98e858cbfabd6ddafc8e57 SHA1 610b451cead5c82637194f475241439f74d7c4c7 SHA256 f6b407197ebea959cc68b51a5446d2945ff2877a2fa97e2870d111f708b69bb0 -MISC ChangeLog 10031 RMD160 d9e84cef8ef5ebd9691fd30129a40ef0b179da19 SHA1 a3d6857d6a90143083e4661c77760dc3749cfa24 SHA256 784b73088ab6115f3d5bc97b44d39a895376c38c763409da426778a3ca24f2bb +MISC ChangeLog 10160 RMD160 76107aca7fc2b91bcc5a8c9383a1bb25bb63035b SHA1 5889ba82ee374163e3e7d61e6e95f76db53809f1 SHA256 366f8cf4a62b162417b6d573aacf8fc2696719050fbf9461a6cf69603fc92cf8 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.7 (GNU/Linux) +Version: GnuPG v2.0.9 (GNU/Linux) -iD8DBQFHsM771fmVwcYIWAYRAvhtAJ45k1yQmBnEZEqXqdXMd8BoIIMeWACfaFG6 -FKDFLynZ7Xm3C7ud0/p+/08= -=rwu8 +iEYEARECAAYFAkg0o70ACgkQ1fmVwcYIWAZsagCghduuXl9ElRlqONsuTF8YPqZH +KnAAoNK1b8f6NejyBk1+pJ9wbdQqourM +=aezP -----END PGP SIGNATURE----- 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() { |