diff options
| -rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-25.1.9999-r1.ebuild (renamed from app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild) | 103 | ||||
| -rw-r--r-- | 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 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> |