2020-10-02 00:35:27 UTC

12 files changed, 17 insertions, 72 deletions

diff --git a/metadata/md5-cache/app-emulation/qemu-5.1.0-r1 b/metadata/md5-cache/app-emulation/qemu-5.1.0-r1
index f7778d4aad53..aec7679a217c 100644
--- a/metadata/md5-cache/app-emulation/qemu-5.1.0-r1
+++ b/metadata/md5-cache/app-emulation/qemu-5.1.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
 EAPI=7
 HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
 IUSE=accessibility +aio alsa bzip2 capstone +caps +curl debug doc +fdt glusterfs gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg kernel_linux kernel_FreeBSD lzo multipath ncurses nfs nls numa opengl +oss +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs +xkb zstd qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_avr qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_rx qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx kernel_linux python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 +filecaps
-KEYWORDS=~amd64 arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 LGPL-2 BSD-2
 RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 xkb? ( x11-libs/libxkbcommon ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.12.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu ) filecaps? ( sys-libs/libcap )
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy ) static-user? ( !plugins ) virtfs? ( caps xattr ) vte? ( gtk ) plugins? ( !static !static-user )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.qemu.org/qemu-5.1.0.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aa6e78312853d952ad4b486f3ec31620
+_md5_=2542a19f8d19a73fdcbb833a3adef4f7
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-19.6.0.0-r1 b/metadata/md5-cache/dev-db/oracle-instantclient-19.6.0.0-r1
index da0c76ce577d..1b519d7f368f 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-19.6.0.0-r1
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-19.6.0.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Oracle 18c Instant Client with SDK
 EAPI=7
 HOMEPAGE=https://www.oracle.com/database/technologies/instant-client.html
 IUSE=jdbc odbc precomp +sdk +sqlplus tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=OTN
 RDEPEND=>=dev-libs/libaio-0.3.109-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<dev-db/oracle-instantclient-basic-12 !<dev-db/oracle-instantclient-odbc-12 !<dev-db/oracle-instantclient-jdbc-12 !<dev-db/oracle-instantclient-sqlplus-12
 REQUIRED_USE=precomp? ( sdk )
@@ -12,4 +12,4 @@ RESTRICT=mirror splitdebug test
 SLOT=0/19.1
 SRC_URI=abi_x86_32? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-basic-linux-19.6.0.0.0dbru.zip jdbc? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-jdbc-linux-19.6.0.0.0dbru.zip ) odbc? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-odbc-linux-19.6.0.0.0dbru.zip ) precomp? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-precomp-linux-19.6.0.0.0dbru.zip ) !abi_x86_64? ( sdk? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-sdk-linux-19.6.0.0.0dbru.zip ) sqlplus? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-sqlplus-linux-19.6.0.0.0dbru.zip ) tools? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-tools-linux-19.6.0.0.0dbru.zip ) ) ) abi_x86_64? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-basic-linux.x64-19.6.0.0.0dbru.zip jdbc? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-jdbc-linux.x64-19.6.0.0.0dbru.zip ) odbc? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-odbc-linux.x64-19.6.0.0.0dbru.zip ) precomp? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-precomp-linux.x64-19.6.0.0.0dbru.zip ) sdk? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-sdk-linux.x64-19.6.0.0.0dbru.zip ) sqlplus? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-sqlplus-linux.x64-19.6.0.0.0dbru.zip ) tools? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-tools-linux.x64-19.6.0.0.0dbru.zip ) )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=db282bf7136716afcb48cc94141986d8
