summaryrefslogtreecommitdiff
path: root/app-admin
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/calamares/Manifest2
-rw-r--r--app-admin/calamares/calamares-3.2.62.ebuild (renamed from app-admin/calamares/calamares-3.2.44.3-r3.ebuild)4
-rw-r--r--app-admin/calamares/files/calamares-dont-run-locale-gen.patch24
3 files changed, 1 insertions, 29 deletions
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 9c9f41e6..409997d8 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1 @@
-DIST calamares-3.2.44.3.tar.gz 4170955 BLAKE2B fff2f58bcdcfc3bdca8f290cad6ca584eb7f3b48cb6009731e0cf8ba155664639694eb06ada2fa0205f66b78ee0503c89f66614952f0fa15c55ea0fcca087b78 SHA512 13130befa8705c5b7d04bf90329e97797f2477abf11a77fb41e158724969284278a6078da4e015944d24ac0a062e60c3bbc250c7c359ff1f1a5b28f7b85d159a
+DIST calamares-3.2.62.tar.gz 4333895 BLAKE2B cf9bb1fed12e1782fc5b9248e05cab3e26c7233e965a070250fe85ac114b5560ea7c9d256c52ba6ee1be930d29f167fa48beed1b42b4a6cc30dc1ea31bd025c9 SHA512 a6ec831a9bc35e7f32563def5d48b4fa2e4ab5810fc3065d847a22adfe7c26f7c7427d5d0fe6259ab839c52756e8cd23185e2a61bc5155a3b884f67677e6cd92
diff --git a/app-admin/calamares/calamares-3.2.44.3-r3.ebuild b/app-admin/calamares/calamares-3.2.62.ebuild
index 67a6371d..cfd00f97 100644
--- a/app-admin/calamares/calamares-3.2.44.3-r3.ebuild
+++ b/app-admin/calamares/calamares-3.2.62.ebuild
@@ -67,10 +67,6 @@ RDEPEND="${COMMON_DEPEND}
config? ( app-misc/calamares-config-redcore )
"
-PATCHES="
- ${FILESDIR}/calamares-dont-run-locale-gen.patch
-"
-
src_prepare() {
ecm_src_prepare
export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
diff --git a/app-admin/calamares/files/calamares-dont-run-locale-gen.patch b/app-admin/calamares/files/calamares-dont-run-locale-gen.patch
deleted file mode 100644
index 03314b12..00000000
--- a/app-admin/calamares/files/calamares-dont-run-locale-gen.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nur a/src/modules/localecfg/main.py b/src/modules/localecfg/main.py
---- a/src/modules/localecfg/main.py 2020-05-11 19:53:23.000000000 +0100
-+++ b/src/modules/localecfg/main.py 2020-05-21 16:11:50.013845904 +0100
-@@ -149,20 +149,6 @@
- target_locale_conf_path = "{!s}/etc/locale.conf".format(install_path)
- target_etc_default_path = "{!s}/etc/default".format(install_path)
-
-- # restore backup if available
-- if os.path.exists(target_locale_gen_bak):
-- shutil.copy2(target_locale_gen_bak, target_locale_gen)
-- libcalamares.utils.debug("Restored backup {!s} -> {!s}"
-- .format(target_locale_gen_bak, target_locale_gen))
--
-- # run locale-gen if detected; this *will* cause an exception
-- # if the live system has locale.gen, but the target does not:
-- # in that case, fix your installation filesystem.
-- if os.path.exists('/etc/locale.gen'):
-- rewrite_locale_gen(target_locale_gen, target_locale_gen, locale_conf)
-- libcalamares.utils.target_env_call(['locale-gen'])
-- libcalamares.utils.debug('{!s} done'.format(target_locale_gen))
--
- # write /etc/locale.conf
- with open(target_locale_conf_path, "w") as lcf:
- for k, v in locale_conf.items():