diff options
author | 2012-02-10 16:30:40 +0000 | |
---|---|---|
committer | 2012-02-10 16:30:40 +0000 | |
commit | 10facd595fd1579b4399709bd0a23f08b7430415 (patch) | |
tree | 7e2447923cbbdc7179d12a44e5b1534d4192d193 /app-editors | |
parent | Mask USE="q64" for media-gfx/imagemagick wrt #401327 and #402999 (diff) | |
download | historical-10facd595fd1579b4399709bd0a23f08b7430415.tar.gz historical-10facd595fd1579b4399709bd0a23f08b7430415.tar.bz2 historical-10facd595fd1579b4399709bd0a23f08b7430415.zip |
Remove old.
Package-Manager: portage-2.1.10.45/cvs/Linux x86_64
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/emacs/ChangeLog | 5 | ||||
-rw-r--r-- | app-editors/emacs/Manifest | 30 | ||||
-rw-r--r-- | app-editors/emacs/emacs-23.4.ebuild | 335 |
3 files changed, 18 insertions, 352 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index 6d2d3c68a8d9..4ec8cbc95b81 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-editors/emacs # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.473 2012/01/31 01:53:59 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.474 2012/02/10 16:30:40 ulm Exp $ + + 10 Feb 2012; Ulrich Müller <ulm@gentoo.org> -emacs-23.4.ebuild: + Remove old. *emacs-23.4-r1 (30 Jan 2012) diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index 451f3eb0154a..a190ac292d93 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -10,7 +10,6 @@ DIST emacs-22.3-patches-8.tar.bz2 5974 RMD160 a17c6e291b6c0d246d30a27baceaa882b1 DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 SHA1 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16 DIST emacs-23.3-patches-4.tar.bz2 19275 RMD160 9a5d61bcf60422efd44efc5f206d9baf8e742bd6 SHA1 695d786f1d43ddbc0c269c780a43cfed9aeb35f0 SHA256 0d4393e221b78bd97c39a10f6e4206d2dbbcee7062e9626d37a3a45c72b34636 DIST emacs-23.3a.tar.bz2 38748283 RMD160 21f201714bca420c3a8fed8c92058cec786e724e SHA1 795bdfa372e42b9589a80f6dcb2ad8fed65b90e4 SHA256 9f4beee3bf4987914d57851c0aac017cb92a1410c2b31ba313265c64a38cc6ba -DIST emacs-23.4-patches-1.tar.bz2 1307 RMD160 b61676bcba3fe869953314f220c0eb4b2de4ff6c SHA1 a58c74dfb6851a664b06ef3243b89c563d173615 SHA256 cb568471e42624cde324cb43c37edf15bb8bfa471e5a6fd1c0cd46445467a2f5 DIST emacs-23.4-patches-2.tar.bz2 1535 RMD160 7b991a627c60a7b26134ef4bc8b4e4062a045ea3 SHA1 fa2682743653fac475f3c8dd9e9ebf3dafa43edd SHA256 ee12b40d769497b98b609933f9f122f9b45873ac84447832930158822f52f920 DIST emacs-23.4.tar.bz2 38646508 RMD160 564d31fabc205b9ee4789827ef50d2b0f0461bf7 SHA1 5effbd2af6bf7a4feb2d80810e49b0ce47b463cb SHA256 26576f9e664397c729f78f5ffcd092969251988461896fe8793062346ee988b9 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b @@ -19,23 +18,22 @@ EBUILD emacs-21.4-r24.ebuild 5241 RMD160 70117c0c7a53e2ffe4b8a03e913ba84c408889e EBUILD emacs-22.3-r9.ebuild 7985 RMD160 01594bd1319b9a671374ffab8bdbdaee8d105013 SHA1 e39dea23803b36ca9c64bfe8600cdd6b8169825e SHA256 e955fa03e9c33411301b1b24559669319a5a5397d113f6c01e6a78cc81f1d14a EBUILD emacs-23.3-r4.ebuild 10912 RMD160 d90a6c60faa1efb6c6c61e5e44667d0debda88b2 SHA1 e471c10c30fa3491f2184c67f0d76faf5b09aee5 SHA256 9e767eba656352da6e2287a436ce559c5eddb535928f2be50dc71f26278b1e21 EBUILD emacs-23.4-r1.ebuild 10922 RMD160 a2683a17fd804b6745e98e14e696a9a3dc75ca92 SHA1 3948f0d38a0cbe8a4d2855694868bcae598ea5a5 SHA256 bff2d916fcfd8c1e6efcdabdacc404a93162f8cb10337a4553ae69ed0f71b166 -EBUILD emacs-23.4.ebuild 10919 RMD160 4f48fab2a57ff1fc787ab14357430e75998fb3a5 SHA1 bc79daa34cb9ac988307384012c3094d15a54286 SHA256 efcbaed85f0fc2d77134a85f667f470a3fa3817cee5e63b1eb8a27c209c5cdf1 -MISC ChangeLog 67385 RMD160 e004aff8ff73f0288faf34c44f0b7dda4947be69 SHA1 ad9b983f1651008014f678daaf831ee1c9f4f76a SHA256 61e39efb9c9f3586491850637b7b166c0e3cf1d2b4f3526a002a27ad8678f26e +MISC ChangeLog 67467 RMD160 3b9c23cc8428a0f75c412b4eb9154137d2f62a77 SHA1 74dd9b2fb9d7659a835027841e62ebeb2626dd50 SHA256 2522392e3b407d9b5f8825caaf9f9ef7c75bd3588beaf0b29c3ecbd043dcd96a MISC metadata.xml 1644 RMD160 911d63b0a921d248984f3c5efeb1922f05aa5111 SHA1 7281388d7c274016274e888d97821fda9e5c958c SHA256 7c703ad3af721dfa1d9737f78cd848b7c69a7b906ead5c5fe8fd1db23a1d3166 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJPJ0oaAAoJEDxpGckxwJCBQ6UQAJw2pqO70osBmXqY7viazWFq -w14Ah7XG2i5LtGmIeWBLbh0ibZrYhico26f3YTmEQJ64X8uv6UcyN9VtAbib6dDE -evgtYfTU+OrbMCRUvTMmkUEjwx4wd0TvpGXaC6XAtCNHgj5racJpPZItHLEc7jZO -KBsT3XMv3Vc5Et6/sFMcYXqUnO6OsCtSILBmL79sDEgeD5rgEbIsLklceq7dzDva -gPw8qXPWyw5EZCMlJ6ZvB6q7dEP1PYzXkLx60EFrGo8A5fp/b9oR4oM2KCpzRz8K -8gmiUzvPoZcRW1d9KHBy9MFOrTMS8A+PjI92/HtDMb7KDna7fHaSIfHBD7kSzOK9 -YbSxuVjV213vb2x1wMx/FmscZLnHEKqbYO6e7HlnmhdggwlZbITmgLrV+IKLfG4d -cZLJjuiHBfDm5fmzZxbYLYlP6NoD/1WRJg1C8jbkz8YTNEEPGPdPYuOKi3tn9goI -1vRJWy9sMEDiG2zCORB1OJBYZWuTQGKjYaxqhQ26XlwsiYgRzjc2hvhT7Qk7fcXz -JM5WBs91BfM/w0gplpKEnJusidPiqbGKKtv/6YBPfkp4abWm2SdCWKzV/HiAI0ig -3PXQoCc4hbx4LeRFMQQanE9sonb2+b7k8OOjBuQ/X+iWNG0u/Ho/Wyo9MZUpcn33 -Ns2tt/h2dSp9c3ba6emx -=pu0B +iQIcBAEBAgAGBQJPNUZ/AAoJEDxpGckxwJCB0xMP/0sec0TWGrwJjIUNx0CwdOkK +myAeaY+5fSMeBt4GJLwPHAEyLAp9PlnuoNu8K+/zx/j2ayHjPjSlHBDq+57JqbeX +cIsx6Ndyc8dH9lG95UqEqGT8CYSOhPjdPuRjUFOhiu56F/Z9EvL9R3pIh9WX7as0 +JPQ7LK/azzzEvL1I24BOaVY0KWrc3NU0ThHVqDokWnq2oP9YYzsWcTlb0xu9sNcD +tuB2PWFxNFNafY2Sf5PcUZ7p4Z17YCpSYjvJ0abpQJGqBW0kIhtda1AZzqzwCgqw +C8HEUx/O1LqYUq77DY/Wk1d8zNtGW1z93p4yckoDqoCDnNso/JkZcQBWBEwtO7nK +4/mbQ+RFE2uVoWYi+Q/PpgOnuTSPUvMuryP1T5+1qPcOxfd1+0uzcoQfe3mWSnGJ +B9Ro03TwIz4IHS5trOr79jotxyrgM4j7zY9OINa4LU8EYzUisxv3u7v/5nu+1qfI +jPpSCjyAq7z5Qi2UPvAsV3dhfbdfzEOzfenAO8C6YCKPgGOzVgXwWQzMYH711of4 +VYiTB29cNGD8fw1g/oMDRht1qc2umP1GYIIXak6ogDf27/WcsYT6PqIo5XnxYd7W +dX4meWsaRMTZ+xdeSdN8JwzmmX5GJg94qQxLG+cYayAKBfuocefKXsktOKnum0dr +DvY1bCqHbbMA0QrBpd0d +=P1ge -----END PGP SIGNATURE----- diff --git a/app-editors/emacs/emacs-23.4.ebuild b/app-editors/emacs/emacs-23.4.ebuild deleted file mode 100644 index 4efd1a56bf8f..000000000000 --- a/app-editors/emacs/emacs-23.4.ebuild +++ /dev/null @@ -1,335 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4.ebuild,v 1.1 2012/01/28 12:00:53 ulm Exp $ - -EAPI=4 -WANT_AUTOMAKE="none" - -inherit autotools elisp-common eutils flag-o-matic multilib - -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 - mirror://gentoo/${P}-patches-1.tar.bz2" - -LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2" -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" -REQUIRED_USE="aqua? ( !X )" - -RDEPEND="sys-libs/ncurses - >=app-admin/eselect-emacs-1.2 - 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 ) - 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? ( - Xaw3d? ( x11-libs/libXaw3d ) - !Xaw3d? ( - athena? ( x11-libs/libXaw ) - !athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) - ) - ) - )" - -DEPEND="${RDEPEND} - alsa? ( dev-util/pkgconfig ) - dbus? ( dev-util/pkgconfig ) - X? ( dev-util/pkgconfig ) - gzip-el? ( app-arch/gzip )" - -RDEPEND="${RDEPEND} - !<app-editors/emacs-vcs-${PV} - >=app-emacs/emacs-common-gentoo-1.3[X?]" - -EMACS_SUFFIX="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 "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \ - -e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \ - "${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings" - - 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() { - ALLOWED_FLAGS="" - 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="${myconf} --with-sound" - else - myconf="${myconf} $(use_with sound)" - fi - - if use X; then - myconf="${myconf} --with-x --without-ns" - myconf="${myconf} $(use_with gconf)" - myconf="${myconf} $(use_with toolkit-scroll-bars)" - myconf="${myconf} $(use_with gif) $(use_with jpeg)" - myconf="${myconf} $(use_with png) $(use_with svg rsvg)" - myconf="${myconf} $(use_with tiff) $(use_with xpm)" - - if use xft; then - myconf="${myconf} --with-xft" - myconf="${myconf} $(use_with m17n-lib libotf)" - myconf="${myconf} $(use_with m17n-lib m17n-flt)" - else - myconf="${myconf} --without-xft" - myconf="${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 - if use gtk; then - einfo "Configuring to build with GIMP Toolkit (GTK+)" - myconf="${myconf} --with-x-toolkit=gtk" - local f - for f in athena Xaw3d motif; do - use ${f} && ewarn "USE flag \"${f}\" ignored" \ - "(superseded by \"gtk\")" - done - elif use athena || use Xaw3d; then - einfo "Configuring to build with Athena/Lucid toolkit" - myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" - use motif && ewarn "USE flag \"motif\" ignored" \ - "(superseded by \"athena\" or \"Xaw3d\")" - elif use motif; then - einfo "Configuring to build with Motif toolkit" - myconf="${myconf} --with-x-toolkit=motif" - else - einfo "Configuring to build with no toolkit" - myconf="${myconf} --with-x-toolkit=no" - fi - elif use aqua; then - einfo "Configuring to build with Cocoa support" - myconf="${myconf} --with-ns --disable-ns-self-contained" - myconf="${myconf} --without-x" - else - myconf="${myconf} --without-x --without-ns" - fi - - # 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 - # set last component of emacs-version to (package revision + 1) - touch src/emacs-${FULL_VERSION}.${PR#r} - emake CC="$(tc-getCC)" -} - -src_install () { - local i m - - emake install DESTDIR="${D}" - - 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 - 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 "${ED}"/var/lib/games/emacs/{snake,tetris}-scores - keepdir /var/lib/games/emacs - - # remove unused <version>/site-lisp dir - rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp - - local c=";;" - if use source; then - insinto /usr/share/emacs/${FULL_VERSION}/src - # 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 - c="" - fi - - sed 's/^X//' >"${T}/${SITEFILE}" <<-EOF - X - ;;; ${PN}-${SLOT} site-lisp configuration - X - (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) - X ${c}(setq find-function-C-source-directory - X ${c} "${EPREFIX}/usr/share/emacs/${FULL_VERSION}/src") - 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 - elog "Emacs${EMACS_SUFFIX#emacs}.app is in ${EPREFIX}/Applications/Gentoo." - elog "You may want to copy or symlink it into /Applications by yourself." - fi -} - -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" - else - # 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() { - local f - for f in "${EROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do - [[ -e ${f} ]] || touch "${f}" - done - chown "${GAMES_USER_DED:-games}" "${EROOT}"/var/lib/games/emacs - - elisp-site-regen - - 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 - - if use X; then - elog "You need to install some fonts for Emacs." - elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's" - elog "machine would satisfy basic Emacs requirements under X11." - elog "See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml" - elog "for how to enable anti-aliased fonts." - elog - fi - - elog "You can set the version to be started by /usr/bin/emacs through" - elog "the Emacs eselect module, which also redirects man and info pages." - elog "Therefore, several Emacs versions can be installed at the same time." - elog "\"man emacs.eselect\" for details." - elog - elog "If you upgrade from a previous major version of Emacs, then it is" - elog "strongly recommended that you use app-admin/emacs-updater to rebuild" - elog "all byte-compiled elisp files of the installed Emacs packages." -} - -pkg_postrm() { - elisp-site-regen - eselect emacs update ifunset -} |