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 50791138334 for ; Mon, 7 Oct 2019 08:05:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 88B35E0802; Mon, 7 Oct 2019 08:05:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 71011E0802 for ; Mon, 7 Oct 2019 08:05:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 6332834B9F2 for ; Mon, 7 Oct 2019 08:05:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E4FDE7F8 for ; Mon, 7 Oct 2019 08:05:03 +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: <1570435489.58d1c22092ded71aeadd25152f8a896a479812b3.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/x48/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/x48/x48-0.6.4-r1.ebuild app-emulation/x48/x48-0.6.4-r2.ebuild X-VCS-Directories: app-emulation/x48/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 58d1c22092ded71aeadd25152f8a896a479812b3 X-VCS-Branch: master Date: Mon, 7 Oct 2019 08:05:03 +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: 6d2ab182-0fe8-4050-98fb-50729d31a9b0 X-Archives-Hash: eb863edc951bd1368a384f2fd1f2b8ef commit: 58d1c22092ded71aeadd25152f8a896a479812b3 Author: David Seifert gentoo org> AuthorDate: Mon Oct 7 08:04:49 2019 +0000 Commit: David Seifert gentoo org> CommitDate: Mon Oct 7 08:04:49 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58d1c220 app-emulation/x48: Use readline:0 package * x48 was using an incorrect SLOT dependency Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: David Seifert gentoo.org> .../x48/{x48-0.6.4-r1.ebuild => x48-0.6.4-r2.ebuild} | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app-emulation/x48/x48-0.6.4-r1.ebuild b/app-emulation/x48/x48-0.6.4-r2.ebuild similarity index 91% rename from app-emulation/x48/x48-0.6.4-r1.ebuild rename to app-emulation/x48/x48-0.6.4-r2.ebuild index 25255dc0248..60123e66d5a 100644 --- a/app-emulation/x48/x48-0.6.4-r1.ebuild +++ b/app-emulation/x48/x48-0.6.4-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools @@ -14,9 +14,10 @@ SLOT="0" KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" IUSE="readline" -RDEPEND="x11-libs/libX11 +RDEPEND=" + x11-libs/libX11 x11-libs/libXext - readline? ( sys-libs/readline:5 )" + readline? ( sys-libs/readline:0= )" DEPEND="${RDEPEND} virtual/pkgconfig x11-libs/libXt" @@ -28,7 +29,7 @@ src_unpack() { } src_prepare() { - eapply_user + default sed -i '698s/inline/static inline/' src/emulate.c || die eautoreconf } @@ -38,10 +39,10 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install + default + insinto /usr/share/"${PN}"/romdump doins -r romdump/{README,ROMDump*} - dodoc AUTHORS README ChangeLog } pkg_postinst() {