From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1348156-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id DD58E158087
	for <garchives@archives.gentoo.org>; Fri, 10 Dec 2021 23:22:48 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 1FC45E0825;
	Fri, 10 Dec 2021 23:22:47 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id F174BE0826
	for <gentoo-commits@lists.gentoo.org>; Fri, 10 Dec 2021 23:22:45 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 9843B3431F3
	for <gentoo-commits@lists.gentoo.org>; Fri, 10 Dec 2021 23:22:43 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 214F1219
	for <gentoo-commits@lists.gentoo.org>; Fri, 10 Dec 2021 23:22:42 +0000 (UTC)
From: "Mats Lidell" <matsl@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mats Lidell" <matsl@gentoo.org>
Message-ID: <1639178489.1365e636cb4f00c4cce8825f262f2529ea04de67.matsl@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.5.34-r7.ebuild
X-VCS-Directories: app-editors/xemacs/
X-VCS-Committer: matsl
X-VCS-Committer-Name: Mats Lidell
X-VCS-Revision: 1365e636cb4f00c4cce8825f262f2529ea04de67
X-VCS-Branch: master
Date: Fri, 10 Dec 2021 23:22:42 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 3bc38bfa-b394-4827-8c5a-d6b1c999d220
X-Archives-Hash: 65f325483526e58165854a36ffb1cb2a

commit:     1365e636cb4f00c4cce8825f262f2529ea04de67
Author:     Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 10 22:58:50 2021 +0000
Commit:     Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Fri Dec 10 23:21:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1365e636

app-editors/xemacs: libXaw3d needs unicode

- require libXaw3d with unicode
- load neXt only if used
- unpack neXt once

Bug: https://bugs.gentoo.org/805173

Signed-off-by: Mats Lidell <matsl <AT> gentoo.org>

 app-editors/xemacs/xemacs-21.5.34-r7.ebuild | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.5.34-r7.ebuild b/app-editors/xemacs/xemacs-21.5.34-r7.ebuild
index c44dccad1aba..aae31d431223 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r7.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r7.ebuild
@@ -11,7 +11,7 @@ inherit flag-o-matic xdg-utils desktop
 DESCRIPTION="highly customizable open source text editor and application development system"
 HOMEPAGE="http://www.xemacs.org/"
 SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
-	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
+	neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -35,7 +35,7 @@ RDEPEND="
 	dnd? ( x11-libs/dnd )
 	motif? ( >=x11-libs/motif-2.3:0[xft=] )
 	athena? ( x11-libs/libXaw )
-	Xaw3d? ( x11-libs/libXaw3d )
+	Xaw3d? ( x11-libs/libXaw3d[unicode] )
 	xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 )
 	neXt? ( x11-libs/neXtaw )
 	xface? ( media-libs/compface )
@@ -54,8 +54,6 @@ PDEPEND="app-xemacs/xemacs-base
 
 src_unpack() {
 	default_src_unpack
-
-	use neXt && unpack NeXT_XEmacs.tar.gz
 }
 
 src_prepare() {