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.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 6F7C4158020 for ; Tue, 27 Dec 2022 06:24:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5146DE0AC1; Tue, 27 Dec 2022 06:24:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 3034BE0AC1 for ; Tue, 27 Dec 2022 06:24:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 DE90D3410AA for ; Tue, 27 Dec 2022 06:24:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F212E771 for ; Tue, 27 Dec 2022 06:24:28 +0000 (UTC) From: "Yuan Liao" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yuan Liao" Message-ID: <1672121539.1bbe30bbd093369cdd7d626ad8c27827d3f6783b.liaoyuan@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/ X-VCS-Repository: repo/proj/guru X-VCS-Files: games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210-r1.ebuild games-emulation/dosbox-x/dosbox-x-9999.ebuild X-VCS-Directories: games-emulation/dosbox-x/ X-VCS-Committer: liaoyuan X-VCS-Committer-Name: Yuan Liao X-VCS-Revision: 1bbe30bbd093369cdd7d626ad8c27827d3f6783b X-VCS-Branch: dev Date: Tue, 27 Dec 2022 06:24:28 +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: 14bd7f30-b642-4119-8478-3ce925a975c7 X-Archives-Hash: 9c32f2390f5ab41a3cd4d25760d3ac67 commit: 1bbe30bbd093369cdd7d626ad8c27827d3f6783b Author: Yuan Liao gmail com> AuthorDate: Tue Dec 27 05:57:37 2022 +0000 Commit: Yuan Liao gmail com> CommitDate: Tue Dec 27 06:12:19 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1bbe30bb games-emulation/dosbox-x: Revert changes for rolling release adoption This reverts commit b8194cde46d4fb966090f5291ca21d88dcfd9a46. The upstream has just made a new release after I started to believe that they had ditched tagged releases. Who knows what will happen next... Not revision-bumping the 2022.09.1_pre20221210 ebuild because there is just a trivial documentation change for it; existing users of this package will likely update to a new version soon. Signed-off-by: Yuan Liao gmail.com> .../dosbox-x/dosbox-x-2022.08.0-r1.ebuild | 2 -- .../dosbox-x-2022.09.1_pre20221210-r1.ebuild | 3 +-- games-emulation/dosbox-x/dosbox-x-9999.ebuild | 26 +++------------------- 3 files changed, 4 insertions(+), 27 deletions(-) diff --git a/games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild b/games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild index d05ffb418..5956244b0 100644 --- a/games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild +++ b/games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild @@ -1,8 +1,6 @@ # Copyright 2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Note: This is the last release (non-pre-release) tagged by upstream - EAPI=8 inherit autotools toolchain-funcs xdg diff --git a/games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210-r1.ebuild b/games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210-r1.ebuild index f489f2b6b..3e9516b1f 100644 --- a/games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210-r1.ebuild +++ b/games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210-r1.ebuild @@ -12,8 +12,7 @@ else # https://github.com/joncampbell123/dosbox-x/discussions/3862 GIT_COMMIT="982c44176e7619ae2a40b5c5d8df31f2911384da" DOC_CONTENTS=" - DOSBox-X upstream has stopped making releases. Therefore, this - package has installed a copy of DOSBox-X built from an upstream + This package has installed a copy of DOSBox-X built from an upstream repository snapshot at the following Git commit:\n \n ${GIT_COMMIT} diff --git a/games-emulation/dosbox-x/dosbox-x-9999.ebuild b/games-emulation/dosbox-x/dosbox-x-9999.ebuild index 1b813f7ff..065a583ee 100644 --- a/games-emulation/dosbox-x/dosbox-x-9999.ebuild +++ b/games-emulation/dosbox-x/dosbox-x-9999.ebuild @@ -3,24 +3,14 @@ EAPI=8 -inherit autotools readme.gentoo-r1 toolchain-funcs xdg +inherit autotools toolchain-funcs xdg if [[ "${PV}" == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/joncampbell123/dosbox-x.git" else - # https://github.com/joncampbell123/dosbox-x/discussions/3862 - GIT_COMMIT="" - DOC_CONTENTS=" - DOSBox-X upstream has stopped making releases. Therefore, this - package has installed a copy of DOSBox-X built from an upstream - repository snapshot at the following Git commit:\n - \n - ${GIT_COMMIT} - " - - SRC_URI="https://github.com/joncampbell123/dosbox-x/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${GIT_COMMIT}" + SRC_URI="https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-v${PV}.tar.gz" + S="${WORKDIR}/${PN}-${PN}-v${PV}" KEYWORDS="~amd64" fi @@ -143,11 +133,6 @@ src_test() { "${@}" || die "Unit tests failed" } -src_install() { - default - [[ -n "${DOC_CONTENTS}" ]] && readme.gentoo_create_doc -} - pkg_preinst() { xdg_pkg_preinst @@ -170,11 +155,6 @@ pkg_preinst() { pkg_postinst() { xdg_pkg_postinst - if ! has "${PVR}" ${REPLACING_VERSIONS} && [[ -n "${DOC_CONTENTS}" ]]; then - FORCE_PRINT_ELOG=1 - readme.gentoo_print_elog - fi - if [[ "${PRINT_NOTES_FOR_DEBUGGER}" ]]; then elog elog "Note on the Debugger"