summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-03-13 07:22:09 +0000
committerUlrich Müller <ulm@gentoo.org>2013-03-13 07:22:09 +0000
commit3e5f0017261b69a71c12b2e53f6b9dcae19683b6 (patch)
treeb461c4044a44607c2eb996c8ffadc7536b13ee91 /app-editors/emacs-vcs
parenttidyup (diff)
downloadhistorical-3e5f0017261b69a71c12b2e53f6b9dcae19683b6.tar.gz
historical-3e5f0017261b69a71c12b2e53f6b9dcae19683b6.tar.bz2
historical-3e5f0017261b69a71c12b2e53f6b9dcae19683b6.zip
Merge some updates from from app-editors/emacs. Remove pretest.
Package-Manager: portage-2.1.11.55/cvs/Linux x86_64 Manifest-Sign-Key: 0x9433907D693FB5B8!
Diffstat (limited to 'app-editors/emacs-vcs')
-rw-r--r--app-editors/emacs-vcs/ChangeLog5
-rw-r--r--app-editors/emacs-vcs/Manifest24
-rw-r--r--app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild13
3 files changed, 24 insertions, 18 deletions
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 0910ef048be0..500a119fc67a 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-editors/emacs-vcs
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.124 2013/03/05 17:39:38 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.125 2013/03/13 07:21:42 ulm Exp $
+
+ 11 Mar 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
+ Merge some updates from from app-editors/emacs. Remove pretest.
05 Mar 2013; Ulrich Müller <ulm@gentoo.org> -emacs-vcs-24.2.90.ebuild,
-emacs-vcs-24.2.91.ebuild, -emacs-vcs-24.2.92.ebuild,
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 913c0219c1fd..f40d5df75f27 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -3,20 +3,20 @@ Hash: SHA256
DIST emacs-24.2.93.tar.xz 35556548 SHA256 59b3971b14b1bc29244f3f98408045ba4dcd5be289792cb0330cb4223a350927 SHA512 3cc5a33f8407a72692c898f60e8725fce6b51472e74a005a8f987a4fe10327aeb2b41339a026d79641090ac91b86f9f4b9deff8bf364be029e3eb8117f85059e WHIRLPOOL b92c9ee6514a531e3c32fed9788763e2fc9850881518a30fe50a85ac31f157ca27b0331bee5d5763a7344fa2f4b8e73db1d28ebecf3921653f2c6857ce17b286
EBUILD emacs-vcs-24.2.93.ebuild 11254 SHA256 39afe406a6fd96dfe9ce2043e3a7a582d0dc1a0ddc28ef3946dcb48564a246d6 SHA512 becaa2b887df8d850a35e44ff62b8f01f69d860d5da8f1aa1df8f547695ad4fe91645a76cf6effdc8bd0346d8ccfc7e446f79df7e53b391f88078f9ee685ec2c WHIRLPOOL 71b46f12ded08e9c5bfb26caed74722661540ea5321818234f9e85f15972c091e7ff1c8a3159274e6a4f91e641e7fa113826727bb8b1d0037e7d640fed30d69d
-EBUILD emacs-vcs-24.3.9999.ebuild 11386 SHA256 d481c0432a1a98d3e08a02d6f5c72542100fd869007ac04747c09a00e75a6ada SHA512 a96da6c9a34221f519ad9e971ca9d09dd2819dc764cecae13780475164445325d961f1c6b38551cf58984eac733d579a63a28ad78f83026467d66cf52a57e423 WHIRLPOOL 55a5d373d52a6046dbdc54c78f8aea9826d4b445007f6310c8a2a119c2016eeff39e69971aa5f3fa1efe5e7053fea8065f1dca61ea9eb064b3bea82a20e0e9fb
-MISC ChangeLog 71595 SHA256 54bc2fab7f15a77e3e6c941254c843dfd5973325fe7577d980e04553e7ded9a1 SHA512 6cad2aa109109412bf97152a1a440210b28f22d36f2f5408897cd611bcaeba82070fc00888cea68d5a6b4df68bd32d3a577c49fc65f21ec296b9bb5b4b254b1f WHIRLPOOL 46b955b9a97bbe908468f31cd0633db9a35a2efe0c5ed21ad49f0014dd6c37baaa0c49eaa6097ffa9d153b51f20036826119ea98f4462137e4800a07079281b8
+EBUILD emacs-vcs-24.3.9999.ebuild 11408 SHA256 3ee2b2aa9c7d8b0a0e77c5f671bb093cee0843e1f198e1eac387497ac234a351 SHA512 b1a10d851668760dac9cf25b2040ff11aaf6666cb1dae4258853e1e929a11b012ee5a9f4242d9ec7147a341c938445dace68e86b130fb13a3ef38a8fbfd74e20 WHIRLPOOL 8c82e32d8285b73ade748c9584bfef3a521855b2f924586a9c71e70ae1c35bcf5c2054746fcd286d2591346f7387cf30c3cb65c6731bcffa1ac58602f1284ca6
+MISC ChangeLog 71737 SHA256 06fadb09ef052d41c95372809f88ec47832f3ea46524aab856a0a7c024780505 SHA512 dac24211c0efc37c9e4ebadc0c41c81c69cbe03dce44b78f2192c8c7b7ab2e78ffd221f73351f8b65f5888178bcf8e0412dc1806bcee5292d9208b5845c00924 WHIRLPOOL e0ef4b8313fa46de0dc22c4b7e204fcdf93cfc78f642a52e193f0355f9e4913d508f53c0675a9328423c4fd0637709ead188cc891a8f84be7bbef92a34d50a0f
MISC metadata.xml 2431 SHA256 f5b0a24ab6e525de4d80cffb7a635260e47c88552e7c2b3fe694b76b130d36f1 SHA512 9345b4871208b2cdc7b1ef4d1981cad54aae6da91ba3fe2aa482df8a242b87d7d1c1288f132ed70ef2cab0372418275a50754c7249bb06adc7f5a17403a40fe7 WHIRLPOOL 73f2ce2c94b5e0b83cd1d06ce975b83004d54f51d573f3330450d60c2e7c5220c4bf92ca0af403a322ed9a67806b3cb11190f81f93e135bf1f8e0d8dee0cf220
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQGcBAEBCAAGBQJRNi8CAAoJEJQzkH1pP7W4QIEL/Agh7yyGfF/Wuc4E5ax0BO2c
-Z1kRIg7gqzP55+XsrqHyK6O2v61Oj5yFNrRViHeRi4RVpR/rlX2LUlqJQuTYmC4l
-rTCcie7Q/NOG4anBqUitnrFlp1fmQjkDJtBeJGQpCan4kLAWr2C6zEDm/xIsY3h3
-wjavq1AaM3m5W2l+YnkG9yUqKfSe2UgxROmcFEbUpnwfQGh5BhpkFotp9q+G+qJG
-TpASiwwCYHgdawcXvbE0VkDHdQY55p32CMoynANZO/Rhpq0Ba2OvzkCjuY4RE5tt
-oWVKi+da9eDveDe1Ydw7v8Aa95UdBFPMaLVpEZ9+JQMg4ZWeKYcxPlh2iAv8iT6r
-tM76sXQqPeWLZbsac8gM/qCs7/WXVA6d3SNB3zgCNHjVe8KKPtsCMVVSNsvOiY1g
-a2QD4YFpOEsP099jEU5p3Xs6P9i+oc6A4iQBFrJmjRD8c7c/ii+FYVQkwdVRSg6U
-eVdEryhQG2ke2pKCQYESzhuuwFmub8hMPL4raybduQ==
-=M52E
+iQGcBAEBCAAGBQJRQCkdAAoJEJQzkH1pP7W4YeoMAJCGh0Hsg4az0kdUH1JcTyWN
+EJLYRHpi5e14vlv0Ef4gSRY86oPVXYxdE2LcfAQRpqdG1lJak5qAzYAVGYLkyG5T
+SRYXsJVucFbzuHU9IoyESMedsy4eoxQc7gNOwTWQ52g1XGR4Otfnn9SmjigZQ2G+
+6CaVlxeEsxCISlNYW+6mKLqxSLxeM2kNpHQCKoDrgpUx2o+NobGcUxA2+SDVyY3r
+8yNujVnROaP30txPWlPJeokF5/87WzV3eEevPaFylnDQkO0zgINdIns0J5kz2EDm
+ipCjURHNlp/tWlnHhm4Fdtnjcqw4CUNI4F7pCCkklwHRGP459gw4k1zJxlnckCjB
+gDL0Q2kUrHIHE/djRnuGgtq813zeLCImHsmA+orBJws/69tB8sNgBlCYTWA+96y5
+053M238nQSp+xXvdc87QVeTiypw/gj4SknzLWDlORyLUnl4XEnZBDiY+ctvSsDzw
+z/Lwe+4ULwl3ZiaW3CVtGy+gV51sJbkvtYE6YcXOHA==
+=JyiS
-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
index 0da5633ba282..24f3830291b6 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.4 2013/03/05 17:39:38 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.5 2013/03/13 07:21:42 ulm Exp $
EAPI=5
@@ -309,10 +309,8 @@ src_install () {
See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml
for how to enable anti-aliased fonts."
use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
- ${EPREFIX}/Applications/Gentoo. You may want to copy or symlink it
- into /Applications by yourself."
- [[ ${REPLACING_VERSIONS} =~ (^|[[:space:]])24\.[12]($|[^0-9]) ]] \
- && FORCE_PRINT_ELOG=1
+ \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
+ it into /Applications by yourself."
readme.gentoo_create_doc
}
@@ -336,6 +334,11 @@ pkg_preinst() {
pkg_postinst() {
elisp-site-regen
+
+ local pvr
+ for pvr in ${REPLACING_VERSIONS}; do
+ [[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
+ done
readme.gentoo_print_elog
if use livecd; then