From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E250313835B for ; Tue, 24 Nov 2020 18:26:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0C549E0829; Tue, 24 Nov 2020 18:26:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D05F5E0829 for ; Tue, 24 Nov 2020 18:26:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9B47C33BE61 for ; Tue, 24 Nov 2020 18:26:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 21265451 for ; Tue, 24 Nov 2020 18:26:20 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1606242372.e39af3e8c6a314a31ddbbdec1aaafad061e65416.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/emacs/emacs-26.3-r3.ebuild app-editors/emacs/emacs-27.1-r2.ebuild app-editors/emacs/emacs-27.1.9999-r1.ebuild app-editors/emacs/emacs-28.0.9999.ebuild X-VCS-Directories: app-editors/emacs/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: e39af3e8c6a314a31ddbbdec1aaafad061e65416 X-VCS-Branch: master Date: Tue, 24 Nov 2020 18:26:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 01aa51de-2ad1-49e6-91c2-7001b9cbc3cc X-Archives-Hash: 50d73243198d7838523b15b1812f0aea commit: e39af3e8c6a314a31ddbbdec1aaafad061e65416 Author: Ulrich Müller gentoo org> AuthorDate: Tue Nov 24 17:50:48 2020 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Tue Nov 24 18:26:12 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e39af3e8 app-editors/emacs: Test for mailutils flag in src_install. Instead of testing for existence of movemail. Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Ulrich Müller gentoo.org> app-editors/emacs/emacs-26.3-r3.ebuild | 7 +++---- app-editors/emacs/emacs-27.1-r2.ebuild | 7 +++---- app-editors/emacs/emacs-27.1.9999-r1.ebuild | 7 +++---- app-editors/emacs/emacs-28.0.9999.ebuild | 7 +++---- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/app-editors/emacs/emacs-26.3-r3.ebuild b/app-editors/emacs/emacs-26.3-r3.ebuild index 187d13793f7..dc65014ec5d 100644 --- a/app-editors/emacs/emacs-26.3-r3.ebuild +++ b/app-editors/emacs/emacs-26.3-r3.ebuild @@ -14,8 +14,7 @@ SLOT="26" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~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 gtk2 gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib" -RDEPEND="acct-group/mail - app-emacs/emacs-common-gentoo[games?,gui(-)?] +RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) @@ -27,7 +26,7 @@ RDEPEND="acct-group/mail lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) - !mailutils? ( net-libs/liblockfile ) + !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) @@ -269,7 +268,7 @@ src_install() { docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig # movemail must be setgid mail - if [[ -f ${ED}/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail ]]; then + if ! use mailutils; then fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail fi diff --git a/app-editors/emacs/emacs-27.1-r2.ebuild b/app-editors/emacs/emacs-27.1-r2.ebuild index e297c44f313..c0a8301900b 100644 --- a/app-editors/emacs/emacs-27.1-r2.ebuild +++ b/app-editors/emacs/emacs-27.1-r2.ebuild @@ -43,8 +43,7 @@ LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib" RESTRICT="test" -RDEPEND="acct-group/mail - app-emacs/emacs-common-gentoo[games?,gui(-)?] +RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) @@ -58,7 +57,7 @@ RDEPEND="acct-group/mail lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) - !mailutils? ( net-libs/liblockfile ) + !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) @@ -312,7 +311,7 @@ src_install() { docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig # movemail must be setgid mail - if [[ -f ${ED}/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail ]]; then + if ! use mailutils; then fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail fi diff --git a/app-editors/emacs/emacs-27.1.9999-r1.ebuild b/app-editors/emacs/emacs-27.1.9999-r1.ebuild index 60faa71894c..a3e4ddfa683 100644 --- a/app-editors/emacs/emacs-27.1.9999-r1.ebuild +++ b/app-editors/emacs/emacs-27.1.9999-r1.ebuild @@ -43,8 +43,7 @@ LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib" RESTRICT="test" -RDEPEND="acct-group/mail - app-emacs/emacs-common-gentoo[games?,gui(-)?] +RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) @@ -58,7 +57,7 @@ RDEPEND="acct-group/mail lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) - !mailutils? ( net-libs/liblockfile ) + !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) @@ -311,7 +310,7 @@ src_install() { docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig # movemail must be setgid mail - if [[ -f ${ED}/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail ]]; then + if ! use mailutils; then fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail fi diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild index 79d4c689e4b..9ea17e49b55 100644 --- a/app-editors/emacs/emacs-28.0.9999.ebuild +++ b/app-editors/emacs/emacs-28.0.9999.ebuild @@ -43,8 +43,7 @@ LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib" RESTRICT="test" -RDEPEND="acct-group/mail - app-emacs/emacs-common-gentoo[games?,gui(-)?] +RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) @@ -58,7 +57,7 @@ RDEPEND="acct-group/mail lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) - !mailutils? ( net-libs/liblockfile ) + !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) @@ -310,7 +309,7 @@ src_install() { docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig # movemail must be setgid mail - if [[ -f ${ED}/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail ]]; then + if ! use mailutils; then fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail fi