From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-775688-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 329CE138A1A
for <garchives@archives.gentoo.org>; Sat, 21 Feb 2015 12:03:44 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C108CE08ED;
Sat, 21 Feb 2015 12:03:43 +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 4CB55E08ED
for <gentoo-commits@lists.gentoo.org>; Sat, 21 Feb 2015 12:03:43 +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 3016E340941
for <gentoo-commits@lists.gentoo.org>; Sat, 21 Feb 2015 12:03:42 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 299C4123C3
for <gentoo-commits@lists.gentoo.org>; Sat, 21 Feb 2015 12:03:39 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
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" <ulm@gentoo.org>
Message-ID: <1424520213.e7bbbe1b46d727c5c2474771f032c47d1c8abf3d.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-r2.ebuild
X-VCS-Directories: app-editors/emacs-vcs/
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: e7bbbe1b46d727c5c2474771f032c47d1c8abf3d
X-VCS-Branch: master
Date: Sat, 21 Feb 2015 12:03:39 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 2d3b6444-8e9f-4183-ab5c-4a74f4930d18
X-Archives-Hash: 9fb8c8550db016880fdd4462cfc739d9
commit: e7bbbe1b46d727c5c2474771f032c47d1c8abf3d
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 21 12:03:33 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 21 12:03:33 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=e7bbbe1b
app-editors/emacs-vcs: Sync from Portage tree. Remove old.
Package-Manager: portage-2.2.17
---
app-editors/emacs-vcs/ChangeLog | 4 +
.../emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild | 363 ---------------------
.../emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild | 4 +-
3 files changed, 6 insertions(+), 365 deletions(-)
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 4a1af1a..0e24e68 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 21 Feb 2015; Ulrich Müller <ulm@gentoo.org> -emacs-vcs-25.0.9999-r1.ebuild,
+ emacs-vcs-25.0.9999-r2.ebuild:
+ Sync from Portage tree. Remove old.
+
19 Feb 2015; Ulrich Müller <ulm@gentoo.org> emacs-vcs-25.0.9999-r2.ebuild:
Use "gamestat" group for shared score files, following QA tree policy.
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild
deleted file mode 100644
index 07daa6b..0000000
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild
+++ /dev/null
@@ -1,363 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild,v 1.1 2014/10/02 07:13:42 ulm Exp $
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
-
-if [[ ${PV##*.} = 9999 ]]; then
- 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"
- # FULL_VERSION keeps the full version number, which is needed in
- # order to determine some path information correctly for copy/move
- # operations later on
- FULL_VERSION="${PV%%_*}"
- S="${WORKDIR}/emacs-${FULL_VERSION}"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="25"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses
- >=app-admin/eselect-emacs-1.16
- >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
- net-libs/liblockfile
- acl? ( virtual/acl )
- alsa? ( media-libs/alsa-lib )
- dbus? ( sys-apps/dbus )
- gfile? ( >=dev-libs/glib-2.28.6 )
- gnutls? ( net-libs/gnutls )
- gpm? ( sys-libs/gpm )
- hesiod? ( net-dns/hesiod )
- kerberos? ( virtual/krb5 )
- libxml2? ( >=dev-libs/libxml2-2.2.0 )
- selinux? ( sys-libs/libselinux )
- zlib? ( sys-libs/zlib )
- X? (
- x11-libs/libXmu
- x11-libs/libXt
- x11-misc/xbitmaps
- gconf? ( >=gnome-base/gconf-2.26.2 )
- gsettings? ( >=dev-libs/glib-2.28.6 )
- gif? ( media-libs/giflib )
- jpeg? ( virtual/jpeg:0= )
- png? ( >=media-libs/libpng-1.4:0= )
- svg? ( >=gnome-base/librsvg-2.0 )
- tiff? ( media-libs/tiff )
- xpm? ( x11-libs/libXpm )
- imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
- xft? (
- media-libs/fontconfig
- media-libs/freetype
- x11-libs/libXft
- m17n-lib? (
- >=dev-libs/libotf-0.9.4
- >=dev-libs/m17n-lib-1.5.1
- )
- )
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? (
- gtk? ( x11-libs/gtk+:2 )
- !gtk? (
- motif? ( >=x11-libs/motif-2.3:0 )
- !motif? (
- Xaw3d? ( x11-libs/libXaw3d )
- !Xaw3d? ( athena? ( x11-libs/libXaw ) )
- )
- )
- )
- )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- gzip-el? ( app-arch/gzip )
- pax_kernel? (
- sys-apps/attr
- sys-apps/paxctl
- )"
-
-if [[ ${PV##*.} = 9999 ]]; then
- DEPEND="${DEPEND}
- sys-apps/texinfo"
-fi
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
- if [[ ${PV##*.} = 9999 ]]; then
- FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
- configure.ac)
- [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
- 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}"
- fi
-
- epatch_user
-
- # Fix filename reference in redirected man page
- sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
- || die "unable to sed ctags.1"
-
- AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
- strip-flags
- filter-flags -pie #526948
-
- if use sh; then
- replace-flags "-O[1-9]" -O0 #262359
- elif use ia64; then
- replace-flags "-O[2-9]" -O1 #325373
- else
- replace-flags "-O[3-9]" -O2
- fi
-
- local myconf
-
- if use alsa; then
- use sound || ewarn \
- "USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
- myconf+=" --with-sound=alsa"
- else
- myconf+=" --with-sound=$(usex sound oss)"
- fi
-
- if use X; then
- 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+=" --with-xft"
- myconf+=" $(use_with m17n-lib libotf)"
- myconf+=" $(use_with m17n-lib m17n-flt)"
- else
- 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 gtk3; then
- einfo "Configuring to build with GIMP Toolkit (GTK+) version 3"
- myconf+=" --with-x-toolkit=gtk3"
- elif use gtk; then
- einfo "Configuring to build with GIMP Toolkit (GTK+) version 2"
- myconf+=" --with-x-toolkit=gtk2"
- elif use motif; then
- einfo "Configuring to build with Motif toolkit"
- myconf+=" --with-x-toolkit=motif"
- elif use athena || use Xaw3d; then
- einfo "Configuring to build with Athena/Lucid toolkit"
- myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
- else
- einfo "Configuring to build with no toolkit"
- myconf+=" --with-x-toolkit=no"
- fi
-
- local f tk
- for f in gtk3 gtk motif Xaw3d athena; do
- use ${f} || continue
- [[ ${tk} = gtk* || ${tk} = motif ]] \
- && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
- : ${tk:=${f}}
- done
- elif use aqua; then
- einfo "Configuring to build with Nextstep (Cocoa) support"
- myconf+=" --with-ns --disable-ns-self-contained"
- myconf+=" --without-x"
- else
- myconf+=" --without-x --without-ns"
- fi
-
- # Save version information in the Emacs binary. It will be available
- # in variable "system-configuration-options".
- myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
- if [[ ${PV##*.} = 9999 ]]; then
- myconf+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}"
- fi
-
- econf \
- --program-suffix="-${EMACS_SUFFIX}" \
- --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
- --localstatedir="${EPREFIX}"/var \
- --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
- --with-gameuser="${GAMES_USER_DED:-games}" \
- --without-compress-install \
- --with-file-notification=$(usev gfile || usev inotify || echo no) \
- $(use_enable acl) \
- $(use_with dbus) \
- $(use_with gnutls) \
- $(use_with gpm) \
- $(use_with hesiod) \
- $(use_with kerberos) $(use_with kerberos kerberos5) \
- $(use_with libxml2 xml2) \
- $(use_with selinux) \
- $(use_with wide-int) \
- $(use_with zlib) \
- ${myconf}
-}
-
-src_compile() {
- export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
- emake
-}
-
-src_install () {
- emake DESTDIR="${D}" NO_BIN_LINK=t install
-
- mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
- || die "moving emacs executable failed"
- mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
- || die "moving emacs man page 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"
- touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
- docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
- # avoid collision between slots, see bug #169033 e.g.
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
- rm -rf "${ED}"/usr/share/{appdata,applications,icons}
- rm -rf "${ED}"/var
-
- # remove unused <version>/site-lisp dir
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
- # remove COPYING file (except for etc/COPYING used by describe-copying)
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
- if use gzip-el; then
- # compress .el files when a corresponding .elc exists
- find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
- -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
- assert "gzip .el failed"
- fi
-
- local cdir
- if use source; then
- cdir="/usr/share/emacs/${FULL_VERSION}/src"
- insinto "${cdir}"
- # This is not meant to install all the source -- just the
- # C source you might find via find-function
- doins src/*.{c,h,m}
- elif has installsources ${FEATURES}; then
- cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
- fi
-
- sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
- X
- ;;; ${PN}-${SLOT} site-lisp configuration
- X
- (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
- Y (setq find-function-C-source-directory
- Y "${EPREFIX}${cdir}")
- X (let ((path (getenv "INFOPATH"))
- X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
- X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
- X (and path
- X ;; move Emacs Info dir before anything else in /usr/share/info
- X (let* ((p (cons nil (split-string path ":" t))) (q p))
- X (while (and (cdr q) (not (string-match re (cadr q))))
- X (setq q (cdr q)))
- X (setcdr q (cons dir (delete dir (cdr q))))
- X (setq Info-directory-list (prune-directory-list (cdr p)))))))
- EOF
- elisp-site-file-install "${T}/${SITEFILE}" || die
-
- dodoc README BUGS CONTRIBUTE
-
- if use aqua; then
- dodir /Applications/Gentoo
- rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
- mv nextstep/Emacs.app \
- "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
- 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 https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
- 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."
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- # move Info dir file to correct name
- local infodir=/usr/share/info/${EMACS_SUFFIX} f
- if [[ -f ${ED}${infodir}/dir.orig ]]; then
- mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
- elif [[ -d "${ED}"${infodir} ]]; then
- # this should not happen in EAPI 4
- ewarn "Regenerating Info directory index in ${infodir} ..."
- rm -f "${ED}"${infodir}/dir{,.*}
- for f in "${ED}"${infodir}/*; do
- if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
- install-info --info-dir="${ED}"${infodir} "${f}" \
- || die "install-info failed"
- fi
- done
- fi
-}
-
-pkg_postinst() {
- elisp-site-regen
-
- local pvr
- for pvr in ${REPLACING_VERSIONS}; do
- [[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
- done
- readme.gentoo_print_elog
-
- 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
- elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
- # refresh symlinks in case any installed files have changed
- eselect emacs set ${EMACS_SUFFIX}
- else
- eselect emacs update ifunset
- fi
-}
-
-pkg_postrm() {
- elisp-site-regen
- eselect emacs update ifunset
-}
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild
index 825e972..bfc3453 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses
>=app-admin/eselect-emacs-1.16
- >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
+ >=app-emacs/emacs-common-gentoo-1.4-r2[games?,X?]
net-libs/liblockfile
acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
@@ -55,7 +55,7 @@ RDEPEND="sys-libs/ncurses
jpeg? ( virtual/jpeg:0= )
png? ( >=media-libs/libpng-1.4:0= )
svg? ( >=gnome-base/librsvg-2.0 )
- tiff? ( media-libs/tiff )
+ tiff? ( media-libs/tiff:0 )
xpm? ( x11-libs/libXpm )
imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
xft? (