From d00cac3e885f838e3fcf95478c4427e925ef2001 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulrich=20M=C3=BCller?= Date: Mon, 30 Apr 2007 08:42:00 +0000 Subject: [PATCH] Removed dependency on gettext. Old revision removed. Package-Manager: portage-2.1.2.5 --- app-editors/emacs/ChangeLog | 6 +- app-editors/emacs/Manifest | 29 ++--- app-editors/emacs/emacs-18.59-r1.ebuild | 105 ------------------ app-editors/emacs/emacs-21.4-r12.ebuild | 3 +- app-editors/emacs/files/digest-emacs-18.59-r1 | 9 -- 5 files changed, 17 insertions(+), 135 deletions(-) delete mode 100644 app-editors/emacs/emacs-18.59-r1.ebuild delete mode 100644 app-editors/emacs/files/digest-emacs-18.59-r1 diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index ec0d51f4281e..e319b209d1eb 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/emacs # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.143 2007/04/29 19:01:15 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.144 2007/04/30 08:42:00 ulm Exp $ + + 30 Apr 2007; Ulrich Mueller -emacs-18.59-r1.ebuild, + emacs-21.4-r12.ebuild: + Removed dependency on sys-devel/gettext. Removed old (non-eselect) revision. 29 Apr 2007; Ulrich Mueller emacs-21.4-r12.ebuild: Don't assign CPPFLAGS, use append-cppflags instead. diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index da07aa16ba3e..550968765d86 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -62,18 +62,14 @@ DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 RMD160 4fab87eead1a66d767d23 DIST emacs-18.59.tar.gz 2962652 RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc SHA1 15b25bf130e3eeb91f3eea8c01a3dec9aabf23cc SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a SHA1 cdb33731180fe4a912838af805dd35e3f55394d4 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b -EBUILD emacs-18.59-r1.ebuild 2937 RMD160 18aefabaeab25bdb2e8e6f1a3a56a7da2eafac0f SHA1 61d72956c406e8e73b357a125b83742939e79659 SHA256 4c96029fa721fb384f259d6d73e789beb8f097ca14ac3ed8a94023b748cc7c23 -MD5 0978c76cf7693fe76e68c4dcc4a5447e emacs-18.59-r1.ebuild 2937 -RMD160 18aefabaeab25bdb2e8e6f1a3a56a7da2eafac0f emacs-18.59-r1.ebuild 2937 -SHA256 4c96029fa721fb384f259d6d73e789beb8f097ca14ac3ed8a94023b748cc7c23 emacs-18.59-r1.ebuild 2937 EBUILD emacs-18.59-r4.ebuild 2549 RMD160 02162c6c4f0561644d326a349e46dd6187df7d1e SHA1 d24b5e0757bbf2696cb54ea51a185be5302d4742 SHA256 c8650c4f9fd7ec4dcce67d9ec0b77c6a25fc023321b55865489e580323f2ebf6 MD5 02f52fa5227806fdfa477c10a5fe7e33 emacs-18.59-r4.ebuild 2549 RMD160 02162c6c4f0561644d326a349e46dd6187df7d1e emacs-18.59-r4.ebuild 2549 SHA256 c8650c4f9fd7ec4dcce67d9ec0b77c6a25fc023321b55865489e580323f2ebf6 emacs-18.59-r4.ebuild 2549 -EBUILD emacs-21.4-r12.ebuild 5788 RMD160 16998c82fabb86b6f670ec567c26c55001803c59 SHA1 086fd53fe6da02083e8762665dc01f1b71c7d92c SHA256 956fb44a9257c82e6813a86cb0e5c8cb59370d22e629f1397bd76f19a1927697 -MD5 04f59ca57c185c7dd09fa2cc1158a247 emacs-21.4-r12.ebuild 5788 -RMD160 16998c82fabb86b6f670ec567c26c55001803c59 emacs-21.4-r12.ebuild 5788 -SHA256 956fb44a9257c82e6813a86cb0e5c8cb59370d22e629f1397bd76f19a1927697 emacs-21.4-r12.ebuild 5788 +EBUILD emacs-21.4-r12.ebuild 5760 RMD160 414da0939080699b6bb855b843ed8b9c581d12b6 SHA1 e4100b98a1ef51e9bd84d62d48be72ce5c8b1bf2 SHA256 cf3c95f3f6e1599a3e32e28fc4f262131682800a61d77c46fb7637740bbd29e3 +MD5 25bfbb4356d7613eb8669829e86c47f4 emacs-21.4-r12.ebuild 5760 +RMD160 414da0939080699b6bb855b843ed8b9c581d12b6 emacs-21.4-r12.ebuild 5760 +SHA256 cf3c95f3f6e1599a3e32e28fc4f262131682800a61d77c46fb7637740bbd29e3 emacs-21.4-r12.ebuild 5760 EBUILD emacs-21.4-r4.ebuild 4551 RMD160 a7b49c929b37f60e45af01038595fd6e26579609 SHA1 aae095ad8995c6dc1b76e2805032073486b13476 SHA256 57f007813695810a6df614b335de85df341fdda53a36d7c806a18e315f70afec MD5 d008266355b179cf5699aded70630be3 emacs-21.4-r4.ebuild 4551 RMD160 a7b49c929b37f60e45af01038595fd6e26579609 emacs-21.4-r4.ebuild 4551 @@ -82,17 +78,14 @@ EBUILD emacs-21.4-r8.ebuild 5727 RMD160 e879aeb102baa9977fee9a40d18c4a0acc001be2 MD5 92f4d4ff1be57566edb7db155c0bbf53 emacs-21.4-r8.ebuild 5727 RMD160 e879aeb102baa9977fee9a40d18c4a0acc001be2 emacs-21.4-r8.ebuild 5727 SHA256 2a692ffbdc1203341a019866b2f54460a7f6faa7a048a8466cc2879545cdc3c2 emacs-21.4-r8.ebuild 5727 -MISC ChangeLog 21694 RMD160 bedbfbf231971271363e4af600dec5678b6cad06 SHA1 bda2d01733ef6220b4dee8c1de2e1498195c5839 SHA256 1212df1732b514c5e49cfd1d6bfa1f6ba38c023b2b4b94c24a76bd1960cfb646 -MD5 3251d022e621b0fea0023822ccfa7a36 ChangeLog 21694 -RMD160 bedbfbf231971271363e4af600dec5678b6cad06 ChangeLog 21694 -SHA256 1212df1732b514c5e49cfd1d6bfa1f6ba38c023b2b4b94c24a76bd1960cfb646 ChangeLog 21694 +MISC ChangeLog 21870 RMD160 f6d1fb3c68b52060d22e1e4bccf06fb914a1bf58 SHA1 5eb72f3dd8bc25d535dc2597cca64c8b691d080f SHA256 05c8b62fb2f6ca95cc9e336fc48002a5726becf2f57cbd67d98db2b1ed19c529 +MD5 fa76bd768e6ffff24eebfccb610a649a ChangeLog 21870 +RMD160 f6d1fb3c68b52060d22e1e4bccf06fb914a1bf58 ChangeLog 21870 +SHA256 05c8b62fb2f6ca95cc9e336fc48002a5726becf2f57cbd67d98db2b1ed19c529 ChangeLog 21870 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158 -MD5 6bd3531350f6b7c7682351e3dcf628d0 files/digest-emacs-18.59-r1 786 -RMD160 4d1f0a68da522f0bfbe8cebdb748c5f95ccc1c9d files/digest-emacs-18.59-r1 786 -SHA256 a5d7f43b69d68028793ee45424a1fce37e65dd63802310ebfda5ca85a62e9ba7 files/digest-emacs-18.59-r1 786 MD5 6bd3531350f6b7c7682351e3dcf628d0 files/digest-emacs-18.59-r4 786 RMD160 4d1f0a68da522f0bfbe8cebdb748c5f95ccc1c9d files/digest-emacs-18.59-r4 786 SHA256 a5d7f43b69d68028793ee45424a1fce37e65dd63802310ebfda5ca85a62e9ba7 files/digest-emacs-18.59-r4 786 @@ -108,7 +101,7 @@ SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) -iD8DBQFGNOv9Oeoy/oIi7uwRAoPrAKC2ipL1gcgRGTL47YhzOg49+IoxfACfZpI6 -2g7rHbhWYhVfIV1iY3r44/g= -=h7Wq +iD8DBQFGNaxcOeoy/oIi7uwRAtNCAJ4qaEgtJW/7/Taay0HQUQLeHlZeyACeLTDb +vLfhhzv1LvA2Gr0PBdUKevg= +=M02h -----END PGP SIGNATURE----- diff --git a/app-editors/emacs/emacs-18.59-r1.ebuild b/app-editors/emacs/emacs-18.59-r1.ebuild deleted file mode 100644 index ca2a19a35257..000000000000 --- a/app-editors/emacs/emacs-18.59-r1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r1.ebuild,v 1.4 2007/04/24 21:49:30 ulm Exp $ - -inherit eutils toolchain-funcs flag-o-matic alternatives - -DESCRIPTION="The extensible self-documenting text editor" -HOMEPAGE="http://www.gnu.org/software/emacs/" -SRC_URI="mirror://gnu/old-gnu/emacs/${P}.tar.gz - mirror://gentoo/emacs-18-patches.tar.bz2 - ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz" - -LICENSE="GPL-1" -SLOT="18" -KEYWORDS="~x86" -IUSE="X" - -DEPEND="sys-libs/ncurses - X? ( x11-libs/libX11 )" -PROVIDE="virtual/editor" - -MY_BASEDIR="/usr/share/emacs/${PV}" -MY_LOCKDIR="/var/lib/emacs/lock" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${WORKDIR}/${P}-linux22x-elf-glibc21.diff" - epatch "${WORKDIR}/${P}-unexelf.patch" - epatch "${WORKDIR}/${P}-gentoo.patch" - epatch "${WORKDIR}/${P}-gcc4.patch" -} - -src_compile() { - SANDBOX_ON=0 - - # autoconf? What's autoconf? We are living in 1992. ;-) - local arch - case ${ARCH} in - x86) arch=intel386 ;; - *) die "Architecture ${ARCH} not 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 - - cat <<-END >src/paths.h - #define PATH_LOADSEARCH "${MY_BASEDIR}/lisp" - #define PATH_EXEC "${MY_BASEDIR}/etc" - #define PATH_LOCK "${MY_LOCKDIR}/" - #define PATH_SUPERLOCK "${MY_LOCKDIR}/!!!SuperLock!!!" - END - - # -O3 and -finline-functions cause segmentation faults at run time. - filter-flags -finline-functions - replace-flags -O[3-9] -O2 - strip-flags - - emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" || die -} - -src_install() { - dodir ${MY_BASEDIR} - dodir /usr/share/man/man1 - make install LIBDIR="${D}${MY_BASEDIR}" BINDIR="${D}/usr/bin" \ - MANDIR="${D}/usr/share/man/man1" || die - chmod -R go-w "${D}${MY_BASEDIR}" - rmdir "${D}${MY_BASEDIR}/lock" - - dodir ${MY_LOCKDIR%/*} - diropts -m0777 - dodir ${MY_LOCKDIR} - keepdir ${MY_LOCKDIR} - - for i in "${D}"/usr/bin/*; do - mv ${i}{,.emacs-${SLOT}} || die "mv ${i} failed" - done - dosym emacs.emacs-${SLOT} /usr/bin/emacs-${SLOT} - mv ${D}/usr/share/man/man1/emacs{,.emacs-${SLOT}}.1 || die - - dodoc README PROBLEMS -} - -update-alternatives() { - # Extract the suffix of the manpages to determine the correct - # compression program. - local suffix=$(echo /usr/share/man/man1/emacs.emacs-*.1*|sed 's/.*\.1//') - - # This creates symlinks for binaries and man page, so the correct - # ones in a slotted environment can be accessed. - for i in emacs emacsclient etags ctags; do - alternatives_auto_makesym "/usr/bin/${i}" "/usr/bin/${i}.emacs-*" - done - - alternatives_auto_makesym "/usr/share/man/man1/emacs.1${suffix}" \ - "/usr/share/man/man1/emacs.emacs-*.1${suffix}" -} - -pkg_postinst() { - update-alternatives -} - -pkg_postrm() { - update-alternatives -} diff --git a/app-editors/emacs/emacs-21.4-r12.ebuild b/app-editors/emacs/emacs-21.4-r12.ebuild index b3e18ca1241d..4fcfa59a561f 100644 --- a/app-editors/emacs/emacs-21.4-r12.ebuild +++ b/app-editors/emacs/emacs-21.4-r12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r12.ebuild,v 1.11 2007/04/29 19:01:15 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r12.ebuild,v 1.12 2007/04/30 08:42:00 ulm Exp $ WANT_AUTOCONF="2.1" @@ -34,7 +34,6 @@ RDEPEND="sys-libs/ncurses !lesstif? ( >=x11-libs/openmotif-2.1.30 ) ) ) ) - nls? ( sys-devel/gettext ) !nosendmail? ( virtual/mta ) >=app-admin/eselect-emacs-0.7-r1" diff --git a/app-editors/emacs/files/digest-emacs-18.59-r1 b/app-editors/emacs/files/digest-emacs-18.59-r1 deleted file mode 100644 index 2ec99cae6e30..000000000000 --- a/app-editors/emacs/files/digest-emacs-18.59-r1 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 f61420b327a9753e57b14fb1d3dae826 emacs-18-patches.tar.bz2 16526 -RMD160 ab0ed5e428fd71f24f44b43945940d7d33670e81 emacs-18-patches.tar.bz2 16526 -SHA256 d8dd29786dbd202b5e7bb3a176d97ae0901b6c1dd4276e253f0f42fcef34cd6e emacs-18-patches.tar.bz2 16526 -MD5 a7a4ed051dc232cdc9cf37208135302a emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 -RMD160 4fab87eead1a66d767d2334d31507695dcf7b4a8 emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 -SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 -MD5 ca57ae095ef098faca135bca736e1ca8 emacs-18.59.tar.gz 2962652 -RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc emacs-18.59.tar.gz 2962652 -SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e emacs-18.59.tar.gz 2962652 -- 2.26.2