2021-09-02 15:36:34 UTC

6 files changed, 8 insertions, 25 deletions

diff --git a/metadata/md5-cache/sci-physics/vgm-4.8-r1 b/metadata/md5-cache/sci-physics/vgm-4.8-r1
index 87403c4fd80c..d2a2ce6bd449 100644
--- a/metadata/md5-cache/sci-physics/vgm-4.8-r1
+++ b/metadata/md5-cache/sci-physics/vgm-4.8-r1
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-physics/clhep:= geant4? ( sci-physics/geant[c++17] ) root? ( sci-physics/root:=[c++17] ) doc? ( app-doc/doxygen[dot] ) test? ( sci-physics/geant[gdml] sci-physics/geant4_vmc[g4root] )
+DEPEND=sci-physics/clhep:= geant4? ( <sci-physics/geant-4.11[c++17] ) root? ( sci-physics/root:=[c++17] ) doc? ( app-doc/doxygen[dot] ) test? ( <sci-physics/geant-4.11[gdml] sci-physics/geant4_vmc[g4root] )
 DESCRIPTION=Virtual Geometry Model for High Energy Physics Experiments
 EAPI=7
 HOMEPAGE=https://github.com/vmc-project/vgm/
@@ -8,9 +8,9 @@ INHERIT=cmake
 IUSE=doc examples +geant4 +root test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=sci-physics/clhep:= geant4? ( sci-physics/geant[c++17] ) root? ( sci-physics/root:=[c++17] )
+RDEPEND=sci-physics/clhep:= geant4? ( <sci-physics/geant-4.11[c++17] ) root? ( sci-physics/root:=[c++17] )
 RESTRICT=!geant4? ( test ) !root? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vmc-project/vgm/archive/v4-8.tar.gz -> vgm-4.8.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	xdg-utils	27f9a2f19502b925ac117bd657aa2979	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=edee04f926359610eb6a4ffc6dcc4a7d
+_md5_=cc3567eb622427cf1dca288dd69d4e1e
diff --git a/metadata/md5-cache/sci-physics/vgm-4.9-r1 b/metadata/md5-cache/sci-physics/vgm-4.9-r1
index c5dac00888bf..6a466cfd3a4a 100644
--- a/metadata/md5-cache/sci-physics/vgm-4.9-r1
+++ b/metadata/md5-cache/sci-physics/vgm-4.9-r1
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-physics/clhep:= geant4? ( sci-physics/geant[c++17] ) root? ( sci-physics/root:=[c++17] ) doc? ( app-doc/doxygen[dot] ) test? ( sci-physics/geant[gdml] sci-physics/geant4_vmc[g4root] )
+DEPEND=sci-physics/clhep:= geant4? ( <sci-physics/geant-4.11[c++17] ) root? ( sci-physics/root:=[c++17] ) doc? ( app-doc/doxygen[dot] ) test? ( <sci-physics/geant-4.11[gdml] sci-physics/geant4_vmc[g4root] )
 DESCRIPTION=Virtual Geometry Model for High Energy Physics Experiments
 EAPI=7
 HOMEPAGE=https://github.com/vmc-project/vgm/
@@ -8,9 +8,9 @@ INHERIT=cmake
 IUSE=doc examples +geant4 +root test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=sci-physics/clhep:= geant4? ( sci-physics/geant[c++17] ) root? ( sci-physics/root:=[c++17] )
+RDEPEND=sci-physics/clhep:= geant4? ( <sci-physics/geant-4.11[c++17] ) root? ( sci-physics/root:=[c++17] )
 RESTRICT=!geant4? ( test ) !root? ( test ) !test? ( test ) !examples? ( test )
 SLOT=0
 SRC_URI=https://github.com/vmc-project/vgm/archive/v4-9.tar.gz -> vgm-4.9.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	xdg-utils	27f9a2f19502b925ac117bd657aa2979	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=70b714ef47e968e7892ae30e8d24eebe
+_md5_=a7c67a9652bc22677fa2d23c80e8d912
diff --git a/metadata/md5-cache/sys-libs/glibc-2.25-r11 b/metadata/md5-cache/sys-libs/glibc-2.25-r11
deleted file mode 100644
index f1b68486d7b3..000000000000
--- a/metadata/md5-cache/sys-libs/glibc-2.25-r11
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) >=app-misc/pax-utils-0.1.10 >=sys-devel/binutils-2.24 >=sys-devel/gcc-4.7 virtual/os-headers sys-devel/gnuconfig virtual/pkgconfig
-DESCRIPTION=GNU libc6 (also called glibc2) C library
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/libc/libc.html
-INHERIT=epatch toolchain-funcs toolchain-glibc
-IUSE=audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla headers-only
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
-PDEPEND=!vanilla? ( sys-libs/timezone-data )
-RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) sys-apps/gentoo-functions vanilla? ( !sys-libs/timezone-data )
-RESTRICT=strip
-SLOT=2.2
-SRC_URI=mirror://gnu/glibc/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/glibc-2.25-patches-15.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-glibc	eed09e597e42f7686f840d7a6bbc5b37
-_md5_=464ed9a867f7bdbb9c1c81d6401d8b67
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 850fcfe4c238..e6a4f96d1b28 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -17939,7 +17939,7 @@ sys-libs/fortify-headers 0.7 1.1 9999: A standalone implementation of fortify so
 sys-libs/freeipmi 1.5.7 1.6.7 1.6.8: Provides Remote-Console and System Management Software as per IPMI v1.5/2.0
 sys-libs/fts-standalone 0.2-r1 1.2.7: Standalone fts library for use with musl
 sys-libs/gdbm 1.19 1.20: Standard GNU database libraries
-sys-libs/glibc 2.19-r2 2.25-r11 2.30-r9 2.31-r7 2.32-r8 2.33 2.33-r1 2.33-r6 2.33-r7 2.34 9999: GNU libc C library
+sys-libs/glibc 2.19-r2 2.30-r9 2.31-r7 2.32-r8 2.33 2.33-r1 2.33-r6 2.33-r7 2.34 9999: GNU libc C library
 sys-libs/gpm 1.20.7-r3: Console-based mouse driver
 sys-libs/gwenhywfar 5.4.1-r1: Multi-platform helper library for other libraries
 sys-libs/kpmcore 21.04.3 21.08.0: Library for managing partitions
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 07a45b966b39..22279c535ba3 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 02 Sep 2021 14:36:34 +0000
+Thu, 02 Sep 2021 15:36:34 +0000
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index a0de2d892896..3e9356968f98 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -8322,7 +8322,6 @@ sys-libs/glibc:gd - build memusage and memusagestat tools
 sys-libs/glibc:multiarch - enable optimizations for multiple CPU architectures (detected at runtime)
 sys-libs/glibc:multilib-bootstrap - Provide prebuilt libgcc.a and crt files if missing. Only needed for ABI switch.
 sys-libs/glibc:nscd - Build, and enable support for, the Name Service Cache Daemon
-sys-libs/glibc:rpc - Enable obsolete RPC/NIS layers
 sys-libs/glibc:ssp - protect stack of glibc internals
 sys-libs/glibc:static-pie - Enable static PIE support (runtime files for -static-pie gcc option).
 sys-libs/glibc:suid - Make internal pt_chown helper setuid -- not needed if using Linux and have /dev/pts mounted with gid=5