diff options
Diffstat (limited to 'metadata/md5-cache/sys-process')
-rw-r--r-- | metadata/md5-cache/sys-process/Manifest.gz | bin | 17651 -> 17509 bytes | |||
-rw-r--r-- | metadata/md5-cache/sys-process/daemontools-0.76-r7 | 4 | ||||
-rw-r--r-- | metadata/md5-cache/sys-process/daemontools-encore-1.10 | 4 | ||||
-rw-r--r-- | metadata/md5-cache/sys-process/daemontools-encore-1.11 | 4 |
4 files changed, 12 insertions, 0 deletions
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz Binary files differindex e74c0f71d42d..fe7a8da62a38 100644 --- a/metadata/md5-cache/sys-process/Manifest.gz +++ b/metadata/md5-cache/sys-process/Manifest.gz diff --git a/metadata/md5-cache/sys-process/daemontools-0.76-r7 b/metadata/md5-cache/sys-process/daemontools-0.76-r7 index 4981c1637dfe..61defa79c0c8 100644 --- a/metadata/md5-cache/sys-process/daemontools-0.76-r7 +++ b/metadata/md5-cache/sys-process/daemontools-0.76-r7 @@ -9,5 +9,9 @@ LICENSE=public-domain RDEPEND=selinux? ( sec-policy/selinux-daemontools ) !app-doc/daemontools-man SLOT=0 SRC_URI=http://cr.yp.to/daemontools/daemontools-0.76.tar.gz http://smarden.org/pape/djb/manpages/daemontools-0.76-man-20020131.tar.gz +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=358142d8ebb82ba1d9ef001158e957ab diff --git a/metadata/md5-cache/sys-process/daemontools-encore-1.10 b/metadata/md5-cache/sys-process/daemontools-encore-1.10 index e5c8d82684e3..d04d60988c5f 100644 --- a/metadata/md5-cache/sys-process/daemontools-encore-1.10 +++ b/metadata/md5-cache/sys-process/daemontools-encore-1.10 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=selinux? ( sec-policy/selinux-daemontools ) !sys-process/daemontools !app-doc/daemontools-man SLOT=0 SRC_URI=http://untroubled.org/daemontools-encore/daemontools-encore-1.10.tar.gz +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=5b363e8e7d6c03c5ab94bbbeb91e5e74 diff --git a/metadata/md5-cache/sys-process/daemontools-encore-1.11 b/metadata/md5-cache/sys-process/daemontools-encore-1.11 index ca5bb776aa93..d3bb3fdf1caa 100644 --- a/metadata/md5-cache/sys-process/daemontools-encore-1.11 +++ b/metadata/md5-cache/sys-process/daemontools-encore-1.11 @@ -9,5 +9,9 @@ LICENSE=GPL-2 MIT RDEPEND=selinux? ( sec-policy/selinux-daemontools ) !sys-process/daemontools !app-doc/daemontools-man SLOT=0 SRC_URI=https://untroubled.org/daemontools-encore/daemontools-encore-1.11.tar.gz +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=5b93c030ed9a6a56ecdb5ac413af0989 |