From 39efcc84614fa52178e66ef69822df9370f47248 Mon Sep 17 00:00:00 2001
From: Puqns67 <me@puqns67.icu>
Date: Sat, 13 Jul 2024 19:30:37 +0800
Subject: [PATCH] games-util/mcdreforged: add 2.13.0-r1, drop 2.13.0

* skip environment check
* fix qa
---
 .../files/mcdreforged-2.13.0-fix-qa.patch     | 19 +++++++++++++++++++
 ...forged-2.13.0-skip-environment-check.patch | 12 ++++++++++++
 ....0.ebuild => mcdreforged-2.13.0-r1.ebuild} |  5 +++++
 3 files changed, 36 insertions(+)
 create mode 100644 games-util/mcdreforged/files/mcdreforged-2.13.0-fix-qa.patch
 create mode 100644 games-util/mcdreforged/files/mcdreforged-2.13.0-skip-environment-check.patch
 rename games-util/mcdreforged/{mcdreforged-2.13.0.ebuild => mcdreforged-2.13.0-r1.ebuild} (90%)

diff --git a/games-util/mcdreforged/files/mcdreforged-2.13.0-fix-qa.patch b/games-util/mcdreforged/files/mcdreforged-2.13.0-fix-qa.patch
new file mode 100644
index 0000000..c9b5f6c
--- /dev/null
+++ b/games-util/mcdreforged/files/mcdreforged-2.13.0-fix-qa.patch
@@ -0,0 +1,19 @@
+--- a/setup.py	2024-07-13 19:24:16.001303928 +0800
++++ b/setup.py	2024-07-13 19:24:40.679695152 +0800
+@@ -1,6 +1,6 @@
+ import os
+ 
+-from setuptools import find_packages, setup
++from setuptools import find_namespace_packages, setup
+ 
+ from mcdreforged.constants import core_constant
+ 
+@@ -65,7 +65,7 @@
+ 	author=AUTHOR,
+ 	python_requires=REQUIRES_PYTHON,
+ 	project_urls=PROJECT_URLS,
+-	packages=find_packages(exclude=['tests', '*.tests', '*.tests.*', 'tests.*']),
++	packages=find_namespace_packages(exclude=['tests', '*.tests', '*.tests.*', 'tests.*']),
+ 	include_package_data=True,
+ 	install_requires=REQUIRED,
+ 	classifiers=CLASSIFIERS,
diff --git a/games-util/mcdreforged/files/mcdreforged-2.13.0-skip-environment-check.patch b/games-util/mcdreforged/files/mcdreforged-2.13.0-skip-environment-check.patch
new file mode 100644
index 0000000..1b30dd9
--- /dev/null
+++ b/games-util/mcdreforged/files/mcdreforged-2.13.0-skip-environment-check.patch
@@ -0,0 +1,12 @@
+--- a/mcdreforged/mcdr_server.py	2024-07-13 18:08:11.731580563 +0800
++++ b/mcdreforged/mcdr_server.py	2024-07-13 18:10:26.344782844 +0800
+@@ -83,7 +83,8 @@
+ 		self.preference_manager: PreferenceManager = PreferenceManager(self)
+ 		self.__tr = self.create_internal_translator('mcdr_server')
+ 
+-		self.__check_environment()
++		# Skip this to fix environment detection
++		# self.__check_environment()
+ 
+ 		# --- Input arguments "generate_default_only" processing --- #
+ 		if args.generate_default_only:
diff --git a/games-util/mcdreforged/mcdreforged-2.13.0.ebuild b/games-util/mcdreforged/mcdreforged-2.13.0-r1.ebuild
similarity index 90%
rename from games-util/mcdreforged/mcdreforged-2.13.0.ebuild
rename to games-util/mcdreforged/mcdreforged-2.13.0-r1.ebuild
index d5e50df..10aaea1 100644
--- a/games-util/mcdreforged/mcdreforged-2.13.0.ebuild
+++ b/games-util/mcdreforged/mcdreforged-2.13.0-r1.ebuild
@@ -33,4 +33,9 @@ RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.13.0-skip-environment-check.patch"
+	"${FILESDIR}/${PN}-2.13.0-fix-qa.patch"
+)
+
 distutils_enable_tests unittest