* [gentoo-commits] gentoo-x86 commit in app-editors/emacs-vcs: ChangeLog emacs-vcs-24.3.9999.ebuild emacs-vcs-24.2.92.ebuild emacs-vcs-24.2.90.ebuild emacs-vcs-24.2.9999-r1.ebuild emacs-vcs-24.2.91.ebuild
@ 2013-03-05 17:39 Ulrich Mueller (ulm)
0 siblings, 0 replies; only message in thread
From: Ulrich Mueller (ulm) @ 2013-03-05 17:39 UTC (permalink / raw
To: gentoo-commits
ulm 13/03/05 17:39:38
Modified: ChangeLog emacs-vcs-24.3.9999.ebuild
Removed: emacs-vcs-24.2.92.ebuild emacs-vcs-24.2.90.ebuild
emacs-vcs-24.2.9999-r1.ebuild
emacs-vcs-24.2.91.ebuild
Log:
Merge some updates from from app-editors/emacs. Remove old.
(Portage version: 2.1.11.54/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Revision Changes Path
1.124 app-editors/emacs-vcs/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.124&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.124&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.123&r2=1.124
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- ChangeLog 7 Feb 2013 23:55:15 -0000 1.123
+++ ChangeLog 5 Mar 2013 17:39:38 -0000 1.124
@@ -1,6 +1,11 @@
# ChangeLog for app-editors/emacs-vcs
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.123 2013/02/07 23:55:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.124 2013/03/05 17:39:38 ulm Exp $
+
+ 05 Mar 2013; Ulrich Müller <ulm@gentoo.org> -emacs-vcs-24.2.90.ebuild,
+ -emacs-vcs-24.2.91.ebuild, -emacs-vcs-24.2.92.ebuild,
+ -emacs-vcs-24.2.9999-r1.ebuild, emacs-vcs-24.3.9999.ebuild:
+ Merge some updates from from app-editors/emacs. Remove old.
*emacs-vcs-24.2.93 (07 Feb 2013)
1.4 app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild?r1=1.3&r2=1.4
Index: emacs-vcs-24.3.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- emacs-vcs-24.3.9999.ebuild 15 Dec 2012 16:50:08 -0000 1.3
+++ emacs-vcs-24.3.9999.ebuild 5 Mar 2013 17:39:38 -0000 1.4
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.3 2012/12/15 16:50:08 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.4 2013/03/05 17:39:38 ulm Exp $
EAPI=5
-inherit autotools elisp-common eutils flag-o-matic multilib
+inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
if [[ ${PV##*.} = 9999 ]]; then
EBZR_PROJECT="emacs"
@@ -16,8 +16,8 @@
inherit bzr
SRC_URI=""
else
- SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz
- mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.gz"
+ SRC_URI="mirror://gentoo/emacs-${PV}.tar.xz
+ mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
# FULL_VERSION keeps the full version number, which is needed in
# order to determine some path information correctly for copy/move
# operations later on
@@ -31,12 +31,12 @@
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="24"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
+IUSE="alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses
>=app-admin/eselect-emacs-1.2
- >=app-emacs/emacs-common-gentoo-1.3[games?,X?]
+ >=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?]
net-libs/liblockfile
hesiod? ( net-dns/hesiod )
kerberos? ( virtual/krb5 )
@@ -140,35 +140,38 @@
if use alsa && ! use sound; then
einfo "Although sound USE flag is disabled you chose to have alsa,"
einfo "so sound is switched on anyway."
- myconf="${myconf} --with-sound"
+ myconf+=" --with-sound"
else
- myconf="${myconf} $(use_with sound)"
+ myconf+=" $(use_with sound)"
fi
if use X; then
- myconf="${myconf} --with-x --without-ns"
- myconf="${myconf} $(use_with gconf)"
- myconf="${myconf} $(use_with gsettings)"
- myconf="${myconf} $(use_with toolkit-scroll-bars)"
- myconf="${myconf} $(use_with gif) $(use_with jpeg)"
- myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
- myconf="${myconf} $(use_with tiff) $(use_with xpm)"
- myconf="${myconf} $(use_with imagemagick)"
+ myconf+=" --with-x --without-ns"
+ myconf+=" $(use_with gconf)"
+ myconf+=" $(use_with gsettings)"
+ myconf+=" $(use_with toolkit-scroll-bars)"
+ myconf+=" $(use_with gif)"
+ myconf+=" $(use_with jpeg)"
+ myconf+=" $(use_with png)"
+ myconf+=" $(use_with svg rsvg)"
+ myconf+=" $(use_with tiff)"
+ myconf+=" $(use_with xpm)"
+ myconf+=" $(use_with imagemagick)"
if use xft; then
- myconf="${myconf} --with-xft"
- myconf="${myconf} $(use_with m17n-lib libotf)"
- myconf="${myconf} $(use_with m17n-lib m17n-flt)"
+ myconf+=" --with-xft"
+ myconf+=" $(use_with m17n-lib libotf)"
+ myconf+=" $(use_with m17n-lib m17n-flt)"
else
- myconf="${myconf} --without-xft"
- myconf="${myconf} --without-libotf --without-m17n-flt"
+ myconf+=" --without-xft"
+ myconf+=" --without-libotf --without-m17n-flt"
use m17n-lib && ewarn \
"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
fi
if use gtk; then
einfo "Configuring to build with GIMP Toolkit (GTK+)"
- myconf="${myconf} --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
+ myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
local f
for f in athena Xaw3d motif; do
use ${f} && ewarn "USE flag \"${f}\" ignored" \
@@ -176,29 +179,29 @@
done
elif use athena || use Xaw3d; then
einfo "Configuring to build with Athena/Lucid toolkit"
- myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+ myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
use motif && ewarn "USE flag \"motif\" ignored" \
"(superseded by \"athena\" or \"Xaw3d\")"
elif use motif; then
einfo "Configuring to build with Motif toolkit"
- myconf="${myconf} --with-x-toolkit=motif"
+ myconf+=" --with-x-toolkit=motif"
else
einfo "Configuring to build with no toolkit"
- myconf="${myconf} --with-x-toolkit=no"
+ myconf+=" --with-x-toolkit=no"
fi
elif use aqua; then
einfo "Configuring to build with Cocoa support"
- myconf="${myconf} --with-ns --disable-ns-self-contained"
- myconf="${myconf} --without-x"
+ myconf+=" --with-ns --disable-ns-self-contained"
+ myconf+=" --without-x"
else
- myconf="${myconf} --without-x --without-ns"
+ myconf+=" --without-x --without-ns"
fi
# Save version information in the Emacs binary. It will be available
# in variable "system-configuration-options".
- myconf="${myconf} GENTOO_PACKAGE=${CATEGORY}/${PF}"
+ myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
if [[ ${PV##*.} = 9999 ]]; then
- myconf="${myconf} EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
+ myconf+=" EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
fi
# According to configure, this option is only used for GNU/Linux
@@ -291,9 +294,26 @@
rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
mv nextstep/Emacs.app \
"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
- elog "Emacs${EMACS_SUFFIX#emacs}.app is in ${EPREFIX}/Applications/Gentoo."
- elog "You may want to copy or symlink it into /Applications by yourself."
fi
+
+ DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
+ through the Emacs eselect module, which also redirects man and info
+ pages. Therefore, several Emacs versions can be installed at the
+ same time. \"man emacs.eselect\" for details.
+ \\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
+ strongly recommended that you use app-admin/emacs-updater to rebuild
+ all byte-compiled elisp files of the installed Emacs packages."
+ 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
+ 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 it
+ into /Applications by yourself."
+ [[ ${REPLACING_VERSIONS} =~ (^|[[:space:]])24\.[12]($|[^0-9]) ]] \
+ && FORCE_PRINT_ELOG=1
+ readme.gentoo_create_doc
}
pkg_preinst() {
@@ -316,25 +336,15 @@
pkg_postinst() {
elisp-site-regen
- eselect emacs update ifunset
+ readme.gentoo_print_elog
- if use X; then
- elog "You need to install some fonts for Emacs."
- elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
- elog "machine would satisfy basic Emacs requirements under X11."
- elog "See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml"
- elog "for how to enable anti-aliased fonts."
- elog
- fi
-
- elog "You can set the version to be started by /usr/bin/emacs through"
- elog "the Emacs eselect module, which also redirects man and info pages."
- elog "Therefore, several Emacs versions can be installed at the same time."
- elog "\"man emacs.eselect\" for details."
- elog
- elog "If you upgrade from Emacs version 24.2 or earlier, then it is"
- elog "strongly recommended that you use app-admin/emacs-updater to rebuild"
- elog "all byte-compiled elisp files of the installed Emacs packages."
+ if use livecd; then
+ # force an update of the emacs symlink for the livecd/dvd,
+ # because some microemacs packages set it with USE=livecd
+ eselect emacs update
+ else
+ eselect emacs update ifunset
+ fi
}
pkg_postrm() {
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-03-05 17:39 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-05 17:39 [gentoo-commits] gentoo-x86 commit in app-editors/emacs-vcs: ChangeLog emacs-vcs-24.3.9999.ebuild emacs-vcs-24.2.92.ebuild emacs-vcs-24.2.90.ebuild emacs-vcs-24.2.9999-r1.ebuild emacs-vcs-24.2.91.ebuild Ulrich Mueller (ulm)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox