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 165BC1381F3 for ; Wed, 14 Aug 2013 06:29:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7D05E0BA3; Wed, 14 Aug 2013 06:29:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3C37AE0BA3 for ; Wed, 14 Aug 2013 06:29:29 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3E9C733E8B5 for ; Wed, 14 Aug 2013 06:29:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 68995E468F for ; Wed, 14 Aug 2013 06:29:25 +0000 (UTC) From: "Ulrich Mueller" 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 Mueller" Message-ID: <1376461855.54bf9918ef7f90724f952ecfd48bee90afd7cd46.ulm@gentoo> Subject: [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/ X-VCS-Repository: proj/emacs X-VCS-Files: app-editors/emacs-vcs/ChangeLog app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild X-VCS-Directories: app-editors/emacs-vcs/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Mueller X-VCS-Revision: 54bf9918ef7f90724f952ecfd48bee90afd7cd46 X-VCS-Branch: master Date: Wed, 14 Aug 2013 06:29:25 +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: ce48018b-6ad8-4eb5-94f8-1f9f23b809af X-Archives-Hash: e7d81ff14d8ddba7cf4b729dd8440408 commit: 54bf9918ef7f90724f952ecfd48bee90afd7cd46 Author: Ulrich Müller gentoo org> AuthorDate: Wed Aug 14 06:30:55 2013 +0000 Commit: Ulrich Mueller gentoo org> CommitDate: Wed Aug 14 06:30:55 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=54bf9918 Merge changes from Portage tree. Package-Manager: portage-2.2.0 --- app-editors/emacs-vcs/ChangeLog | 3 +++ app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index aa11a70..a3bdbf5 100644 --- a/app-editors/emacs-vcs/ChangeLog +++ b/app-editors/emacs-vcs/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 14 Aug 2013; Ulrich Müller emacs-vcs-24.3.9999.ebuild: + Merge changes from Portage tree. + 13 Aug 2013; Ulrich Müller emacs-vcs-24.3.9999.ebuild: Explicitly ask for --with-sound=alsa with USE="alsa". diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild index e3651cc..91a3102 100644 --- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild @@ -218,7 +218,6 @@ src_configure() { econf \ --program-suffix="-${EMACS_SUFFIX}" \ - --program-transform-name="s/^\(emacs\)-[0-9].*-\1/\1/" \ --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ --with-gameuser="${GAMES_USER_DED:-games}" \ @@ -245,6 +244,9 @@ src_compile() { src_install () { emake DESTDIR="${D}" NO_BIN_LINK=t install + mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \ + || die "moving emacs executable failed" + # move info dir to avoid collisions with the dir file generated by portage mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \ || die "moving info dir failed"