commit: 7fb031a791fdd08d8dbfefdfa3acb22aa552e4b8 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Sun Mar 18 16:47:09 2018 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Sun Mar 18 16:51:32 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fb031a7
app-editors/emacs: Drop optional hesiod support. Remove support because net-dns/hesiod is masked for removal. The hesiod flag was package.use.masked for some time already. Closes: https://bugs.gentoo.org/626242 Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-editors/emacs/emacs-23.4-r17.ebuild | 5 ++--- app-editors/emacs/emacs-24.5-r5.ebuild | 5 ++--- app-editors/emacs/emacs-25.3-r1.ebuild | 5 ++--- app-editors/emacs/emacs-25.3-r3.ebuild | 5 ++--- app-editors/emacs/metadata.xml | 1 - 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/app-editors/emacs/emacs-23.4-r17.ebuild b/app-editors/emacs/emacs-23.4-r17.ebuild index b331aae1a49..d984134389d 100644 --- a/app-editors/emacs/emacs-23.4-r17.ebuild +++ b/app-editors/emacs/emacs-23.4-r17.ebuild @@ -14,14 +14,13 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="23" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm" +IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm" REQUIRED_USE="?? ( aqua X )" RDEPEND="sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile - hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) gpm? ( sys-libs/gpm ) @@ -215,7 +214,7 @@ src_configure() { --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ --with-crt-dir="${crtdir}" \ --with-gameuser=":gamestat" \ - $(use_with hesiod) \ + --without-hesiod \ $(use_with kerberos) $(use_with kerberos kerberos5) \ $(use_with gpm) \ $(use_with dbus) \ diff --git a/app-editors/emacs/emacs-24.5-r5.ebuild b/app-editors/emacs/emacs-24.5-r5.ebuild index 2668c7388bd..23d6f54c458 100644 --- a/app-editors/emacs/emacs-24.5-r5.ebuild +++ b/app-editors/emacs/emacs-24.5-r5.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="acl alsa aqua athena 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 zlib" +IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el 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 zlib" REQUIRED_USE="?? ( aqua X )" RDEPEND="sys-libs/ncurses:0= @@ -24,7 +24,6 @@ RDEPEND="sys-libs/ncurses:0= alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) 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 ) @@ -209,11 +208,11 @@ src_configure() { --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ --with-gameuser=":gamestat" \ --without-compress-install \ + --without-hesiod \ --with-file-notification=$(usev inotify || usev gfile || echo no) \ $(use_enable acl) \ $(use_with dbus) \ $(use_with gpm) \ - $(use_with hesiod) \ $(use_with kerberos) $(use_with kerberos kerberos5) \ $(use_with libxml2 xml2) \ $(use_with selinux) \ diff --git a/app-editors/emacs/emacs-25.3-r1.ebuild b/app-editors/emacs/emacs-25.3-r1.ebuild index c7a9b7fa242..be629ab7382 100644 --- a/app-editors/emacs/emacs-25.3-r1.ebuild +++ b/app-editors/emacs/emacs-25.3-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="25" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips 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 cairo dbus dynamic-loading 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 zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el 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 zlib" REQUIRED_USE="?? ( aqua X )" RDEPEND="sys-libs/ncurses:0= @@ -23,7 +23,6 @@ RDEPEND="sys-libs/ncurses:0= alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) 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 ) @@ -220,12 +219,12 @@ src_configure() { --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ --with-gameuser=":gamestat" \ --without-compress-install \ + --without-hesiod \ --with-file-notification=$(usev inotify || usev gfile || echo no) \ $(use_enable acl) \ $(use_with dbus) \ $(use_with dynamic-loading modules) \ $(use_with gpm) \ - $(use_with hesiod) \ $(use_with kerberos) $(use_with kerberos kerberos5) \ $(use_with libxml2 xml2) \ $(use_with selinux) \ diff --git a/app-editors/emacs/emacs-25.3-r3.ebuild b/app-editors/emacs/emacs-25.3-r3.ebuild index 8fccd46c6d3..72aacd2aed7 100644 --- a/app-editors/emacs/emacs-25.3-r3.ebuild +++ b/app-editors/emacs/emacs-25.3-r3.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="25" KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~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 cairo dbus dynamic-loading 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 zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el 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 zlib" REQUIRED_USE="?? ( aqua X )" RDEPEND="sys-libs/ncurses:0= @@ -23,7 +23,6 @@ RDEPEND="sys-libs/ncurses:0= alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) 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 ) @@ -220,12 +219,12 @@ src_configure() { --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ --with-gameuser=":gamestat" \ --without-compress-install \ + --without-hesiod \ --with-file-notification=$(usev inotify || usev gfile || echo no) \ $(use_enable acl) \ $(use_with dbus) \ $(use_with dynamic-loading modules) \ $(use_with gpm) \ - $(use_with hesiod) \ $(use_with kerberos) $(use_with kerberos kerberos5) \ $(use_with libxml2 xml2) \ $(use_with selinux) \ diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml index 64c34d30c31..d0265f5fe8f 100644 --- a/app-editors/emacs/metadata.xml +++ b/app-editors/emacs/metadata.xml @@ -34,7 +34,6 @@ <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 processing</flag> <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
