diff options
Diffstat (limited to 'metadata/md5-cache/dev-java')
45 files changed, 178 insertions, 0 deletions
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz Binary files differindex 8c553f03d9a8..6a49e58dbc87 100644 --- a/metadata/md5-cache/dev-java/Manifest.gz +++ b/metadata/md5-cache/dev-java/Manifest.gz diff --git a/metadata/md5-cache/dev-java/ant-antlr-1.10.5 b/metadata/md5-cache/dev-java/ant-antlr-1.10.5 index bd9354a5b267..595756c3b268 100644 --- a/metadata/md5-cache/dev-java/ant-antlr-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-antlr-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/antlr-2.7.7-r7:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/an RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=7bfba4f3b963883a506333f52c031ee4 diff --git a/metadata/md5-cache/dev-java/ant-antlr-1.9.13 b/metadata/md5-cache/dev-java/ant-antlr-1.9.13 index 5f22af21e3fb..ae8c5f0a7bde 100644 --- a/metadata/md5-cache/dev-java/ant-antlr-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-antlr-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/antlr-2.7.7-r7:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/an RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=7bfba4f3b963883a506333f52c031ee4 diff --git a/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.5 b/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.5 index 7a6ca04ad862..0924ad0c45b6 100644 --- a/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/bcel-5.1-r3:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-c RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=10e0776610ac97b1d7bb001dd2d6febb diff --git a/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.13 b/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.13 index 29d2dff4e067..fd673f8e16d5 100644 --- a/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/bcel-5.1-r3:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-c RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=10e0776610ac97b1d7bb001dd2d6febb diff --git a/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.5 b/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.5 index debbc097e11b..dd4037e44b71 100644 --- a/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?] >=dev-java/java-co RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=9da38285e4b5e8446cdaff0dffa68f53 diff --git a/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.13 b/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.13 index da91b603df6f..6227192f276d 100644 --- a/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?] >=dev-java/java-co RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=9da38285e4b5e8446cdaff0dffa68f53 diff --git a/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.5 b/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.5 index cc97e9ee9054..d8655604fd65 100644 --- a/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/log4j-1.2.13-r2:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/a RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=63d1a4b8f05a88eee1470fabd3d70c6f diff --git a/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.13 b/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.13 index 4caf951e2b48..9718778d9dd4 100644 --- a/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/log4j-1.2.13-r2:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/a RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=63d1a4b8f05a88eee1470fabd3d70c6f diff --git a/metadata/md5-cache/dev-java/ant-apache-oro-1.10.5 b/metadata/md5-cache/dev-java/ant-apache-oro-1.10.5 index c659da1c35c4..cdbdcfefffc6 100644 --- a/metadata/md5-cache/dev-java/ant-apache-oro-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-apache-oro-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/jakarta-oro-2.0.8-r2:2.0 >=dev-java/java-config-2.2.0-r3 ~dev RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=e11b229b2cab98f10f88fa3c300e1f21 diff --git a/metadata/md5-cache/dev-java/ant-apache-oro-1.9.13 b/metadata/md5-cache/dev-java/ant-apache-oro-1.9.13 index adc86962f610..aee601abf6f0 100644 --- a/metadata/md5-cache/dev-java/ant-apache-oro-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-apache-oro-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/jakarta-oro-2.0.8-r2:2.0 >=dev-java/java-config-2.2.0-r3 ~dev RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=e11b229b2cab98f10f88fa3c300e1f21 diff --git a/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.5 b/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.5 index 965f83e1d954..daeccce9cfb9 100644 --- a/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/jakarta-regexp-1.4-r1:1.4 >=dev-java/java-config-2.2.0-r3 ~de RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=fa84f88cec7fd60d5908495ccaa90345 diff --git a/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.13 b/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.13 index dfcc6c17ddd3..270caacec202 100644 --- a/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/jakarta-regexp-1.4-r1:1.4 >=dev-java/java-config-2.2.0-r3 ~de RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=fa84f88cec7fd60d5908495ccaa90345 diff --git a/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.5 b/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.5 index c4418969fa72..d7b9622d16db 100644 --- a/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/xml-commons-resolver-1.2:0 >=dev-java/java-config-2.2.0-r3 ~d RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=239ecc46f76e29eb927e947ed7cd2035 diff --git a/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.13 b/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.13 index 7dffada62920..e5295f98676f 100644 --- a/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/xml-commons-resolver-1.2:0 >=dev-java/java-config-2.2.0-r3 ~d RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=239ecc46f76e29eb927e947ed7cd2035 diff --git a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.5 b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.5 index a2b7dd78a2ff..aded6ff0b0f6 100644 --- a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=dev-java/xalan:0 dev-java/xalan-serializer:0 >=dev-java/java-config-2.2. RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=9297b0ab595190a47310f483b1111e52 diff --git a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.13 b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.13 index 413350b3b0f1..4d1bd0a24f03 100644 --- a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=dev-java/xalan:0 dev-java/xalan-serializer:0 >=dev-java/java-config-2.2. RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=9297b0ab595190a47310f483b1111e52 diff --git a/metadata/md5-cache/dev-java/ant-commons-logging-1.10.5 b/metadata/md5-cache/dev-java/ant-commons-logging-1.10.5 index 5d42c5a6337a..699f4dd2ab60 100644 --- a/metadata/md5-cache/dev-java/ant-commons-logging-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-commons-logging-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/commons-logging-1.0.4-r2:0 >=dev-java/java-config-2.2.0-r3 ~d RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=a2fe0d69b51415f59e7391881ba3f5ac diff --git a/metadata/md5-cache/dev-java/ant-commons-logging-1.9.13 b/metadata/md5-cache/dev-java/ant-commons-logging-1.9.13 index 6661fd4bc14f..e6c67651c192 100644 --- a/metadata/md5-cache/dev-java/ant-commons-logging-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-commons-logging-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/commons-logging-1.0.4-r2:0 >=dev-java/java-config-2.2.0-r3 ~d RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=a2fe0d69b51415f59e7391881ba3f5ac diff --git a/metadata/md5-cache/dev-java/ant-commons-net-1.10.5 b/metadata/md5-cache/dev-java/ant-commons-net-1.10.5 index 8b12ecce9fdf..93bff25b52a4 100644 --- a/metadata/md5-cache/dev-java/ant-commons-net-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-commons-net-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/commons-net-1.4.1-r1:0 >=dev-java/java-config-2.2.0-r3 ~dev-j RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=65b3153a52d3b7558b766a6bbf9f3110 diff --git a/metadata/md5-cache/dev-java/ant-commons-net-1.9.13 b/metadata/md5-cache/dev-java/ant-commons-net-1.9.13 index eadda0a2556b..9daf357890ea 100644 --- a/metadata/md5-cache/dev-java/ant-commons-net-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-commons-net-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/commons-net-1.4.1-r1:0 >=dev-java/java-config-2.2.0-r3 ~dev-j RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=65b3153a52d3b7558b766a6bbf9f3110 diff --git a/metadata/md5-cache/dev-java/ant-jai-1.10.5 b/metadata/md5-cache/dev-java/ant-jai-1.10.5 index cb24645d6e82..83d2d4d667ac 100644 --- a/metadata/md5-cache/dev-java/ant-jai-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-jai-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/sun-jai-bin-1.1.2.01-r1 >=dev-java/java-config-2.2.0-r3 ~dev- RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=c8725a4288113d01dd000972a924883d diff --git a/metadata/md5-cache/dev-java/ant-jai-1.9.13 b/metadata/md5-cache/dev-java/ant-jai-1.9.13 index 1efced486948..f045bfb3598d 100644 --- a/metadata/md5-cache/dev-java/ant-jai-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-jai-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/sun-jai-bin-1.1.2.01-r1 >=dev-java/java-config-2.2.0-r3 ~dev- RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=c8725a4288113d01dd000972a924883d diff --git a/metadata/md5-cache/dev-java/ant-javamail-1.10.5 b/metadata/md5-cache/dev-java/ant-javamail-1.10.5 index 9a007182c8ca..b9bc7eb9bed8 100644 --- a/metadata/md5-cache/dev-java/ant-javamail-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-javamail-1.10.5 @@ -10,5 +10,10 @@ RDEPEND=virtual/jdk:1.8 dev-java/gnu-jaf:1 dev-java/oracle-javamail:0 >=dev-java RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +_md5_=92d03e76bd80d4659bf881709c30604c +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 _md5_=4a365e271c3a765e9808013ab81f9fe0 +>>>>>>> next diff --git a/metadata/md5-cache/dev-java/ant-javamail-1.9.13 b/metadata/md5-cache/dev-java/ant-javamail-1.9.13 index 3b43718de25b..ab823160873e 100644 --- a/metadata/md5-cache/dev-java/ant-javamail-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-javamail-1.9.13 @@ -10,5 +10,10 @@ RDEPEND=virtual/jdk:1.8 dev-java/oracle-javamail:0 >=dev-java/java-config-2.2.0- RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +_md5_=92d03e76bd80d4659bf881709c30604c +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 _md5_=1f10e85ca46164840c366dafdb0d2eab +>>>>>>> next diff --git a/metadata/md5-cache/dev-java/ant-jdepend-1.10.5 b/metadata/md5-cache/dev-java/ant-jdepend-1.10.5 index 9cf89865288a..5828929db98a 100644 --- a/metadata/md5-cache/dev-java/ant-jdepend-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-jdepend-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/jdepend-2.9-r2:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/an RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=13a7d0c32cd7d140921f5aebf6a8680c diff --git a/metadata/md5-cache/dev-java/ant-jdepend-1.9.13 b/metadata/md5-cache/dev-java/ant-jdepend-1.9.13 index 89c1d4a04dff..642d56b8cc24 100644 --- a/metadata/md5-cache/dev-java/ant-jdepend-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-jdepend-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/jdepend-2.9-r2:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/an RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=13a7d0c32cd7d140921f5aebf6a8680c diff --git a/metadata/md5-cache/dev-java/ant-jmf-1.10.5 b/metadata/md5-cache/dev-java/ant-jmf-1.10.5 index c43d362c35d2..f3a4dcab977a 100644 --- a/metadata/md5-cache/dev-java/ant-jmf-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-jmf-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.5:0 >=virtual/jr RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=5f83eab15fbefe175f46eafee17fe6d8 diff --git a/metadata/md5-cache/dev-java/ant-jmf-1.9.13 b/metadata/md5-cache/dev-java/ant-jmf-1.9.13 index cf4e94b6ef1f..00cc633853c6 100644 --- a/metadata/md5-cache/dev-java/ant-jmf-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-jmf-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.13:0 >=virtual/jr RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=5f83eab15fbefe175f46eafee17fe6d8 diff --git a/metadata/md5-cache/dev-java/ant-jsch-1.10.5 b/metadata/md5-cache/dev-java/ant-jsch-1.10.5 index ecb74c44f530..a49aaa1b0b93 100644 --- a/metadata/md5-cache/dev-java/ant-jsch-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-jsch-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/jsch-0.1.37:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-c RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=747e5f84256b8bac749e7543fc3177ab diff --git a/metadata/md5-cache/dev-java/ant-jsch-1.9.13 b/metadata/md5-cache/dev-java/ant-jsch-1.9.13 index 7f8086402384..fa35b72ab759 100644 --- a/metadata/md5-cache/dev-java/ant-jsch-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-jsch-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/jsch-0.1.37:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-c RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=747e5f84256b8bac749e7543fc3177ab diff --git a/metadata/md5-cache/dev-java/ant-junit-1.10.5-r1 b/metadata/md5-cache/dev-java/ant-junit-1.10.5-r1 index ec2632fe4cb7..11675f72bc19 100644 --- a/metadata/md5-cache/dev-java/ant-junit-1.10.5-r1 +++ b/metadata/md5-cache/dev-java/ant-junit-1.10.5-r1 @@ -10,5 +10,9 @@ RDEPEND=dev-java/junit:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 ~dev-j RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=53a91ee974cddb404cc49155f3ed439c diff --git a/metadata/md5-cache/dev-java/ant-junit-1.9.13-r1 b/metadata/md5-cache/dev-java/ant-junit-1.9.13-r1 index a05f10870508..04b27211246e 100644 --- a/metadata/md5-cache/dev-java/ant-junit-1.9.13-r1 +++ b/metadata/md5-cache/dev-java/ant-junit-1.9.13-r1 @@ -10,5 +10,9 @@ RDEPEND=dev-java/junit:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 ~dev-j RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=bf5532bcaac01556ef237ce1843cdd55 diff --git a/metadata/md5-cache/dev-java/ant-junit4-1.10.5 b/metadata/md5-cache/dev-java/ant-junit4-1.10.5 index f23696dc88e4..8ed75cd3f752 100644 --- a/metadata/md5-cache/dev-java/ant-junit4-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-junit4-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=dev-java/junit:4 ~dev-java/ant-junit-1.10.5 >=dev-java/java-config-2.2.0 RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=dff17fd4860f0ba442c5a6350a3e52d6 diff --git a/metadata/md5-cache/dev-java/ant-junit4-1.9.13 b/metadata/md5-cache/dev-java/ant-junit4-1.9.13 index f9b77f03efa7..5b611493fa54 100644 --- a/metadata/md5-cache/dev-java/ant-junit4-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-junit4-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=dev-java/junit:4 ~dev-java/ant-junit-1.9.13 >=dev-java/java-config-2.2.0 RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=dff17fd4860f0ba442c5a6350a3e52d6 diff --git a/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.5 b/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.5 index 6cea2c73a8b8..56351e07c9b0 100644 --- a/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.5:0 >=virtual/jr RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=18c15d4d9c32d3f7e8d63914fb4e126c diff --git a/metadata/md5-cache/dev-java/ant-swing-1.10.5 b/metadata/md5-cache/dev-java/ant-swing-1.10.5 index 1298ecc5da62..031a640f7789 100644 --- a/metadata/md5-cache/dev-java/ant-swing-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-swing-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.5:0 >=virtual/jr RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=9f3aa54c7c85f6fbde2690c9f4a21491 diff --git a/metadata/md5-cache/dev-java/ant-swing-1.9.13 b/metadata/md5-cache/dev-java/ant-swing-1.9.13 index cc0e26afef2f..31a14b3693ee 100644 --- a/metadata/md5-cache/dev-java/ant-swing-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-swing-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.13:0 >=virtual/jr RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=9f3aa54c7c85f6fbde2690c9f4a21491 diff --git a/metadata/md5-cache/dev-java/ant-testutil-1.10.5 b/metadata/md5-cache/dev-java/ant-testutil-1.10.5 index 7dc799de5b97..96df5a5fa014 100644 --- a/metadata/md5-cache/dev-java/ant-testutil-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-testutil-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 ~d RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=ed79a8e604369909542b167ae778ce45 diff --git a/metadata/md5-cache/dev-java/ant-testutil-1.9.13 b/metadata/md5-cache/dev-java/ant-testutil-1.9.13 index 374e838f5207..12fb60b93171 100644 --- a/metadata/md5-cache/dev-java/ant-testutil-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-testutil-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 ~d RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=ed79a8e604369909542b167ae778ce45 diff --git a/metadata/md5-cache/dev-java/ant-xz-1.10.5 b/metadata/md5-cache/dev-java/ant-xz-1.10.5 index 6a3670f4f0a8..360edb8e8d8e 100644 --- a/metadata/md5-cache/dev-java/ant-xz-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-xz-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=dev-java/xz-java >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10 RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=9adc17b170049fae20da4b04ef8711e6 diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.3_p7-r4 b/metadata/md5-cache/dev-java/openjdk-11.0.3_p7-r4 index f9b7b4c264d5..d8185ceac5c2 100644 --- a/metadata/md5-cache/dev-java/openjdk-11.0.3_p7-r4 +++ b/metadata/md5-cache/dev-java/openjdk-11.0.3_p7-r4 @@ -11,5 +11,9 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/libpng:0= media- REQUIRED_USE=javafx? ( alsa !headless-awt ) SLOT=11 SRC_URI=https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.3+7.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 java-vm-2 7cfcabfd055e69d3568103a4e0b0fae7 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 java-vm-2 7cfcabfd055e69d3568103a4e0b0fae7 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f0dd70aadfc82e038f48fdc75bdbe574 diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.4_p11 b/metadata/md5-cache/dev-java/openjdk-11.0.4_p11 index a8664d349922..ee65ef011037 100644 --- a/metadata/md5-cache/dev-java/openjdk-11.0.4_p11 +++ b/metadata/md5-cache/dev-java/openjdk-11.0.4_p11 @@ -11,5 +11,9 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/libpng:0= media- REQUIRED_USE=javafx? ( alsa !headless-awt ) SLOT=11 SRC_URI=https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.4+11.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 java-vm-2 7cfcabfd055e69d3568103a4e0b0fae7 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 java-vm-2 7cfcabfd055e69d3568103a4e0b0fae7 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=43e62113b3436005f4fcc4a1cb086fc6 diff --git a/metadata/md5-cache/dev-java/openjdk-8.212_p03-r3 b/metadata/md5-cache/dev-java/openjdk-8.212_p03-r3 index ab4ef0521d92..216e12b36d6f 100644 --- a/metadata/md5-cache/dev-java/openjdk-8.212_p03-r3 +++ b/metadata/md5-cache/dev-java/openjdk-8.212_p03-r3 @@ -10,5 +10,9 @@ PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/iced RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0 SLOT=8 SRC_URI=https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u212-b03.tar.bz2 -> openjdk-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u212-b03.tar.bz2 -> openjdk-corba-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u212-b03.tar.bz2 -> openjdk-hotspot-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u212-b03.tar.bz2 -> openjdk-jaxp-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u212-b03.tar.bz2 -> openjdk-jaxws-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u212-b03.tar.bz2 -> openjdk-jdk-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u212-b03.tar.bz2 -> openjdk-langtools-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u212-b03.tar.bz2 -> openjdk-nashorn-8.212_p03.tar.bz2 +<<<<<<< HEAD +_eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 java-vm-2 7cfcabfd055e69d3568103a4e0b0fae7 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 java-vm-2 7cfcabfd055e69d3568103a4e0b0fae7 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4f7c244e1bc52a2c2bdff6ed0169a4fb diff --git a/metadata/md5-cache/dev-java/openjdk-8.222_p10 b/metadata/md5-cache/dev-java/openjdk-8.222_p10 index 3df87e684066..a564b9e298a1 100644 --- a/metadata/md5-cache/dev-java/openjdk-8.222_p10 +++ b/metadata/md5-cache/dev-java/openjdk-8.222_p10 @@ -10,5 +10,9 @@ PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/iced RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0 SLOT=8 SRC_URI=https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u222-b10.tar.bz2 -> openjdk-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u222-b10.tar.bz2 -> openjdk-corba-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u222-b10.tar.bz2 -> openjdk-hotspot-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u222-b10.tar.bz2 -> openjdk-jaxp-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u222-b10.tar.bz2 -> openjdk-jaxws-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u222-b10.tar.bz2 -> openjdk-jdk-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u222-b10.tar.bz2 -> openjdk-langtools-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u222-b10.tar.bz2 -> openjdk-nashorn-8.222_p10.tar.bz2 +<<<<<<< HEAD +_eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 java-vm-2 7cfcabfd055e69d3568103a4e0b0fae7 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 java-vm-2 7cfcabfd055e69d3568103a4e0b0fae7 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b1fc4b3f92c4050dbcae3649986735c9 |