[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/

["Yuan Liao" <liaoyuan@gmail.com>]

commit:     1bbe30bbd093369cdd7d626ad8c27827d3f6783b
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Tue Dec 27 05:57:37 2022 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> 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 <liaoyuan <AT> 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"