summaryrefslogtreecommitdiff
path: root/profiles
diff options
context:
space:
mode:
Diffstat (limited to 'profiles')
-rw-r--r--profiles/Manifest.gzbin148259 -> 148263 bytes
-rw-r--r--profiles/features/wd40/package.mask1
-rw-r--r--profiles/use.local.desc1
3 files changed, 2 insertions, 0 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 2ae4bfb9ecb1..4dc97ffa2af7 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
Binary files differ
diff --git a/profiles/features/wd40/package.mask b/profiles/features/wd40/package.mask
index 6dc55ad9a1bc..7ef53b96fb46 100644
--- a/profiles/features/wd40/package.mask
+++ b/profiles/features/wd40/package.mask
@@ -15,6 +15,7 @@ dev-lang/rust-bin
>=dev-lang/spidermonkey-78
>=dev-libs/gjs-1.66
dev-python/autobahn
+>=dev-python/bcrypt-4
>=dev-python/cryptography-36
dev-python/gcs-oauth2-boto-plugin
dev-python/google-apitools
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index a8aca2632445..c7f9f1f7d873 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2952,6 +2952,7 @@ dev-vcs/git-annex:magicmime - Use libmagic to determine file MIME types
dev-vcs/git-annex:pairing - Enable pairing
dev-vcs/git-annex:torrentparser - Use haskell torrent library to parse torrent files
dev-vcs/git-annex:webapp - Enable git-annex webapp
+dev-vcs/git-delete-merged-branches:full-name-executable - Install executable /usr/bin/git-delete-merged-branches that is in conflict with dev-vcs/git-extras
dev-vcs/gitg:glade - Install a glade catalog file
dev-vcs/gitg:python - Install Python bindings for those plugins requiring it.
dev-vcs/gitolite:contrib - Install user-contributed files