From 9791bbde2dc1b4ed89869472a0a8c4889cc50cd8 Mon Sep 17 00:00:00 2001 From: Mamoru Komachi Date: Sun, 3 Oct 2004 08:20:03 +0000 Subject: Don't unset CFLAGS/CXXFLAGS; use strip-flags instead. More on SLOT support. --- app-editors/emacs-cvs/ChangeLog | 8 ++++- app-editors/emacs-cvs/emacs-cvs-21.3.50-r1.ebuild | 38 +++++++++++++++------- app-editors/emacs-cvs/emacs-cvs-21.3.50.ebuild | 4 +-- app-editors/emacs-cvs/files/50emacs-21.3.50.envd | 1 + app-editors/emacs-cvs/files/emacs-21.3.50.desktop | 7 ++++ .../emacs-cvs/files/emacs-subdirs-el-gentoo.diff | 32 ++++++++++++++++++ 6 files changed, 75 insertions(+), 15 deletions(-) create mode 100644 app-editors/emacs-cvs/files/50emacs-21.3.50.envd create mode 100644 app-editors/emacs-cvs/files/emacs-21.3.50.desktop create mode 100644 app-editors/emacs-cvs/files/emacs-subdirs-el-gentoo.diff (limited to 'app-editors') diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog index b5ffcc52af48..7fdf301db3bc 100644 --- a/app-editors/emacs-cvs/ChangeLog +++ b/app-editors/emacs-cvs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-editors/emacs-cvs # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.21 2004/07/01 18:07:26 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.22 2004/10/03 08:20:03 usata Exp $ + + 03 Oct 2004; Mamoru KOMACHI + +files/50emacs-21.3.50.envd, +files/emacs-21.3.50.desktop, + +files/emacs-subdirs-el-gentoo.diff, emacs-cvs-21.3.50-r1.ebuild, + emacs-cvs-21.3.50.ebuild: + Don't unset CFLAGS/CXXFLAGS; use strip-flags instead. More on SLOT support. *emacs-cvs-22.0.0 (02 Jul 2004) *emacs-cvs-21.3.50-r1 (02 Jul 2004) diff --git a/app-editors/emacs-cvs/emacs-cvs-21.3.50-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-21.3.50-r1.ebuild index c6a51b958064..96bfe6d9c230 100644 --- a/app-editors/emacs-cvs/emacs-cvs-21.3.50-r1.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-21.3.50-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-21.3.50-r1.ebuild,v 1.1 2004/07/01 18:07:26 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-21.3.50-r1.ebuild,v 1.2 2004/10/03 08:20:03 usata Exp $ ECVS_AUTH="ext" export CVS_RSH="ssh" @@ -8,11 +8,11 @@ ECVS_SERVER="savannah.gnu.org:/cvsroot/emacs" ECVS_MODULE="emacs" ECVS_BRANCH="HEAD" ECVS_USER="anoncvs" -ECVS_PASS="" +#ECVS_PASS="" ECVS_CVS_OPTIONS="-dP" ECVS_SSH_HOST_KEY="savannah.gnu.org,199.232.41.3 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAzFQovi+67xa+wymRz9u3plx0ntQnELBoNU4SCl3RkwSFZkrZsRTC0fTpOKatQNs1r/BLFoVt21oVFwIXVevGQwB+Lf0Z+5w9qwVAQNu/YUAFHBPTqBze4wYK/gSWqQOLoj7rOhZk0xtAS6USqcfKdzMdRWgeuZ550P6gSzEHfv0=" -inherit elisp-common cvs alternatives +inherit elisp-common cvs alternatives flag-o-matic eutils IUSE="X Xaw3d gif gnome gtk jpeg nls png spell tiff" @@ -37,17 +37,22 @@ DEPEND=">=sys-libs/ncurses-5.3 gtk? ( =x11-libs/gtk+-2* ) !gtk? ( Xaw3d? ( x11-libs/Xaw3d ) ) gnome? ( gnome-base/gnome-desktop ) ) - nls? ( >=sys-devel/gettext-0.11.5 )" + nls? ( >=sys-devel/gettext-0.11.5 ) + >=sys-apps/portage-2.0.51_rc1" PROVIDE="virtual/emacs virtual/editor" -SLOT="${PV}" +SLOT="21.3.50" LICENSE="GPL-2" KEYWORDS="~x86 ~ppc ~sparc ~amd64" -DFILE=emacs.desktop +DFILE=emacs-${SLOT}.desktop src_compile() { + + strip-flags + epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff + local myconf use nls || myconf="${myconf} --disable-nls" @@ -74,10 +79,8 @@ src_compile() { fi fi - unset CFLAGS CPPFLAGS - econf --enable-debug \ - --program-suffix=-${PV} \ + --program-suffix=-${SLOT} \ ${myconf} || die make bootstrap || die @@ -85,18 +88,29 @@ src_compile() { src_install () { einstall || die - rm ${D}/usr/bin/emacs-${PV}-${PV} + rm ${D}/usr/bin/emacs-${SLOT}-${SLOT} # fix info documentation - find ${D}/usr/share/info -type f -exec mv {} {}.info \; + einfo "Fixing info documentation..." + dodir /usr/share/info/emacs-${SLOT} + mv ${D}/usr/share/info/{,emacs-${SLOT}/}dir || die "mv dir failed" + for i in ${D}/usr/share/info/* + do + if [ "${i##*/}" != emacs-${SLOT} ] ; then + mv ${i} ${i/info/info/emacs-${SLOT}}.info + gzip -9 ${i/info/info/emacs-${SLOT}}.info + fi + done if has_version 'app-text/aspell' ; then # defaults to aspell if installed elisp-site-file-install ${FILESDIR}/40aspell-gentoo.el fi + newenvd ${FILESDIR}/50emacs-${SLOT}.envd 50emacs-${SLOT} + einfo "Fixing manpages..." for m in ${D}/usr/share/man/man1/* ; do - mv ${m} ${m/.1/-${PV}.1} + mv ${m} ${m/.1/-${SLOT}.1} || die "mv man failed" done dodoc BUGS ChangeLog README diff --git a/app-editors/emacs-cvs/emacs-cvs-21.3.50.ebuild b/app-editors/emacs-cvs/emacs-cvs-21.3.50.ebuild index bbb820f1168c..b33b052eba61 100644 --- a/app-editors/emacs-cvs/emacs-cvs-21.3.50.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-21.3.50.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-21.3.50.ebuild,v 1.24 2004/06/30 02:31:54 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-21.3.50.ebuild,v 1.25 2004/10/03 08:20:03 usata Exp $ ECVS_AUTH="ext" export CVS_RSH="ssh" @@ -40,7 +40,7 @@ DEPEND=">=sys-libs/ncurses-5.3 PROVIDE="virtual/emacs virtual/editor" -SLOT="0" +SLOT="21.3.50" LICENSE="GPL-2" KEYWORDS="x86 ppc sparc ~amd64" diff --git a/app-editors/emacs-cvs/files/50emacs-21.3.50.envd b/app-editors/emacs-cvs/files/50emacs-21.3.50.envd new file mode 100644 index 000000000000..198a3983d404 --- /dev/null +++ b/app-editors/emacs-cvs/files/50emacs-21.3.50.envd @@ -0,0 +1 @@ +INFOPATH=/usr/share/info/emacs-%%SLOT%% diff --git a/app-editors/emacs-cvs/files/emacs-21.3.50.desktop b/app-editors/emacs-cvs/files/emacs-21.3.50.desktop new file mode 100644 index 000000000000..fc86b8dd7855 --- /dev/null +++ b/app-editors/emacs-cvs/files/emacs-21.3.50.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=GNU Emacs 21.3.50 +Comment=Emacs is the extensible, customizable, self-documenting real-time display editor. +Icon=gnome-emacs.png +Terminal=0 +Type=Application +Exec=/usr/bin/emacs-21.3.50 diff --git a/app-editors/emacs-cvs/files/emacs-subdirs-el-gentoo.diff b/app-editors/emacs-cvs/files/emacs-subdirs-el-gentoo.diff new file mode 100644 index 000000000000..c76aab71b771 --- /dev/null +++ b/app-editors/emacs-cvs/files/emacs-subdirs-el-gentoo.diff @@ -0,0 +1,32 @@ +--- Makefile.in 2002-10-19 10:21:01.000000000 +0900 ++++ Makefile.in.subdirs-el 2004-08-02 17:01:35.852417016 +0900 +@@ -387,18 +387,21 @@ + then true; \ + else \ + (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ ++ echo " (normal-top-level-add-subdirs-to-load-path))"; \ ++ echo "(setq default-directory \"/usr/share/emacs/site-lisp\")"; \ ++ echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ + echo " (normal-top-level-add-subdirs-to-load-path))") \ + > ${datadir}/emacs/${version}/site-lisp/subdirs.el; \ + fi + chmod a+r ${datadir}/emacs/${version}/site-lisp/subdirs.el +- -if [ -f ${datadir}/emacs/site-lisp/subdirs.el ]; \ +- then true; \ +- else \ +- (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ +- echo " (normal-top-level-add-subdirs-to-load-path))") \ +- > ${datadir}/emacs/site-lisp/subdirs.el; \ +- fi +- -chmod a+r ${datadir}/emacs/site-lisp/subdirs.el ++# -if [ -f ${datadir}/emacs/site-lisp/subdirs.el ]; \ ++# then true; \ ++# else \ ++# (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ ++# echo " (normal-top-level-add-subdirs-to-load-path))") \ ++# > ${datadir}/emacs/site-lisp/subdirs.el; \ ++# fi ++# -chmod a+r ${datadir}/emacs/site-lisp/subdirs.el + -unset CDPATH; \ + if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \ + then \ -- cgit v1.2.3-65-gdbad