+_md5_=462ef4880991be892c464ada1d1211f5
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-basic-11.2.0.4 b/metadata/md5-cache/dev-db/oracle-instantclient-basic-11.2.0.4
deleted file mode 100644
index f15f37a57d12..000000000000
--- a/metadata/md5-cache/dev-db/oracle-instantclient-basic-11.2.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst prepare test unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Oracle 11g Instant Client with SDK
-EAPI=4
-HOMEPAGE=http://www.oracle.com/technetwork/database/features/instant-client/index.html
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 x86
-LICENSE=OTN
-RDEPEND=>=dev-libs/libaio-0.3.109-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=fetch splitdebug
-SLOT=0
-SRC_URI=abi_x86_32? ( instantclient-basic-linux-11.2.0.4.0.zip !abi_x86_64? ( instantclient-sdk-linux-11.2.0.4.0.zip ) ) abi_x86_64? ( instantclient-basic-linux.x64-11.2.0.4.0.zip instantclient-sdk-linux.x64-11.2.0.4.0.zip )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8456a5c04379f0529ee8239e3d75d954
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-basic-12 b/metadata/md5-cache/dev-db/oracle-instantclient-basic-12
index 63756aaaa2a1..39cbdb9fe1b1 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-basic-12
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-basic-12
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Transition package moving to single dev-db/oracle-instantclient package
 EAPI=6
 HOMEPAGE=https://bugs.gentoo.org/show_bug.cgi?id=524922#c12
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=dev-db/oracle-instantclient-12[sdk]
 SLOT=0
-_md5_=9d5a1795e06be9e114934ca481d3098b
+_md5_=7380b567face9379dfb03cda8016aa4f
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-11.2.0.4 b/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-11.2.0.4
deleted file mode 100644
index 9232c4c45656..000000000000
--- a/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-11.2.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch test unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Oracle 11g Instant Client: JDBC supplement
-EAPI=4
-HOMEPAGE=http://www.oracle.com/technetwork/database/features/instant-client/index.html
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 x86
-LICENSE=OTN
-RDEPEND=~dev-db/oracle-instantclient-basic-11.2.0.4
-RESTRICT=fetch splitdebug
-SLOT=0
-SRC_URI=abi_x86_32? ( instantclient-jdbc-linux-11.2.0.4.0.zip ) abi_x86_64? ( instantclient-jdbc-linux.x64-11.2.0.4.0.zip )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9e320a9e948ba5e6b30fefb9c5030ea7
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-12 b/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-12
index bcddf1a8c97d..b82b77705332 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-12
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-12
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Transition package moving to single dev-db/oracle-instantclient package
 EAPI=6
 HOMEPAGE=https://bugs.gentoo.org/show_bug.cgi?id=524922#c12
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=dev-db/oracle-instantclient-basic-12 >=dev-db/oracle-instantclient-12[jdbc]
 SLOT=0
-_md5_=c4523475f8f50658e9f86cab7d3b0e40
+_md5_=36ef7cbb7c6ea78bb6d6eb649920959c
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-odbc-11.2.0.4 b/metadata/md5-cache/dev-db/oracle-instantclient-odbc-11.2.0.4
deleted file mode 100644
index bb59e353357c..000000000000
--- a/metadata/md5-cache/dev-db/oracle-instantclient-odbc-11.2.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch test unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Oracle 11g Instant Client: ODBC supplement
-EAPI=4
-HOMEPAGE=http://www.oracle.com/technetwork/database/features/instant-client/index.html
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 x86
-LICENSE=OTN
-RDEPEND=~dev-db/oracle-instantclient-basic-11.2.0.4
-RESTRICT=fetch splitdebug
-SLOT=0
-SRC_URI=abi_x86_32? ( instantclient-odbc-linux-11.2.0.4.0.zip ) abi_x86_64? ( instantclient-odbc-linux.x64-11.2.0.4.0.zip )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d764fddaffffb132deb0e794ea948c5e
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-odbc-12 b/metadata/md5-cache/dev-db/oracle-instantclient-odbc-12
index bd9955dcc510..27e13712c95b 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-odbc-12
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-odbc-12
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Transition package moving to single dev-db/oracle-instantclient package
 EAPI=6
 HOMEPAGE=https://bugs.gentoo.org/show_bug.cgi?id=524922#c12
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=dev-db/oracle-instantclient-basic-12 >=dev-db/oracle-instantclient-12[odbc]
 SLOT=0
