diff options
author | 2015-06-05 12:07:19 +0000 | |
---|---|---|
committer | 2015-06-05 12:07:19 +0000 | |
commit | 14eaae6f8d551697a9f0ce4e8ceda083fd4e6b0d (patch) | |
tree | e9a8080167c40c86d7e839eb93874872fe73a90a /app-emacs | |
parent | Add slot operators (diff) | |
download | historical-14eaae6f8d551697a9f0ce4e8ceda083fd4e6b0d.tar.gz historical-14eaae6f8d551697a9f0ce4e8ceda083fd4e6b0d.tar.bz2 historical-14eaae6f8d551697a9f0ce4e8ceda083fd4e6b0d.zip |
Remove backwards compatibility code for site-start.el.
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!
Diffstat (limited to 'app-emacs')
-rw-r--r-- | app-emacs/emacs-common-gentoo/ChangeLog | 5 | ||||
-rw-r--r-- | app-emacs/emacs-common-gentoo/Manifest | 24 | ||||
-rw-r--r-- | app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild | 31 |
3 files changed, 17 insertions, 43 deletions
diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog index 75557950c516..0317879d4d56 100644 --- a/app-emacs/emacs-common-gentoo/ChangeLog +++ b/app-emacs/emacs-common-gentoo/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-emacs/emacs-common-gentoo # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.123 2015/04/17 12:24:38 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.124 2015/06/05 12:07:06 ulm Exp $ + + 05 Jun 2015; Ulrich Müller <ulm@gentoo.org> emacs-common-gentoo-1.5.ebuild: + Remove backwards compatibility code for site-start.el. 17 Apr 2015; Ulrich Müller <ulm@gentoo.org> -emacs-common-gentoo-1.4-r1.ebuild: diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest index c3caadbb0fce..5c3197a016fa 100644 --- a/app-emacs/emacs-common-gentoo/Manifest +++ b/app-emacs/emacs-common-gentoo/Manifest @@ -2,20 +2,20 @@ Hash: SHA256 DIST emacs-common-gentoo-1.5.tar.xz 40844 SHA256 fbec52de8552c6b22f56382a28d469d9346c02c7569c05cdb0db6a54b39995a1 SHA512 61ac2a1bb8bc449480137789f4d93228d81d2a7ea87a255a7fd82072ce98eecf5f585d102db95f0deda06102e27efbd5d9fce8cd21d6b58239f7a2b6d4ee4d55 WHIRLPOOL bb6d58d8afb55c9d6204f82553962190cd50f64d25ea5fb50308827f88ea3b1c42dc0e072155567391ffc7745b8871c733c9aee5042b57bfcbef5e5419d0b6cf -EBUILD emacs-common-gentoo-1.5.ebuild 4815 SHA256 b920f89b40e11ae92fbe7e0d463bce1400717ae9e6e67f124af647aef3364074 SHA512 6fb618fbe02de4d49cd1c1e5ff5980dc2f9d1eb6aabc2e0772af090c8357afcffd06afb4125d5fd282c503c9809f760b1048d6ae8cbf2054e650ef1f91711950 WHIRLPOOL 1f6afd1c5202f258c2f9644f066d083290e2a4535175e900b701988033235067a1e05ef1f3c80eb92e90effd65437b72d10983c9a21bcbfb001a32d2b95f51d9 -MISC ChangeLog 18812 SHA256 8d7a1a86068bd8ac720714526cb3328cb91bffbd1d8b97ea827d6584ddf8dce0 SHA512 72afaf73f6d423f1eefa1e499200eafece99a1d1c4a3abcaa960612f9aa36aacf158a67009ead68cd0473771156bf1f1eb1e92d769dcd8d1ea12d215907c0d24 WHIRLPOOL 53a64ccc6c8d552b462db73dc74058c7046e9e675d401c0a18635aedc6bb422665f9259929115fcf4cf0457eea5f23f114b2d4b9e7caf17ed5a79dcbe818ceb2 +EBUILD emacs-common-gentoo-1.5.ebuild 3584 SHA256 8bcd4e6fc3207f2077a2eca4dc78cb420493f6a01f45b8bc76a97dbdd0bce797 SHA512 ccf6b90aedd47583260a3a2b930b54644cea26accabf85c3dc300b639d03fdbdbb63dff7bc89e7c243c8b0fe624b40432c79bcb286af7b71d9d2b9c839bacff2 WHIRLPOOL 39944426a47fdd28104444ada28ba7786698d4c72a70610dd2c507dc011f6f7fc8cb7db0a93638c015dfb2dae451bd20655829ea58dc63c9b41ac9acc354e496 +MISC ChangeLog 18949 SHA256 2197fc9f3f5bc73005477876e5022b1dcf384979030bf23d13380ff62c8daba5 SHA512 b053ae09e61c6bf77ed654b182aaa204281f0536b1bfb177d3cb8c82367e5d3369b6e644024183e3c84b3c2d4da035daa34268522557e6c8236b5e1c9218320d WHIRLPOOL 499fb29f272097ba3b68fc0ef1726e29ee14ac76c3b34e099aa19cb496a0aff87419809211d86487f19fa62570a4824bcab3e3d62f6f53036a794f5a3f3e9699 MISC metadata.xml 236 SHA256 f0b6df93ac83810a22d1519f0b37ee94996d1512c4fe4407df6fbb27f4da6608 SHA512 beb19666e6ea1a04718133d41e61ee7e7604ae0e614f979c66835f10fcd8b8e908a136a67397b212bcbb3e67d9bda458d561da228998cd9b616cd4a8bff6a989 WHIRLPOOL 099d599d015c0835bf2ed4780df6609ed0bf407c8cef5278f35fab89ccc6b9b2d98d48833aac8ef3243633dc33206eb155851cf570c980e96dc259d1e0416759 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQGcBAEBCAAGBQJVMPuYAAoJEJQzkH1pP7W4f6IL/jSHQRKZ8oF4hAMCaJjV46L7 -UTem89GYZsdgJnhKmMljxUbW3qAzGTo1+E6XzvpAlvL8GsfLZTMK5cDf2XIZIqXI -PR2Rn67/217Czfrh/wEUZrYnKzZd/OEwOj3COkibl0SY5br/gYSio5HZvF8O+SXs -A+OJlAwcMWvb86r27M94rzI5biLruuBUdswNI77nEeiHh5/li8lamXUizzQwsVfQ -T/f+ux0vwFyp4GNUum5scJ61+KiY/xqXbCKHcXH9k7Lb9QUxxKJb3G06Y9m5Ndr3 -w07Cly40TfK05saraDiFajceuRoNPoN84nknBTOetyi9mYSh0RNRlHRD0By5YOw1 -4JyjYT1PVwQTsFDAAWsNRJX6/WteiD7sYBAieaFVr9mDhfy2FV/OfRTX4emEjLq6 -0ELf1EyjeqHlo5OZY+ay4urcvdc8RSqgxrFZ6kLHEejKqBIDYvJEVY/ibWMGSIvW -XTRgrzWPbvG2btarlHxyfMYIoi65eZ2iKU/5aIRKyQ== -=QTSy +iQGcBAEBCAAGBQJVcZB+AAoJEJQzkH1pP7W4VkkL/imGgKfbZjTDUPhccHeOVsTi +GpMw8QbNVayeoZkphOTI4rsK5pZEKKd0hQ1JhyzgDPphQJI/czwoH849Hl4nESL7 +3X9zXscgXF/JBAMUJzJnGmRR4uYQLmPQibAtO1qbneH5Jp2LmFDyImZCoCd5m0sy +sRkhMjY3uE+1TktcO7PrD9igc9S/prv5uZBf7o5JCVxRGZfpuhbMMw1zVTaqgrYW +TjDo1wvxgM0GEGg8IcgM0Z9S/1CCEh/jK1EUVmrgKTCFfOp6tpamkECrqgyQ7gY1 +BDudtfDT1/lEO9K+ykZj5zXA+O+BkdH9haQGlYXqELQesD1NFnY+SlzNqi7MLaBt +1rT5BqbPGLcbVnZYS5+/FVzVSRQHC5LfScxMkBGr7CM+xGyX/CdnFc7TXbPFBckq +DqlSJx5FnwgGo9yuM8GM9QCDCTlv8ur/kpl6m/zQX4Y3/23wzBjIdV4gb0Tnc+Sb +xV/r9dXaS2BQtuaWZ8jhabjsfonkAndTxMrmNp3yKQ== +=Eugm -----END PGP SIGNATURE----- diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild index 30945ac77620..85267a16bcf7 100644 --- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild +++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild,v 1.10 2015/04/17 10:40:33 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild,v 1.11 2015/06/05 12:07:06 ulm Exp $ EAPI=5 @@ -69,20 +69,6 @@ src_install() { readme.gentoo_create_doc } -site-start-modified-p() { - case $(cksum <"${EROOT}${SITELISP}/site-start.el") in - # checksums of auto-generated site-start.el files - "2098727038 349") return 1 ;; # elisp-common.eclass - "3626264063 355") return 1 ;; # emacs-common-gentoo-1.0 (cvs rev 1.1) - "3738455534 394") return 1 ;; # emacs-common-gentoo-1.0 (cvs rev 1.6) - "4199862847 394") return 1 ;; # emacs-common-gentoo-1.1 - "2547348044 394") return 1 ;; # emacs-common-gentoo-1.2 - "2214952934 397") return 1 ;; # emacs-common-gentoo-1.2-r1 - "3917799317 397") return 1 ;; # emacs-common-gentoo-1.2-r2 - *) return 0 ;; - esac -} - pkg_preinst() { # make sure that site-gentoo.el exists since site-start.el requires it if [[ ! -d ${EROOT}${SITELISP} ]]; then @@ -119,21 +105,6 @@ pkg_preinst() { chmod 775 "${EROOT}"/var/games/emacs || die fi fi - - if [[ -e ${EROOT}${SITELISP}/site-start.el ]]; then - ewarn "The location of the site startup file for Emacs has changed to" - ewarn "/etc/emacs/site-start.el." - if site-start-modified-p; then - eerror "Locally modified ${SITELISP}/site-start.el file found." - eerror "If this file contains your own customisation, you should" - eerror "move it to /etc/emacs/. In any case, you must remove the" - eerror "file from the old location." - die "Cannot continue unless ${SITELISP}/site-start.el is removed." - else - ewarn "Removing the old ${SITELISP}/site-start.el file." - rm -f "${EROOT}${SITELISP}/site-start.el" - fi - fi } pkg_postinst() { |