From 57e3a6525a5169ca0ec3601eb0624edc1b4abfdc Mon Sep 17 00:00:00 2001 From: Christian Faulhammer Date: Mon, 16 Apr 2007 16:31:46 +0000 Subject: [PATCH] prepared for the new eselect module; qa patch to shut down QA warnings Package-Manager: portage-2.1.2.2 --- app-editors/emacs/ChangeLog | 8 +- app-editors/emacs/Manifest | 25 ++- app-editors/emacs/emacs-21.4-r12.ebuild | 208 ++++++++++++++++++ app-editors/emacs/files/digest-emacs-21.4-r12 | 6 + app-editors/emacs/files/emacs-21.4-qa.patch | 92 ++++++++ 5 files changed, 331 insertions(+), 8 deletions(-) create mode 100644 app-editors/emacs/emacs-21.4-r12.ebuild create mode 100644 app-editors/emacs/files/digest-emacs-21.4-r12 create mode 100644 app-editors/emacs/files/emacs-21.4-qa.patch diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index 64ea44623a7e..e3bcd5b8ab85 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,12 @@ # 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.131 2007/04/16 16:23:45 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.132 2007/04/16 16:31:46 opfer Exp $ + +*emacs-21.4-r12 (16 Apr 2007) + + 16 Apr 2007; Christian Faulhammer + +files/emacs-21.4-qa.patch, +emacs-21.4-r12.ebuild: + prepared for the new eselect module; qa patch to shut down QA warnings *emacs-18.59-r4 (16 Apr 2007) diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index d4a54ef9bd40..efc4cb458029 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -37,6 +37,10 @@ AUX emacs-21.4-libungif-gif-gentoo.patch 1534 RMD160 8bc5ef391e644ad00f46c7d34e7 MD5 1607d289126ca057110a993cde0e25fd files/emacs-21.4-libungif-gif-gentoo.patch 1534 RMD160 8bc5ef391e644ad00f46c7d34e7341862572346a files/emacs-21.4-libungif-gif-gentoo.patch 1534 SHA256 61793086af3c4a56ced40830977ba0d6ebc285d84b4b612798b35ca08f1f1689 files/emacs-21.4-libungif-gif-gentoo.patch 1534 +AUX emacs-21.4-qa.patch 2467 RMD160 22b054159a57b859b1d381b42565e96d254e4f7e SHA1 5aafbd565c97154399c663ec6a978c91957bda81 SHA256 058c08ab6300fe7bb6c91d253008972457eb51fe152787499cc9f6e3f78fe608 +MD5 b17a2a2d4bb386151ab7bbe2b946d031 files/emacs-21.4-qa.patch 2467 +RMD160 22b054159a57b859b1d381b42565e96d254e4f7e files/emacs-21.4-qa.patch 2467 +SHA256 058c08ab6300fe7bb6c91d253008972457eb51fe152787499cc9f6e3f78fe608 files/emacs-21.4-qa.patch 2467 AUX emacs-21.desktop 238 RMD160 57336e2584a671f642fa1cd5c458b33dbb1e44cc SHA1 92e6200b87c613264ee7103caa15d977c9040a12 SHA256 3d40581e18f1f633d0f1c822b00a8d2fb2de8ea95660fe0815ac837616f6db58 MD5 ab4757cbbda4ac6f848021b947d1f2b2 files/emacs-21.desktop 238 RMD160 57336e2584a671f642fa1cd5c458b33dbb1e44cc files/emacs-21.desktop 238 @@ -58,6 +62,10 @@ EBUILD emacs-18.59-r4.ebuild 2565 RMD160 48ec8327551a3c62eaef317212c38095f9bf5aa MD5 9d243787c2d24292323c8d5194820563 emacs-18.59-r4.ebuild 2565 RMD160 48ec8327551a3c62eaef317212c38095f9bf5aa3 emacs-18.59-r4.ebuild 2565 SHA256 5ef985e2208697bc13b9cb1858da6ce6d9b14169cf238f6d8995e75b673eb23f emacs-18.59-r4.ebuild 2565 +EBUILD emacs-21.4-r12.ebuild 5768 RMD160 134c69c0289967f97b2e922742c690aca2dc43ae SHA1 bc99a7f7039954c7b2ae8d765db66503017edcc5 SHA256 266e15be3b78c456a9c264accbb8f4f14b97dcc7446af14f3372e747eefcb6cb +MD5 77c722b0b34cef3bae5b5ff5f6180dea emacs-21.4-r12.ebuild 5768 +RMD160 134c69c0289967f97b2e922742c690aca2dc43ae emacs-21.4-r12.ebuild 5768 +SHA256 266e15be3b78c456a9c264accbb8f4f14b97dcc7446af14f3372e747eefcb6cb emacs-21.4-r12.ebuild 5768 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 @@ -66,10 +74,10 @@ 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 19945 RMD160 5d0a95320ff22a36a0585b519c48a9eb6ee8dbfb SHA1 ed96883fee125858aa4d8b35e4a6a05d6553793f SHA256 59460200846ea8c5606bd0092fe1193ef03dc6ac71c8c0c512683f6dc12dfbef -MD5 f5e30d3a53e62b833dabd97b7270d720 ChangeLog 19945 -RMD160 5d0a95320ff22a36a0585b519c48a9eb6ee8dbfb ChangeLog 19945 -SHA256 59460200846ea8c5606bd0092fe1193ef03dc6ac71c8c0c512683f6dc12dfbef ChangeLog 19945 +MISC ChangeLog 20159 RMD160 4d2dcfc8e81b577ee12053303c39a150191f94b8 SHA1 d742def9e106a4b79d8ed7b83a1fd7cd9381e442 SHA256 a582b0c42a303f34b95d305add3a4943c0e47b79fd144ff41b3925282f492786 +MD5 c1dda74830d68dafda30d3b859ae6423 ChangeLog 20159 +RMD160 4d2dcfc8e81b577ee12053303c39a150191f94b8 ChangeLog 20159 +SHA256 a582b0c42a303f34b95d305add3a4943c0e47b79fd144ff41b3925282f492786 ChangeLog 20159 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158 @@ -80,6 +88,9 @@ SHA256 a5d7f43b69d68028793ee45424a1fce37e65dd63802310ebfda5ca85a62e9ba7 files/di 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 +MD5 6276bfdc37e540127a083cc6b979ac37 files/digest-emacs-21.4-r12 473 +RMD160 4f6aee1102af50b44f69f8de5714c901c5b6b15c files/digest-emacs-21.4-r12 473 +SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/digest-emacs-21.4-r12 473 MD5 6276bfdc37e540127a083cc6b979ac37 files/digest-emacs-21.4-r4 473 RMD160 4f6aee1102af50b44f69f8de5714c901c5b6b15c files/digest-emacs-21.4-r4 473 SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/digest-emacs-21.4-r4 473 @@ -89,7 +100,7 @@ SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFGI6MaNQqtfCuFneMRAk8MAKCGyintY1wN+Od46K6Mz85egEIG9gCeI2jU -PT+4kdp1vnGD0qigrNTMibo= -=ZXUw +iD8DBQFGI6T6NQqtfCuFneMRAkyuAKCcARYmsGLvthhG8oNByFnAbQdKJQCePD+q +trxNoGrtHupdTT0/6hSgm7M= +=8wSJ -----END PGP SIGNATURE----- diff --git a/app-editors/emacs/emacs-21.4-r12.ebuild b/app-editors/emacs/emacs-21.4-r12.ebuild new file mode 100644 index 000000000000..72c0092bebe3 --- /dev/null +++ b/app-editors/emacs/emacs-21.4-r12.ebuild @@ -0,0 +1,208 @@ +# 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.1 2007/04/16 16:31:46 opfer Exp $ + +WANT_AUTOCONF="2.1" + +inherit flag-o-matic eutils toolchain-funcs autotools + +DESCRIPTION="An incredibly powerful, extensible text editor" +HOMEPAGE="http://www.gnu.org/software/emacs" +SRC_URI="mirror://gnu/emacs/${P}a.tar.gz + leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )" + +LICENSE="GPL-2 FDL-1.1" +SLOT="21" +KEYWORDS="~x86" +IUSE="X Xaw3d leim lesstif motif nls nosendmail" + +RDEPEND="sys-libs/ncurses + X? ( x11-libs/libXext + x11-libs/libICE + x11-libs/libSM + x11-libs/libXmu + x11-libs/libXpm + x11-misc/emacs-desktop + >=media-libs/giflib-4.1.0.1b + >=media-libs/jpeg-6b-r2 + >=media-libs/tiff-3.5.5-r3 + >=media-libs/libpng-1.2.1 + !arm? ( + Xaw3d? ( x11-libs/Xaw3d ) + motif? ( + lesstif? ( x11-libs/lesstif ) + !lesstif? ( >=x11-libs/openmotif-2.1.30 ) ) + ) + ) + nls? ( sys-devel/gettext ) + !nosendmail? ( virtual/mta ) + >=app-admin/eselect-emacs-0.7-r1" + +DEPEND="${RDEPEND} + X? ( x11-misc/xbitmaps + !arm? ( Xaw3d? ( x11-libs/libXaw ) ) + )" + +PROVIDE="virtual/emacs virtual/editor" + +src_unpack() { + + unpack ${A} + + cd "${S}" + epatch "${FILESDIR}/emacs-21.3-xorg.patch" + epatch "${FILESDIR}/emacs-21.3-amd64.patch" + epatch "${FILESDIR}/emacs-21.3-hppa.patch" + epatch "${FILESDIR}/emacs-21.2-sh.patch" + epatch "${FILESDIR}/emacs-21.4-libungif-gif-gentoo.patch" + + use ppc64 && epatch "${FILESDIR}/emacs-21.3-ppc64.patch" + + epatch "${FILESDIR}/emacs-21.4-autosave-tmp.patch" + epatch "${FILESDIR}/emacs-21.4-blessmail-build.patch" + epatch "${FILESDIR}/emacs-21.4-qa.patch" + + # install emacsclient.1 man page (#165466) + sed -i -e "s/for page in emacs/& emacsclient/" Makefile.in || die + + # This will need to be updated for X-Compilation + sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \ + "${S}/src/s/gnu-linux.h" || die +} + +src_compile() { + export SANDBOX_ON=0 + + # -fstack-protector gets internal compiler error at xterm.c (bug 33265) + filter-flags -fstack-protector + + # emacs doesn't handle LDFLAGS properly (bug #77430 and bug #65002) + unset LDFLAGS + + # ever since GCC 3.2 + replace-flags -O[3-9] -O2 + + # this fixes bug 152006 + use ppc64 && append-flags -mno-fp-in-toc -mno-sum-in-toc + + # -march is known to cause signal 6 on some environment + filter-flags "-march=*" + + eautoconf + + local myconf + use nls || myconf="${myconf} --disable-nls" + if use X ; then + if use motif && use lesstif; then + append-ldflags -L/usr/X11R6/lib/lesstif -R/usr/X11R6/lib/lesstif + export CPPFLAGS="${CPPFLAGS} -I/usr/X11R6/include/lesstif" + fi + myconf="${myconf} + --with-x + --with-xpm + --with-jpeg + --with-tiff + --with-gif + --with-png" + if use Xaw3d ; then + myconf="${myconf} --with-x-toolkit=athena" + elif use motif ; then + myconf="${myconf} --with-x-toolkit=motif" + else + # do not build emacs with any toolkit, bug 35300 + myconf="${myconf} --with-x-toolkit=no" + fi + else + myconf="${myconf} --without-x" + fi + econf ${myconf} || die + emake CC="$(tc-getCC)" || die + + einfo "Recompiling patched lisp files..." + (cd lisp; emake recompile) || die + emake CC="$(tc-getCC)" || die +} + +src_install() { + einstall || die + for i in "${D}"/usr/bin/* ; do + mv ${i} ${i}-emacs-${SLOT} || die "mv ${i} failed" + done + mv "${D}"/usr/bin/emacs{-emacs,}-${SLOT} || die "mv emacs failed" + rm "${D}"/usr/bin/emacs-${PV}-emacs-${SLOT} + + einfo "Fixing info documentation..." + mkdir "${T}/emacs-${SLOT}" + mv "${D}/usr/share/info/dir" "${T}" + for i in "${D}"/usr/share/info/* + do + mv ${i} "${T}"/emacs-${SLOT}/${i##*/}.info + done + mv "${T}/emacs-${SLOT}" "${D}/usr/share/info" + mv "${T}/dir" "${D}/usr/share/info/emacs-${SLOT}" + + einfo "Fixing manpages..." + for m in "${D}"/usr/share/man/man1/* ; do + mv ${m} ${m/.1/-emacs-${SLOT}.1} || die "mv ${m} failed" + done + + # avoid collision between slots + rm "${D}"/usr/share/emacs/site-lisp/subdirs.el + + einfo "Fixing permissions..." + find "${D}" -perm 664 |xargs chmod -f 644 2>/dev/null + find "${D}" -type d |xargs chmod -f 755 2>/dev/null + + keepdir /usr/share/emacs/${PV}/leim + keepdir /usr/share/emacs/site-lisp + + dodoc BUGS ChangeLog README +} + +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 + einfo "Regenerating Info directory index in ${infodir} ..." + rm -f ${ROOT}${infodir}/dir{,.*} + for f in ${ROOT}${infodir}/*.info*; do + [[ ${f##*/} == *[0-9].info* ]] \ + || install-info --info-dir=${ROOT}${infodir} ${f} &>/dev/null + done + echo +} + +pkg_postinst() { + test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el || + cp ${ROOT}/usr/share/emacs{/${PV},}/site-lisp/subdirs.el + + 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 --if-unset + fi + + if use nosendmail; then + elog "You disabled sendmail support for Emacs. If you later install a MTA" + elog "then you will need to recompile Emacs. See Bug #11104." + fi + if use X; then + elog "You need to install some fonts for Emacs. Under monolithic" + elog "XFree86/Xorg you typically had such fonts installed by default. With" + elog "modular Xorg, you will have to perform this step yourself on the machine" + elog "your X server is running." + echo + elog "Installing media-fonts/font-adobe-{75,100}dpi would satisfy basic" + elog "Emacs requirements under X11." + fi +} + +pkg_postrm() { + emacs-infodir-rebuild + eselect emacs update --if-unset +} diff --git a/app-editors/emacs/files/digest-emacs-21.4-r12 b/app-editors/emacs/files/digest-emacs-21.4-r12 new file mode 100644 index 000000000000..6898ecff2a12 --- /dev/null +++ b/app-editors/emacs/files/digest-emacs-21.4-r12 @@ -0,0 +1,6 @@ +MD5 8f9d97cbd126121bd5d97e5e31168a87 emacs-21.4a.tar.gz 20403483 +RMD160 c312e739935b56d08783bbfe97992297a363cb8a emacs-21.4a.tar.gz 20403483 +SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216 emacs-21.4a.tar.gz 20403483 +MD5 32938cb5a7505d995a1e835639d19707 leim-21.4.tar.gz 3291433 +RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca leim-21.4.tar.gz 3291433 +SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b leim-21.4.tar.gz 3291433 diff --git a/app-editors/emacs/files/emacs-21.4-qa.patch b/app-editors/emacs/files/emacs-21.4-qa.patch new file mode 100644 index 000000000000..d44ddc4acb4a --- /dev/null +++ b/app-editors/emacs/files/emacs-21.4-qa.patch @@ -0,0 +1,92 @@ +diff -ur emacs-21.4-orig/lib-src/cvtmail.c emacs-21.4/lib-src/cvtmail.c +--- emacs-21.4-orig/lib-src/cvtmail.c 2002-02-15 13:06:48.000000000 +0100 ++++ emacs-21.4/lib-src/cvtmail.c 2007-03-19 09:02:08.000000000 +0100 +@@ -33,12 +33,15 @@ + * Author: Larry Kolodney, 1985 + */ + ++#ifdef HAVE_CONFIG_H ++#include ++#endif + + #include + +-char *malloc (); +-char *realloc (); ++#ifndef HAVE_STDLIB_H + char *getenv (); ++#endif + + char *xmalloc (); + char *xrealloc (); +diff -ur emacs-21.4-orig/lib-src/yow.c emacs-21.4/lib-src/yow.c +--- emacs-21.4-orig/lib-src/yow.c 1999-02-26 12:37:05.000000000 +0100 ++++ emacs-21.4/lib-src/yow.c 2007-03-19 09:03:50.000000000 +0100 +@@ -10,6 +10,10 @@ + * With dynamic memory allocation. + */ + ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #include + #include + #include <../src/epaths.h> /* For PATH_DATA. */ +@@ -33,8 +37,6 @@ + &res;}) + #endif + +-char *malloc(), *realloc(); +- + void yow(); + void setup_yow(); + +diff -ur emacs-21.4-orig/src/prefix-args.c emacs-21.4/src/prefix-args.c +--- emacs-21.4-orig/src/prefix-args.c 2001-02-22 02:49:37.000000000 +0100 ++++ emacs-21.4/src/prefix-args.c 2007-03-19 09:20:27.000000000 +0100 +@@ -43,6 +43,10 @@ + If I can't write a completely portable program to do this in C, + I'm quitting and taking up gardening. */ + ++#ifdef HAVE_CONFIG_H ++# include ++#endif ++ + #include + + int +diff -ur emacs-21.4-orig/src/xterm.c emacs-21.4/src/xterm.c +--- emacs-21.4-orig/src/xterm.c 2002-10-15 16:21:45.000000000 +0200 ++++ emacs-21.4/src/xterm.c 2007-03-19 09:13:01.000000000 +0100 +@@ -10899,7 +10899,7 @@ + if (!tool_bar_p) + if (!dpyinfo->x_focus_frame + || f == dpyinfo->x_focus_frame) +- construct_mouse_click (&emacs_event, &event, f); ++ construct_mouse_click (&emacs_event, &event.xbutton, f); + } + else + { +diff -ur emacs-21.4-orig/oldXMenu/ChgPane.c emacs-21.4/oldXMenu/ChgPane.c +--- emacs-21.4-orig/oldXMenu/ChgPane.c 1999-10-03 21:34:53.000000000 +0200 ++++ emacs-21.4/oldXMenu/ChgPane.c 2007-03-19 15:10:00.000000000 +0100 +@@ -13,6 +13,7 @@ + * + */ + ++#include + #include "XMenuInt.h" + + int +diff -ur emacs-21.4-orig/oldXMenu/ChgSel.c emacs-21.4/oldXMenu/ChgSel.c +--- emacs-21.4-orig/oldXMenu/ChgSel.c 1999-10-03 21:34:54.000000000 +0200 ++++ emacs-21.4/oldXMenu/ChgSel.c 2007-03-19 15:10:02.000000000 +0100 +@@ -13,6 +13,7 @@ + * + */ + ++#include + #include "XMenuInt.h" + + int -- 2.26.2