summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2011-12-06 13:59:49 +0000
committerUlrich Müller <ulm@gentoo.org>2011-12-06 13:59:49 +0000
commitcb96475ac7258da272967838586f8a618d2f47df (patch)
tree0d368003306ca731a9f6b6311c1eaf23a20b8ce0 /app-editors
parentGet rid of all echo commands because they aren't logged. (diff)
downloademacs-cb96475ac7258da272967838586f8a618d2f47df.tar.gz
emacs-cb96475ac7258da272967838586f8a618d2f47df.tar.bz2
emacs-cb96475ac7258da272967838586f8a618d2f47df.zip
Merge changes from main tree.
svn path=/emacs-overlay/; revision=1765
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/emacs/Manifest8
-rw-r--r--app-editors/emacs/emacs-23.3-r2.ebuild2
2 files changed, 5 insertions, 5 deletions
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index af43381..8c734bb 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -3,13 +3,13 @@ Hash: SHA1
DIST emacs-23.3-patches-2.tar.bz2 1936 RMD160 c1cbe26f05e68efe0768445a3918892e995a59dd SHA1 3f55305dab83084b01f8958371d4e0fd4114b88b SHA256 403f88c0b814817734f275e6ee6ff4c8f27858a2429ea7d0a029c2d89ebaa5de
DIST emacs-23.3a.tar.bz2 38748283 RMD160 21f201714bca420c3a8fed8c92058cec786e724e SHA1 795bdfa372e42b9589a80f6dcb2ad8fed65b90e4 SHA256 9f4beee3bf4987914d57851c0aac017cb92a1410c2b31ba313265c64a38cc6ba
-EBUILD emacs-23.3-r2.ebuild 10695 RMD160 a0bb8bda04406eb94a2da07dc27edcd998683b85 SHA1 f0daa0b7699b0915a26f5055459783508724d5ed SHA256 cebe3f6a7ac43e645a1bdb376295922da3a93db7b43efa43b21ecee0fb7ce204
+EBUILD emacs-23.3-r2.ebuild 10719 RMD160 a22f69bfe21e7795212cdb3f3c6023d3feb5c32a SHA1 9b9baba8c8993f07be246c02464837811feec0ab SHA256 5648e08f12f9fdcee20ed4bc5bea374a76ad37a8132691dc26260297dbfa708e
MISC ChangeLog 435 RMD160 ba076a6ce479725910ac94c6dad83fbd01f0207d SHA1 fe284fd4b1363c238a161b64b77ba02e19480c24 SHA256 fd6926b6a0d91ce7c94102e11c9d07b9e073beb6ccbc243e02194ad85774c15c
MISC metadata.xml 1657 RMD160 5d264611cedf5599197cf5fb9998678ec2569d79 SHA1 ff30d22526dcacaefdf078e4617d93be1bbc144a SHA256 fad2a290e4815f5cac10bfd3e6a9e547ddea2663cfdcc4889ea1b7e124389e0c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEARECAAYFAk7d3NQACgkQOeoy/oIi7uxOpACdHE+I3+Klm/A1fku3bTKORjuL
-wXIAoIV0Cuun3x7b8iFrwYjzPGye9c0r
-=vp2i
+iEYEARECAAYFAk7eIesACgkQOeoy/oIi7uwWHQCffNCu+DDQPI8gC/4KHjs1ciOq
+h0EAnjH2v7kSJMGxTuvHIoxm1oFduyO7
+=uFZZ
-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-23.3-r2.ebuild b/app-editors/emacs/emacs-23.3-r2.ebuild
index 07711bd..18e9743 100644
--- a/app-editors/emacs/emacs-23.3-r2.ebuild
+++ b/app-editors/emacs/emacs-23.3-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"
SRC_URI="mirror://gnu/emacs/${P}a.tar.bz2
mirror://gentoo/${P}-patches-2.tar.bz2"
-LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
+LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2 Emacs-23-CEDET-grammars"
SLOT="23"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="alsa aqua athena dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"