From af9d3612b52145d6ec0894bd406dade449e64c1f Mon Sep 17 00:00:00 2001 From: Hans de Graaff Date: Sat, 9 Dec 2006 14:53:05 +0000 Subject: [PATCH] Documentation fixes and avoid clashes with applications from emacs Package-Manager: portage-2.1.1-r2 --- app-editors/xemacs/ChangeLog | 9 ++++- .../xemacs/files/xemacs-21.4.19-texi.patch | 33 +++++++++++++++++++ app-editors/xemacs/xemacs-21.4.19-r1.ebuild | 14 ++++++-- 3 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 app-editors/xemacs/files/xemacs-21.4.19-texi.patch diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog index feff0bd770fa..62006cf7ed2e 100644 --- a/app-editors/xemacs/ChangeLog +++ b/app-editors/xemacs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-editors/xemacs # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.67 2006/12/02 14:16:32 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.68 2006/12/09 14:53:05 graaff Exp $ + + 09 Dec 2006; Hans de Graaff + -files/xemacs-21.4.15-gdbm.patch, +files/xemacs-21.4.19-texi.patch, + xemacs-21.4.19-r1.ebuild: + Documentation fixes; part of #97786. Install some binaries with package name + and symlinks to better handle clashes with emacs. Fixes #62991. Remove unused + patch. *xemacs-21.4.19-r1 (02 Dec 2006) diff --git a/app-editors/xemacs/files/xemacs-21.4.19-texi.patch b/app-editors/xemacs/files/xemacs-21.4.19-texi.patch new file mode 100644 index 000000000000..f53eb3dafd31 --- /dev/null +++ b/app-editors/xemacs/files/xemacs-21.4.19-texi.patch @@ -0,0 +1,33 @@ +Index: emodules.texi +=================================================================== +RCS file: /pack/xemacscvs/XEmacs/xemacs/man/emodules.texi,v +retrieving revision 1.2.2.2 +diff -u -B -r1.2.2.2 emodules.texi +--- man/emodules.texi 2002/08/20 11:35:22 1.2.2.2 ++++ man/emodules.texi 2006/12/09 14:21:22 +@@ -3,6 +3,9 @@ + @c %**start of header + @setfilename ../info/emodules.info + @settitle Extending Emacs using C Modules ++@direntry ++* Emodules: (emodules). XEmacs dynamically loadable module support. ++@end direntry + @c %**end of header + + @c +Index: external-widget.texi +=================================================================== +RCS file: /pack/xemacscvs/XEmacs/xemacs/man/external-widget.texi,v +retrieving revision 1.3.2.1 +diff -u -B -r1.3.2.1 external-widget.texi +--- man/external-widget.texi 2002/04/30 16:06:06 1.3.2.1 ++++ man/external-widget.texi 2006/12/09 14:21:22 +@@ -4,7 +4,7 @@ + @ifinfo + @dircategory XEmacs Editor + @direntry +-* External Widget: (external-widget) External Client Widget. ++* External Widget: (external-widget). External Client Widget. + @end direntry + @end ifinfo + diff --git a/app-editors/xemacs/xemacs-21.4.19-r1.ebuild b/app-editors/xemacs/xemacs-21.4.19-r1.ebuild index 6f9f93026fe5..ce62f4950506 100644 --- a/app-editors/xemacs/xemacs-21.4.19-r1.ebuild +++ b/app-editors/xemacs/xemacs-21.4.19-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.19-r1.ebuild,v 1.1 2006/12/02 14:16:32 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.19-r1.ebuild,v 1.2 2006/12/09 14:53:05 graaff Exp $ export WANT_AUTOCONF="2.1" inherit autotools eutils @@ -51,7 +51,7 @@ src_unpack() { use neXt && unpack NeXT_XEmacs.tar.gz cd "${S}" - epatch ${FILESDIR}/emodules.info-21.4.8-gentoo.patch + epatch ${FILESDIR}/xemacs-21.4.19-texi.patch # see bug 58350 epatch ${FILESDIR}/${PN}-21.4.17-gdbm.patch @@ -167,6 +167,15 @@ src_install() { infodir="${D}"/usr/share/info \ install gzip-el || die + # Rename some applications installed in bin so that it is clear + # which application installed them and so that conflicting + # packages (emacs) can't clobber the actual applications. + # Addresses bug #62991. + for i in b2m ctags etags rcs-checkin ; do + mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed" + dosym /usr/bin/${i}-xemacs /usr/bin/${i} + done + # install base packages directories dodir /usr/lib/xemacs/xemacs-packages/ dodir /usr/lib/xemacs/site-packages/ @@ -185,7 +194,6 @@ src_install() { cd "${S}" dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README* dodoc "${FILESDIR}"/README.Gentoo - rm -f "${D}"/usr/share/info/emodules.info~* insinto /usr/share/pixmaps newins "${S}"/etc/${PN}-icon.xpm ${PN}.xpm -- 2.26.2