summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/dev-java/ant-javamail-1.9.13
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/dev-java/ant-javamail-1.9.13')
-rw-r--r--metadata/md5-cache/dev-java/ant-javamail-1.9.137
1 files changed, 6 insertions, 1 deletions
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 07c659baa118..ab823160873e 100644
--- a/metadata/md5-cache/dev-java/ant-javamail-1.9.13
+++ b/metadata/md5-cache/dev-java/ant-javamail-1.9.13
@@ -1,6 +1,6 @@
DEFINED_PHASES=compile configure install preinst prepare setup unpack
DEPEND=virtual/jdk:1.8 dev-java/oracle-javamail:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/javatoolkit-0.3.0-r2 ~dev-java/ant-core-1.9.13:0 >=virtual/jdk-1.8
-DESCRIPTION=Apache Ant's optional tasks depending on oracle-javamail
+DESCRIPTION=Apache Ant's optional tasks depending on gnu-jaf-1
EAPI=6
HOMEPAGE=http://ant.apache.org/
IUSE=elibc_FreeBSD elibc_FreeBSD
@@ -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