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 E46501381F3 for ; Sun, 14 Jul 2013 15:46:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5FF77E093A; Sun, 14 Jul 2013 15:46:08 +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 E0212E093A for ; Sun, 14 Jul 2013 15:46:07 +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 0736833EA32 for ; Sun, 14 Jul 2013 15:46:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 9573EE468F for ; Sun, 14 Jul 2013 15:46:05 +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: <1373816811.ad6172d5c9393f715657ca71651a7817093e6814.ulm@gentoo> Subject: [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-xwidget/ X-VCS-Repository: proj/emacs X-VCS-Files: app-editors/emacs-xwidget/ChangeLog app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild X-VCS-Directories: app-editors/emacs-xwidget/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Mueller X-VCS-Revision: ad6172d5c9393f715657ca71651a7817093e6814 X-VCS-Branch: master Date: Sun, 14 Jul 2013 15:46:05 +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: d0584932-76d0-4bba-b1ea-34075428a4bd X-Archives-Hash: 989e20aac593ecdd7d8064cc571ad7b9 commit: ad6172d5c9393f715657ca71651a7817093e6814 Author: Ulrich Müller gentoo org> AuthorDate: Sun Jul 14 15:46:51 2013 +0000 Commit: Ulrich Mueller gentoo org> CommitDate: Sun Jul 14 15:46:51 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=ad6172d5 Merge changes from emacs-vcs. Package-Manager: portage-2.1.12.13 --- app-editors/emacs-xwidget/ChangeLog | 3 +++ app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog index 4a98282..73c6eb1 100644 --- a/app-editors/emacs-xwidget/ChangeLog +++ b/app-editors/emacs-xwidget/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 14 Jul 2013; Ulrich Müller emacs-xwidget-24.3.9999.ebuild: + Merge changes from emacs-vcs. + 15 Jun 2013; Ulrich Müller emacs-xwidget-24.3.9999.ebuild, metadata.xml: Merge changes from emacs-vcs. diff --git a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild index 6515c5f..7a93bf9 100644 --- a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild +++ b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild @@ -12,9 +12,10 @@ if [[ ${PV##*.} = 9999 ]]; then 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 - SRC_URI="" + S="${EBZR_UNPACK_DIR}" else SRC_URI="mirror://gentoo/emacs-${PV}.tar.xz mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz" @@ -323,7 +324,7 @@ src_install () { use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. Installing media-fonts/font-adobe-{75,100}dpi on the X server's machine would satisfy basic Emacs requirements under X11. - See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml + See also https://wiki.gentoo.org/wiki/Project:Emacs/Xft_support for how to enable anti-aliased fonts." use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink