[gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/

2016-05-28 Thread Ulrich Müller 
commit: 1c7e7618c5a592049e94bdfd525c608ba59c9c3e
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat May 28 06:52:10 2016 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat May 28 06:52:10 2016 +
URL:https://gitweb.gentoo.org/proj/emacs.git/commit/?id=1c7e7618

app-editors/emacs-vcs: Add pkg_pretend to warn early about USE flag problems.

Package-Manager: portage-2.3.0_rc1

 .../emacs-vcs/emacs-vcs-25.1.-r1.ebuild| 42 ++
 1 file changed, 42 insertions(+)

diff --git a/app-editors/emacs-vcs/emacs-vcs-25.1.-r1.ebuild 
b/app-editors/emacs-vcs/emacs-vcs-25.1.-r1.ebuild
index 5457c54..4d274bf 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.1.-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.1.-r1.ebuild
@@ -104,6 +104,48 @@ fi
 EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
 SITEFILE="20${PN}-${SLOT}-gentoo.el"
 
+pkg_pretend() {
+   local f
+
+   if use alsa && ! use sound; then
+   ewarn "USE flag \"alsa\" overrides \"-sound\"; enabling sound 
support."
+   fi
+
+   if use X; then
+   if ! use xft; then
+   for f in cairo m17n-lib; do
+   use ${f} && ewarn \
+   "USE flag \"${f}\" has no effect if 
\"xft\" is not set."
+   done
+   fi
+
+   if use gtk; then
+   while read line; do ewarn "${line}"; done <<-EOF
+   Your version of GTK+ will have problems with 
closing open
+   displays. This is no problem if you just use 
one display, but
+   if you use more than one and close one of them 
Emacs may crash.
+   See 
.
+   If you intend to use more than one display, 
then it is strongly
+   recommended that you compile Emacs with the 
Athena/Lucid or the
+   Motif toolkit instead.
+   EOF
+   for f in motif Xaw3d athena; do
+   use ${f} && ewarn \
+   "USE flag \"${f}\" has no effect if 
\"gtk\" is set."
+   done
+   elif use motif; then
+   for f in Xaw3d athena; do
+   use ${f} && ewarn \
+   "USE flag \"${f}\" has no effect if 
\"motif\" is set."
+   done
+   fi
+
+   if ! use gtk && use xwidgets; then
+  ewarn "USE flag \"xwidgets\" has no effect if \"gtk\" is not 
set."
+   fi
+   fi
+}
+
 src_prepare() {
if [[ ${PV##*.} =  ]]; then
FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ 
\t,)]*\).*/\1/p' \

[gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/

2016-03-21 Thread Ulrich Müller 
commit: f752454e2ea479ff6ef2f60f8cd3f621eba676ce
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Mar 20 18:21:34 2016 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Mar 21 09:44:30 2016 +
URL:https://gitweb.gentoo.org/proj/emacs.git/commit/?id=f752454e

app-editors/emacs-vcs: Sync from Portage tree.

Package-Manager: portage-2.2.28

 ...999-r2.ebuild => emacs-vcs-25.1.-r1.ebuild} | 103 +
 app-editors/emacs-vcs/metadata.xml |   8 +-
 2 files changed, 67 insertions(+), 44 deletions(-)

diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild 
b/app-editors/emacs-vcs/emacs-vcs-25.1.-r1.ebuild
similarity index 80%
rename from app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild
rename to app-editors/emacs-vcs/emacs-vcs-25.1.-r1.ebuild
index 2e9d5f4..5457c54 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.1.-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
+inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1
 
 if [[ ${PV##*.} =  ]]; then
inherit git-r3
@@ -13,37 +13,38 @@ if [[ ${PV##*.} =  ]]; then
EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
S="${EGIT_CHECKOUT_DIR}"
 else
-   SRC_URI="http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
+   SRC_URI="https://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}"
+   [[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display 
editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/;
+HOMEPAGE="https://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"
+IUSE="acl alsa aqua athena cairo dbus games gconf gfile gif gpm gsettings gtk 
+gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib 
motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars 
wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
 
-RDEPEND="sys-libs/ncurses
+RDEPEND="sys-libs/ncurses:0
>=app-eselect/eselect-emacs-1.16
-   >=app-emacs/emacs-common-gentoo-1.4-r2[games?,X?]
+   >=app-emacs/emacs-common-gentoo-1.5[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 )
+   !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
kerberos? ( virtual/krb5 )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
selinux? ( sys-libs/libselinux )
+   ssl? ( net-libs/gnutls )
zlib? ( sys-libs/zlib )
X? (
x11-libs/libXmu
@@ -51,7 +52,7 @@ RDEPEND="sys-libs/ncurses
x11-misc/xbitmaps
gconf? ( >=gnome-base/gconf-2.26.2 )
gsettings? ( >=dev-libs/glib-2.28.6 )
-   gif? ( media-libs/giflib )
+   gif? ( media-libs/giflib:0= )
jpeg? ( virtual/jpeg:0= )
png? ( >=media-libs/libpng-1.4:0= )
svg? ( >=gnome-base/librsvg-2.0 )
@@ -62,20 +63,27 @@ RDEPEND="sys-libs/ncurses
media-libs/fontconfig
media-libs/freetype
x11-libs/libXft
+   cairo? ( >=x11-libs/cairo-1.12.18 )
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 ) )
-   )
+   gtk? (
+

[gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/

2015-02-21 Thread Ulrich Müller 
commit: e7bbbe1b46d727c5c2474771f032c47d1c8abf3d
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Sat Feb 21 12:03:33 2015 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Sat Feb 21 12:03:33 2015 +
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.-r1.ebuild| 363 -
 .../emacs-vcs/emacs-vcs-25.0.-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 u...@gentoo.org -emacs-vcs-25.0.-r1.ebuild,
+  emacs-vcs-25.0.-r2.ebuild:
+  Sync from Portage tree. Remove old.
+
   19 Feb 2015; Ulrich Müller u...@gentoo.org emacs-vcs-25.0.-r2.ebuild:
   Use gamestat group for shared score files, following QA tree policy.
 

diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.-r1.ebuild 
b/app-editors/emacs-vcs/emacs-vcs-25.0.-r1.ebuild
deleted file mode 100644
index 07daa6b..000
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.-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..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##*.} =  ]]; 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? (
-

[gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/

2015-02-19 Thread Ulrich Müller 
commit: d44f86995cd6f75b8b5034251ebf84c463d34b32
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Thu Feb 19 22:14:17 2015 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Thu Feb 19 22:14:17 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=d44f8699

app-editors/emacs-vcs: Use gamestat group for shared score files, following 
QA tree policy.

Package-Manager: portage-2.2.17

---
 app-editors/emacs-vcs/ChangeLog | 3 +++
 app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 9203ce2..4a1af1a 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Feb 2015; Ulrich Müller u...@gentoo.org emacs-vcs-25.0.-r2.ebuild:
+  Use gamestat group for shared score files, following QA tree policy.
+
   09 Feb 2015; Ulrich Müller u...@gentoo.org emacs-vcs-25.0.-r2.ebuild:
   Use group 'scores' instead of 'games' for shared score files.
 

diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild 
b/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild
index 4b43250..825e972 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild
@@ -207,7 +207,7 @@ src_configure() {
--infodir=${EPREFIX}/usr/share/info/${EMACS_SUFFIX} \
--localstatedir=${EPREFIX}/var \

--enable-locallisppath=${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP} \
-   --with-gameuser=:scores \
+   --with-gameuser=:gamestat \
--without-compress-install \
--with-file-notification=$(usev gfile || usev inotify || echo 
no) \
$(use_enable acl) \

[gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/

2015-02-09 Thread Ulrich Müller 
commit: 5b7e14adcab35bae5f27862a5c2dbd327e6e
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Mon Feb  9 12:15:38 2015 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Mon Feb  9 12:15:38 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=5b7e14ad

app-editors/emacs-vcs: Use group 'scores' instead of 'games' for shared score 
files.

Package-Manager: portage-2.2.16

---
 app-editors/emacs-vcs/ChangeLog | 3 +++
 app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index a2367d2..9203ce2 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Feb 2015; Ulrich Müller u...@gentoo.org emacs-vcs-25.0.-r2.ebuild:
+  Use group 'scores' instead of 'games' for shared score files.
+
   01 Feb 2015; Ulrich Müller u...@gentoo.org metadata.xml:
   Sync metadata.xml from Portage tree.
 

diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild 
b/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild
index b54dff7..4b43250 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild
@@ -207,7 +207,7 @@ src_configure() {
--infodir=${EPREFIX}/usr/share/info/${EMACS_SUFFIX} \
--localstatedir=${EPREFIX}/var \

--enable-locallisppath=${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP} \
-   --with-gameuser=:${GAMES_GROUP:-games} \
+   --with-gameuser=:scores \
--without-compress-install \
--with-file-notification=$(usev gfile || usev inotify || echo 
no) \
$(use_enable acl) \

[gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/

2015-02-01 Thread Ulrich Müller 
commit: 266b87172a5e25519d8d09d37af0fbbe8aa2e4fc
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Sun Feb  1 14:01:25 2015 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Sun Feb  1 14:01:25 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=266b8717

app-editors/emacs-vcs: Sync metadata.xml from Portage tree.

Package-Manager: portage-2.2.15

---
 app-editors/emacs-vcs/ChangeLog| 3 +++
 app-editors/emacs-vcs/metadata.xml | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 7b871b8..a2367d2 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Feb 2015; Ulrich Müller u...@gentoo.org metadata.xml:
+  Sync metadata.xml from Portage tree.
+
   23 Jan 2015; Ulrich Müller u...@gentoo.org emacs-vcs-25.0.-r2.ebuild:
   Respect GAMES_GROUP variable.
 

diff --git a/app-editors/emacs-vcs/metadata.xml 
b/app-editors/emacs-vcs/metadata.xml
index b648feb..dd924f4 100644
--- a/app-editors/emacs-vcs/metadata.xml
+++ b/app-editors/emacs-vcs/metadata.xml
@@ -36,8 +36,7 @@
 processing/flag
   flag name='libxml2'Use pkgdev-libs/libxml2/pkg to parse XML instead
 of the internal Lisp implementations/flag
-  flag name='pax_kernel'Enable building under a PaX enabled kernel
-(pkgsys-apps/paxctl/pkg)/flag
+  flag name='pax_kernel'Enable building under a PaX enabled kernel/flag
   flag name='source'Install C source files and make them available for
 find-function/flag
   flag name='toolkit-scroll-bars'Use the selected toolkit's scrollbars in

[gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/

2015-02-01 Thread Ulrich Müller 
commit: 4b94cce821add353b6873cf0e2c1b8623fcf4336
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Sun Feb  1 15:50:42 2015 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Sun Feb  1 15:50:42 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=4b94cce8

app-editors/emacs-vcs: Update for upstream merge of the xwidget branch.

Package-Manager: portage-2.2.15

---
 app-editors/emacs-vcs/ChangeLog |  4 
 app-editors/emacs-vcs/emacs-vcs-25.0.-r1.ebuild | 16 
 app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild | 14 +++---
 app-editors/emacs-vcs/metadata.xml  |  1 +
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index a2367d2..0de398f 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: $
 
+  01 Feb 2015; Ulrich Müller u...@gentoo.org emacs-vcs-25.0.-r1.ebuild,
+  emacs-vcs-25.0.-r2.ebuild, metadata.xml:
+  Update for upstream merge of the xwidget branch.
+
   01 Feb 2015; Ulrich Müller u...@gentoo.org metadata.xml:
   Sync metadata.xml from Portage tree.
 

diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.-r1.ebuild 
b/app-editors/emacs-vcs/emacs-vcs-25.0.-r1.ebuild
index 07daa6b..cf43f0a 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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..ebuild,v 1.1 
2014/10/02 07:13:42 ulm Exp $
 
@@ -27,7 +27,7 @@ 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
+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 xwidgets zlib
 REQUIRED_USE=?? ( aqua X )
 
 RDEPEND=sys-libs/ncurses
@@ -67,7 +67,13 @@ RDEPEND=sys-libs/ncurses
=dev-libs/m17n-lib-1.5.1
)
)
-   gtk3? ( x11-libs/gtk+:3 )
+   gtk3? (
+   x11-libs/gtk+:3
+   xwidgets? (
+   =dev-libs/gobject-introspection-1.32.1
+   net-libs/webkit-gtk:3
+   )
+   )
!gtk3? (
gtk? ( x11-libs/gtk+:2 )
!gtk? (
@@ -165,7 +171,7 @@ src_configure() {
 
if use gtk3; then
einfo Configuring to build with GIMP Toolkit (GTK+) 
version 3
-   myconf+= --with-x-toolkit=gtk3
+   myconf+= --with-x-toolkit=gtk3 $(use_with xwidgets)
elif use gtk; then
einfo Configuring to build with GIMP Toolkit (GTK+) 
version 2
myconf+= --with-x-toolkit=gtk2
@@ -187,6 +193,8 @@ src_configure() {
 ewarn USE flag \${f}\ ignored (superseded 
by \${tk}\)
: ${tk:=${f}}
done
+   ! use gtk3  use xwidgets  ewarn \
+   USE flag \xwidgets\ has no effect if \gtk3\ is not 
set.
elif use aqua; then
einfo Configuring to build with Nextstep (Cocoa) support
myconf+= --with-ns --disable-ns-self-contained

diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild 
b/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild
index b54dff7..ae63b36 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild
@@ -27,7 +27,7 @@ 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
+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

[gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/

2015-02-01 Thread Ulrich Müller 
commit: cdbfc6e884c17c9baae5ed2995a610b3cb85c431
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Sun Feb  1 21:37:10 2015 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Sun Feb  1 21:37:10 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=cdbfc6e8

Revert app-editors/emacs-vcs: Update for upstream merge of the xwidget branch.

This reverts commit 4b94cce821add353b6873cf0e2c1b8623fcf4336.

---
 app-editors/emacs-vcs/ChangeLog |  4 
 app-editors/emacs-vcs/emacs-vcs-25.0.-r1.ebuild | 16 
 app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild | 14 +++---
 app-editors/emacs-vcs/metadata.xml  |  1 -
 4 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 0de398f..a2367d2 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,10 +2,6 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-  01 Feb 2015; Ulrich Müller u...@gentoo.org emacs-vcs-25.0.-r1.ebuild,
-  emacs-vcs-25.0.-r2.ebuild, metadata.xml:
-  Update for upstream merge of the xwidget branch.
-
   01 Feb 2015; Ulrich Müller u...@gentoo.org metadata.xml:
   Sync metadata.xml from Portage tree.
 

diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.-r1.ebuild 
b/app-editors/emacs-vcs/emacs-vcs-25.0.-r1.ebuild
index cf43f0a..07daa6b 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# 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..ebuild,v 1.1 
2014/10/02 07:13:42 ulm Exp $
 
@@ -27,7 +27,7 @@ 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 xwidgets zlib
+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
@@ -67,13 +67,7 @@ RDEPEND=sys-libs/ncurses
=dev-libs/m17n-lib-1.5.1
)
)
-   gtk3? (
-   x11-libs/gtk+:3
-   xwidgets? (
-   =dev-libs/gobject-introspection-1.32.1
-   net-libs/webkit-gtk:3
-   )
-   )
+   gtk3? ( x11-libs/gtk+:3 )
!gtk3? (
gtk? ( x11-libs/gtk+:2 )
!gtk? (
@@ -171,7 +165,7 @@ src_configure() {
 
if use gtk3; then
einfo Configuring to build with GIMP Toolkit (GTK+) 
version 3
-   myconf+= --with-x-toolkit=gtk3 $(use_with xwidgets)
+   myconf+= --with-x-toolkit=gtk3
elif use gtk; then
einfo Configuring to build with GIMP Toolkit (GTK+) 
version 2
myconf+= --with-x-toolkit=gtk2
@@ -193,8 +187,6 @@ src_configure() {
 ewarn USE flag \${f}\ ignored (superseded 
by \${tk}\)
: ${tk:=${f}}
done
-   ! use gtk3  use xwidgets  ewarn \
-   USE flag \xwidgets\ has no effect if \gtk3\ is not 
set.
elif use aqua; then
einfo Configuring to build with Nextstep (Cocoa) support
myconf+= --with-ns --disable-ns-self-contained

diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild 
b/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild
index ae63b36..b54dff7 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild
@@ -27,7 +27,7 @@ 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 xwidgets zlib
+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

[gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/

2015-01-22 Thread Ulrich Müller 
commit: 5dd077169085ce3c7e47960be04e7695a8190353
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Fri Jan 23 06:16:22 2015 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Fri Jan 23 06:16:22 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=5dd07716

Respect GAMES_GROUP variable.

Package-Manager: portage-2.2.15

---
 app-editors/emacs-vcs/ChangeLog | 3 +++
 app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 32c97f3..7b871b8 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  23 Jan 2015; Ulrich Müller u...@gentoo.org emacs-vcs-25.0.-r2.ebuild:
+  Respect GAMES_GROUP variable.
+
 *emacs-vcs-25.0.-r2 (21 Jan 2015)
 
   21 Jan 2015; Ulrich Müller u...@gentoo.org +emacs-vcs-25.0.-r2.ebuild:

diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild 
b/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild
index 4b8c6e6..b54dff7 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild
@@ -207,7 +207,7 @@ src_configure() {
--infodir=${EPREFIX}/usr/share/info/${EMACS_SUFFIX} \
--localstatedir=${EPREFIX}/var \

--enable-locallisppath=${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP} \
-   --with-gameuser=:games \
+   --with-gameuser=:${GAMES_GROUP:-games} \
--without-compress-install \
--with-file-notification=$(usev gfile || usev inotify || echo 
no) \
$(use_enable acl) \

[gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/

2015-01-21 Thread Ulrich Müller 
commit: 7a6aa0729b701a1ed3d3e7acc4829ff6463b0d0f
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Wed Jan 21 21:48:33 2015 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Wed Jan 21 21:48:33 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=7a6aa072

app-editors/emacs-vcs: Test new setgid games setup.

Package-Manager: portage-2.2.15

---
 app-editors/emacs-vcs/ChangeLog|   7 +-
 .../emacs-vcs/emacs-vcs-25.0.-r2.ebuild| 363 +
 2 files changed, 369 insertions(+), 1 deletion(-)

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index fb31368..32c97f3 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for app-editors/emacs-vcs
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*emacs-vcs-25.0.-r2 (21 Jan 2015)
+
+  21 Jan 2015; Ulrich Müller u...@gentoo.org +emacs-vcs-25.0.-r2.ebuild:
+  Test new setgid games setup.
+
   29 Dec 2014; Ulrich Müller u...@gentoo.org emacs-vcs-25.0.-r1.ebuild:
   Install CONTRIBUTE file.
 

diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild 
b/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild
new file mode 100644
index 000..4b8c6e6
--- /dev/null
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild
@@ -0,0 +1,363 @@
+# Copyright 1999-2015 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..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##*.} =  ]]; 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? (
+

[gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/

2014-12-29 Thread Ulrich Müller 
commit: b8df3c03057602613ecacb0939e2ea62ad28d27e
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Mon Dec 29 10:38:08 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Mon Dec 29 10:38:08 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=b8df3c03

app-editors/emacs-vcs: Install CONTRIBUTE file.

Package-Manager: portage-2.2.15

---
 app-editors/emacs-vcs/ChangeLog | 3 +++
 app-editors/emacs-vcs/emacs-vcs-25.0.-r1.ebuild | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 9ace187..fb31368 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Dec 2014; Ulrich Müller u...@gentoo.org emacs-vcs-25.0.-r1.ebuild:
+  Install CONTRIBUTE file.
+
 *emacs-vcs-25.0.-r1 (13 Nov 2014)
 
   13 Nov 2014; Ulrich Müller u...@gentoo.org -emacs-vcs-25.0..ebuild,

diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.-r1.ebuild 
b/app-editors/emacs-vcs/emacs-vcs-25.0.-r1.ebuild
index 1a4cf02..07daa6b 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.-r1.ebuild
@@ -291,7 +291,7 @@ src_install () {
EOF
elisp-site-file-install ${T}/${SITEFILE} || die
 
-   dodoc README BUGS
+   dodoc README BUGS CONTRIBUTE
 
if use aqua; then
dodir /Applications/Gentoo

[gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/

2014-11-13 Thread Ulrich Müller 
commit: 8e45750f5743b1344e6e84fc6908dd0e83a01d68
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Thu Nov 13 23:18:19 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Thu Nov 13 23:18:19 2014 +
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..ebuild = emacs-vcs-25.0.-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.-r1 (13 Nov 2014)
+
+  13 Nov 2014; Ulrich Müller u...@gentoo.org -emacs-vcs-25.0..ebuild,
+  +emacs-vcs-25.0.-r1.ebuild:
+  Merge changes from Portage tree.
+
   10 Nov 2014; Ulrich Müller u...@gentoo.org emacs-vcs-25.0..ebuild:
   Merge changes from Portage tree.
 

diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0..ebuild 
b/app-editors/emacs-vcs/emacs-vcs-25.0.-r1.ebuild
similarity index 95%
rename from app-editors/emacs-vcs/emacs-vcs-25.0..ebuild
rename to app-editors/emacs-vcs/emacs-vcs-25.0.-r1.ebuild
index f66a49f..1a4cf02 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0..ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.-r1.ebuild
@@ -7,15 +7,11 @@ EAPI=5
 inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
 
 if [[ ${PV##*.} =  ]]; 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##*.} =  ]]; 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 version/site-lisp dir

[gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/

2014-11-10 Thread Ulrich Müller 
commit: cfbd1eb9437262ace3e41358e44148e7a352dca4
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Mon Nov 10 20:13:54 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Mon Nov 10 20:13:54 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=cfbd1eb9

app-editors/emacs-vcs: Merge changes from Portage tree.

Package-Manager: portage-2.2.14

---
 app-editors/emacs-vcs/ChangeLog  | 3 +++
 app-editors/emacs-vcs/emacs-vcs-25.0..ebuild | 4 
 2 files changed, 7 insertions(+)

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 984e63a..9161e69 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Nov 2014; Ulrich Müller u...@gentoo.org emacs-vcs-25.0..ebuild:
+  Merge changes from Portage tree.
+
   18 May 2014; Ulrich Müller u...@gentoo.org emacs-vcs-24.4..ebuild:
   Merge changes from Portage tree.
 

diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0..ebuild 
b/app-editors/emacs-vcs/emacs-vcs-25.0..ebuild
index 66ef7a1..f66a49f 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0..ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0..ebuild
@@ -123,6 +123,7 @@ src_prepare() {
 
 src_configure() {
strip-flags
+   filter-flags -pie   #526948
 
if use sh; then
replace-flags -O[1-9] -O0 #262359
@@ -253,6 +254,9 @@ src_install () {
# 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 \

[gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/

2014-10-02 Thread Ulrich Müller 
commit: fff48d4f3068e3cb3537b847315d8077cfad175f
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Thu Oct  2 20:44:45 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Thu Oct  2 20:44:45 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=fff48d4f

app-editors/emacs-vcs: Merge changes from Portage tree.

Package-Manager: portage-2.2.14_rc1

---
 .../{emacs-vcs-24.4..ebuild = emacs-vcs-25.0..ebuild}| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4..ebuild 
b/app-editors/emacs-vcs/emacs-vcs-25.0..ebuild
similarity index 99%
rename from app-editors/emacs-vcs/emacs-vcs-24.4..ebuild
rename to app-editors/emacs-vcs/emacs-vcs-25.0..ebuild
index f324765..66ef7a1 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.4..ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0..ebuild
@@ -1,6 +1,6 @@
 # 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-24.3..ebuild,v 1.22 
2014/01/04 20:05:39 ulm Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0..ebuild,v 1.1 
2014/10/02 07:13:42 ulm Exp $
 
 EAPI=5
 
@@ -30,7 +30,7 @@ DESCRIPTION=The extensible, customizable, self-documenting 
real-time display ed
 HOMEPAGE=http://www.gnu.org/software/emacs/;
 
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-SLOT=24
+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 )

[gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/

2014-05-18 Thread Ulrich Müller 
commit: 7de896814e030d9e225c0a13cd4721008e0b0725
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Sun May 18 14:56:39 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Sun May 18 14:56:39 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=7de89681

Merge changes from Portage tree.

Package-Manager: portage-2.2.10

---
 app-editors/emacs-vcs/ChangeLog  | 3 +++
 app-editors/emacs-vcs/emacs-vcs-24.4..ebuild | 7 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index a7590b2..984e63a 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 May 2014; Ulrich Müller u...@gentoo.org emacs-vcs-24.4..ebuild:
+  Merge changes from Portage tree.
+
   05 May 2014; Ulrich Müller u...@gentoo.org emacs-vcs-24.4..ebuild:
   Merge changes from Portage tree.
 

diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4..ebuild 
b/app-editors/emacs-vcs/emacs-vcs-24.4..ebuild
index 95c8ace..f324765 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.4..ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.4..ebuild
@@ -85,12 +85,7 @@ RDEPEND=sys-libs/ncurses
)
 
 DEPEND=${RDEPEND}
-   alsa? ( virtual/pkgconfig )
-   dbus? ( virtual/pkgconfig )
-   gfile? ( virtual/pkgconfig )
-   gnutls? ( virtual/pkgconfig )
-   libxml2? ( virtual/pkgconfig )
-   X? ( virtual/pkgconfig )
+   virtual/pkgconfig
gzip-el? ( app-arch/gzip )
pax_kernel? (
sys-apps/attr

[gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/

2014-04-07 Thread Ulrich Müller 
commit: 4c30bc1f6d8e494c40ce15b09b7572df5c9ae34c
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Tue Apr  8 05:28:46 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Tue Apr  8 05:28:46 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=4c30bc1f

Merge changes from Portage tree.

Package-Manager: portage-2.2.10

---
 app-editors/emacs-vcs/ChangeLog  | 3 +++
 app-editors/emacs-vcs/emacs-vcs-24.4..ebuild | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 3222012..084ea4b 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Apr 2014; Ulrich Müller u...@gentoo.org emacs-vcs-24.4..ebuild:
+  Merge changes from Portage tree.
+
   04 Apr 2014; Ulrich Müller u...@gentoo.org emacs-vcs-24.4..ebuild:
   Merge changes from Portage tree.
 

diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4..ebuild 
b/app-editors/emacs-vcs/emacs-vcs-24.4..ebuild
index 0483cef..ea73d01 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.4..ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.4..ebuild
@@ -311,7 +311,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 https://wiki.gentoo.org/wiki/Project:Emacs/Xft_support
+   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

[gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/

2014-04-04 Thread Ulrich Müller 
commit: ac0178b008b08add3d60a1c700a289b89afb8d54
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Fri Apr  4 18:56:17 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Fri Apr  4 18:56:17 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=ac0178b0

Merge changes from Portage tree.

Package-Manager: portage-2.2.10

---
 app-editors/emacs-vcs/ChangeLog  | 3 +++
 app-editors/emacs-vcs/emacs-vcs-24.4..ebuild | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 8506cbb..3222012 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Apr 2014; Ulrich Müller u...@gentoo.org emacs-vcs-24.4..ebuild:
+  Merge changes from Portage tree.
+
 *emacs-vcs-24.4. (26 Mar 2014)
 
   26 Mar 2014; Ulrich Müller u...@gentoo.org -emacs-vcs-24.3..ebuild,

diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4..ebuild 
b/app-editors/emacs-vcs/emacs-vcs-24.4..ebuild
index 5f6b179..0483cef 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.4..ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.4..ebuild
@@ -104,7 +104,7 @@ SITEFILE=20${PN}-${SLOT}-gentoo.el
 
 src_prepare() {
if [[ ${PV##*.} =  ]]; then
-   FULL_VERSION=$(sed -n 's/^AC_INIT(emacs,[ \t]*\([^ 
\t,)]*\).*/\1/p' \
+   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}

[gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/

2014-03-26 Thread Ulrich Müller 
commit: 4c2c33eecae14f5081e873737141b74d886defe2
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Wed Mar 26 11:59:41 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Wed Mar 26 11:59:41 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=4c2c33ee

Version bump to reflect upstream change of version number.

Package-Manager: portage-2.2.10

---
 app-editors/emacs-vcs/ChangeLog | 6 ++
 .../{emacs-vcs-24.3..ebuild = emacs-vcs-24.4..ebuild}  | 0
 2 files changed, 6 insertions(+)

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 878367c..8506cbb 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-24.4. (26 Mar 2014)
+
+  26 Mar 2014; Ulrich Müller u...@gentoo.org -emacs-vcs-24.3..ebuild,
+  +emacs-vcs-24.4..ebuild:
+  Version bump to reflect upstream change of version number.
+
   13 Mar 2014; Ulrich Müller u...@gentoo.org emacs-vcs-24.3..ebuild:
   Install emacs man page under the same name as the binary.
 

diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3..ebuild 
b/app-editors/emacs-vcs/emacs-vcs-24.4..ebuild
similarity index 100%
rename from app-editors/emacs-vcs/emacs-vcs-24.3..ebuild
rename to app-editors/emacs-vcs/emacs-vcs-24.4..ebuild

[gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/

2014-03-13 Thread Ulrich Müller 
commit: 66f5d9a762f7c1a2396f1bcd965413946aae7298
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Thu Mar 13 18:50:52 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Thu Mar 13 18:50:52 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=66f5d9a7

Install emacs man page under the same name as the binary.

Package-Manager: portage-2.2.8-r1

---
 app-editors/emacs-vcs/ChangeLog  | 3 +++
 app-editors/emacs-vcs/emacs-vcs-24.3..ebuild | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 2c2498e..878367c 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Mar 2014; Ulrich Müller u...@gentoo.org emacs-vcs-24.3..ebuild:
+  Install emacs man page under the same name as the binary.
+
   19 Feb 2014; Ulrich Müller u...@gentoo.org emacs-vcs-24.3..ebuild,
   metadata.xml:
   Follow QA policy on gtk and gtk3 USE flags.

diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3..ebuild 
b/app-editors/emacs-vcs/emacs-vcs-24.3..ebuild
index 5f89968..1c1fa09 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3..ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3..ebuild
@@ -35,7 +35,7 @@ IUSE=acl alsa aqua athena dbus games gconf gfile gif gnutls 
gpm gsettings gtk g
 REQUIRED_USE=?? ( aqua X )
 
 RDEPEND=sys-libs/ncurses
-   =app-admin/eselect-emacs-1.2
+   =app-admin/eselect-emacs-1.16
=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?]
net-libs/liblockfile
acl? ( virtual/acl )
@@ -237,6 +237,8 @@ src_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} \