commit: 7d4dfd08f5353f2e79b28a80a10ecd15c1867700 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Sat Nov 28 12:04:30 2020 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Sat Nov 28 12:19:22 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d4dfd08
app-editors/emacs: Fix install failure with USE="-gui aqua". Closes: https://bugs.gentoo.org/757303 Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> app-editors/emacs/emacs-23.4-r20.ebuild | 20 +++++++++++--------- app-editors/emacs/emacs-24.5-r9.ebuild | 20 +++++++++++--------- app-editors/emacs/emacs-25.3-r8.ebuild | 20 +++++++++++--------- app-editors/emacs/emacs-26.3-r3.ebuild | 20 +++++++++++--------- app-editors/emacs/emacs-27.1-r2.ebuild | 20 +++++++++++--------- app-editors/emacs/emacs-27.1.9999-r1.ebuild | 20 +++++++++++--------- app-editors/emacs/emacs-28.0.9999.ebuild | 20 +++++++++++--------- 7 files changed, 77 insertions(+), 63 deletions(-) diff --git a/app-editors/emacs/emacs-23.4-r20.ebuild b/app-editors/emacs/emacs-23.4-r20.ebuild index 7817b125574..32bef55e4ff 100644 --- a/app-editors/emacs/emacs-23.4-r20.ebuild +++ b/app-editors/emacs/emacs-23.4-r20.ebuild @@ -301,7 +301,7 @@ src_install() { dodoc README BUGS - if use aqua; then + if use gui && use aqua; then dodir /Applications/Gentoo rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app mv nextstep/Emacs.app \ @@ -316,14 +316,16 @@ src_install() { it is strongly recommended that you use app-admin/emacs-updater to rebuild all byte-compiled elisp files of the installed Emacs packages." - use gui && 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\\n${EMACS_SUFFIX^}.app is in - \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink - it into /Applications by yourself." + if use gui; then + 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\\n${EMACS_SUFFIX^}.app is in + \"${EPREFIX}/Applications/Gentoo\". You may want to copy or + symlink it into /Applications by yourself." + fi readme.gentoo_create_doc } diff --git a/app-editors/emacs/emacs-24.5-r9.ebuild b/app-editors/emacs/emacs-24.5-r9.ebuild index d205fe64db8..f52f447b679 100644 --- a/app-editors/emacs/emacs-24.5-r9.ebuild +++ b/app-editors/emacs/emacs-24.5-r9.ebuild @@ -298,7 +298,7 @@ src_install() { dodoc README BUGS - if use aqua; then + if use gui && use aqua; then dodir /Applications/Gentoo rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app mv nextstep/Emacs.app \ @@ -312,14 +312,16 @@ src_install() { \\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 gui && 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\\n${EMACS_SUFFIX^}.app is in - \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink - it into /Applications by yourself." + if use gui; then + 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\\n${EMACS_SUFFIX^}.app is in + \"${EPREFIX}/Applications/Gentoo\". You may want to copy or + symlink it into /Applications by yourself." + fi readme.gentoo_create_doc } diff --git a/app-editors/emacs/emacs-25.3-r8.ebuild b/app-editors/emacs/emacs-25.3-r8.ebuild index 2deef88cebc..466ee76552f 100644 --- a/app-editors/emacs/emacs-25.3-r8.ebuild +++ b/app-editors/emacs/emacs-25.3-r8.ebuild @@ -307,7 +307,7 @@ src_install() { dodoc README BUGS CONTRIBUTE - if use aqua; then + if use gui && use aqua; then dodir /Applications/Gentoo rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app mv nextstep/Emacs.app \ @@ -322,14 +322,16 @@ src_install() { it is strongly recommended that you use app-admin/emacs-updater to rebuild all byte-compiled elisp files of the installed Emacs packages." - use gui && 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\\n${EMACS_SUFFIX^}.app is in - \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink - it into /Applications by yourself." + if use gui; then + 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\\n${EMACS_SUFFIX^}.app is in + \"${EPREFIX}/Applications/Gentoo\". You may want to copy or + symlink it into /Applications by yourself." + fi readme.gentoo_create_doc } diff --git a/app-editors/emacs/emacs-26.3-r3.ebuild b/app-editors/emacs/emacs-26.3-r3.ebuild index dc65014ec5d..80915e9112b 100644 --- a/app-editors/emacs/emacs-26.3-r3.ebuild +++ b/app-editors/emacs/emacs-26.3-r3.ebuild @@ -334,7 +334,7 @@ src_install() { dodoc README BUGS CONTRIBUTE - if use aqua; then + if use gui && use aqua; then dodir /Applications/Gentoo rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app mv nextstep/Emacs.app \ @@ -349,14 +349,16 @@ src_install() { it is strongly recommended that you use app-admin/emacs-updater to rebuild all byte-compiled elisp files of the installed Emacs packages." - use gui && 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\\n${EMACS_SUFFIX^}.app is in - \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink - it into /Applications by yourself." + if use gui; then + 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\\n${EMACS_SUFFIX^}.app is in + \"${EPREFIX}/Applications/Gentoo\". You may want to copy or + symlink it into /Applications by yourself." + fi readme.gentoo_create_doc } diff --git a/app-editors/emacs/emacs-27.1-r2.ebuild b/app-editors/emacs/emacs-27.1-r2.ebuild index c0a8301900b..e6c3aef737c 100644 --- a/app-editors/emacs/emacs-27.1-r2.ebuild +++ b/app-editors/emacs/emacs-27.1-r2.ebuild @@ -377,7 +377,7 @@ src_install() { dodoc README BUGS CONTRIBUTE - if use aqua; then + if use gui && use aqua; then dodir /Applications/Gentoo rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app mv nextstep/Emacs.app \ @@ -392,14 +392,16 @@ src_install() { it is strongly recommended that you use app-admin/emacs-updater to rebuild all byte-compiled elisp files of the installed Emacs packages." - use gui && 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\\n${EMACS_SUFFIX^}.app is in - \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink - it into /Applications by yourself." + if use gui; then + 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\\n${EMACS_SUFFIX^}.app is in + \"${EPREFIX}/Applications/Gentoo\". You may want to copy or + symlink it into /Applications by yourself." + fi readme.gentoo_create_doc } diff --git a/app-editors/emacs/emacs-27.1.9999-r1.ebuild b/app-editors/emacs/emacs-27.1.9999-r1.ebuild index a3e4ddfa683..8995971a50a 100644 --- a/app-editors/emacs/emacs-27.1.9999-r1.ebuild +++ b/app-editors/emacs/emacs-27.1.9999-r1.ebuild @@ -376,7 +376,7 @@ src_install() { dodoc README BUGS CONTRIBUTE - if use aqua; then + if use gui && use aqua; then dodir /Applications/Gentoo rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app mv nextstep/Emacs.app \ @@ -391,14 +391,16 @@ src_install() { it is strongly recommended that you use app-admin/emacs-updater to rebuild all byte-compiled elisp files of the installed Emacs packages." - use gui && 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\\n${EMACS_SUFFIX^}.app is in - \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink - it into /Applications by yourself." + if use gui; then + 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\\n${EMACS_SUFFIX^}.app is in + \"${EPREFIX}/Applications/Gentoo\". You may want to copy or + symlink it into /Applications by yourself." + fi readme.gentoo_create_doc } diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild index 9ea17e49b55..39d49261783 100644 --- a/app-editors/emacs/emacs-28.0.9999.ebuild +++ b/app-editors/emacs/emacs-28.0.9999.ebuild @@ -375,7 +375,7 @@ src_install() { dodoc README BUGS CONTRIBUTE - if use aqua; then + if use gui && use aqua; then dodir /Applications/Gentoo rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app mv nextstep/Emacs.app \ @@ -390,14 +390,16 @@ src_install() { it is strongly recommended that you use app-admin/emacs-updater to rebuild all byte-compiled elisp files of the installed Emacs packages." - use gui && 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\\n${EMACS_SUFFIX^}.app is in - \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink - it into /Applications by yourself." + if use gui; then + 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\\n${EMACS_SUFFIX^}.app is in + \"${EPREFIX}/Applications/Gentoo\". You may want to copy or + symlink it into /Applications by yourself." + fi readme.gentoo_create_doc }
