From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 396A259CA5 for ; Sat, 19 Mar 2016 17:19:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F93721C001; Sat, 19 Mar 2016 17:19:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EF7E621C001 for ; Sat, 19 Mar 2016 17:19:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7F60A340A9E for ; Sat, 19 Mar 2016 17:19:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 578DF822 for ; Sat, 19 Mar 2016 17:19:05 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1458407902.ac41a6b03cb56dcfd7fb76ed2ab358688f06d539.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/emacs/Manifest app-editors/emacs/emacs-18.59-r10.ebuild X-VCS-Directories: app-editors/emacs/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: ac41a6b03cb56dcfd7fb76ed2ab358688f06d539 X-VCS-Branch: master Date: Sat, 19 Mar 2016 17:19:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0568b04d-61c1-4656-aaf6-91a0132246cb X-Archives-Hash: 14d57e387a2556389990546f546c31fc commit: ac41a6b03cb56dcfd7fb76ed2ab358688f06d539 Author: Ulrich Müller gentoo org> AuthorDate: Sat Mar 19 17:18:22 2016 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sat Mar 19 17:18:22 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac41a6b0 app-editors/emacs: Remove old. Package-Manager: portage-2.2.28 app-editors/emacs/Manifest | 1 - app-editors/emacs/emacs-18.59-r10.ebuild | 151 ------------------------------- 2 files changed, 152 deletions(-) diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index b99b34a..645c976 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -1,5 +1,4 @@ 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-patches-9.tar.xz 21380 SHA256 69411c57b20850e8aab1e20614437f9a836c2ddf47c46a833d0262c138fa3270 SHA512 595a4a7a4052c3b3325e4d4952eed24c98d3dd62b7ce89bd149f046552e2dd67ec3e720b7559fbc086b06a667c992bccc60201ef53b263dbd0fc96cbcdceee38 WHIRLPOOL 23f803d940c35fe9519fe7169e6bca7012c2d2db2246dec121fba37e8dbf39f411a9e579a9cbd4193562da72b9ac226286ad687877ccadd7cb78ea7eb615ab3f DIST emacs-18.59.tar.gz 2962652 SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33 WHIRLPOOL 5e98e71518f665e2a8278afe54e0ace6d7fdd9df23ff0a3354ffc1d5cc25cd21b0dd4d82766fcb436d4f24e9291c933295e956e1ffea43cfeedf915175763be6 DIST emacs-23.4-patches-17.tar.xz 16164 SHA256 bc9d4a36239f2749e218d903b67102e211a3a62ef162f5ab2801865dab77b752 SHA512 ceccd559b4f53328d75016b64d246ecf6fca7edebd080ce3bbba5f4d000bec38be5da91f3195c972ede0710da14b3be0545891321259b0a0b2963981c8fd62de WHIRLPOOL 4b70ce4d876e92a006e3dc0a31301f604aa8fa53a198515d1cbb3517a94933b1d7a11636494c1bd28ad1049a5a233d4ec13213e74e1eaff1cf96bb1fd095c345 diff --git a/app-editors/emacs/emacs-18.59-r10.ebuild b/app-editors/emacs/emacs-18.59-r10.ebuild deleted file mode 100644 index c2bd175..0000000 --- a/app-editors/emacs/emacs-18.59-r10.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils toolchain-funcs flag-o-matic multilib - -DESCRIPTION="The extensible self-documenting text editor" -HOMEPAGE="https://www.gnu.org/software/emacs/" -SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz - ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz - https://dev.gentoo.org/~ulm/emacs/${P}-patches-8.tar.bz2" - -LICENSE="GPL-1+ GPL-2+ BSD" #HPND -SLOT="18" -KEYWORDS="amd64 x86" -IUSE="abi_x86_x32" - -RDEPEND=">=app-eselect/eselect-emacs-1.16 - sys-libs/ncurses:0 - amd64? ( - abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0[abi_x86_x32(-)?] ) - !abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)] ) - )" -# X? ( x11-libs/libX11[-xcb] ) -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - epatch "${WORKDIR}/${P}-linux22x-elf-glibc21.diff" - EPATCH_SUFFIX=patch epatch - epatch_user -} - -src_configure() { - # autoconf? What's autoconf? We are living in 1992. ;-) - local arch - case ${ARCH} in - amd64) - if use abi_x86_x32; then - arch=x86-x32 - multilib_toolchain_setup x32 - else - arch=intel386 - multilib_toolchain_setup x86 - fi - ;; - x86) arch=intel386 ;; - *) die "Architecture ${ARCH} not yet supported" ;; - esac - local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/" - #use X && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/" - sed -e "${cmd}" src/config.h-dist >src/config.h || die - - cat <<-END >src/paths.h - #define PATH_LOADSEARCH "/usr/share/emacs/${PV}/lisp" - #define PATH_EXEC "/usr/share/emacs/${PV}/etc" - #define PATH_LOCK "/var/lib/emacs/lock/" - #define PATH_SUPERLOCK "/var/lib/emacs/lock/!!!SuperLock!!!" - END - - sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \ - -e "s:-lncurses:$("$(tc-getPKG_CONFIG)" --libs ncurses):" \ - src/s-linux.h || die - - # -O3 and -finline-functions cause segmentation faults at run time. - filter-flags -finline-functions - replace-flags -O[3-9] -O2 - strip-flags -} - -src_compile() { - # Do not use the sandbox, or the dumped Emacs will be twice as large - export SANDBOX_ON=0 - emake --jobs=1 \ - CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \ - LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}" -} - -src_install() { - local basedir="/usr/share/emacs/${PV}" i - - dodir ${basedir} - dodir /usr/share/man/man1 - emake --jobs=1 \ - LIBDIR="${D}"${basedir} \ - BINDIR="${D}"/usr/bin \ - MANDIR="${D}"/usr/share/man/man1 \ - install - - rmdir "${D}"${basedir}/lock || die - find "${D}"${basedir} -type f \( -name "*.c" -o -name ChangeLog \ - -o -name COPYING ! -path "*/etc/COPYING" \) -exec rm "{}" + || die - fperms -R go-w ${basedir} - - # remove duplicate DOC file - rm "${D}"${basedir}/etc/DOC || die - - # move executables to the correct place - mv "${D}"/usr/bin/emacs{,-${SLOT}} || die - for i in etags ctags emacsclient; do - mv "${D}"/usr/bin/${i}{,-emacs-${SLOT}} || die - rm "${D}"${basedir}/etc/${i} || die - done - - dodir /usr/libexec/emacs/${PV} - for i in wakeup digest-doc sorted-doc movemail cvtmail fakemail \ - yow env server - do - mv "${D}"${basedir}/etc/${i} "${D}"/usr/libexec/emacs/${PV}/${i} || die - dosym ../../../../libexec/emacs/${PV}/${i} ${basedir}/etc/${i} - done - for i in test-distrib make-docfile; do - rm "${D}"${basedir}/etc/${i} || die - done - - # move man page - mv "${D}"/usr/share/man/man1/emacs{,-${SLOT}}.1 || die - - # move Info files - dodir /usr/share/info - mv "${D}"${basedir}/info "${D}"/usr/share/info/emacs-${SLOT} || die - dosym ../../info/emacs-${SLOT} "${basedir}"/info - docompress -x /usr/share/info - - # move Info dir to avoid collisions with the dir file generated by portage - mv "${D}"/usr/share/info/emacs-${SLOT}/dir{,.orig} || die - touch "${D}"/usr/share/info/emacs-${SLOT}/.keepinfodir - - dodir /var/lib/emacs - diropts -m0777 - keepdir /var/lib/emacs/lock - - dodoc README PROBLEMS -} - -pkg_preinst() { - # move Info dir file to correct name - if [[ -d "${D}"/usr/share/info ]]; then - mv "${D}"/usr/share/info/emacs-${SLOT}/dir{.orig,} || die - fi -} - -pkg_postinst() { - eselect emacs update ifunset -} - -pkg_postrm() { - eselect emacs update ifunset -}