Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/files/
Date: Tue, 21 Sep 2021 18:26:38
Message-Id: 1632248755.e7fba2177f693f81b4216b7acd81bbb4f4593e1f.conikost@gentoo
1 commit: e7fba2177f693f81b4216b7acd81bbb4f4593e1f
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Tue Sep 21 17:00:01 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 21 18:25:55 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7fba217
7
8 dev-db/mongodb: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/22356
11 Package-Manager: Portage-3.0.23, Repoman-3.0.3
12 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 .../mongodb/files/mongodb-4.2.10-no-compass.patch | 54 ----------------------
16 1 file changed, 54 deletions(-)
17
18 diff --git a/dev-db/mongodb/files/mongodb-4.2.10-no-compass.patch b/dev-db/mongodb/files/mongodb-4.2.10-no-compass.patch
19 deleted file mode 100644
20 index e60cd827f49..00000000000
21 --- a/dev-db/mongodb/files/mongodb-4.2.10-no-compass.patch
22 +++ /dev/null
23 @@ -1,54 +0,0 @@
24 -diff --git a/src/mongo/SConscript b/src/mongo/SConscript
25 -index 6c78164c..b4b7c579 100644
26 ---- a/src/mongo/SConscript
27 -+++ b/src/mongo/SConscript
28 -@@ -805,41 +805,6 @@ for full_dir, archive_dir in list(env["ARCHIVE_ADDITION_DIR_MAP"].items()):
29 - for target in env["DIST_BINARIES"]:
30 - installBinary(env, "db/modules/" + target)
31 -
32 --compass_type = 'compass'
33 --
34 --compass_script = "install_compass"
35 --if env.TargetOSIs('windows'):
36 -- # On windows the .in needs to be explicitly added to the file.
37 -- compass_script = "Install-Compass.ps1.in"
38 --
39 --compass_python_interpreter = '/usr/bin/env python2'
40 --if env.TargetOSIs('darwin'):
41 -- compass_python_interpreter = '/usr/bin/env python'
42 --
43 --compass_installer = env.Substfile('#/src/mongo/installer/compass/' + compass_script,
44 -- SUBST_DICT=[
45 -- ('@compass_type@', compass_type),
46 -- ('@python_interpreter@', compass_python_interpreter),
47 -- ])
48 --distBinaries.append(compass_installer)
49 --
50 --if not hygienic:
51 -- compass_script_installer = env.Install("$INSTALL_DIR/bin", compass_installer)
52 --else:
53 -- compass_script_installer = env.AutoInstall(
54 -- 'bin',
55 -- source=[
56 -- compass_installer,
57 -- ],
58 -- INSTALL_ALIAS=[
59 -- 'tools',
60 -- ],
61 -- )
62 --
63 --if env.TargetOSIs('posix'):
64 -- env.AddPostAction( compass_script_installer, 'chmod 755 $TARGET' )
65 -- env.AddPostAction( compass_installer, 'chmod 755 $TARGET' )
66 --
67 - # "dist" target is valid only when --use-new-tools is specified
68 - # Attempts to build release artifacts without tools must fail
69 - if has_option("use-new-tools"):
70 -@@ -857,7 +822,6 @@ if has_option("use-new-tools"):
71 - '--transform $BUILD_DIR/mongo=$SERVER_DIST_BASENAME/bin',
72 - '--transform $BUILD_DIR/mongo/stripped/src/mongo-tools=$SERVER_DIST_BASENAME/bin',
73 - '--transform src/mongo-tools=$SERVER_DIST_BASENAME/bin',
74 -- '--transform src/mongo/installer/compass=$SERVER_DIST_BASENAME/bin',
75 - '${TEMPFILE(SOURCES[1:])}'
76 - ],
77 - ),