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 0064E138A1A for ; Thu, 13 Nov 2014 23:16:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53C41E08E6; Thu, 13 Nov 2014 23:16:39 +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 E5CA9E08E6 for ; Thu, 13 Nov 2014 23:16:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 773883404E6 for ; Thu, 13 Nov 2014 23:16:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1C995A150 for ; Thu, 13 Nov 2014 23:16:36 +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: <1415920699.8e45750f5743b1344e6e84fc6908dd0e83a01d68.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-25.0.9999-r1.ebuild app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild X-VCS-Directories: app-editors/emacs-vcs/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 8e45750f5743b1344e6e84fc6908dd0e83a01d68 X-VCS-Branch: master Date: Thu, 13 Nov 2014 23:16:36 +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: 51cc85f1-09f8-42fa-8eed-09bd26fd5293 X-Archives-Hash: 53ae7d361cc277da97eba09cbf12cdfa commit: 8e45750f5743b1344e6e84fc6908dd0e83a01d68 Author: Ulrich Müller gentoo org> AuthorDate: Thu Nov 13 23:18:19 2014 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Thu Nov 13 23:18:19 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=8e45750f app-editors/emacs-vcs: Merge changes from Portage tree. Package-Manager: portage-2.2.14 --- app-editors/emacs-vcs/ChangeLog | 6 ++++++ ...0.9999.ebuild => emacs-vcs-25.0.9999-r1.ebuild} | 22 +++++++++------------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index 9161e69..9ace187 100644 --- a/app-editors/emacs-vcs/ChangeLog +++ b/app-editors/emacs-vcs/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*emacs-vcs-25.0.9999-r1 (13 Nov 2014) + + 13 Nov 2014; Ulrich Müller -emacs-vcs-25.0.9999.ebuild, + +emacs-vcs-25.0.9999-r1.ebuild: + Merge changes from Portage tree. + 10 Nov 2014; Ulrich Müller emacs-vcs-25.0.9999.ebuild: Merge changes from Portage tree. diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild similarity index 95% rename from app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild rename to app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild index f66a49f..1a4cf02 100644 --- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild @@ -7,15 +7,11 @@ EAPI=5 inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo if [[ ${PV##*.} = 9999 ]]; then - EBZR_PROJECT="emacs" - EBZR_BRANCH="trunk" - EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/" - # "Nosmart" is much faster for initial branching. - EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}" - EBZR_UNPACK_DIR="${WORKDIR}/emacs" - EBZR_WORKDIR_CHECKOUT="t" #434746 - inherit bzr - S="${EBZR_UNPACK_DIR}" + inherit git-r3 + EGIT_REPO_URI="git://git.sv.gnu.org/emacs.git" + EGIT_BRANCH="master" + EGIT_CHECKOUT_DIR="${WORKDIR}/emacs" + S="${EGIT_CHECKOUT_DIR}" else SRC_URI="http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz" @@ -105,8 +101,8 @@ src_prepare() { FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \ configure.ac) [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" - einfo "Emacs branch: ${EBZR_BRANCH}" - einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}" + einfo "Emacs branch: ${EGIT_BRANCH}" + einfo "Commit: ${EGIT_VERSION}" einfo "Emacs version number: ${FULL_VERSION}" [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \ || die "Upstream version number changed to ${FULL_VERSION}" @@ -203,7 +199,7 @@ src_configure() { # in variable "system-configuration-options". myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}" if [[ ${PV##*.} = 9999 ]]; then - myconf+=" EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}" + myconf+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}" fi econf \ @@ -248,7 +244,7 @@ src_install () { # avoid collision between slots, see bug #169033 e.g. rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el - rm -rf "${ED}"/usr/share/{applications,icons} + rm -rf "${ED}"/usr/share/{appdata,applications,icons} rm -rf "${ED}"/var # remove unused /site-lisp dir