summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2010-11-02 07:59:08 +0000
committerUlrich Müller <ulm@gentoo.org>2010-11-02 07:59:08 +0000
commit1ff11ae83f504758efd30c550ec95692fffa58a8 (patch)
tree341f7c034aba96da32b3315ae7a413857ab223b9 /app-emacs
parentAutomated update of use.local.desc (diff)
downloadhistorical-1ff11ae83f504758efd30c550ec95692fffa58a8.tar.gz
historical-1ff11ae83f504758efd30c550ec95692fffa58a8.tar.bz2
historical-1ff11ae83f504758efd30c550ec95692fffa58a8.zip
Fix LICENSE.
Package-Manager: portage-2.1.9.23/cvs/Linux x86_64
Diffstat (limited to 'app-emacs')
-rw-r--r--app-emacs/org-mode/Manifest8
-rw-r--r--app-emacs/org-mode/org-mode-7.3.ebuild4
2 files changed, 6 insertions, 6 deletions
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index c2fc301575e1..63051c784a1a 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -9,13 +9,13 @@ DIST org-7.3.tar.gz 2926747 RMD160 c919a5348175d9c60221e3eb01a10e7781b84a0a SHA1
EBUILD org-mode-6.36c.ebuild 1074 RMD160 6c8b887b19e7607bc50bb7333ec00f07a578918b SHA1 b5933d76e001b6fb445258cf387b485be69df750 SHA256 0a21645daa444e553b5726c5c3e7216e3afcb0734736e4742d28608a7f624575
EBUILD org-mode-7.01h-r1.ebuild 1062 RMD160 392e5748649291cd763c4d18db76f9dbca533052 SHA1 d6f0d56e59fc2ca6090893f7714524720516fe66 SHA256 7ea4aeadfaaf3b173c216c1b9b717afb06fdb3945abcf5cbf7f0072dbccf63e4
EBUILD org-mode-7.02.ebuild 1058 RMD160 4562f2d3dad226867c8d1c1097a50dcbfbfc5ef9 SHA1 7ec5a064360ca17922d79606936d22911469db4f SHA256 3194e530572e092465af13eda839770c8eebf04d42d0870269c5e722de40f5a1
-EBUILD org-mode-7.3.ebuild 1425 RMD160 d5db5b21bb62beb13fc7cc8602c551ae59fbd08b SHA1 dd8adb96b9a363fbde4111926899e6617d60057e SHA256 799127205747b4f19b549b9405f66f45dee685c02dc7d209edd87128b5c9cb3a
+EBUILD org-mode-7.3.ebuild 1448 RMD160 f5b91f0544418211973ce883bb0cb27d189d2b15 SHA1 475c9e4a59b25ccb5be135be179ca77aafce1ffd SHA256 a4d57321dc850e10698b084cc268bd482381884bf89b5959f47a98370efd1feb
MISC ChangeLog 16962 RMD160 e3f518c41d08e1624a97cd37984dc8e02f947a7b SHA1 2f2a89a769c03394342c00c18717cd16ff59bfdb SHA256 f90d77dd653bf1097c81ed5364a924e3fc507fa4b794dfeb22125b012853afd1
MISC metadata.xml 1146 RMD160 cd7f3b1f135d9a4483ee2fc6b039370504b8f894 SHA1 adb78dce5a2849ff934805fcc881e82cb2f8574c SHA256 bd68dc6ea0c238afb569ed5108af4b3e53c5e7fab7e7cfcc1f3c6fff0f4ac447
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
-iEYEARECAAYFAkzPwAsACgkQOeoy/oIi7uxL7QCeOFTuwhPsdI0y3fH39RPuFQWp
-6DsAn1OjxPPRuF7f0t+GUtQ8k0KgFZY1
-=+qsw
+iEYEARECAAYFAkzPxXAACgkQOeoy/oIi7uw9AQCfTfeIoPL0LwE1yUUfkHAK1AAa
+9K0An1dRfzr1td3ApQwh2yygQ3YDjTy6
+=7e/r
-----END PGP SIGNATURE-----
diff --git a/app-emacs/org-mode/org-mode-7.3.ebuild b/app-emacs/org-mode/org-mode-7.3.ebuild
index bb12a25090d9..1cfdee976d5e 100644
--- a/app-emacs/org-mode/org-mode-7.3.ebuild
+++ b/app-emacs/org-mode/org-mode-7.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-7.3.ebuild,v 1.1 2010/11/02 07:36:10 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-7.3.ebuild,v 1.2 2010/11/02 07:59:08 ulm Exp $
EAPI=3
NEED_EMACS=22
@@ -11,7 +11,7 @@ DESCRIPTION="An Emacs mode for notes and project planning"
HOMEPAGE="http://www.orgmode.org/"
SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
-LICENSE="GPL-3 FDL-1.3"
+LICENSE="GPL-3 FDL-1.3 contrib? ( GPL-2 MIT )"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
IUSE="contrib"