summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2014-06-08 11:53:06 +0000
committerUlrich Müller <ulm@gentoo.org>2014-06-08 11:53:06 +0000
commit389f31b125f20055cd4ada22e435d57dd2a452ad (patch)
tree486bed3c9de7b0c8c8c5c04ed432b0ffd5d2e95a /app-editors/emacs
parentVersion bump, remove old, fix pid file path in logrotate script (diff)
downloadhistorical-389f31b125f20055cd4ada22e435d57dd2a452ad.tar.gz
historical-389f31b125f20055cd4ada22e435d57dd2a452ad.tar.bz2
historical-389f31b125f20055cd4ada22e435d57dd2a452ad.zip
Remove vulnerable versions wrt security bug 509830.
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0x9433907D693FB5B8!
Diffstat (limited to 'app-editors/emacs')
-rw-r--r--app-editors/emacs/ChangeLog6
-rw-r--r--app-editors/emacs/Manifest26
-rw-r--r--app-editors/emacs/emacs-23.4-r6.ebuild338
-rw-r--r--app-editors/emacs/emacs-24.3-r2.ebuild341
4 files changed, 16 insertions, 695 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 9ff08b259f02..79f258f75e0b 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/emacs
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.633 2014/06/08 11:30:24 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.634 2014/06/08 11:53:04 ulm Exp $
+
+ 08 Jun 2014; Ulrich Müller <ulm@gentoo.org> -emacs-23.4-r6.ebuild,
+ -emacs-24.3-r2.ebuild:
+ Remove vulnerable versions wrt security bug 509830.
08 Jun 2014; Agostino Sarubbo <ago@gentoo.org> emacs-23.4-r11.ebuild,
emacs-24.3-r6.ebuild:
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 9a3c80d7feca..40911808a1d6 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -4,32 +4,28 @@ Hash: SHA256
DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd SHA512 c6c6ea33850dadf08d68fff56fc6aacc80ad1aa36661260715d50b95438942d56e6244094427d50356cfe716f26559feb885254c436399bff7be639637d605b6 WHIRLPOOL cafaa0fb0d06058cac8e445a7a1b5cba145d23186477a9c681efdab8ca0f18a9675dec3a93851fd7138890701f83fab83300c28a548c8fc22478a0cfff95d5da
DIST emacs-18.59-patches-8.tar.bz2 19667 SHA256 637542bf5ee07d4abac11b76e742598a60787f3869dbf377eed99ae005fbc59d SHA512 a6564bc16724bfdb22f77b0e21b6064ca5e0e1bc91f3223c1037c26f8a048f28ac7a5da6817dc940a5f00f1f39bbfcda2277645409cd7e143a55fabdc3d3fe5d WHIRLPOOL 6b81f978aef2b429262e79ab1d995cca9237dc9c9d98144d2dc3de07bc2cdcec8547adbaf5ad41d9cce3239554918c04c7b9ff783b7931582a3a7398eb2b66f1
DIST emacs-18.59.tar.gz 2962652 SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33 WHIRLPOOL 5e98e71518f665e2a8278afe54e0ace6d7fdd9df23ff0a3354ffc1d5cc25cd21b0dd4d82766fcb436d4f24e9291c933295e956e1ffea43cfeedf915175763be6
-DIST emacs-23.4-patches-10.tar.xz 4920 SHA256 0b8e8cf31b013995d4e4cab12636aeaf6f49d2c879eb929fa7fd8774d86a5a00 SHA512 552568fe9264c6e1fe57ec0b48adade34d15b1c768534d0f3e036849c938b18720121dad5ce2c83a4f4c61911d9f386a96f49cab10b641feb265e7eff8d2553e WHIRLPOOL 17dac888cf9120f66f1940eac6e99d34fa447702cb64e391a433829c61b4bc24017125d44bad2108f1bace14c9ae7b40d6aa39245feb9ea2fe215c287da6b100
DIST emacs-23.4-patches-12.tar.xz 8140 SHA256 17188d0cfaba417cc047fb9a9ba3f4d19a66792a3c123539036bf48a39a6e066 SHA512 d069849be69a14ab8dab11412914e31ba8faeb10d23731c6e476809cf3edeba57a13bbfecb42437636357df1165fce9c83f8a16c421f238e88caee8f32431d3d WHIRLPOOL 23c2aba6e0f91b42cd4d6daf3d4bfec5902c680c2ec0c5a2d0b5841d689b447b65426396fb006347c8d1da487c2ce1ca03f6d17cffd9a6d74820f6f0fc2d1fa7
DIST emacs-23.4-patches-14.tar.xz 12088 SHA256 c46406a32b53d6c8b68c007f8d990ceb18343056814c5025e8a6ad53587050a9 SHA512 37467b57174b8e7a56864fa7d68c18d5ffe4690a93bd90af04184c88688eea5c0f6b3b3b2662a512099b7b0bcce36a20256f04789072b61f5c9dc353ac2c04cb WHIRLPOOL 06045478595ad805826ae487ed99d663e7cd45944f5c6c8b1aedc1451fab7e442294de828052c2308f6aab57398038f06ffafc75680d477c536d4f23e028e73e
DIST emacs-23.4.tar.bz2 38646508 SHA256 26576f9e664397c729f78f5ffcd092969251988461896fe8793062346ee988b9 SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296 WHIRLPOOL 2384c3f63ff153c3975e373334d6021d46b23ad3cab448ed2e1180501236453a61d13bf1dfbb2e6075bb141dd8511d85f77e37c763b39769f98de48eacc56f3b
-DIST emacs-24.3-patches-5.tar.xz 3260 SHA256 ed9928b23a8b73b3ad265ba6866f609cdf61524602dea3b9f57d397d13a6fcb6 SHA512 c5989a9920c5b8cf1935f2d1bea228262c7953516cf93f75dbf6b305fc7c66f0d22c4038931972c441b8c0508acc04a83c7a160e20bf18b2c2e25c10d20f6a5a WHIRLPOOL facb1dd20830a87c8ed0480168127822cfb961cc6592d5c51c9057dfba944adfd4d3211ac7af07873b46fd78580704325f56ab4a5dfb6f78790005b718f19364
DIST emacs-24.3-patches-7.tar.xz 6484 SHA256 167a004b3b528dada8f68d28ce98cfbf1f23a1e00e52d7b23e14352178e5eab7 SHA512 6e3f6f053ad66e6d298b4fd904c57a6c2a03269ec53e9dfc56f834672a42c8f48eeb20a7ed1bcfb534eb62e0cca6e01b4a1663bebb046a0ce7325b732a378868 WHIRLPOOL bb68a6874e682afe58fe4cdf60695bc7b8d763afd15ba40ffda3156e80a6cad318e969fed6f22cb6e484ffdc29daa1b6b64873bf6cf73de28cfa711172046138
DIST emacs-24.3.tar.xz 35565352 SHA256 70aa2942e9ae689ed17eddedfca5027c364ffbcc8b59968b1645e935f4c7058d SHA512 a1300fa10a9fba2db9735db3d01382bcda89ceec033976c4622796dfdf6d2748ed5fa73edf229182b368190c8acbf706810dd5f344542d2c0d294154bc2d0ca9 WHIRLPOOL 687ad4c7d69b41884bf28269bdea1808e03cdcec5a5218d0bac23c07cca3ced341ef98b4d5892149e2dbe899774a5e60edde9931d6c0fe41687995f530fb61d8
EBUILD emacs-18.59-r10.ebuild 4381 SHA256 7aff3e288a550a347d7257a2f1f33290f0a148a7d5df46c3a71b91e9d58e3059 SHA512 32dd6fce795b6eb999f76d2a8896f4e8af2850314f969fe5a9885f1adf7e9b0b7bbd879789491f99869c2a84aebddea7889804b3593258094625c06ad35a53c5 WHIRLPOOL 1a737882a91136a6093d30a6a6ffc28ceface46d91436ee7ed202e92626f23c6ee38b9c4cc6bf0951c4ec55a362c0305ba682c7e08086a68d2e46960c93fd920
EBUILD emacs-23.4-r10.ebuild 11191 SHA256 fd789d021fd5a6c5aafcd8d775e38e724c161aa7a00144c29404689196464c11 SHA512 f4b68c28e3248990b989e3e34c36e36aa91d2796022d6faf9ba14499363705adb711ad2faa2964c157fd7ac3551289112c25886e0a12aae08d1b3c8a9d9dcaf0 WHIRLPOOL 15d5face8631b802b07e65666f54718ceedcb07ce1796174bc692b01a418023a3e41587c6e0792374d1fb6ae317c186dd881de7c6397ee5ef6c0dd624c3f1339
EBUILD emacs-23.4-r11.ebuild 11183 SHA256 c2abcdf3818d7a9f935f566115c9e565c67806465cd577f70ca2e604a314aa5d SHA512 b7d0967d9e0ad523158981a0e3bb19916b57e33dec3608db7ef5d4489663b92d4ddcdd50d262b6c459c0641be534def8ac1d87fe14b61779de4895f82a077ddd WHIRLPOOL 44ffe51827c8bedf491a37edb2fcbaae4aa9ae182e3de790d19b3a55c4b63dd9d45fcb58d4213f1e61250a9bebaa7676241edad9e2513776614f509304620ba7
-EBUILD emacs-23.4-r6.ebuild 10801 SHA256 b709e1eedfb142a0b62e70e917f5f41e10c932c8d92790bcf5e80953f4027efb SHA512 4d84c5bd07704c0541670f268c8ff69f4dcd2a3eb74d6210323a7c63b61fe8a6c4bab6521f84cd0aba0aea4b535e2510decbe46e735bdc79896d40229049145f WHIRLPOOL 4e83c5497e9b0f121de23a82b787270a7bf187c2ab43acfaa351f7eb963a4d355a21ee62af265b82b5fbb226dd65101ebcef1bc0cd65fadad8a27aa8ab50d7a4
-EBUILD emacs-24.3-r2.ebuild 10786 SHA256 24ee66757397c4c8ba91873575ca196edb67e4e31732144ad344e02e3777cad9 SHA512 47a49c1dac01279af2272aec81347ae9d9e40c7879e8ba25070f315c0d342daaddd4bea457fdd021b07c3bf2ab677185bf9c4ce92ae0d0cca4ce3e5f4eae73f6 WHIRLPOOL d5449aa8296057c805b2bb79ee067098ea6809154e31a027468beeee965246725c5378b9ea9c84343c5ea8d7fa8df056e6d5bff16f5a73026ba841a5ea7930aa
EBUILD emacs-24.3-r6.ebuild 11077 SHA256 64ddd4f5dd1034033c43654eaa8f07f8864dcb560ba8f4b635ba6dd938494e4f SHA512 4e61f865046ab4a152f96809b11c648d96ce79ae4bc95fb97c6d743e677bde648775abb612b28f32312dbdba444f655441dc3320b601315c939ed7b8c5adb64c WHIRLPOOL 18607e47889e25cedfc6347ac78d131a58852f4b011aa73eca87283dfb86b4c5bfb99aed7d705bda04494cdc5f84bdf359783c7c697157895441f0521284068d
-MISC ChangeLog 86585 SHA256 55eae2f54f343de344c15b84b18156bbeebfd1f90c798a1259b68f8568638d3e SHA512 5edf226360ec42cb0eb25ce1ecf6eae550b053678af77faf7a6582fe35338d04bc232b39a082507ff000f24e860fc9ae12ff279fc37c0ef6221af20038a34c23 WHIRLPOOL 05975037824da59872e62fabdf3cddc5817b27e511252a7153196db62ec443105c27af23b337ee4e4e6a6393ac3bc787577f88560ede64dda3f8702260dd5e2d
+MISC ChangeLog 86735 SHA256 9c7969ac55fc4c16c092b051819fdc528061210106b6dabdf8c394147ff89dc2 SHA512 72f0349dbd072e6a86aa0bdcb7391ffed97fb32ca6c83d694df110d2d427e00e64947448feab410a2a975aee1e23ffa510b8e1993e05d91ca6e7096f8c6ad511 WHIRLPOOL e5bdab197f9cb5ace269d3ae7dc033abe1a9a51e57db60de3e3e1a0d45e3331e64593b3dcb00adca7950d67b257e18ed120d6e9e858af3579e85c18a4c5de100
MISC metadata.xml 2431 SHA256 f5b0a24ab6e525de4d80cffb7a635260e47c88552e7c2b3fe694b76b130d36f1 SHA512 9345b4871208b2cdc7b1ef4d1981cad54aae6da91ba3fe2aa482df8a242b87d7d1c1288f132ed70ef2cab0372418275a50754c7249bb06adc7f5a17403a40fe7 WHIRLPOOL 73f2ce2c94b5e0b83cd1d06ce975b83004d54f51d573f3330450d60c2e7c5220c4bf92ca0af403a322ed9a67806b3cb11190f81f93e135bf1f8e0d8dee0cf220
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQGcBAEBCAAGBQJTlEmZAAoJEJQzkH1pP7W4krgL/0je3u7Ptj3AFExUB4Jez2aF
-Tx/HNlmZBCOQI4flZXdZA8cNVoaai8hkQICN92RtRjw5fRnLXjjU3wLleZhCFDRH
-HDZrnFCkxNkJx4IOpXG4Wu2jDw4v3pfQ/Pd9cl9BP04ixeMWL56wZF/15ZF0TIyN
-49R6iwfHO5FCM3dvo5khT6ZujWFRnsiX0iJYjZuBxHj1nTPsyEcLNKmpwf5pk1SO
-h8QmjzlYWcCaIA5yeRG06oXJBnJPjb63DuHtj9+uVkWIPbWVBn6tCFmCf6LuHphN
-emG9gcS96mA0nbcvgy+E3/LbXjFjZnkNEGjjUe1QZgxvEoE+TF9KJSH7/eCs+HeS
-Iy5tXZ54jqyyAYGQCBMS3uTeeMu8ivTjccevMBD3oh9rNwr1RcDgQ9neM5z1S+/Y
-DgvhZgMiF1rxMP7TYf3gamELTtreLz+6wgU1Ht1S7Lo40ZODwf3wOKVmvbU2cyGM
-xRGthsAJX1UUz1SfR0kiM31EMlUXQKVZ+0YEIjdWMg==
-=XVnu
+iQGcBAEBCAAGBQJTlE7gAAoJEJQzkH1pP7W4fgYL/26/2Vjj8lvOWFUScRhdFySC
+mQLSKowBFOUdsVN4NIG152Glb5nPcKk0y8kqidBtoS4MD5br/zpc/CC9WX2fwFuc
+xHduDM7qXsJxbHpi9llHTnl0IeTVjQVlcKWNk8aw8HiZ2YkN3rJWeW4TTCufDkbk
+epyb4nlJD/+k2AFuY5lvoibcflHDBcUNe8Fv7YGBwlZzOdRhp4DpXieO34CR78Qm
+JoPYKKUa8ans7BD9qMGTeqNM0pFLyrZVCZSlQrg8a9hulL2u7vsYx4Zb9D35KBbb
+Pc6erhZVMwE8CwvDiT8UQKng0lojY+VQWqpeowty75314UKly+CSDj2u/s/iNN+I
+blHqoeipB5W2/Mt5ILFmR9oHfcNLsAZPGYefHetOcVWjckdB6rWFEvd90yPFvVvb
+bYETv/5Ip1M7BWsaNDNtp/ZahJcZYmOe7iFaVo5+TSvPk7eaxEHQBBc+EAq6BSbc
+bwmrqSdK1ejoZaTk95GIE24k9H9woCi5DCDF8En6VA==
+=v8gc
-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-23.4-r6.ebuild b/app-editors/emacs/emacs-23.4-r6.ebuild
deleted file mode 100644
index f61612d5763b..000000000000
--- a/app-editors/emacs/emacs-23.4-r6.ebuild
+++ /dev/null
@@ -1,338 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r6.ebuild,v 1.9 2014/04/06 22:08:14 ulm Exp $
-
-EAPI=5
-WANT_AUTOMAKE="none"
-
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
- http://dev.gentoo.org/~ulm/emacs/${P}-patches-10.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="23"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses
- >=app-admin/eselect-emacs-1.2
- >=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?]
- net-libs/liblockfile
- hesiod? ( net-dns/hesiod )
- kerberos? ( virtual/krb5 )
- alsa? ( media-libs/alsa-lib )
- gpm? ( sys-libs/gpm )
- dbus? ( sys-apps/dbus )
- X? (
- x11-libs/libXmu
- x11-libs/libXt
- x11-misc/xbitmaps
- gconf? ( >=gnome-base/gconf-2.26.2 )
- gif? ( media-libs/giflib )
- jpeg? ( virtual/jpeg:0= )
- png? ( >=media-libs/libpng-1.4:0= )
- svg? ( >=gnome-base/librsvg-2.0 )
- tiff? ( media-libs/tiff )
- xpm? ( x11-libs/libXpm )
- xft? (
- media-libs/fontconfig
- media-libs/freetype
- x11-libs/libXft
- m17n-lib? (
- >=dev-libs/libotf-0.9.4
- >=dev-libs/m17n-lib-1.5.1
- )
- )
- gtk? ( x11-libs/gtk+:2 )
- !gtk? (
- motif? ( >=x11-libs/motif-2.3:0 )
- !motif? (
- Xaw3d? ( x11-libs/libXaw3d )
- !Xaw3d? ( athena? ( x11-libs/libXaw ) )
- )
- )
- )"
-
-DEPEND="${RDEPEND}
- alsa? ( virtual/pkgconfig )
- dbus? ( virtual/pkgconfig )
- X? ( virtual/pkgconfig )
- gzip-el? ( app-arch/gzip )
- pax_kernel? (
- sys-apps/attr
- sys-apps/paxctl
- )"
-
-RDEPEND="${RDEPEND}
- !<app-editors/emacs-vcs-${PV}"
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-# FULL_VERSION keeps the full version number, which is needed in
-# order to determine some path information correctly for copy/move
-# operations later on
-FULL_VERSION="${PV%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-
-src_prepare() {
- EPATCH_SUFFIX=patch epatch
- epatch_user
-
- sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
- || die "unable to sed ctags.1"
-
- if ! use alsa; then
- # ALSA is detected even if not requested by its USE flag.
- # Suppress it by supplying pkg-config with a wrong library name.
- sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
- || die "unable to sed configure.in"
- fi
- if ! use gzip-el; then
- # Emacs' build system automatically detects the gzip binary and
- # compresses el files. We don't want that so confuse it with a
- # wrong binary name
- sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
- || die "unable to sed configure.in"
- fi
-
- eautoreconf
-}
-
-src_configure() {
- strip-flags
- filter-flags -fstrict-aliasing
- append-flags $(test-flags -fno-strict-aliasing)
-
- if use sh; then
- replace-flags "-O[1-9]" -O0 #262359
- elif use ia64; then
- replace-flags "-O[2-9]" -O1 #325373
- else
- replace-flags "-O[3-9]" -O2
- fi
-
- local myconf
-
- if use alsa && ! use sound; then
- einfo "Although sound USE flag is disabled you chose to have alsa,"
- einfo "so sound is switched on anyway."
- myconf+=" --with-sound"
- else
- myconf+=" $(use_with sound)"
- fi
-
- if use X; then
- myconf+=" --with-x --without-ns"
- myconf+=" $(use_with gconf)"
- myconf+=" $(use_with toolkit-scroll-bars)"
- myconf+=" $(use_with gif)"
- myconf+=" $(use_with jpeg)"
- myconf+=" $(use_with png)"
- myconf+=" $(use_with svg rsvg)"
- myconf+=" $(use_with tiff)"
- myconf+=" $(use_with xpm)"
-
- if use xft; then
- myconf+=" --with-xft"
- myconf+=" $(use_with m17n-lib libotf)"
- myconf+=" $(use_with m17n-lib m17n-flt)"
- else
- myconf+=" --without-xft"
- myconf+=" --without-libotf --without-m17n-flt"
- use m17n-lib && ewarn \
- "USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
- fi
-
- # GTK+ is the default toolkit if USE=gtk is chosen with other
- # possibilities. Emacs upstream thinks this should be standard
- # policy on all distributions
- local f
- if use gtk; then
- einfo "Configuring to build with GIMP Toolkit (GTK+)"
- myconf+=" --with-x-toolkit=gtk"
- for f in motif Xaw3d athena; do
- use ${f} && ewarn \
- "USE flag \"${f}\" has no effect if \"gtk\" is set."
- done
- elif use motif; then
- einfo "Configuring to build with Motif toolkit"
- myconf+=" --with-x-toolkit=motif"
- for f in Xaw3d athena; do
- use ${f} && ewarn \
- "USE flag \"${f}\" has no effect if \"motif\" is set."
- done
- elif use athena || use Xaw3d; then
- einfo "Configuring to build with Athena/Lucid toolkit"
- myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
- else
- einfo "Configuring to build with no toolkit"
- myconf+=" --with-x-toolkit=no"
- fi
- elif use aqua; then
- einfo "Configuring to build with Nextstep (Cocoa) support"
- myconf+=" --with-ns --disable-ns-self-contained"
- myconf+=" --without-x"
- else
- myconf+=" --without-x --without-ns"
- fi
-
- # Save version information in the Emacs binary. It will be available
- # in variable "system-configuration-options".
- myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-
- # According to configure, this option is only used for GNU/Linux
- # (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
- # out the location because $(get_libdir) does not necessarily return
- # something that matches the host OS's libdir naming (e.g. RHEL).
- local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
- crtdir=${crtdir%/*}
-
- econf \
- --program-suffix="-${EMACS_SUFFIX}" \
- --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
- --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
- --with-crt-dir="${crtdir}" \
- --with-gameuser="${GAMES_USER_DED:-games}" \
- $(use_with hesiod) \
- $(use_with kerberos) $(use_with kerberos kerberos5) \
- $(use_with gpm) \
- $(use_with dbus) \
- ${myconf}
-}
-
-src_compile() {
- export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
- emake CC="$(tc-getCC)" \
- AR="$(tc-getAR) cq" \
- RANLIB="$(tc-getRANLIB)"
-}
-
-src_install () {
- emake DESTDIR="${D}" install
-
- rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
- || die "removing duplicate emacs executable failed"
- mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
- || die "moving Emacs executable failed"
-
- # move man pages to the correct place
- local m
- for m in "${ED}"/usr/share/man/man1/* ; do
- mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
- done
-
- # move info dir to avoid collisions with the dir file generated by portage
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
- || die "moving info dir failed"
- touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
- docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
- # avoid collision between slots, see bug #169033 e.g.
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
- rm -rf "${ED}"/usr/share/{applications,icons}
- rm -rf "${ED}"/var
-
- # remove unused <version>/site-lisp dir
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
- local cdir
- if use source; then
- cdir="/usr/share/emacs/${FULL_VERSION}/src"
- insinto "${cdir}"
- # This is not meant to install all the source -- just the
- # C source you might find via find-function
- doins src/*.{c,h,m}
- doins -r src/{m,s}
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
- elif has installsources ${FEATURES}; then
- cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
- fi
-
- sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
- X
- ;;; ${PN}-${SLOT} site-lisp configuration
- X
- (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
- Y (setq find-function-C-source-directory
- Y "${EPREFIX}${cdir}")
- X (let ((path (getenv "INFOPATH"))
- X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
- X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
- X (and path
- X ;; move Emacs Info dir before anything else in /usr/share/info
- X (let* ((p (cons nil (split-string path ":" t))) (q p))
- X (while (and (cdr q) (not (string-match re (cadr q))))
- X (setq q (cdr q)))
- X (setcdr q (cons dir (delete dir (cdr q))))
- X (setq Info-directory-list (prune-directory-list (cdr p)))))))
- EOF
- elisp-site-file-install "${T}/${SITEFILE}" || die
-
- dodoc README BUGS
-
- if use aqua; then
- dodir /Applications/Gentoo
- rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
- mv nextstep/Emacs.app \
- "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
- fi
-
- DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
- through the Emacs eselect module, which also redirects man and info
- pages. Therefore, several Emacs versions can be installed at the
- same time. \"man emacs.eselect\" for details.
- \\n\\nIf you upgrade from a previous major version of Emacs, then
- it is strongly recommended that you use app-admin/emacs-updater
- to rebuild all byte-compiled elisp files of the installed Emacs
- packages."
- use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
- Installing media-fonts/font-adobe-{75,100}dpi on the X server's
- machine would satisfy basic Emacs requirements under X11.
- See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
- 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."
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- # move Info dir file to correct name
- local infodir=/usr/share/info/${EMACS_SUFFIX} f
- if [[ -f ${ED}${infodir}/dir.orig ]]; then
- mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
- elif [[ -d "${ED}"${infodir} ]]; then
- # this should not happen in EAPI 4
- ewarn "Regenerating Info directory index in ${infodir} ..."
- rm -f "${ED}"${infodir}/dir{,.*}
- for f in "${ED}"${infodir}/*; do
- if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
- install-info --info-dir="${ED}"${infodir} "${f}" \
- || die "install-info failed"
- fi
- done
- fi
-}
-
-pkg_postinst() {
- elisp-site-regen
- readme.gentoo_print_elog
-
- if use livecd; then
- # force an update of the emacs symlink for the livecd/dvd,
- # because some microemacs packages set it with USE=livecd
- eselect emacs update
- else
- eselect emacs update ifunset
- fi
-}
-
-pkg_postrm() {
- elisp-site-regen
- eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-24.3-r2.ebuild b/app-editors/emacs/emacs-24.3-r2.ebuild
deleted file mode 100644
index 295201c92ceb..000000000000
--- a/app-editors/emacs/emacs-24.3-r2.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.3-r2.ebuild,v 1.21 2014/04/06 22:08:14 ulm Exp $
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz
- http://dev.gentoo.org/~ulm/emacs/${P}-patches-5.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="24"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses
- >=app-admin/eselect-emacs-1.2
- >=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?]
- net-libs/liblockfile
- hesiod? ( net-dns/hesiod )
- kerberos? ( virtual/krb5 )
- alsa? ( media-libs/alsa-lib )
- gpm? ( sys-libs/gpm )
- dbus? ( sys-apps/dbus )
- gnutls? ( net-libs/gnutls )
- libxml2? ( >=dev-libs/libxml2-2.2.0 )
- selinux? ( sys-libs/libselinux )
- X? (
- x11-libs/libXmu
- x11-libs/libXt
- x11-misc/xbitmaps
- gconf? ( >=gnome-base/gconf-2.26.2 )
- gsettings? ( >=dev-libs/glib-2.28.6 )
- gif? ( media-libs/giflib )
- jpeg? ( virtual/jpeg:0= )
- png? ( >=media-libs/libpng-1.4:0= )
- svg? ( >=gnome-base/librsvg-2.0 )
- tiff? ( media-libs/tiff )
- xpm? ( x11-libs/libXpm )
- imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
- xft? (
- media-libs/fontconfig
- media-libs/freetype
- x11-libs/libXft
- m17n-lib? (
- >=dev-libs/libotf-0.9.4
- >=dev-libs/m17n-lib-1.5.1
- )
- )
- gtk? (
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( x11-libs/gtk+:2 )
- )
- !gtk? (
- motif? ( >=x11-libs/motif-2.3:0 )
- !motif? (
- Xaw3d? ( x11-libs/libXaw3d )
- !Xaw3d? ( athena? ( x11-libs/libXaw ) )
- )
- )
- )"
-
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- alsa? ( virtual/pkgconfig )
- dbus? ( virtual/pkgconfig )
- gnutls? ( virtual/pkgconfig )
- libxml2? ( virtual/pkgconfig )
- X? ( virtual/pkgconfig )
- gzip-el? ( app-arch/gzip )
- pax_kernel? (
- sys-apps/attr
- sys-apps/paxctl
- )"
-
-RDEPEND="${RDEPEND}
- !<app-editors/emacs-vcs-${PV}"
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-# FULL_VERSION keeps the full version number, which is needed in
-# order to determine some path information correctly for copy/move
-# operations later on
-FULL_VERSION="${PV%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-
-src_prepare() {
- EPATCH_SUFFIX=patch epatch
- epatch_user
-
- sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
- || die "unable to sed ctags.1"
-
- if ! use alsa; then
- # ALSA is detected even if not requested by its USE flag.
- # Suppress it by supplying pkg-config with a wrong library name.
- sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.ac \
- || die "unable to sed configure.ac"
- fi
- if ! use gzip-el; then
- # Emacs' build system automatically detects the gzip binary and
- # compresses el files. We don't want that so confuse it with a
- # wrong binary name
- sed -i -e "/AC_PATH_PROG/s/gzip/PrEvEnTcOmPrEsSiOn/" configure.ac \
- || die "unable to sed configure.ac"
- fi
-
- AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
- strip-flags
-
- if use sh; then
- replace-flags "-O[1-9]" -O0 #262359
- elif use ia64; then
- replace-flags "-O[2-9]" -O1 #325373
- else
- replace-flags "-O[3-9]" -O2
- fi
-
- local myconf
-
- if use alsa && ! use sound; then
- einfo "Although sound USE flag is disabled you chose to have alsa,"
- einfo "so sound is switched on anyway."
- myconf+=" --with-sound"
- else
- myconf+=" $(use_with sound)"
- fi
-
- if use X; then
- myconf+=" --with-x --without-ns"
- myconf+=" $(use_with gconf)"
- myconf+=" $(use_with gsettings)"
- myconf+=" $(use_with toolkit-scroll-bars)"
- myconf+=" $(use_with gif)"
- myconf+=" $(use_with jpeg)"
- myconf+=" $(use_with png)"
- myconf+=" $(use_with svg rsvg)"
- myconf+=" $(use_with tiff)"
- myconf+=" $(use_with xpm)"
- myconf+=" $(use_with imagemagick)"
-
- if use xft; then
- myconf+=" --with-xft"
- myconf+=" $(use_with m17n-lib libotf)"
- myconf+=" $(use_with m17n-lib m17n-flt)"
- else
- myconf+=" --without-xft"
- myconf+=" --without-libotf --without-m17n-flt"
- use m17n-lib && ewarn \
- "USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
- fi
-
- local f
- if use gtk; then
- einfo "Configuring to build with GIMP Toolkit (GTK+)"
- myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
- for f in motif Xaw3d athena; do
- use ${f} && ewarn \
- "USE flag \"${f}\" has no effect if \"gtk\" is set."
- done
- elif use motif; then
- einfo "Configuring to build with Motif toolkit"
- myconf+=" --with-x-toolkit=motif"
- for f in Xaw3d athena; do
- use ${f} && ewarn \
- "USE flag \"${f}\" has no effect if \"motif\" is set."
- done
- elif use athena || use Xaw3d; then
- einfo "Configuring to build with Athena/Lucid toolkit"
- myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
- else
- einfo "Configuring to build with no toolkit"
- myconf+=" --with-x-toolkit=no"
- fi
- elif use aqua; then
- einfo "Configuring to build with Nextstep (Cocoa) support"
- myconf+=" --with-ns --disable-ns-self-contained"
- myconf+=" --without-x"
- else
- myconf+=" --without-x --without-ns"
- fi
-
- # Save version information in the Emacs binary. It will be available
- # in variable "system-configuration-options".
- myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-
- # According to configure, this option is only used for GNU/Linux
- # (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
- # out the location because $(get_libdir) does not necessarily return
- # something that matches the host OS's libdir naming (e.g. RHEL).
- local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
- crtdir=${crtdir%/*}
-
- econf \
- --program-suffix="-${EMACS_SUFFIX}" \
- --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
- --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
- --with-crt-dir="${crtdir}" \
- --with-gameuser="${GAMES_USER_DED:-games}" \
- --without-compress-info \
- $(use_with hesiod) \
- $(use_with kerberos) $(use_with kerberos kerberos5) \
- $(use_with gpm) \
- $(use_with dbus) \
- $(use_with gnutls) \
- $(use_with libxml2 xml2) \
- $(use_with selinux) \
- $(use_with wide-int) \
- ${myconf}
-}
-
-src_compile() {
- export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
- emake
-}
-
-src_install () {
- emake DESTDIR="${D}" NO_BIN_LINK=t install
-
- mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
- || die "moving emacs executable failed"
-
- # move info dir to avoid collisions with the dir file generated by portage
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
- || die "moving info dir failed"
- touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
- docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
- # avoid collision between slots, see bug #169033 e.g.
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
- rm -rf "${ED}"/usr/share/{applications,icons}
- rm -rf "${ED}"/var
-
- # remove unused <version>/site-lisp dir
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
- local cdir
- if use source; then
- cdir="/usr/share/emacs/${FULL_VERSION}/src"
- insinto "${cdir}"
- # This is not meant to install all the source -- just the
- # C source you might find via find-function
- doins src/*.{c,h,m}
- elif has installsources ${FEATURES}; then
- cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
- fi
-
- sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
- X
- ;;; ${PN}-${SLOT} site-lisp configuration
- X
- (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
- Y (setq find-function-C-source-directory
- Y "${EPREFIX}${cdir}")
- X (let ((path (getenv "INFOPATH"))
- X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
- X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
- X (and path
- X ;; move Emacs Info dir before anything else in /usr/share/info
- X (let* ((p (cons nil (split-string path ":" t))) (q p))
- X (while (and (cdr q) (not (string-match re (cadr q))))
- X (setq q (cdr q)))
- X (setcdr q (cons dir (delete dir (cdr q))))
- X (setq Info-directory-list (prune-directory-list (cdr p)))))))
- EOF
- elisp-site-file-install "${T}/${SITEFILE}" || die
-
- dodoc README BUGS
-
- if use aqua; then
- dodir /Applications/Gentoo
- rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
- mv nextstep/Emacs.app \
- "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
- fi
-
- DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
- through the Emacs eselect module, which also redirects man and info
- pages. Therefore, several Emacs versions can be installed at the
- same time. \"man emacs.eselect\" for details.
- \\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
- strongly recommended that you use app-admin/emacs-updater to rebuild
- all byte-compiled elisp files of the installed Emacs packages."
- use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
- Installing media-fonts/font-adobe-{75,100}dpi on the X server's
- machine would satisfy basic Emacs requirements under X11.
- See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
- 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."
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- # move Info dir file to correct name
- local infodir=/usr/share/info/${EMACS_SUFFIX} f
- if [[ -f ${ED}${infodir}/dir.orig ]]; then
- mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
- elif [[ -d "${ED}"${infodir} ]]; then
- # this should not happen in EAPI 4
- ewarn "Regenerating Info directory index in ${infodir} ..."
- rm -f "${ED}"${infodir}/dir{,.*}
- for f in "${ED}"${infodir}/*; do
- if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
- install-info --info-dir="${ED}"${infodir} "${f}" \
- || die "install-info failed"
- fi
- done
- fi
-}
-
-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
- # force an update of the emacs symlink for the livecd/dvd,
- # because some microemacs packages set it with USE=livecd
- eselect emacs update
- else
- eselect emacs update ifunset
- fi
-}
-
-pkg_postrm() {
- elisp-site-regen
- eselect emacs update ifunset
-}