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 1954413933E for ; Sat, 17 Jul 2021 11:26:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 12BD0E090E; Sat, 17 Jul 2021 11:26:46 +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 ED976E090E for ; Sat, 17 Jul 2021 11:26:45 +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 DB13033FE26 for ; Sat, 17 Jul 2021 11:26:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7E5277D8 for ; Sat, 17 Jul 2021 11:26:43 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1626521116.81c70c84e7e0507df2f180cb90d3e57e3f1e2efc.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/xemacs/xemacs-21.4.24-r2.ebuild app-editors/xemacs/xemacs-21.4.24-r3.ebuild app-editors/xemacs/xemacs-21.5.34-r5.ebuild app-editors/xemacs/xemacs-21.5.34-r6.ebuild X-VCS-Directories: app-editors/xemacs/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 81c70c84e7e0507df2f180cb90d3e57e3f1e2efc X-VCS-Branch: master Date: Sat, 17 Jul 2021 11:26:43 +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: 3e07e851-32b3-42ef-8843-023c8475aa2f X-Archives-Hash: 6834d967fe6f27e927a37c03f489d406 commit: 81c70c84e7e0507df2f180cb90d3e57e3f1e2efc Author: David Seifert gentoo org> AuthorDate: Sat Jul 17 11:25:16 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Jul 17 11:25:16 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81c70c84 app-editors/xemacs: Remove app-i18n/canna Signed-off-by: David Seifert gentoo.org> .../xemacs/{xemacs-21.4.24-r2.ebuild => xemacs-21.4.24-r3.ebuild} | 6 +++--- .../xemacs/{xemacs-21.5.34-r5.ebuild => xemacs-21.5.34-r6.ebuild} | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild b/app-editors/xemacs/xemacs-21.4.24-r3.ebuild similarity index 97% rename from app-editors/xemacs/xemacs-21.4.24-r2.ebuild rename to app-editors/xemacs/xemacs-21.4.24-r3.ebuild index 557ca34677b..9b7467a98c2 100644 --- a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild +++ b/app-editors/xemacs/xemacs-21.4.24-r3.ebuild @@ -17,7 +17,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 sparc x86" -IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb" +IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xim athena neXt Xaw3d gdbm berkdb" X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps" @@ -41,7 +41,6 @@ RDEPEND=" tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) - canna? ( app-i18n/canna ) !amd64? ( freewnn? ( app-i18n/freewnn ) ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15" @@ -147,7 +146,7 @@ src_configure() { myconf="${myconf} --with-xim=no" fi - myconf="${myconf} $(use_with canna ) $(use_with freewnn wnn )" + myconf="${myconf} $(use_with freewnn wnn )" fi # This determines the type of sounds we are playing @@ -187,6 +186,7 @@ src_configure() { $(use_with pop ) \ --compiler=$(tc-getCC) \ --prefix=/usr \ + --without-canna \ --with-ncurses \ --with-system-malloc \ --with-msw=no \ diff --git a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild b/app-editors/xemacs/xemacs-21.5.34-r6.ebuild similarity index 97% rename from app-editors/xemacs/xemacs-21.5.34-r5.ebuild rename to app-editors/xemacs/xemacs-21.5.34-r6.ebuild index bcf39ec31bb..7e8c4188da8 100644 --- a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild +++ b/app-editors/xemacs/xemacs-21.5.34-r6.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz LICENSE="GPL-3+" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb" +IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xft xim athena neXt Xaw3d gdbm berkdb" X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps" @@ -42,7 +42,6 @@ RDEPEND=" tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) - canna? ( app-i18n/canna ) freewnn? ( app-i18n/freewnn ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15" @@ -144,7 +143,6 @@ src_configure() { myconf="${myconf} --with-xim=no" fi - myconf="${myconf} $(use_with canna )" myconf="${myconf} $(use_with freewnn wnn )" fi @@ -177,6 +175,7 @@ src_configure() { $(use_with eolconv file-coding ) \ $(use_with pop ) \ --prefix=/usr \ + --without-canna \ --with-ncurses \ --with-msw=no \ --with-mail-locking=flock \