summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Genasci <fedeliallalinea@gmail.com>2022-01-09 13:04:02 +0100
committerSam James <sam@gentoo.org>2022-01-15 21:50:58 +0000
commit0af25712cb38fb03c45227f229c77720e17e1cad (patch)
tree5a518385cf57872f2b9372b17d0cd87dfa9f462f /profiles
parentdev-db/oracle-instantclient-*: removed old packages (diff)
downloadgentoo-0af25712cb38fb03c45227f229c77720e17e1cad.tar.gz
gentoo-0af25712cb38fb03c45227f229c77720e17e1cad.tar.bz2
gentoo-0af25712cb38fb03c45227f229c77720e17e1cad.zip
profiles: Mask dev-db/oracle-instantclient-* for removal
Bug: https://bugs.gentoo.org/589146 Signed-off-by: Marco Genasci <fedeliallalinea@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/23687 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'profiles')
-rw-r--r--profiles/package.mask13
1 files changed, 13 insertions, 0 deletions
diff --git a/profiles/package.mask b/profiles/package.mask
index 23f3c0661417..82ba0fb44c78 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,7 @@
## app-misc/some-package
#--- END OF EXAMPLES ---
+<<<<<<< HEAD
# Georgy Yakovlev <gyakovlev@gentoo.org> (2022-01-15)
# Last branch update happened ~ 12 month ago.
@@ -43,6 +44,18 @@
~sys-fs/zfs-0.8.6
~sys-fs/zfs-kmod-0.8.6
+||||||| parent of 8b4d5f684a22 (profiles: Mask dev-db/oracle-instantclient-* for removal)
+=======
+
+# Marco Genasci <fedeliallalinea@gmail.com> (2022-01-15)
+# Removed in favor of unified package dev-db/oracle-instantclient
+# Removal on 2022-02-15. Bug #589146
+dev-db/oracle-instantclient-basic
+dev-db/oracle-instantclient-jdbc
+dev-db/oracle-instantclient-odbc
+dev-db/oracle-instantclient-sqlplus
+
+>>>>>>> 8b4d5f684a22 (profiles: Mask dev-db/oracle-instantclient-* for removal)
# Ulrich Müller <ulm@gentoo.org> (2022-01-15)
# Pretest versions, masked for testing.
<app-editors/emacs-28.0.9999:28-vcs