-_md5_=2ea74a9b703e5b04dacedf5d54141e0a
+_md5_=eee475582e4e9accdd3f82d4f8988e40
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.4 b/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.4
deleted file mode 100644
index 807c9526dd92..000000000000
--- a/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch
-DEPEND=app-arch/unzip
-DESCRIPTION=Oracle 11g Instant Client: SQL*Plus
-EAPI=4
-HOMEPAGE=http://www.oracle.com/technetwork/database/features/instant-client/index.html
-KEYWORDS=amd64 x86
-LICENSE=OTN
-RDEPEND=~dev-db/oracle-instantclient-basic-11.2.0.4
-RESTRICT=fetch splitdebug
-SLOT=0
-SRC_URI=x86? ( instantclient-sqlplus-linux-11.2.0.4.0.zip ) amd64? ( instantclient-sqlplus-linux.x64-11.2.0.4.0.zip )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=76842f81c771e1b969aef191ab65565d
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-12 b/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-12
index 4283e50243bf..00c37bb0f9ed 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-12
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-12
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Transition package moving to single dev-db/oracle-instantclient package
 EAPI=6
 HOMEPAGE=https://bugs.gentoo.org/show_bug.cgi?id=524922#c12
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=dev-db/oracle-instantclient-basic-12 >=dev-db/oracle-instantclient-12[sqlplus]
 SLOT=0
-_md5_=d228138d8fef80b978775733bb891152
+_md5_=4b7befc44af44e7ef31c7a20067ec4fb
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index e70a85348a68..28bcc7cd1547 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -3536,10 +3536,10 @@ dev-db/mytop 1.6-r4 1.9.1: mytop - a top clone for mysql
 dev-db/ocp 0.2 0.3 9999: Oracle copy tool
 dev-db/opendbx 1.4.5-r1 1.4.6-r2 1.4.6-r3 1.5.0-r2: OpenDBX - A database abstraction layer
 dev-db/oracle-instantclient 18.3.0.0-r2 18.5.0.0 19.3.0.0-r1 19.5.0.0 19.6.0.0 19.6.0.0-r1: Oracle 18c Instant Client with SDK
-dev-db/oracle-instantclient-basic 11.2.0.4 12: Transition package moving to single dev-db/oracle-instantclient package
-dev-db/oracle-instantclient-jdbc 11.2.0.4 12: Transition package moving to single dev-db/oracle-instantclient package
-dev-db/oracle-instantclient-odbc 11.2.0.4 12: Transition package moving to single dev-db/oracle-instantclient package
-dev-db/oracle-instantclient-sqlplus 11.2.0.4 12: Transition package moving to single dev-db/oracle-instantclient package
+dev-db/oracle-instantclient-basic 12: Transition package moving to single dev-db/oracle-instantclient package
+dev-db/oracle-instantclient-jdbc 12: Transition package moving to single dev-db/oracle-instantclient package
+dev-db/oracle-instantclient-odbc 12: Transition package moving to single dev-db/oracle-instantclient package
+dev-db/oracle-instantclient-sqlplus 12: Transition package moving to single dev-db/oracle-instantclient package
 dev-db/percona-server 5.7.27.30-r1 8.0.19.10-r1 8.0.20.11-r1: Fully compatible, enhanced and open source drop-in replacement for MySQL
 dev-db/percona-toolkit 2.2.20 3.0.9 3.0.13 3.1.0-r1: Advanced command-line tools to perform a variety of MySQL and system tasks
 dev-db/percona-xtrabackup 2.4.15 2.4.20 8.0.13: Hot backup utility for MySQL based servers
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a9b895547c42..32fe4221a6bc 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 02 Oct 2020 00:09:52 +0000
+Fri, 02 Oct 2020 00:35:27 +0000