summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/sys-freebsd/freebsd-lib-9.1-r11
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/sys-freebsd/freebsd-lib-9.1-r11')
-rw-r--r--metadata/md5-cache/sys-freebsd/freebsd-lib-9.1-r114
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-lib-9.1-r11 b/metadata/md5-cache/sys-freebsd/freebsd-lib-9.1-r11
index 957e3fe0f4c0..69db81779ec3 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-lib-9.1-r11
+++ b/metadata/md5-cache/sys-freebsd/freebsd-lib-9.1-r11
@@ -9,5 +9,9 @@ LICENSE=BSD
RDEPEND=ssl? ( dev-libs/openssl ) kerberos? ( app-crypt/heimdal ) usb? ( !dev-libs/libusb ) zfs? ( =sys-freebsd/freebsd-cddl-9.1* ) >=dev-libs/expat-2.0.1 !sys-libs/libutempter !sys-freebsd/freebsd-headers
SLOT=0
SRC_URI=mirror://gentoo/freebsd-lib-9.1.tar.bz2 mirror://gentoo/freebsd-contrib-9.1.tar.bz2 mirror://gentoo/freebsd-crypto-9.1.tar.bz2 mirror://gentoo/freebsd-libexec-9.1.tar.bz2 mirror://gentoo/freebsd-etc-9.1.tar.bz2 mirror://gentoo/freebsd-include-9.1.tar.bz2 mirror://gentoo/freebsd-usbin-9.1.tar.bz2 mirror://gentoo/freebsd-gnu-9.1.tar.bz2 build? ( mirror://gentoo/freebsd-sys-9.1.tar.bz2 ) zfs? ( mirror://gentoo/freebsd-cddl-9.1.tar.bz2 )
+<<<<<<< HEAD
_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
+=======
+_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
+>>>>>>> next
_md5_=188134e9c92ba576750894117ef6449b