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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C288313835B for ; Sat, 20 Feb 2021 22:44:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 20C55E088F; Sat, 20 Feb 2021 22:44:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 09CCFE088F for ; Sat, 20 Feb 2021 22:44:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 032C133BE95 for ; Sat, 20 Feb 2021 22:44:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 23FF64F1 for ; Sat, 20 Feb 2021 22:44:00 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1613861025.4b79e258a918930fa470fc73dc685bee42f41163.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mongodb/files/mongodb-4.0.0-no-compass.patch X-VCS-Directories: dev-db/mongodb/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 4b79e258a918930fa470fc73dc685bee42f41163 X-VCS-Branch: master Date: Sat, 20 Feb 2021 22:44:00 +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: e249de52-f665-4816-ba8a-5d853960bff1 X-Archives-Hash: 6251696e659e2b9ba02c3524456694ce commit: 4b79e258a918930fa470fc73dc685bee42f41163 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sat Feb 20 08:19:40 2021 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sat Feb 20 22:43:45 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b79e258 dev-db/mongodb: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/19551 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> .../mongodb/files/mongodb-4.0.0-no-compass.patch | 57 ---------------------- 1 file changed, 57 deletions(-) diff --git a/dev-db/mongodb/files/mongodb-4.0.0-no-compass.patch b/dev-db/mongodb/files/mongodb-4.0.0-no-compass.patch deleted file mode 100644 index 35e9c172e9e..00000000000 --- a/dev-db/mongodb/files/mongodb-4.0.0-no-compass.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/src/mongo/SConscript b/src/mongo/SConscript -index c8f925b7..0e4f99ad 100644 ---- a/src/mongo/SConscript -+++ b/src/mongo/SConscript -@@ -671,44 +671,6 @@ for full_dir, archive_dir in env["ARCHIVE_ADDITION_DIR_MAP"].items(): - for target in env["DIST_BINARIES"]: - installBinary(env, "db/modules/" + target) - --# Set the download url to the right place --compass_type = 'compass-community' --if 'enterprise' in env['MONGO_MODULES']: -- compass_type = 'compass' -- --compass_script = "install_compass" --if env.TargetOSIs('windows'): -- # On windows the .in needs to be explicitly added to the file. -- compass_script = "Install-Compass.ps1.in" -- --compass_python_interpreter = '/usr/bin/env python2' --if env.TargetOSIs('darwin'): -- compass_python_interpreter = '/usr/bin/env python' -- --compass_installer = env.Substfile('#/src/mongo/installer/compass/' + compass_script, -- SUBST_DICT=[ -- ('@compass_type@', compass_type), -- ('@python_interpreter@', compass_python_interpreter), -- ]) --distBinaries.append(compass_installer) -- --if not hygienic: -- compass_script_installer = env.Install("$INSTALL_DIR/bin", compass_installer) --else: -- compass_script_installer = env.AutoInstall( -- 'bin', -- source=[ -- compass_installer, -- ], -- INSTALL_ALIAS=[ -- 'tools', -- ], -- ) -- --if env.TargetOSIs('posix'): -- env.AddPostAction( compass_script_installer, 'chmod 755 $TARGET' ) -- env.AddPostAction( compass_installer, 'chmod 755 $TARGET' ) -- - # "dist" target is valid only when --use-new-tools is specified - # Attempts to build release artifacts without tools must fail - if has_option("use-new-tools"): -@@ -726,7 +688,6 @@ if has_option("use-new-tools"): - '--transform $BUILD_DIR/mongo=$SERVER_DIST_BASENAME/bin', - '--transform $BUILD_DIR/mongo/stripped/src/mongo-tools=$SERVER_DIST_BASENAME/bin', - '--transform src/mongo-tools=$SERVER_DIST_BASENAME/bin', -- '--transform src/mongo/installer/compass=$SERVER_DIST_BASENAME/bin', - '${TEMPFILE(SOURCES[1:])}' - ], - ),