* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2013-06-08 21:11 Ulrich Mueller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Mueller @ 2013-06-08 21:11 UTC (permalink / raw
To: gentoo-commits
commit: 01dbc126edfceb21b029837252f6933699bac4bd
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 8 21:10:50 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 8 21:10:50 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=01dbc126
Merge changes from Portage tree.
Package-Manager: portage-2.1.12.3
---
app-editors/emacs-vcs/ChangeLog | 4 +++
app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild | 38 ++++++++++++++++--------
app-editors/emacs-vcs/metadata.xml | 2 ++
3 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index f99932b..94ead1d 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 08 Jun 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild,
+ metadata.xml:
+ Merge changes from Portage tree.
+
31 Mar 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
Merge changes from Portage tree.
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
index d82e038..df437ba 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
@@ -1,6 +1,6 @@
# 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.10 2013/03/31 11:51:18 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.13 2013/06/08 21:00:29 ulm Exp $
EAPI=5
@@ -31,20 +31,21 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"
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="acl alsa aqua athena dbus games gconf 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"
+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"
REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses
>=app-admin/eselect-emacs-1.2
>=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?]
net-libs/liblockfile
- hesiod? ( net-dns/hesiod )
- kerberos? ( virtual/krb5 )
+ acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
- gpm? ( sys-libs/gpm )
dbus? ( sys-apps/dbus )
gnutls? ( net-libs/gnutls )
- acl? ( virtual/acl )
+ 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 )
X? (
@@ -55,7 +56,7 @@ RDEPEND="sys-libs/ncurses
gsettings? ( >=dev-libs/glib-2.28.6 )
gif? ( media-libs/giflib )
jpeg? ( virtual/jpeg )
- png? ( >=media-libs/libpng-1.4:0 )
+ png? ( >=media-libs/libpng-1.4:0= )
svg? ( >=gnome-base/librsvg-2.0 )
tiff? ( media-libs/tiff )
xpm? ( x11-libs/libXpm )
@@ -86,11 +87,17 @@ DEPEND="${RDEPEND}
alsa? ( virtual/pkgconfig )
dbus? ( virtual/pkgconfig )
gnutls? ( virtual/pkgconfig )
+ !inotify? ( gfile? ( virtual/pkgconfig ) )
libxml2? ( virtual/pkgconfig )
X? ( virtual/pkgconfig )
gzip-el? ( app-arch/gzip )
pax_kernel? ( 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"
@@ -146,6 +153,14 @@ src_configure() {
myconf+=" $(use_with sound)"
fi
+ if use inotify; then
+ myconf+=" --with-file-notification=inotify"
+ use gfile && ewarn \
+ "USE flag \"gfile\" has no effect if \"inotify\" is set."
+ else
+ myconf+=" --with-file-notification=$(usex gfile gfile)"
+ fi
+
if use X; then
myconf+=" --with-x --without-ns"
myconf+=" $(use_with gconf)"
@@ -214,13 +229,12 @@ src_configure() {
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
--with-gameuser="${GAMES_USER_DED:-games}" \
--without-compress-info \
- $(use_with hesiod) \
- $(use_with kerberos) $(use_with kerberos kerberos5) \
- $(use_with gpm) \
+ $(use_enable acl) \
$(use_with dbus) \
$(use_with gnutls) \
- $(use_with inotify) \
- $(use_with acl) \
+ $(use_with gpm) \
+ $(use_with hesiod) \
+ $(use_with kerberos) $(use_with kerberos kerberos5) \
$(use_with libxml2 xml2) \
$(use_with selinux) \
$(use_with wide-int) \
diff --git a/app-editors/emacs-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml
index b68a939..358a70c 100644
--- a/app-editors/emacs-vcs/metadata.xml
+++ b/app-editors/emacs-vcs/metadata.xml
@@ -22,6 +22,8 @@
<flag name='games'>Support shared score files for games</flag>
<flag name='gconf'>Use <pkg>gnome-base/gconf</pkg> to read the system
font name</flag>
+ <flag name='gfile'>Use gfile (<pkg>dev-libs/glib</pkg>) for file
+ notification</flag>
<flag name='gsettings'>Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
system font name</flag>
<flag name='gtk3'>Link against version 3 of the GIMP Toolkit instead of
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2013-06-09 7:15 Ulrich Mueller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Mueller @ 2013-06-09 7:15 UTC (permalink / raw
To: gentoo-commits
commit: 6e429c0ee158737b0475af0d020b0138cf015af9
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 9 07:14:26 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 9 07:14:26 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=6e429c0e
Merge changes from Portage tree.
Package-Manager: portage-2.1.12.3
---
app-editors/emacs-vcs/ChangeLog | 3 +++
app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild | 15 ++++-----------
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 94ead1d..7002932 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 09 Jun 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
+ Merge changes from Portage tree.
+
08 Jun 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild,
metadata.xml:
Merge changes from Portage tree.
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
index df437ba..97f40e8 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
@@ -1,6 +1,6 @@
# 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.13 2013/06/08 21:00:29 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.14 2013/06/09 07:11:06 ulm Exp $
EAPI=5
@@ -41,10 +41,10 @@ RDEPEND="sys-libs/ncurses
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 )
@@ -86,8 +86,8 @@ RDEPEND="sys-libs/ncurses
DEPEND="${RDEPEND}
alsa? ( virtual/pkgconfig )
dbus? ( virtual/pkgconfig )
+ gfile? ( virtual/pkgconfig )
gnutls? ( virtual/pkgconfig )
- !inotify? ( gfile? ( virtual/pkgconfig ) )
libxml2? ( virtual/pkgconfig )
X? ( virtual/pkgconfig )
gzip-el? ( app-arch/gzip )
@@ -153,14 +153,6 @@ src_configure() {
myconf+=" $(use_with sound)"
fi
- if use inotify; then
- myconf+=" --with-file-notification=inotify"
- use gfile && ewarn \
- "USE flag \"gfile\" has no effect if \"inotify\" is set."
- else
- myconf+=" --with-file-notification=$(usex gfile gfile)"
- fi
-
if use X; then
myconf+=" --with-x --without-ns"
myconf+=" $(use_with gconf)"
@@ -229,6 +221,7 @@ src_configure() {
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
--with-gameuser="${GAMES_USER_DED:-games}" \
--without-compress-info \
+ --with-file-notification=$(usev gfile || usev inotify || echo no) \
$(use_enable acl) \
$(use_with dbus) \
$(use_with gnutls) \
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2013-07-11 21:24 Ulrich Mueller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Mueller @ 2013-07-11 21:24 UTC (permalink / raw
To: gentoo-commits
commit: d78af424ff22382499a4acb8036a862934250ab0
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 11 18:52:57 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 11 18:52:57 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=d78af424
Define EBZR_UNPACK_DIR.
Package-Manager: portage-2.1.12.13
---
app-editors/emacs-vcs/ChangeLog | 3 +++
app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 7002932..3eaad4c 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 11 Jul 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
+ Define EBZR_UNPACK_DIR.
+
09 Jun 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
Merge changes from Portage tree.
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
index 97f40e8..6c176be 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-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"
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2013-07-14 15:41 Ulrich Mueller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Mueller @ 2013-07-14 15:41 UTC (permalink / raw
To: gentoo-commits
commit: 435532027f471b158974a23d163be3fb80e5d56b
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 15:41:31 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 15:41:31 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=43553202
Update URI for Xft font guide.
Package-Manager: portage-2.1.12.13
---
app-editors/emacs-vcs/ChangeLog | 3 +++
app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 3eaad4c..e8b7388 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/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-vcs-24.3.9999.ebuild:
+ Update URI for Xft font guide.
+
11 Jul 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
Define EBZR_UNPACK_DIR.
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
index 6c176be..21d908b 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
@@ -307,7 +307,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
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2013-08-02 16:38 Ulrich Mueller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Mueller @ 2013-08-02 16:38 UTC (permalink / raw
To: gentoo-commits
commit: f943758ce4081e2ae7ecc67e14dbade3c7bd7b83
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 2 16:39:41 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 2 16:39:41 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=f943758c
Merge changes from Portage tree.
Package-Manager: portage-2.1.12.13
---
app-editors/emacs-vcs/ChangeLog | 3 +++
app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index e8b7388..837311e 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 02 Aug 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
+ Merge changes from Portage tree.
+
14 Jul 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
Update URI for Xft font guide.
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
index 21d908b..6326622 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
@@ -56,7 +56,7 @@ RDEPEND="sys-libs/ncurses
gconf? ( >=gnome-base/gconf-2.26.2 )
gsettings? ( >=dev-libs/glib-2.28.6 )
gif? ( media-libs/giflib )
- jpeg? ( virtual/jpeg )
+ jpeg? ( virtual/jpeg:0= )
png? ( >=media-libs/libpng-1.4:0= )
svg? ( >=gnome-base/librsvg-2.0 )
tiff? ( media-libs/tiff )
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2013-08-12 7:29 Ulrich Mueller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Mueller @ 2013-08-12 7:29 UTC (permalink / raw
To: gentoo-commits
commit: d099a5ba6524e77739d9b7ca6626c4f09287c794
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 12 07:30:24 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 07:30:24 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=d099a5ba
Merge changes from Portage tree.
Package-Manager: portage-2.1.13.7
---
app-editors/emacs-vcs/ChangeLog | 3 +++
app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild | 6 ++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 837311e..e208164 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 12 Aug 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
+ Merge changes from Portage tree.
+
02 Aug 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
Merge changes from Portage tree.
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
index 6326622..8988fc8 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
@@ -1,6 +1,6 @@
# 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.14 2013/06/09 07:11:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.18 2013/08/12 05:54:23 ulm Exp $
EAPI=5
@@ -32,7 +32,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"
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="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"
+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
@@ -49,6 +49,7 @@ RDEPEND="sys-libs/ncurses
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
@@ -232,6 +233,7 @@ src_configure() {
$(use_with libxml2 xml2) \
$(use_with selinux) \
$(use_with wide-int) \
+ $(use_with zlib) \
${myconf}
}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2013-08-13 18:10 Ulrich Mueller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Mueller @ 2013-08-13 18:10 UTC (permalink / raw
To: gentoo-commits
commit: 3bf1090f9d3396156d228dc440f594fbab95d18e
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 13 18:11:46 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 13 18:11:46 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=3bf1090f
Explicitly ask for --with-sound=alsa with USE="alsa".
Package-Manager: portage-2.2.0
---
app-editors/emacs-vcs/ChangeLog | 3 +++
app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild | 8 ++++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index e208164..aa11a70 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 13 Aug 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
+ Explicitly ask for --with-sound=alsa with USE="alsa".
+
12 Aug 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
Merge changes from Portage tree.
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
index 8988fc8..e3651cc 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
@@ -147,10 +147,10 @@ src_configure() {
local myconf
- 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+=" --with-sound"
+ if use alsa; then
+ use sound || einfo \
+ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+ myconf+=" --with-sound=alsa"
else
myconf+=" $(use_with sound)"
fi
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2013-08-14 6:29 Ulrich Mueller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Mueller @ 2013-08-14 6:29 UTC (permalink / raw
To: gentoo-commits
commit: 54bf9918ef7f90724f952ecfd48bee90afd7cd46
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 06:30:55 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 06:30:55 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=54bf9918
Merge changes from Portage tree.
Package-Manager: portage-2.2.0
---
app-editors/emacs-vcs/ChangeLog | 3 +++
app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index aa11a70..a3bdbf5 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 14 Aug 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
+ Merge changes from Portage tree.
+
13 Aug 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
Explicitly ask for --with-sound=alsa with USE="alsa".
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
index e3651cc..91a3102 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
@@ -218,7 +218,6 @@ src_configure() {
econf \
--program-suffix="-${EMACS_SUFFIX}" \
- --program-transform-name="s/^\(emacs\)-[0-9].*-\1/\1/" \
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
--with-gameuser="${GAMES_USER_DED:-games}" \
@@ -245,6 +244,9 @@ src_compile() {
src_install () {
emake DESTDIR="${D}" NO_BIN_LINK=t install
+ mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
+ || die "moving emacs executable 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"
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2013-08-31 22:33 Ulrich Mueller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Mueller @ 2013-08-31 22:33 UTC (permalink / raw
To: gentoo-commits
commit: 4cae174a7859b066cab44412fe3b05d4120a5e5f
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 31 22:15:50 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 22:30:52 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=4cae174a
Merge changes from Portage tree.
Package-Manager: portage-2.2.1
---
app-editors/emacs-vcs/ChangeLog | 3 +++
app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild | 12 +++---------
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index a3bdbf5..63ad864 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 31 Aug 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
+ Merge changes from Portage tree.
+
14 Aug 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
Merge changes from Portage tree.
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
index 91a3102..c3cdcc0 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
@@ -1,6 +1,6 @@
# 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.18 2013/08/12 05:54:23 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.20 2013/08/31 22:13:48 ulm Exp $
EAPI=5
@@ -117,12 +117,6 @@ src_prepare() {
epatch_user
- if ! use alsa; then
- # ALSA is detected even if not requested by its USE flag.
- # Suppress it by supplying pkg-config with a wrong library name.
- sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.ac \
- || die "unable to sed configure.ac"
- fi
if ! use gzip-el; then
# Emacs' build system automatically detects the gzip binary and
# compresses el files. We don't want that so confuse it with a
@@ -148,11 +142,11 @@ src_configure() {
local myconf
if use alsa; then
- use sound || einfo \
+ use sound || ewarn \
"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
myconf+=" --with-sound=alsa"
else
- myconf+=" $(use_with sound)"
+ myconf+=" --with-sound=$(usex sound oss)"
fi
if use X; then
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2013-12-29 10:07 Ulrich Müller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Müller @ 2013-12-29 10:07 UTC (permalink / raw
To: gentoo-commits
commit: 0e97c8f1b6ace6eea29703b409707186601c2467
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 29 10:09:41 2013 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 10:09:41 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=0e97c8f1
Merge changes from Portage tree.
Package-Manager: portage-2.2.7
---
app-editors/emacs-vcs/ChangeLog | 3 +++
app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild | 20 +++++++++-----------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 63ad864..fb84c31 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 29 Dec 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
+ Merge changes from Portage tree.
+
31 Aug 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
Merge changes from Portage tree.
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
index c3cdcc0..2d3a558 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
@@ -1,6 +1,6 @@
# 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.20 2013/08/31 22:13:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.21 2013/12/16 23:59:27 ulm Exp $
EAPI=5
@@ -116,15 +116,6 @@ src_prepare() {
fi
epatch_user
-
- if ! use gzip-el; then
- # Emacs' build system automatically detects the gzip binary and
- # compresses el files. We don't want that so confuse it with a
- # wrong binary name
- sed -i -e "/AC_PATH_PROG/s/gzip/PrEvEnTcOmPrEsSiOn/" configure.ac \
- || die "unable to sed configure.ac"
- fi
-
AT_M4DIR=m4 eautoreconf
}
@@ -215,7 +206,7 @@ src_configure() {
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
--with-gameuser="${GAMES_USER_DED:-games}" \
- --without-compress-info \
+ --without-compress-install \
--with-file-notification=$(usev gfile || usev inotify || echo no) \
$(use_enable acl) \
$(use_with dbus) \
@@ -255,6 +246,13 @@ src_install () {
# remove unused <version>/site-lisp dir
rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+ 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"
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2014-01-19 17:31 Ulrich Müller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Müller @ 2014-01-19 17:31 UTC (permalink / raw
To: gentoo-commits
commit: 6c50e76533b0acd9360f91305bc1b79faea33a0b
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 19 17:13:29 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 19 17:13:29 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=6c50e765
Merge changes from Portage tree.
Package-Manager: portage-2.2.8
---
app-editors/emacs-vcs/ChangeLog | 5 ++++-
app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild | 6 +++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index fb84c31..64fe41e 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for app-editors/emacs-vcs
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 19 Jan 2014; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
+ Merge changes from Portage tree.
+
29 Dec 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
Merge changes from Portage tree.
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
index 2d3a558..598c795 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 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-24.3.9999.ebuild,v 1.21 2013/12/16 23:59:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.22 2014/01/04 20:05:39 ulm Exp $
EAPI=5
@@ -17,7 +17,7 @@ if [[ ${PV##*.} = 9999 ]]; then
inherit bzr
S="${EBZR_UNPACK_DIR}"
else
- SRC_URI="mirror://gentoo/emacs-${PV}.tar.xz
+ 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
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2014-02-19 20:15 Ulrich Müller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Müller @ 2014-02-19 20:15 UTC (permalink / raw
To: gentoo-commits
commit: 140b7c97fac1b881f15c014178f430551f8edc22
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 19 20:00:48 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 19 20:00:48 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=140b7c97
Merge changes from Portage tree.
Package-Manager: portage-2.2.8-r1
---
app-editors/emacs-vcs/ChangeLog | 3 +++
app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild | 5 +++++
2 files changed, 8 insertions(+)
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index e851c16..6acbfeb 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: $
+ 19 Feb 2014; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
+ Merge changes from Portage tree.
+
19 Jan 2014; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
Switch from package.mask to empty KEYWORDS.
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
index 01cc9d0..159111d 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
@@ -115,6 +115,11 @@ src_prepare() {
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
}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2014-02-19 21:49 Ulrich Müller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Müller @ 2014-02-19 21:49 UTC (permalink / raw
To: gentoo-commits
commit: 193bbdfde5d1ab4bcd46dcc26c960238781df929
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 19 21:48:49 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 19 21:48:49 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=193bbdfd
Follow QA policy on gtk and gtk3 USE flags.
Package-Manager: portage-2.2.8-r1
---
app-editors/emacs-vcs/ChangeLog | 4 +++
app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild | 46 ++++++++++++------------
app-editors/emacs-vcs/metadata.xml | 6 ++--
3 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 6acbfeb..2c2498e 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 19 Feb 2014; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild,
+ metadata.xml:
+ Follow QA policy on gtk and gtk3 USE flags.
+
19 Feb 2014; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
Merge changes from Portage tree.
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
index 159111d..5f89968 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
@@ -31,7 +31,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="24"
-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 zlib"
REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses
@@ -71,15 +71,15 @@ RDEPEND="sys-libs/ncurses
>=dev-libs/m17n-lib-1.5.1
)
)
- gtk? (
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( x11-libs/gtk+:2 )
- )
- !gtk? (
- motif? ( >=x11-libs/motif-2.3:0 )
- !motif? (
- Xaw3d? ( x11-libs/libXaw3d )
- !Xaw3d? ( athena? ( x11-libs/libXaw ) )
+ 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 ) )
+ )
)
)
)"
@@ -168,21 +168,15 @@ src_configure() {
"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
fi
- local f
- if use gtk; then
- einfo "Configuring to build with GIMP Toolkit (GTK+)"
- myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
- for f in motif Xaw3d athena; do
- use ${f} && ewarn \
- "USE flag \"${f}\" has no effect if \"gtk\" is set."
- done
+ 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"
- for f in Xaw3d athena; do
- use ${f} && ewarn \
- "USE flag \"${f}\" has no effect if \"motif\" is set."
- done
elif use athena || use Xaw3d; then
einfo "Configuring to build with Athena/Lucid toolkit"
myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
@@ -190,6 +184,14 @@ src_configure() {
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"
diff --git a/app-editors/emacs-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml
index 358a70c..b648feb 100644
--- a/app-editors/emacs-vcs/metadata.xml
+++ b/app-editors/emacs-vcs/metadata.xml
@@ -26,8 +26,10 @@
notification</flag>
<flag name='gsettings'>Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
system font name</flag>
- <flag name='gtk3'>Link against version 3 of the GIMP Toolkit instead of
- version 2 (<pkg>x11-libs/gtk+</pkg>)</flag>
+ <flag name='gtk'>Add support for <pkg>x11-libs/gtk+</pkg>
+ (the GIMP Toolkit) version 2</flag>
+ <flag name='gtk3'>Add support for <pkg>x11-libs/gtk+</pkg>
+ (the GIMP Toolkit) version 3</flag>
<flag name='gzip-el'>Compress bundled Emacs Lisp source</flag>
<flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag>
<flag name='imagemagick'>Use <pkg>media-gfx/imagemagick</pkg> for image
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2014-03-13 19:09 Ulrich Müller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Müller @ 2014-03-13 19:09 UTC (permalink / raw
To: gentoo-commits
commit: 66f5d9a762f7c1a2396f1bcd965413946aae7298
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 13 18:50:52 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 13 18:50:52 2014 +0000
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.9999.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 <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
+ Install emacs man page under the same name as the binary.
+
19 Feb 2014; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild,
metadata.xml:
Follow QA policy on gtk and gtk3 USE flags.
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
index 5f89968..1c1fa09 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.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} \
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2014-03-15 7:26 Ulrich Müller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Müller @ 2014-03-15 7:26 UTC (permalink / raw
To: gentoo-commits
commit: 82b2cc278b816b354947e3c80d749974c6d0d294
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 15 07:31:58 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 15 07:31:58 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=82b2cc27
Call eselect in postinst phase if this is the selected version.
Package-Manager: portage-2.2.8-r1
---
app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
index 1c1fa09..5f6b179 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
@@ -350,6 +350,9 @@ pkg_postinst() {
# 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
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2014-03-26 11:53 Ulrich Müller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Müller @ 2014-03-26 11:53 UTC (permalink / raw
To: gentoo-commits
commit: 4c2c33eecae14f5081e873737141b74d886defe2
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 26 11:59:41 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 26 11:59:41 2014 +0000
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.9999.ebuild => emacs-vcs-24.4.9999.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.9999 (26 Mar 2014)
+
+ 26 Mar 2014; Ulrich Müller <ulm@gentoo.org> -emacs-vcs-24.3.9999.ebuild,
+ +emacs-vcs-24.4.9999.ebuild:
+ Version bump to reflect upstream change of version number.
+
13 Mar 2014; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
Install emacs man page under the same name as the binary.
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild
similarity index 100%
rename from app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
rename to app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2014-04-04 18:49 Ulrich Müller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Müller @ 2014-04-04 18:49 UTC (permalink / raw
To: gentoo-commits
commit: ac0178b008b08add3d60a1c700a289b89afb8d54
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 4 18:56:17 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 4 18:56:17 2014 +0000
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.9999.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 <ulm@gentoo.org> emacs-vcs-24.4.9999.ebuild:
+ Merge changes from Portage tree.
+
*emacs-vcs-24.4.9999 (26 Mar 2014)
26 Mar 2014; Ulrich Müller <ulm@gentoo.org> -emacs-vcs-24.3.9999.ebuild,
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild
index 5f6b179..0483cef 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild
@@ -104,7 +104,7 @@ SITEFILE="20${PN}-${SLOT}-gentoo.el"
src_prepare() {
if [[ ${PV##*.} = 9999 ]]; 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}"
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2014-04-08 5:22 Ulrich Müller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Müller @ 2014-04-08 5:22 UTC (permalink / raw
To: gentoo-commits
commit: 4c30bc1f6d8e494c40ce15b09b7572df5c9ae34c
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 8 05:28:46 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 8 05:28:46 2014 +0000
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.9999.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 <ulm@gentoo.org> emacs-vcs-24.4.9999.ebuild:
+ Merge changes from Portage tree.
+
04 Apr 2014; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.4.9999.ebuild:
Merge changes from Portage tree.
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild
index 0483cef..ea73d01 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.4.9999.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
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2014-05-05 8:16 Ulrich Müller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Müller @ 2014-05-05 8:16 UTC (permalink / raw
To: gentoo-commits
commit: 2b77c759489ae0bdcc2624f161bc48e480ea7143
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon May 5 08:15:23 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon May 5 08:15:23 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=2b77c759
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.9999.ebuild | 8 ++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 084ea4b..a7590b2 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: $
+ 05 May 2014; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.4.9999.ebuild:
+ Merge changes from Portage tree.
+
08 Apr 2014; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.4.9999.ebuild:
Merge changes from Portage tree.
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild
index ea73d01..95c8ace 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild
@@ -36,7 +36,7 @@ REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses
>=app-admin/eselect-emacs-1.16
- >=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?]
+ >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
net-libs/liblockfile
acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
@@ -92,7 +92,10 @@ DEPEND="${RDEPEND}
libxml2? ( virtual/pkgconfig )
X? ( virtual/pkgconfig )
gzip-el? ( app-arch/gzip )
- pax_kernel? ( sys-apps/paxctl )"
+ pax_kernel? (
+ sys-apps/attr
+ sys-apps/paxctl
+ )"
if [[ ${PV##*.} = 9999 ]]; then
DEPEND="${DEPEND}
@@ -210,6 +213,7 @@ src_configure() {
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 \
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2014-05-18 14:56 Ulrich Müller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Müller @ 2014-05-18 14:56 UTC (permalink / raw
To: gentoo-commits
commit: 7de896814e030d9e225c0a13cd4721008e0b0725
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun May 18 14:56:39 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun May 18 14:56:39 2014 +0000
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.9999.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 <ulm@gentoo.org> emacs-vcs-24.4.9999.ebuild:
+ Merge changes from Portage tree.
+
05 May 2014; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.4.9999.ebuild:
Merge changes from Portage tree.
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild
index 95c8ace..f324765 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.4.9999.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
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2014-10-02 20:44 Ulrich Müller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Müller @ 2014-10-02 20:44 UTC (permalink / raw
To: gentoo-commits
commit: fff48d4f3068e3cb3537b847315d8077cfad175f
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 2 20:44:45 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 2 20:44:45 2014 +0000
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.9999.ebuild => emacs-vcs-25.0.9999.ebuild} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild
similarity index 99%
rename from app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild
rename to app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild
index f324765..66ef7a1 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999.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.9999.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.9999.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 )"
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2014-11-10 20:11 Ulrich Müller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Müller @ 2014-11-10 20:11 UTC (permalink / raw
To: gentoo-commits
commit: cfbd1eb9437262ace3e41358e44148e7a352dca4
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 10 20:13:54 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 10 20:13:54 2014 +0000
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.9999.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 <ulm@gentoo.org> emacs-vcs-25.0.9999.ebuild:
+ Merge changes from Portage tree.
+
18 May 2014; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.4.9999.ebuild:
Merge changes from Portage tree.
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild
index 66ef7a1..f66a49f 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999.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 \
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2014-11-13 23:16 Ulrich Müller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Müller @ 2014-11-13 23:16 UTC (permalink / raw
To: gentoo-commits
commit: 8e45750f5743b1344e6e84fc6908dd0e83a01d68
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 13 23:18:19 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 13 23:18:19 2014 +0000
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.9999.ebuild => emacs-vcs-25.0.9999-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.9999-r1 (13 Nov 2014)
+
+ 13 Nov 2014; Ulrich Müller <ulm@gentoo.org> -emacs-vcs-25.0.9999.ebuild,
+ +emacs-vcs-25.0.9999-r1.ebuild:
+ Merge changes from Portage tree.
+
10 Nov 2014; Ulrich Müller <ulm@gentoo.org> emacs-vcs-25.0.9999.ebuild:
Merge changes from Portage tree.
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild
similarity index 95%
rename from app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild
rename to app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild
index f66a49f..1a4cf02 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild
@@ -7,15 +7,11 @@ EAPI=5
inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
if [[ ${PV##*.} = 9999 ]]; 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##*.} = 9999 ]]; 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
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2014-12-29 11:12 Ulrich Müller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Müller @ 2014-12-29 11:12 UTC (permalink / raw
To: gentoo-commits
commit: b8df3c03057602613ecacb0939e2ea62ad28d27e
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 29 10:38:08 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 29 10:38:08 2014 +0000
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.9999-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 <ulm@gentoo.org> emacs-vcs-25.0.9999-r1.ebuild:
+ Install CONTRIBUTE file.
+
*emacs-vcs-25.0.9999-r1 (13 Nov 2014)
13 Nov 2014; Ulrich Müller <ulm@gentoo.org> -emacs-vcs-25.0.9999.ebuild,
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
index 1a4cf02..07daa6b 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-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
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2015-01-21 21:43 Ulrich Müller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Müller @ 2015-01-21 21:43 UTC (permalink / raw
To: gentoo-commits
commit: 7a6aa0729b701a1ed3d3e7acc4829ff6463b0d0f
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 21 21:48:33 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 21 21:48:33 2015 +0000
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.9999-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.9999-r2 (21 Jan 2015)
+
+ 21 Jan 2015; Ulrich Müller <ulm@gentoo.org> +emacs-vcs-25.0.9999-r2.ebuild:
+ Test new setgid games setup.
+
29 Dec 2014; Ulrich Müller <ulm@gentoo.org> emacs-vcs-25.0.9999-r1.ebuild:
Install CONTRIBUTE file.
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
new file mode 100644
index 0000000..4b8c6e6
--- /dev/null
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-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.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" \
+ --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
+}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2015-01-23 6:10 Ulrich Müller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Müller @ 2015-01-23 6:10 UTC (permalink / raw
To: gentoo-commits
commit: 5dd077169085ce3c7e47960be04e7695a8190353
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 23 06:16:22 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 23 06:16:22 2015 +0000
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.9999-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 <ulm@gentoo.org> emacs-vcs-25.0.9999-r2.ebuild:
+ Respect GAMES_GROUP variable.
+
*emacs-vcs-25.0.9999-r2 (21 Jan 2015)
21 Jan 2015; Ulrich Müller <ulm@gentoo.org> +emacs-vcs-25.0.9999-r2.ebuild:
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 4b8c6e6..b54dff7 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
@@ -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) \
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2015-02-01 13:55 Ulrich Müller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Müller @ 2015-02-01 13:55 UTC (permalink / raw
To: gentoo-commits
commit: 266b87172a5e25519d8d09d37af0fbbe8aa2e4fc
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 1 14:01:25 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 1 14:01:25 2015 +0000
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 <ulm@gentoo.org> metadata.xml:
+ Sync metadata.xml from Portage tree.
+
23 Jan 2015; Ulrich Müller <ulm@gentoo.org> emacs-vcs-25.0.9999-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 <pkg>dev-libs/libxml2</pkg> to parse XML instead
of the internal Lisp implementations</flag>
- <flag name='pax_kernel'>Enable building under a PaX enabled kernel
- (<pkg>sys-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
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2015-02-01 15:51 Ulrich Müller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Müller @ 2015-02-01 15:51 UTC (permalink / raw
To: gentoo-commits
commit: 4b94cce821add353b6873cf0e2c1b8623fcf4336
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 1 15:50:42 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 1 15:50:42 2015 +0000
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.9999-r1.ebuild | 16 ++++++++++++----
app-editors/emacs-vcs/emacs-vcs-25.0.9999-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 <ulm@gentoo.org> emacs-vcs-25.0.9999-r1.ebuild,
+ emacs-vcs-25.0.9999-r2.ebuild, metadata.xml:
+ Update for upstream merge of the xwidget branch.
+
01 Feb 2015; Ulrich Müller <ulm@gentoo.org> metadata.xml:
Sync metadata.xml from Portage tree.
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
index 07daa6b..cf43f0a 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-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.9999.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.9999-r2.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild
index b54dff7..ae63b36 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
@@ -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/metadata.xml b/app-editors/emacs-vcs/metadata.xml
index dd924f4..c2cefd0 100644
--- a/app-editors/emacs-vcs/metadata.xml
+++ b/app-editors/emacs-vcs/metadata.xml
@@ -44,5 +44,6 @@
<flag name='wide-int'>Prefer wide Emacs integers (typically 62-bit).
This option has an effect only on architectures where "long" and
"long long" types have different size.</flag>
+ <flag name='xwidgets'>Enable use of some gtk widgets in Emacs buffers</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2015-02-01 21:31 Ulrich Müller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Müller @ 2015-02-01 21:31 UTC (permalink / raw
To: gentoo-commits
commit: cdbfc6e884c17c9baae5ed2995a610b3cb85c431
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 1 21:37:10 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 1 21:37:10 2015 +0000
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.9999-r1.ebuild | 16 ++++------------
app-editors/emacs-vcs/emacs-vcs-25.0.9999-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 <ulm@gentoo.org> emacs-vcs-25.0.9999-r1.ebuild,
- emacs-vcs-25.0.9999-r2.ebuild, metadata.xml:
- Update for upstream merge of the xwidget branch.
-
01 Feb 2015; Ulrich Müller <ulm@gentoo.org> metadata.xml:
Sync metadata.xml from Portage tree.
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
index cf43f0a..07daa6b 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-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.9999.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.9999-r2.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild
index ae63b36..b54dff7 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
@@ -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/metadata.xml b/app-editors/emacs-vcs/metadata.xml
index c2cefd0..dd924f4 100644
--- a/app-editors/emacs-vcs/metadata.xml
+++ b/app-editors/emacs-vcs/metadata.xml
@@ -44,6 +44,5 @@
<flag name='wide-int'>Prefer wide Emacs integers (typically 62-bit).
This option has an effect only on architectures where "long" and
"long long" types have different size.</flag>
- <flag name='xwidgets'>Enable use of some gtk widgets in Emacs buffers</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2015-02-09 12:09 Ulrich Müller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Müller @ 2015-02-09 12:09 UTC (permalink / raw
To: gentoo-commits
commit: 5b7e14adcab35bae5f278111162a5c2dbd327e6e
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 9 12:15:38 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 9 12:15:38 2015 +0000
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.9999-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 <ulm@gentoo.org> emacs-vcs-25.0.9999-r2.ebuild:
+ Use group 'scores' instead of 'games' for shared score files.
+
01 Feb 2015; Ulrich Müller <ulm@gentoo.org> metadata.xml:
Sync metadata.xml from Portage tree.
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 b54dff7..4b43250 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
@@ -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) \
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2015-02-19 22:07 Ulrich Müller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Müller @ 2015-02-19 22:07 UTC (permalink / raw
To: gentoo-commits
commit: d44f86995cd6f75b8b5034251ebf84c463d34b32
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 19 22:14:17 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 19 22:14:17 2015 +0000
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.9999-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 <ulm@gentoo.org> emacs-vcs-25.0.9999-r2.ebuild:
+ Use "gamestat" group for shared score files, following QA tree policy.
+
09 Feb 2015; Ulrich Müller <ulm@gentoo.org> emacs-vcs-25.0.9999-r2.ebuild:
Use group 'scores' instead of 'games' for shared score files.
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 4b43250..825e972 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
@@ -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) \
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2015-02-21 12:03 Ulrich Müller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Müller @ 2015-02-21 12:03 UTC (permalink / raw
To: gentoo-commits
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? (
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2016-03-21 9:45 Ulrich Müller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Müller @ 2016-03-21 9:45 UTC (permalink / raw
To: gentoo-commits
commit: f752454e2ea479ff6ef2f60f8cd3f621eba676ce
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 18:21:34 2016 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 09:44:30 2016 +0000
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.9999-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.9999-r2.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.1.9999-r1.ebuild
similarity index 80%
rename from app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild
rename to app-editors/emacs-vcs/emacs-vcs-25.1.9999-r1.ebuild
index 2e9d5f4..5457c54 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.1.9999-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##*.} = 9999 ]]; then
inherit git-r3
@@ -13,37 +13,38 @@ if [[ ${PV##*.} = 9999 ]]; 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? (
+ xwidgets? (
+ x11-libs/gtk+:3
+ net-libs/webkit-gtk:3=
+ )
+ !xwidgets? (
+ gtk3? ( x11-libs/gtk+:3 )
+ !gtk3? ( x11-libs/gtk+:2 )
+ )
+ )
+ !gtk? (
+ motif? ( >=x11-libs/motif-2.3:0 )
+ !motif? (
+ Xaw3d? ( x11-libs/libXaw3d )
+ !Xaw3d? ( athena? ( x11-libs/libXaw ) )
)
)
)"
@@ -108,7 +116,7 @@ src_prepare() {
|| die "Upstream version number changed to ${FULL_VERSION}"
fi
- epatch_user
+ eapply_user
# Fix filename reference in redirected man page
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
@@ -154,24 +162,48 @@ src_configure() {
if use xft; then
myconf+=" --with-xft"
+ myconf+=" $(use_with cairo)"
myconf+=" $(use_with m17n-lib libotf)"
myconf+=" $(use_with m17n-lib m17n-flt)"
else
myconf+=" --without-xft"
+ myconf+=" --without-cairo"
myconf+=" --without-libotf --without-m17n-flt"
+ use cairo && ewarn \
+ "USE flag \"cairo\" has no effect if \"xft\" is not set."
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"
+ local f
+ if use gtk; then
+ einfo "Configuring to build with GIMP Toolkit (GTK+)"
+ 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 <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
+ 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
+ if use xwidgets; then
+ myconf+=" --with-x-toolkit=gtk3 --with-xwidgets"
+ else
+ myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
+ myconf+=" --without-xwidgets"
+ fi
+ 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
einfo "Configuring to build with Motif toolkit"
myconf+=" --with-x-toolkit=motif"
+ for f in Xaw3d athena; do
+ use ${f} && ewarn \
+ "USE flag \"${f}\" has no effect if \"motif\" is set."
+ done
elif use athena || use Xaw3d; then
einfo "Configuring to build with Athena/Lucid toolkit"
myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
@@ -179,14 +211,8 @@ src_configure() {
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
+ ! use gtk && use xwidgets && ewarn \
+ "USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
elif use aqua; then
einfo "Configuring to build with Nextstep (Cocoa) support"
myconf+=" --with-ns --disable-ns-self-contained"
@@ -198,9 +224,6 @@ src_configure() {
# 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}" \
@@ -209,15 +232,15 @@ src_configure() {
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
--with-gameuser=":gamestat" \
--without-compress-install \
- --with-file-notification=$(usev gfile || usev inotify || echo no) \
+ --with-file-notification=$(usev inotify || usev gfile || 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 ssl gnutls) \
$(use_with wide-int) \
$(use_with zlib) \
${myconf}
diff --git a/app-editors/emacs-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml
index d0de63c..a22860c 100644
--- a/app-editors/emacs-vcs/metadata.xml
+++ b/app-editors/emacs-vcs/metadata.xml
@@ -29,10 +29,8 @@
notification</flag>
<flag name='gsettings'>Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
system font name</flag>
- <flag name='gtk'>Add support for <pkg>x11-libs/gtk+</pkg>
- (the GIMP Toolkit) version 2</flag>
- <flag name='gtk3'>Add support for <pkg>x11-libs/gtk+</pkg>
- (the GIMP Toolkit) version 3</flag>
+ <flag name='gtk3'>Prefer version 3 of the GIMP Toolkit to version 2
+ (<pkg>x11-libs/gtk+</pkg>)</flag>
<flag name='gzip-el'>Compress bundled Emacs Lisp source</flag>
<flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag>
<flag name='imagemagick'>Use <pkg>media-gfx/imagemagick</pkg> for image
@@ -47,5 +45,7 @@
<flag name='wide-int'>Prefer wide Emacs integers (typically 62-bit).
This option has an effect only on architectures where "long" and
"long long" types have different size.</flag>
+ <flag name='xwidgets'>Enable use of GTK widgets in Emacs buffers
+ (requires GTK3)</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
@ 2016-05-28 6:53 Ulrich Müller
0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Müller @ 2016-05-28 6:53 UTC (permalink / raw
To: gentoo-commits
commit: 1c7e7618c5a592049e94bdfd525c608ba59c9c3e
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat May 28 06:52:10 2016 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat May 28 06:52:10 2016 +0000
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.9999-r1.ebuild | 42 ++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.1.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.1.9999-r1.ebuild
index 5457c54..4d274bf 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.1.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.1.9999-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 <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
+ 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##*.} = 9999 ]]; then
FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
^ permalink raw reply related [flat|nested] 34+ messages in thread
end of thread, other threads:[~2016-05-28 6:53 UTC | newest]
Thread overview: 34+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-04 18:49 [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/ Ulrich Müller
-- strict thread matches above, loose matches on Subject: below --
2016-05-28 6:53 Ulrich Müller
2016-03-21 9:45 Ulrich Müller
2015-02-21 12:03 Ulrich Müller
2015-02-19 22:07 Ulrich Müller
2015-02-09 12:09 Ulrich Müller
2015-02-01 21:31 Ulrich Müller
2015-02-01 15:51 Ulrich Müller
2015-02-01 13:55 Ulrich Müller
2015-01-23 6:10 Ulrich Müller
2015-01-21 21:43 Ulrich Müller
2014-12-29 11:12 Ulrich Müller
2014-11-13 23:16 Ulrich Müller
2014-11-10 20:11 Ulrich Müller
2014-10-02 20:44 Ulrich Müller
2014-05-18 14:56 Ulrich Müller
2014-05-05 8:16 Ulrich Müller
2014-04-08 5:22 Ulrich Müller
2014-03-26 11:53 Ulrich Müller
2014-03-15 7:26 Ulrich Müller
2014-03-13 19:09 Ulrich Müller
2014-02-19 21:49 Ulrich Müller
2014-02-19 20:15 Ulrich Müller
2014-01-19 17:31 Ulrich Müller
2013-12-29 10:07 Ulrich Müller
2013-08-31 22:33 Ulrich Mueller
2013-08-14 6:29 Ulrich Mueller
2013-08-13 18:10 Ulrich Mueller
2013-08-12 7:29 Ulrich Mueller
2013-08-02 16:38 Ulrich Mueller
2013-07-14 15:41 Ulrich Mueller
2013-07-11 21:24 Ulrich Mueller
2013-06-09 7:15 Ulrich Mueller
2013-06-08 21:11 Ulrich Mueller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox