From: Ulrich Müller Date: Fri, 6 Jan 2012 21:15:28 +0000 (+0000) Subject: Remove old. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6f9c09afe0434bf30f33788d99582d8b275304f4;p=gentoo.git Remove old. Package-Manager: portage-2.1.10.44/cvs/Linux x86_64 --- diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index af54b1ab8f47..e1e5c3d1440b 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.458 2012/01/06 16:40:00 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.459 2012/01/06 21:15:28 ulm Exp $ + + 06 Jan 2012; Ulrich Mueller -emacs-23.3-r1.ebuild: + Remove old. 06 Jan 2012; Mark Loeser emacs-23.3-r2.ebuild: Stable for ppc64; bug #384297 diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index ea757b5136f6..1126883689e9 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -8,7 +8,6 @@ DIST emacs-21.4-patches-12.tar.bz2 13207 RMD160 1a35ce8b479ab783b3bf2d827bbae98c DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a SHA1 cdb33731180fe4a912838af805dd35e3f55394d4 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216 DIST emacs-22.3-patches-8.tar.bz2 5974 RMD160 a17c6e291b6c0d246d30a27baceaa882b12a1250 SHA1 fbb03538973be5f416edbffebc567f6346caef4b SHA256 72a68bd14ce2efd52b0425c56649d735f4b3c0e630de73e0eb51ddf947d56ff7 DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 SHA1 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16 -DIST emacs-23.3-patches-1.tar.bz2 1675 RMD160 f167c15e8d1c6a9629967aa3f910cc476e22315e SHA1 51522c8af1c0991ef189f8537e6636f7e1b30553 SHA256 caec6e052a564e75de2873e2d0e4ffb8169bde3c4f786e1a04b8781df31456fe DIST emacs-23.3-patches-2.tar.bz2 1936 RMD160 c1cbe26f05e68efe0768445a3918892e995a59dd SHA1 3f55305dab83084b01f8958371d4e0fd4114b88b SHA256 403f88c0b814817734f275e6ee6ff4c8f27858a2429ea7d0a029c2d89ebaa5de DIST emacs-23.3-patches-3.tar.bz2 14783 RMD160 5a609bfded363d63f6146c482881d63ea6fe8b08 SHA1 da25e5ab9e5c10d36fdffe17ee3825822f8618b7 SHA256 1c8b404d52a5f66861e1533c785642c5c0a371d55287b5df7d9c2587a24d1bbd DIST emacs-23.3a.tar.bz2 38748283 RMD160 21f201714bca420c3a8fed8c92058cec786e724e SHA1 795bdfa372e42b9589a80f6dcb2ad8fed65b90e4 SHA256 9f4beee3bf4987914d57851c0aac017cb92a1410c2b31ba313265c64a38cc6ba @@ -18,25 +17,24 @@ EBUILD emacs-21.4-r23.ebuild 5010 RMD160 2b7019a59d7ba82a320c8464c3c2b6c098410b5 EBUILD emacs-21.4-r24.ebuild 5241 RMD160 70117c0c7a53e2ffe4b8a03e913ba84c408889ea SHA1 5c9a5b3f00f4870af54b77c8bc6112d38b6414a8 SHA256 59342c8f7c3d6b7f2e5c891289f129168cda39b801028648e078acee24a4cb66 EBUILD emacs-22.3-r8.ebuild 7832 RMD160 d74e25b91dbe8783930d1647dec3cf8e44b49b17 SHA1 92e6d6b50578faf6f669e6b2389d7599712048e9 SHA256 b9a75b8b6f468f984441ab725779ff581c8ddbfa14ccff404cc11381d0db741b EBUILD emacs-22.3-r9.ebuild 7985 RMD160 01594bd1319b9a671374ffab8bdbdaee8d105013 SHA1 e39dea23803b36ca9c64bfe8600cdd6b8169825e SHA256 e955fa03e9c33411301b1b24559669319a5a5397d113f6c01e6a78cc81f1d14a -EBUILD emacs-23.3-r1.ebuild 10301 RMD160 885b752594822d1425e3afe95e997ea9fb5a2776 SHA1 90bcec933661eb0f5066a6ae679ecdb6b7ac42d0 SHA256 93cf3fe5516ed9b9f0e06ae9de0472e55c47d89d0c7824da5269e71d548e4d0c EBUILD emacs-23.3-r2.ebuild 10658 RMD160 63927365f7e2a728bba68b9fa3d3e83bf6733e56 SHA1 887baad945d4c248954fc6b7a9261a85184dca3d SHA256 4cd619f0697ba1a8f26c73e787f0b05a6ed258f99c513ed1fc4f107e65ff0342 EBUILD emacs-23.3-r3.ebuild 10481 RMD160 626fe3cf524bfeec60bc676e4a176a3748695a72 SHA1 580d3ad9d18985aee0c3b79e003268253e394312 SHA256 509469ab61b087b6893d2ea3e19a664e427570fad2e9860d2fade2346a0891d8 -MISC ChangeLog 65501 RMD160 c6de1744599698b0abc73a4084f91178793da5da SHA1 c501d08b31fea5a070a88b3f72db0616af6b8df1 SHA256 fb100fa55ef59573c1c8daf6d2c3e01e7f79b2ebe98536597c6c390f42ad92b5 +MISC ChangeLog 65582 RMD160 bc74af384bc268cb30c6f2809483f115242f63a6 SHA1 cc3c0c6fb1a8f52438adde5806fdf28741c9c371 SHA256 f30c0348c56b42a6432691c64de4366cd7d7edce506b762e0072abc2135a7035 MISC metadata.xml 1644 RMD160 911d63b0a921d248984f3c5efeb1922f05aa5111 SHA1 7281388d7c274016274e888d97821fda9e5c958c SHA256 7c703ad3af721dfa1d9737f78cd848b7c69a7b906ead5c5fe8fd1db23a1d3166 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJPByPyAAoJEPTTRK0uRVaNsekQAJmhFv1pZTEy+lwQiOsSEToR -ZAU2XBUSxcuLykSh2Mpuut++UCUYGTFl4Y0VcrWe6R1UahxLIIibJg4JP2DWDiLl -y+AVY4K+WYd+Hnz+jCNuvp+u5DHMNaDa4FY8lyB3t3ZdHK9jMzCl/LQreXowdBGs -yAnPx8lTC3TQVgP0toqvD1b+U0yX8HpNIsGXJUcVzqdI0pJO2eJYPcfght3clvAT -NfNQtlH6hqb6PoMpcpcHhTyIBcUbdjrHzCaP1NIV32zAK/QFM0cMhvqv0o6Emmp3 -uHj5dkWoQNVYCiFrG90p5Y7/YPnZ/3Nf8m7mbnc/3e2sctUNqcIqHKR3eWlolCoG -rXd4rndvRTUaFOeOSsLaVdizEOeRHxE1/7ul0MRwHOXnj5Lf2h0+K7SZODpQyd9c -cmLifBFLs2mLdZcc7qL3IWqep19iVpJ1dol90UvNrQu2gjaP5PjZ856wBF14Tbc+ -rU/f5IGj4vTquxNQ2RWkUp9RWhUzLoVyGLLUac3fXzH5e5QQ4ULDPC9PhI/x9qn4 -Ds9Yb3ez4x6tnJa96Ugl2x0lnahyQeeXcjvpz8/8letk8GZl81p1cdxzHzqxE0IS -WkT9bKrRENiUln8K4JBS1eRHmiIdL7rQA98Vd0OkBfOJhfof/rA8cs6YPooylQoB -x5ef/kVxXc/rBhJZlhq9 -=Nzry +iQIcBAEBAgAGBQJPB2R2AAoJEDxpGckxwJCBmoEP/2TZSyHaDM/z/tQuAxnKKxKM +3/AZNbl1CcNMKesh3c7fXAHGm0raT8QJCSYCJmKyGvAv0PY4So/GGlM500fMdNCa +fAOUBFggM/AB6kThTqDDFWHxlPhONCEtjpk298i68UeN7SFoxv/WN0zZiKXOcyMX +6G+Tlw7VdifxjiHYNSK17oAX4RYdzeQDdONmr8R64XoB1WNx0vAksYvg/sXWwG8a +ztR1pxaB+xSVAMMeIQLUtDMvsFjntqDrmYzL85dW5yRbTwdMhtwGpN3LDsE85l5l +dZgxtgttK/wKMl8ALJ5HoIGGi7g+3KKRpWiMVigymfRoDce9kasKs1bOGimkTGbf +8Fgx2LSj0A2V3nJGyeuINr5zWj9pkqK3mjhoAynMky1TmHvAvkuSilfSuYR9JfEZ +twEv2ZDDkc5OhM0eTltYhMaOudMIyJBdxIhW5ZAVOyUvb+UuMVCHkmWsBIVRuSnM +Lu7zELhLz0vYW0R97M7SthaRuy0rjY8np+s9WMHAkZ7WSZa/4w6MSil49PwjyUOi +P3qxxTOv0d/05OIzr4SXW9Hcbsxyh5YAKRdZu7NvM8gYlZUcIM8UzpaDNPdHyaRj +CnRwNSXEFyeKpjvDi5MYcqvG3IVSfIkcHHhBDQ8Hmp6MmHGIojDB/AYxPI1pCacY +bGiZQ9VzvcsOig5imbcW +=mqni -----END PGP SIGNATURE----- diff --git a/app-editors/emacs/emacs-23.3-r1.ebuild b/app-editors/emacs/emacs-23.3-r1.ebuild deleted file mode 100644 index aa5041e6121f..000000000000 --- a/app-editors/emacs/emacs-23.3-r1.ebuild +++ /dev/null @@ -1,324 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r1.ebuild,v 1.4 2011/12/06 13:44:27 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}a.tar.bz2 - mirror://gentoo/${P}-patches-1.tar.bz2" - -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 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 )" -RESTRICT="strip" - -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? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) - ) - )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - gzip-el? ( app-arch/gzip )" - -RDEPEND="${RDEPEND} - !=app-emacs/emacs-common-gentoo-1[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 - - 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 - echo - einfo "Although sound USE flag is disabled you chose to have alsa," - einfo "so sound is switched on anyway." - echo - 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)" - myconf="${myconf} $(use_with xft)" - - if use xft; then - myconf="${myconf} $(use_with m17n-lib libotf)" - myconf="${myconf} $(use_with m17n-lib m17n-flt)" - else - myconf="${myconf} --without-libotf --without-m17n-flt" - use m17n-lib && ewarn \ - "USE flag \"m17n-lib\" has no effect because 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" - elif use Xaw3d; then - einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit" - myconf="${myconf} --with-x-toolkit=athena" - 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 - - local f tk= - for f in gtk Xaw3d motif; do - use ${f} || continue - [ "${tk}" ] \ - && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")" - tk="${tk}${tk:+ }${f}" - done - 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} \ - --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)" -} - -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 - - 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/*.[ch] - 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 - einfo "Emacs${EMACS_SUFFIX#emacs}.app is in ${EPREFIX}/Applications/Gentoo." - einfo "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 - echo - 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." - fi - - echo - 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." - echo - 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 -}