summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-07-14 17:46:51 +0200
committerUlrich Müller <ulm@gentoo.org>2013-07-14 17:46:51 +0200
commitad6172d5c9393f715657ca71651a7817093e6814 (patch)
tree04ff5a787233ea36f1deaaed35cfd3ac157b3c3f /app-editors
parentUpdate URI for Xft font guide. (diff)
downloademacs-ad6172d5c9393f715657ca71651a7817093e6814.tar.gz
emacs-ad6172d5c9393f715657ca71651a7817093e6814.tar.bz2
emacs-ad6172d5c9393f715657ca71651a7817093e6814.zip
Merge changes from emacs-vcs.
Package-Manager: portage-2.1.12.13
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/emacs-xwidget/ChangeLog3
-rw-r--r--app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild5
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 <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
+ Merge changes from emacs-vcs.
+
15 Jun 2013; Ulrich Müller <ulm@gentoo.org> 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