commit: 0af25712cb38fb03c45227f229c77720e17e1cad Author: Marco Genasci <fedeliallalinea <AT> gmail <DOT> com> AuthorDate: Sun Jan 9 12:04:02 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jan 15 21:50:58 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0af25712
profiles: Mask dev-db/oracle-instantclient-* for removal Bug: https://bugs.gentoo.org/589146 Signed-off-by: Marco Genasci <fedeliallalinea <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/23687 Signed-off-by: Sam James <sam <AT> gentoo.org> profiles/package.mask | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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 <[email protected]> (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 <[email protected]> (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 <[email protected]> (2022-01-15) # Pretest versions, masked for testing. <app-editors/emacs-28.0.9999:28-vcs
