Fix LICENSE (yelp.m4 is GPL2 or freedist).

Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64

diff --git a/app-text/yelp-tools/ChangeLog b/app-text/yelp-tools/ChangeLog
index 685024707f4fff731458e0e5dfd42d63a66627e5..d859cd0a3d0c21848d35a4c0090439730f694c96 100644 (file)
--- a/app-text/yelp-tools/ChangeLog
+++ b/app-text/yelp-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/yelp-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/yelp-tools/ChangeLog,v 1.1 2011/11/04 06:09:18 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/yelp-tools/ChangeLog,v 1.2 2011/11/13 04:33:17 tetromino Exp $
+
+  13 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  yelp-tools-3.2.1.ebuild:
+  Fix LICENSE (yelp.m4 is GPL2 or freedist).
 
 *yelp-tools-3.2.1 (04 Nov 2011)
 

diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index d2a5ec0d7d364c088b1e021f038b1f4503756f41..23beacac58affb1a6c4a7d15948d2c6b810e9399 100644 (file)
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA256
 
 DIST yelp-tools-3.2.1.tar.xz 194340 RMD160 90c023829f91ff2199311385ab64bc87f2d40ce8 SHA1 efcb194831ca3eb7d28d5e8b488d39e65efa8217 SHA256 0da05c50ed30f049d654dda4bc2b438fb29b728ec172945d8a1944abfdf1b7b9
-EBUILD yelp-tools-3.2.1.ebuild 667 RMD160 1999d46d6008737aa71ec2de97f1d28ddae159e5 SHA1 9f4fcdc48cd0158319c96b02086a998a46ed39c6 SHA256 b0cf77fd8621522ebfa122607dfa82c0a09212da0ef446550ff5f26c7f402603
-MISC ChangeLog 420 RMD160 7fe48efc675b2194a7e839505f6e388d7e304b07 SHA1 03eead48f12923be9561783b6ff96c14e604f04c SHA256 7b1bc470502d3a7bd7eb12614f962131a2e52a1fb3e121db9e69df5a40b5f644
+EBUILD yelp-tools-3.2.1.ebuild 688 RMD160 a135850fd3107cfb2504bf57d7b9691820cc157a SHA1 5f9c998f98fa29db91ed489037bdd8d5711b0399 SHA256 99baac746486b5a4b377e18860d3282b25ce6816943e0c51ddd58de605adf94e
+MISC ChangeLog 552 RMD160 86884764d5980e2e0328ec77a2323c29b4daad53 SHA1 ed57c1642dab427c80dfd663f5cfab3158ebab32 SHA256 861a93f8d91213b6206d8e8485afecbe49be7515ecb351c2a3d343638f868034
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6zgZMACgkQdjK8w9WeBnAogAD+ImdI6ZfFIzyTUQDQ6enbnBnF
-RZa90OlXuVzjFNRYGlkBAJOH4ZOEQrTZvB6CT/5CK0mTvPkfe/z71VL0FlFM66uy
-=3TDd
+iF4EAREIAAYFAk6/SJIACgkQdjK8w9WeBnA2uAEAt2dgpolyvCa1D2yJPdjgzFzn
+TJs8pcqo3bFeO4zs0C4A/A0HuW1nlFJAyTc/gkpZZYIQnynhf7m7RCHqlQyJJW38
+=TVfS
 -----END PGP SIGNATURE-----

diff --git a/app-text/yelp-tools/yelp-tools-3.2.1.ebuild b/app-text/yelp-tools/yelp-tools-3.2.1.ebuild
index 6dbb7e1aab831619a2c0337c6a33eb420c58140c..7f7d09549b268d40c778a8de97c89eada2861428 100644 (file)
--- a/app-text/yelp-tools/yelp-tools-3.2.1.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/yelp-tools/yelp-tools-3.2.1.ebuild,v 1.1 2011/11/04 06:09:18 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/yelp-tools/yelp-tools-3.2.1.ebuild,v 1.2 2011/11/13 04:33:17 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -10,7 +10,7 @@ inherit gnome2
 DESCRIPTION="Collection of tools for building and converting documentation"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="GPL-2 freedist" # yelp.m4 is freely distributable
+LICENSE="|| ( GPL-2 freedist ) GPL-2" # yelp.m4 is GPL2 || freely distributable
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""