diff options
Diffstat (limited to 'metadata/md5-cache/sys-libs/glibc-9999')
| -rw-r--r-- | metadata/md5-cache/sys-libs/glibc-9999 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999 index 9b22086678ab..21e81b6c739d 100644 --- a/metadata/md5-cache/sys-libs/glibc-9999 +++ b/metadata/md5-cache/sys-libs/glibc-9999 @@ -11,5 +11,9 @@ PROPERTIES=live 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 !sys-kernel/ps3-sources !sys-libs/nss-db >=net-dns/libidn2-2.0.5 vanilla? ( !sys-libs/timezone-data ) SLOT=2.2 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/glibc-9999-patches-14.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz ) +<<<<<<< HEAD _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 +======= +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 +>>>>>>> next _md5_=fed655e5334612d1d06bed43d4c83fc8 |