From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1E3591391DB for ; Tue, 18 Mar 2014 16:57:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B1006E0980; Tue, 18 Mar 2014 16:57:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 33403E0980 for ; Tue, 18 Mar 2014 16:57:18 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3A00433F7C0 for ; Tue, 18 Mar 2014 16:57:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id EAE9618875 for ; Tue, 18 Mar 2014 16:57:12 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1395161979.1bc3c06c292b515de249f7dd53a2ad55bc7638a3.ulm@gentoo> Subject: [gentoo-commits] proj/emacs:master commit in: app-editors/emacs/ X-VCS-Repository: proj/emacs X-VCS-Files: app-editors/emacs/ChangeLog app-editors/emacs/emacs-21.4-r24.ebuild app-editors/emacs/emacs-22.3-r10.ebuild X-VCS-Directories: app-editors/emacs/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 1bc3c06c292b515de249f7dd53a2ad55bc7638a3 X-VCS-Branch: master Date: Tue, 18 Mar 2014 16:57:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5092e15b-11e3-44db-b07a-067d4d20b5fc X-Archives-Hash: 19deb2116c90333e9167071b7d26e809 commit: 1bc3c06c292b515de249f7dd53a2ad55bc7638a3 Author: Ulrich Müller gentoo org> AuthorDate: Tue Mar 18 16:59:39 2014 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Tue Mar 18 16:59:39 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=1bc3c06c Further fixes to man page installation. Package-Manager: portage-2.2.8-r1 --- app-editors/emacs/ChangeLog | 4 ++++ app-editors/emacs/emacs-21.4-r24.ebuild | 3 +++ app-editors/emacs/emacs-22.3-r10.ebuild | 12 ++++++++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index 91ccb49..9952ead 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 18 Mar 2014; Ulrich Müller emacs-21.4-r24.ebuild, + emacs-22.3-r10.ebuild: + Further fixes to man page installation. + 16 Mar 2014; Ulrich Müller emacs-18.59-r9.ebuild, emacs-21.4-r24.ebuild, emacs-22.3-r10.ebuild, emacs-23.4-r6.ebuild, emacs-24.3-r2.ebuild: diff --git a/app-editors/emacs/emacs-21.4-r24.ebuild b/app-editors/emacs/emacs-21.4-r24.ebuild index ed4459b..c548550 100644 --- a/app-editors/emacs/emacs-21.4-r24.ebuild +++ b/app-editors/emacs/emacs-21.4-r24.ebuild @@ -51,6 +51,9 @@ src_prepare() { sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \ "${S}/src/s/gnu-linux.h" || die + sed -i -e "/^\\.so/s/etags/&-emacs-${SLOT}/" etc/ctags.1 \ + || die "unable to sed ctags.1" + # custom aclocal.m4 was only needed for autoconf 2.13 and earlier rm aclocal.m4 eaclocal diff --git a/app-editors/emacs/emacs-22.3-r10.ebuild b/app-editors/emacs/emacs-22.3-r10.ebuild index 87fcaba..bb86749 100644 --- a/app-editors/emacs/emacs-22.3-r10.ebuild +++ b/app-editors/emacs/emacs-22.3-r10.ebuild @@ -59,6 +59,9 @@ src_prepare() { -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" + sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" etc/ctags.1 \ + || die "unable to sed ctags.1" + 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. @@ -156,11 +159,12 @@ src_install () { # move man pages to the correct place local m - for m in "${D}"/usr/share/man/man1/* ; do - mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed" - done - mv "${D}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \ + mv "${D}"/usr/share/man/man1/{emacs,${EMACS_SUFFIX}}.1 \ || die "moving emacs man page failed" + for m in ctags emacsclient etags; do + mv "${D}"/usr/share/man/man1/${m}{,-${EMACS_SUFFIX}}.1 \ + || die "moving ${m} man page failed" + done # move info dir to avoid collisions with the dir file generated by portage mv "${D}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \