diff options
author | Ulrich Müller <ulm@gentoo.org> | 2009-11-08 23:53:28 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2009-11-08 23:53:28 +0000 |
commit | 042175a5793cb5ad5b9bf63d5c48c93a9b986b66 (patch) | |
tree | b810408b1a4f848ba43061c309fb0e388c2bab1b /app-editors/emacs | |
parent | Remove empty directories (diff) | |
download | historical-042175a5793cb5ad5b9bf63d5c48c93a9b986b66.tar.gz historical-042175a5793cb5ad5b9bf63d5c48c93a9b986b66.tar.bz2 historical-042175a5793cb5ad5b9bf63d5c48c93a9b986b66.zip |
Fix updating of menus with GTK+ 2.18, bug 292007.
Package-Manager: portage-2.2_rc49/cvs/Linux i686
Diffstat (limited to 'app-editors/emacs')
-rw-r--r-- | app-editors/emacs/ChangeLog | 12 | ||||
-rw-r--r-- | app-editors/emacs/Manifest | 18 | ||||
-rw-r--r-- | app-editors/emacs/emacs-22.3-r3.ebuild | 257 | ||||
-rw-r--r-- | app-editors/emacs/emacs-23.1-r2.ebuild (renamed from app-editors/emacs/emacs-23.1-r1.ebuild) | 10 | ||||
-rw-r--r-- | app-editors/emacs/emacs-23.1.ebuild | 9 | ||||
-rw-r--r-- | app-editors/emacs/files/emacs-23.0.94-handle-xz-suffix.patch | 16 | ||||
-rw-r--r-- | app-editors/emacs/files/emacs-23.1-backspace.patch | 54 |
7 files changed, 288 insertions, 88 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index a87f475819f1..11099201611f 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for app-editors/emacs # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.342 2009/10/28 19:38:52 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.343 2009/11/08 23:53:27 ulm Exp $ + +*emacs-23.1-r2 (08 Nov 2009) +*emacs-22.3-r3 (08 Nov 2009) + + 08 Nov 2009; Ulrich Mueller <ulm@gentoo.org> +emacs-22.3-r3.ebuild, + -files/emacs-23.0.94-handle-xz-suffix.patch, emacs-23.1.ebuild, + -emacs-23.1-r1.ebuild, +emacs-23.1-r2.ebuild, + -files/emacs-23.1-backspace.patch: + Fix updating of menus with GTK+ 2.18, bug 292007. Patchsets for Emacs 23 + moved to Gentoo mirrors. *emacs-23.1-r1 (28 Oct 2009) diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index 6393ef31120f..3f5533b3cdae 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -1,28 +1,30 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX emacs-23.0.94-handle-xz-suffix.patch 751 RMD160 6380952113ef9652c58f82de6b6a4254281721a6 SHA1 2666b767674a1b57853d8802e3243ce9b5f5b0cd SHA256 167b019518b147f737c7e69281a76d0e5651db44c82dff0834d6e2a964870bfc -AUX emacs-23.1-backspace.patch 2364 RMD160 34da24ea55db165f4650b9a0b19bbac050e3f472 SHA1 7cce3ee5072005080696647d663a79f79c13c0c8 SHA256 c82240cad46190448580445feaaedf12640ccbb0f8649651c5bd5c9465648bfe DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 RMD160 4fab87eead1a66d767d2334d31507695dcf7b4a8 SHA1 075f1c9cf86e9a10fb686ebd04a2f95d6e4c3972 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd DIST emacs-18.59-patches-4.tar.bz2 17690 RMD160 72d71f47616b51d3a82afd375585f614c0a188fb SHA1 c53d978d09e1ac326d0cdc094ff2b80ba102be48 SHA256 2172a28e5f7550e23f9aaa93281b1243e0c314dfe118e83864e09ec02aaef712 DIST emacs-18.59.tar.gz 2962652 RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc SHA1 15b25bf130e3eeb91f3eea8c01a3dec9aabf23cc SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e DIST emacs-21.4-patches-8.tar.bz2 12260 RMD160 7e8acfe340becf4d2b3ee282e47098052eaf6b51 SHA1 c292b57ffa618b04a8c85d5feb412a6e4f3e166d SHA256 51815b4f13177474e2e8f30c829e12fc936f8b4b21b0aa0274d56601aef6bb21 DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a SHA1 cdb33731180fe4a912838af805dd35e3f55394d4 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216 DIST emacs-22.3-patches-1.tar.bz2 2622 RMD160 43d68a7dba5e57676a587ca1bbc97b41c8dae2c1 SHA1 2af958f1d0f7e653db5597abdce307bb70626069 SHA256 4f10bd62440dde10747e262d68a5af779fc787b68ccb1891ddbb4fba2be74ae6 +DIST emacs-22.3-patches-2.tar.bz2 4084 RMD160 56fcb6a48b8854d420527e29f0b62a8236291db1 SHA1 3712231e71ee253def1081f3e6fa21653d2d6147 SHA256 30e988921ba585661905b362259fa9b3aee95c5e20276e5bcc27cc399c78ea2e DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 SHA1 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16 +DIST emacs-23.1-patches-1.tar.bz2 589 RMD160 d19e9af04e3f84628d165c0fe6c397076270424a SHA1 f6983733bde69e0303caae8baed86b01b9823f57 SHA256 78e633a5a45e750342e5c1eeba2881ed0276db802507659dffcfd8fb4a7a2c90 +DIST emacs-23.1-patches-2.tar.bz2 3044 RMD160 8c43f1f770873bc97109905bd4a2571dee04b02d SHA1 7e53916f0d1b11a86fb9db3d940c330997a55691 SHA256 f4c2f9d0c02e0e68f7a9d18653dbd2cd21785bcfae360c4413b2a0017b1cd73c DIST emacs-23.1.tar.bz2 34382732 RMD160 e9b30bce2c174dde4dcfefb6068ae8648d59b251 SHA1 5f2d5dfcc17e7627ea752f675c605fe37c9c145c SHA256 2b35f4457c7a0ee9f9185579cc2890b43f129a112cf22500233489db7a24cb1c DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b EBUILD emacs-18.59-r6.ebuild 2774 RMD160 0d7c2ce8f64928d020794692dd3574207bc6fb55 SHA1 76a48b1fae680fbcaa04e5533f60e9a6f9a33583 SHA256 87bcd21f12cf88e641699d15574efc598af6e0f15a62660ac657720bc0a24850 EBUILD emacs-21.4-r19.ebuild 5314 RMD160 163ffd52b686ad7fe4aa2126e34250d9c4e33950 SHA1 3a6ebd946d73a0cf86f19633a189bf8ea9069d31 SHA256 9c93d672f72648fb383c5bdb8bc305db9609d5e88e2b0e856fbc3ac621e53cc8 EBUILD emacs-22.3-r2.ebuild 7848 RMD160 4ff1cd1dfa6aa792b92f48ddd1acbebd839368cc SHA1 914f22df412ca73b4a128fc25f7675d54df7f435 SHA256 b94cca9747e3d117a58aa2245d1b30c63fc7bcd56e9e7548b54c92b5b948b3ab -EBUILD emacs-23.1-r1.ebuild 9420 RMD160 8d1dbd5ce19f842295223da0f1202a5887aa0f28 SHA1 e07d5e8ca51189b2e8a297b2ce44b87cc998932b SHA256 c1e01785274dadb2ef4e1c091211fd6f3fee4f3dba19b913c12489ac42719231 -EBUILD emacs-23.1.ebuild 9369 RMD160 b868dbd05c06484efa40d28693b3ded9340bef40 SHA1 0d4020023e92ad87da6f6529c7f7080ebb395f38 SHA256 d5c17805011858668c581a3c0ecaaf821437c680f7ea16824bfd2b5e8392f1a3 -MISC ChangeLog 48692 RMD160 aa8b9ff6ff5387568da55a45d7eb19aed53eac5c SHA1 bb3edfac0002dd83f9c779ead11e3ae3ee108cf9 SHA256 f8ccadec51d35faf51e00430ea6e5f1d153c4c9d87498dd737ad2d485cb978e1 +EBUILD emacs-22.3-r3.ebuild 7858 RMD160 a680c31e71443f0d308f78c834c5481b42f305e9 SHA1 ed7526fb68472a1d2a8fdfa446c989e9447d007e SHA256 953ac24beada89d9f0bc0ec3c48862d879e70b13434d7bd887236725834c6c98 +EBUILD emacs-23.1-r2.ebuild 9393 RMD160 9e7562b26a21afe37ee693067e9829bfa6bd2bfe SHA1 4191abf6203392a35e32b61fcfdac93a36ce2ca9 SHA256 e799f12c3039493f0f79738781b1a417040dd3063016b22912aed3195f3b35c8 +EBUILD emacs-23.1.ebuild 9381 RMD160 fbe1e31f6ca2aec94b96ac63b5f56f8996a93fbb SHA1 5a87e3754c03b3c17b5318e04a05936653133647 SHA256 6846ab019d35cee888f5f902582e073388a21d156effa0f7f75c2bc954e251c0 +MISC ChangeLog 49075 RMD160 3d53a29549e0a7922819ce04548b7e9bd4ac31d6 SHA1 b005b338fa52ba125b5331f40f1b28832440c2c7 SHA256 be848d377a6fff11ab282af18cbd95b42b93b10f7410a2602d0e679bce75cb9e MISC metadata.xml 1652 RMD160 d5b841ffd970ae6338f01b56bc354004a78a13e8 SHA1 3f19193ed03a37bc67644966c839ea738b21c976 SHA256 fa53ed0bd63c3dd37877f11aa0ac7e3811da9db6c90437176ab60d76329f0cd7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) -iEYEARECAAYFAkronmAACgkQOeoy/oIi7uyODwCeLoHXuEyeryrBZDD/vRjCLqZx -2CcAnjMQ72LPqCwEIxmi4ndjPCtobdhr -=eMaZ +iEYEARECAAYFAkr3Wo8ACgkQOeoy/oIi7ux3VQCg4idxzR8+sgI3ClaDbICoUcqF +990AnRNeth80Yyk8XpbWkfdpIaxBKgjV +=Euo3 -----END PGP SIGNATURE----- diff --git a/app-editors/emacs/emacs-22.3-r3.ebuild b/app-editors/emacs/emacs-22.3-r3.ebuild new file mode 100644 index 000000000000..fc8effeea292 --- /dev/null +++ b/app-editors/emacs/emacs-22.3-r3.ebuild @@ -0,0 +1,257 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r3.ebuild,v 1.1 2009/11/08 23:53:27 ulm Exp $ + +EAPI=2 + +inherit autotools elisp-common eutils flag-o-matic + +DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" +HOMEPAGE="http://www.gnu.org/software/emacs/" +SRC_URI="mirror://gnu/emacs/${P}.tar.gz + mirror://gentoo/${P}-patches-2.tar.bz2" + +LICENSE="GPL-3 FDL-1.2 BSD as-is X11" +SLOT="22" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="alsa gif gtk gzip-el hesiod jpeg kerberos motif png sound source tiff toolkit-scroll-bars X Xaw3d +xpm" +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 ) + X? ( + x11-libs/libXmu + x11-libs/libXt + x11-misc/xbitmaps + gif? ( media-libs/giflib ) + jpeg? ( media-libs/jpeg ) + tiff? ( media-libs/tiff ) + png? ( media-libs/libpng ) + xpm? ( x11-libs/libXpm ) + gtk? ( x11-libs/gtk+:2 ) + !gtk? ( + Xaw3d? ( x11-libs/Xaw3d ) + !Xaw3d? ( motif? ( x11-libs/openmotif ) ) + ) + )" + +DEPEND="${RDEPEND} + alsa? ( dev-util/pkgconfig ) + X? ( gtk? ( dev-util/pkgconfig ) ) + gzip-el? ( app-arch/gzip )" + +RDEPEND="${RDEPEND} + !<app-editors/emacs-cvs-22.1 + >=app-emacs/emacs-common-gentoo-1[X?]" + +# 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}" +SITEFILE="20${PN}-${SLOT}-gentoo.el" + +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 + #unset LDFLAGS + if use hppa; then # bug #193703 + replace-flags -O[2-9] -O + else + replace-flags -O[3-9] -O2 + fi + sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die + + 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" + myconf="${myconf} $(use_with toolkit-scroll-bars)" + myconf="${myconf} $(use_with jpeg) $(use_with tiff)" + myconf="${myconf} $(use_with gif) $(use_with png)" + myconf="${myconf} $(use_with xpm)" + + # 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" + myconf="${myconf} --without-gtk" + elif use motif; then + einfo "Configuring to build with Motif toolkit" + myconf="${myconf} --with-x-toolkit=motif" + myconf="${myconf} --without-gtk" + else + einfo "Configuring to build with no toolkit" + myconf="${myconf} --with-x-toolkit=no" + myconf="${myconf} --without-gtk" + 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 + else + myconf="${myconf} --without-x" + fi + + myconf="${myconf} $(use_with hesiod)" + myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)" + + econf \ + --program-suffix=-emacs-${SLOT} \ + --infodir=/usr/share/info/emacs-${SLOT} \ + --without-carbon \ + ${myconf} || die "econf emacs failed" +} + +src_compile() { + export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 + emake CC="$(tc-getCC)" || die "emake failed" +} + +src_install () { + local i m + + emake install DESTDIR="${D}" || die "make install failed" + + rm "${D}"/usr/bin/emacs-${FULL_VERSION}-emacs-${SLOT} \ + || die "removing duplicate emacs executable failed" + mv "${D}"/usr/bin/emacs-emacs-${SLOT} "${D}"/usr/bin/emacs-${SLOT} \ + || die "moving Emacs executable failed" + + # move info documentation to the correct place + for i in "${D}"/usr/share/info/emacs-${SLOT}/*; do + mv "${i}" "${i}.info" || die "mv info failed" + done + + # move man pages to the correct place + for m in "${D}"/usr/share/man/man1/* ; do + mv "${m}" "${m%.1}-emacs-${SLOT}.1" || die "mv man failed" + done + + # avoid collision between slots, see bug #169033 e.g. + rm "${D}"/usr/share/emacs/site-lisp/subdirs.el + rm "${D}"/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//' >"${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} "/usr/share/emacs/${FULL_VERSION}/src") + X (let ((path (getenv "INFOPATH")) + X (dir "/usr/share/info/emacs-${SLOT}") + X (re "\\\\\`/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 "${SITEFILE}" || die + + dodoc AUTHORS BUGS CONTRIBUTE README || die "dodoc failed" +} + +emacs-infodir-rebuild() { + # Depending on the Portage version, the Info dir file is compressed + # or removed. It is only rebuilt by Portage if our directory is in + # INFOPATH, which is not guaranteed. So we rebuild it ourselves. + + local infodir=/usr/share/info/emacs-${SLOT} f + [ -d "${ROOT}"${infodir} ] || return # may occur with FEATURES=noinfo + einfo "Regenerating Info directory index in ${infodir} ..." + rm -f "${ROOT}"${infodir}/dir{,.*} + for f in "${ROOT}"${infodir}/*.info*; do + [[ ${f##*/} != *[0-9].info* && -e ${f} ]] \ + && install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null + done + rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty + echo +} + +pkg_postinst() { + local f + for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do + [ -e "${f}" ] || touch "${f}" + done + + elisp-site-regen + emacs-infodir-rebuild + + if [[ $(readlink "${ROOT}"/usr/bin/emacs) == emacs.emacs-${SLOT}* ]]; then + # transition from pre-eselect revision + eselect emacs set emacs-${SLOT} + else + eselect emacs update ifunset + 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." +} + +pkg_postrm() { + elisp-site-regen + emacs-infodir-rebuild + eselect emacs update ifunset +} diff --git a/app-editors/emacs/emacs-23.1-r1.ebuild b/app-editors/emacs/emacs-23.1-r2.ebuild index 86a84bc34547..371289c955ce 100644 --- a/app-editors/emacs/emacs-23.1-r1.ebuild +++ b/app-editors/emacs/emacs-23.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.1-r1.ebuild,v 1.1 2009/10/28 19:38:52 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.1-r2.ebuild,v 1.1 2009/11/08 23:53:27 ulm Exp $ EAPI=2 @@ -16,7 +16,8 @@ if [ "${PV##*.}" = "9999" ]; then SRC_URI="" S="${WORKDIR}/${ECVS_LOCALNAME}" else - SRC_URI="mirror://gnu/emacs/${P}.tar.bz2" + SRC_URI="mirror://gnu/emacs/${P}.tar.bz2 + mirror://gentoo/${P}-patches-2.tar.bz2" # FULL_VERSION keeps the full version number, which is needed in # order to determine some path information correctly for copy/move # operations later on @@ -90,11 +91,10 @@ src_prepare() { [ "${FULL_VERSION%.*}" = ${PV%.*} ] \ || die "Upstream version number changed to ${FULL_VERSION}" echo + else + EPATCH_SUFFIX=patch epatch fi - epatch "${FILESDIR}/${PN}-23.0.94-handle-xz-suffix.patch" - epatch "${FILESDIR}/${P}-backspace.patch" - 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" diff --git a/app-editors/emacs/emacs-23.1.ebuild b/app-editors/emacs/emacs-23.1.ebuild index cc5d2e536ac8..5d7673d5aefb 100644 --- a/app-editors/emacs/emacs-23.1.ebuild +++ b/app-editors/emacs/emacs-23.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.1.ebuild,v 1.12 2009/10/12 16:34:24 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.1.ebuild,v 1.13 2009/11/08 23:53:27 ulm Exp $ EAPI=2 @@ -16,7 +16,8 @@ if [ "${PV##*.}" = "9999" ]; then SRC_URI="" S="${WORKDIR}/${ECVS_LOCALNAME}" else - SRC_URI="mirror://gnu/emacs/${P}.tar.bz2" + SRC_URI="mirror://gnu/emacs/${P}.tar.bz2 + mirror://gentoo/${P}-patches-1.tar.bz2" # FULL_VERSION keeps the full version number, which is needed in # order to determine some path information correctly for copy/move # operations later on @@ -90,10 +91,10 @@ src_prepare() { [ "${FULL_VERSION%.*}" = ${PV%.*} ] \ || die "Upstream version number changed to ${FULL_VERSION}" echo + else + EPATCH_SUFFIX=patch epatch fi - epatch "${FILESDIR}/emacs-23.0.94-handle-xz-suffix.patch" - 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" diff --git a/app-editors/emacs/files/emacs-23.0.94-handle-xz-suffix.patch b/app-editors/emacs/files/emacs-23.0.94-handle-xz-suffix.patch deleted file mode 100644 index 9345ceaabbd4..000000000000 --- a/app-editors/emacs/files/emacs-23.0.94-handle-xz-suffix.patch +++ /dev/null @@ -1,16 +0,0 @@ -Automatically handle .xz suffix (XZ-compressed files) -From Jim Meyering <meyering@redhat.com> on emacs-devel - ---- a/lisp/jka-cmpr-hook.el -+++ b/lisp/jka-cmpr-hook.el -@@ -219,6 +219,10 @@ options through Custom does this automatically." - "compressing" "gzip" ("-c" "-q") - "uncompressing" "gzip" ("-c" "-q" "-d") - t t "\037\213"] -+ ["\\.xz\\(~\\|\\.~[0-9]+~\\)?\\'" -+ "XZ compressing" "xz" ("-c" "-q") -+ "XZ uncompressing" "xz" ("-c" "-q" "-d") -+ t t "\3757zXZ\0"] - ;; dzip is gzip with random access. Its compression program can't - ;; read/write stdin/out, so .dz files can only be viewed without - ;; saving, having their contents decompressed with gzip. diff --git a/app-editors/emacs/files/emacs-23.1-backspace.patch b/app-editors/emacs/files/emacs-23.1-backspace.patch deleted file mode 100644 index bc547af8a27b..000000000000 --- a/app-editors/emacs/files/emacs-23.1-backspace.patch +++ /dev/null @@ -1,54 +0,0 @@ -2009-10-22 Stefan Monnier <monnier@iro.umontreal.ca> - - * simple.el (normal-erase-is-backspace-mode): Use input-decode-map - rather than fiddling with global-map bindings, since it should only - affect per-terminal settings. - See http://bugs.gentoo.org/show_bug.cgi?id=289709. - ---- emacs-23.1-orig/lisp/simple.el -+++ emacs-23.1/lisp/simple.el -@@ -6269,31 +6269,27 @@ - (let* ((bindings - `(([M-delete] [M-backspace]) - ([C-M-delete] [C-M-backspace]) -- (,esc-map -- [C-delete] [C-backspace]))) -+ ([?\e C-delete] [?\e C-backspace]))) - (old-state (lookup-key local-function-key-map [delete]))) - - (if enabled - (progn - (define-key local-function-key-map [delete] [?\C-d]) - (define-key local-function-key-map [kp-delete] [?\C-d]) -- (define-key local-function-key-map [backspace] [?\C-?])) -+ (define-key local-function-key-map [backspace] [?\C-?]) -+ (dolist (b bindings) -+ ;; Not sure if input-decode-map is really right, but -+ ;; keyboard-translate-table (used below) only works -+ ;; for integer events, and key-translation-table is -+ ;; global (like the global-map, used earlier). -+ (define-key input-decode-map (car b) nil) -+ (define-key input-decode-map (cadr b) nil))) - (define-key local-function-key-map [delete] [?\C-?]) - (define-key local-function-key-map [kp-delete] [?\C-?]) -- (define-key local-function-key-map [backspace] [?\C-?])) -- -- ;; Maybe swap bindings of C-delete and C-backspace, etc. -- (unless (equal old-state (lookup-key local-function-key-map [delete])) -- (dolist (binding bindings) -- (let ((map global-map)) -- (when (keymapp (car binding)) -- (setq map (car binding) binding (cdr binding))) -- (let* ((key1 (nth 0 binding)) -- (key2 (nth 1 binding)) -- (binding1 (lookup-key map key1)) -- (binding2 (lookup-key map key2))) -- (define-key map key1 binding2) -- (define-key map key2 binding1))))))) -+ (define-key local-function-key-map [backspace] [?\C-?]) -+ (dolist (b bindings) -+ (define-key input-decode-map (car b) (cadr b)) -+ (define-key input-decode-map (cadr b) (car b)))))) - (t - (if enabled - (progn |