summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/sys-libs/glibc-2.19-r2
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/sys-libs/glibc-2.19-r2')
-rw-r--r--metadata/md5-cache/sys-libs/glibc-2.19-r24
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/sys-libs/glibc-2.19-r2 b/metadata/md5-cache/sys-libs/glibc-2.19-r2
index 3594d7075788..96ab06eb5318 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.19-r2
+++ b/metadata/md5-cache/sys-libs/glibc-2.19-r2
@@ -10,5 +10,9 @@ 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 !sys-kernel/ps3-sources !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
SLOT=2.2
SRC_URI=mirror://gnu/glibc/glibc-2.19.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.19-patches-9.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
+<<<<<<< HEAD
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+=======
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+>>>>>>> next
_md5_=f687536b88a87dac28a46cbe620b9609