* [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/, app-editors/emacs-vcs/
@ 2015-09-20 12:00 Ulrich Müller
0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Müller @ 2015-09-20 12:00 UTC (permalink / raw
To: gentoo-commits
commit: 67c97f62a611081c46cbc3158cb3a3cd337e4671
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 11:44:36 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 11:46:41 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67c97f62
app-editors/emacs: Prefer inotify to gfile.
USE flag "inotify" will override "gfile" when both are set.
This follows an upstream change in configure.
Bug: http://debbugs.gnu.org/21241
Package-Manager: portage-2.2.20.1
app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild | 4 +-
.../emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild | 4 +-
.../emacs-24.5-r1.ebuild} | 55 ++++++----------------
3 files changed, 19 insertions(+), 44 deletions(-)
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild
index 5d6f549..32126d5 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild
@@ -39,10 +39,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 )
@@ -218,7 +218,7 @@ src_configure() {
--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) \
+ --with-file-notification=$(usev inotify || usev gfile || echo no) \
$(use_enable acl) \
$(use_with dbus) \
$(use_with gnutls) \
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 7198b67..85b8e5b 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
@@ -39,10 +39,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 )
@@ -223,7 +223,7 @@ 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) \
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild b/app-editors/emacs/emacs-24.5-r1.ebuild
similarity index 87%
copy from app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild
copy to app-editors/emacs/emacs-24.5-r1.ebuild
index 5d6f549..4c7d69d 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild
+++ b/app-editors/emacs/emacs-24.5-r1.ebuild
@@ -6,43 +6,28 @@ 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="emacs-24"
- EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
- S="${EGIT_CHECKOUT_DIR}"
-else
- SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
- mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
- 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"
- # 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}"
- S="${WORKDIR}/emacs"
-fi
-
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
HOMEPAGE="https://www.gnu.org/software/emacs/"
+SRC_URI="mirror://gnu/emacs/${P}.tar.xz
+ https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz"
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="24"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~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 zlib"
REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses
>=app-eselect/eselect-emacs-1.16
- >=app-emacs/emacs-common-gentoo-1.4-r1[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 )
@@ -90,26 +75,19 @@ DEPEND="${RDEPEND}
sys-apps/paxctl
)"
-if [[ ${PV##*.} = 9999 ]]; then
- DEPEND="${DEPEND}
- sys-apps/texinfo"
-fi
+RDEPEND="${RDEPEND}
+ !<app-editors/emacs-vcs-${PV}"
EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
SITEFILE="20${PN}-${SLOT}-gentoo.el"
+# 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}"
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_SUFFIX=patch epatch
epatch_user
# Fix filename reference in redirected man page
@@ -207,18 +185,15 @@ 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}" \
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
--localstatedir="${EPREFIX}"/var \
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
- --with-gameuser="${GAMES_USER_DED:-games}" \
+ --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) \
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/, app-editors/emacs-vcs/
@ 2018-07-28 19:36 Ulrich Müller
0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Müller @ 2018-07-28 19:36 UTC (permalink / raw
To: gentoo-commits
commit: e1125966498ad68c9cbc567767df1d594beb2b7c
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 28 19:33:25 2018 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 28 19:33:38 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1125966
app-editors/emacs{,-vcs}: Consolidate quoting style in metadata.xml.
app-editors/emacs-vcs/metadata.xml | 2 +-
app-editors/emacs/metadata.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-editors/emacs-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml
index b252d016514..ba717307034 100644
--- a/app-editors/emacs-vcs/metadata.xml
+++ b/app-editors/emacs-vcs/metadata.xml
@@ -48,7 +48,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
+ <flag name="xwidgets">Enable use of GTK widgets in Emacs buffers
(requires GTK3)</flag>
</use>
</pkgmetadata>
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index 7ed552aba66..b3f71c734b1 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -47,7 +47,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
+ <flag name="xwidgets">Enable use of GTK widgets in Emacs buffers
(requires GTK3)</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-07-28 19:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-20 12:00 [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/, app-editors/emacs-vcs/ Ulrich Müller
-- strict thread matches above, loose matches on Subject: below --
2018-07-28 19:36 Ulrich Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox