gentoo resync : 03.01.2018

7 files changed, 41 insertions, 39 deletions

diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 1ff3834943c8..957493c11517 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/lucene-1.4.3-r3 b/metadata/md5-cache/dev-java/lucene-1.4.3-r4
index ce68f210607e..89ba7a331c64 100644
--- a/metadata/md5-cache/dev-java/lucene-1.4.3-r3
+++ b/metadata/md5-cache/dev-java/lucene-1.4.3-r4
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile install preinst setup test unpack
-DEPEND=>=virtual/jdk-1.4 test? ( =dev-java/junit-3* dev-java/ant-junit ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=High-performance, full-featured text search engine written entirely in Java
-EAPI=0
-HOMEPAGE=http://lucene.apache.org
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=High-performance, full-featured Java text search engine
+EAPI=6
+HOMEPAGE=https://lucene.apache.org
 IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
 KEYWORDS=amd64 x86 ~x86-fbsd
 LICENSE=Apache-1.1
-RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://apache/lucene/java/archive/lucene-1.4.3-src.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=44b181fc4a85d963d24bac985040dece
+_md5_=305e461dc0d6a5583ee39ddec85bd935
diff --git a/metadata/md5-cache/dev-java/lucene-2.4.1-r1 b/metadata/md5-cache/dev-java/lucene-2.4.1-r2
index c40d177ba35c..e5cba562aaec 100644
--- a/metadata/md5-cache/dev-java/lucene-2.4.1-r1
+++ b/metadata/md5-cache/dev-java/lucene-2.4.1-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 dev-java/ant-nodeps dev-java/javacc test? ( dev-java/ant-junit =dev-java/junit-3* ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=dev-java/javacc:0 >=virtual/jdk-1.6 test? ( dev-java/junit:0 dev-java/ant-core:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=High-performance, full-featured text search engine written entirely in Java
-EAPI=3
-HOMEPAGE=http://lucene.apache.org
+EAPI=6
+HOMEPAGE=https://lucene.apache.org
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
 KEYWORDS=amd64 x86 ~x86-fbsd
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=dev-java/javacc:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.4
-SRC_URI=mirror://apache/lucene/java/lucene-2.4.1-src.tar.gz
+SRC_URI=https://archive.apache.org/dist/lucene/java/lucene-2.4.1-src.tar.gz -> lucene-2.4.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c5b4690b27e0a162b30dad9237008047
+_md5_=2292060220643170c3d32443dd1e1733
diff --git a/metadata/md5-cache/dev-java/lucene-3.5.0 b/metadata/md5-cache/dev-java/lucene-3.5.0
deleted file mode 100644
index d8e1b5db9159..000000000000
--- a/metadata/md5-cache/dev-java/lucene-3.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 dev-java/ant-nodeps:0 dev-java/junit:4 dev-java/ant-junit:0 contrib? ( dev-java/jakarta-regexp:1.4 dev-java/commons-compress:0 dev-java/commons-collections:0 dev-java/commons-digester:0 dev-java/commons-logging:0 dev-java/commons-beanutils:1.7 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=High-performance, full-featured text search engine written entirely in Java
-EAPI=3
-HOMEPAGE=http://lucene.apache.org
-IUSE=elibc_FreeBSD doc source test contrib elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.5
-SRC_URI=mirror://apache/lucene/java/3.5.0/lucene-3.5.0-src.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d305a4034f8d850523249bf3bb64f364
diff --git a/metadata/md5-cache/dev-java/lucene-3.5.0-r1 b/metadata/md5-cache/dev-java/lucene-3.5.0-r1
new file mode 100644
index 000000000000..5f3da89650cd
--- /dev/null
+++ b/metadata/md5-cache/dev-java/lucene-3.5.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=dev-java/junit:4 dev-java/ant-junit:0 dev-java/ant-nodeps:0 contrib? ( dev-java/jakarta-regexp:1.4 dev-java/commons-compress:0 dev-java/commons-collections:0 dev-java/commons-digester:0 dev-java/commons-logging:0 dev-java/commons-beanutils:1.7 ) >=virtual/jdk-1.6 test? ( dev-java/junit:4 dev-java/ant-core:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=High-performance, full-featured text search engine written entirely in Java
+EAPI=6
+HOMEPAGE=https://lucene.apache.org
+IUSE=elibc_FreeBSD doc source test contrib elibc_FreeBSD
+KEYWORDS=amd64 x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/junit:4 dev-java/ant-junit:0 dev-java/ant-nodeps:0 contrib? ( dev-java/jakarta-regexp:1.4 dev-java/commons-compress:0 dev-java/commons-collections:0 dev-java/commons-digester:0 dev-java/commons-logging:0 dev-java/commons-beanutils:1.7 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=3.5
+SRC_URI=mirror://apache/lucene/java/3.5.0/lucene-3.5.0-src.tgz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=93d18340437e30a0ec2ac0b870151fda
diff --git a/metadata/md5-cache/dev-java/lucene-3.6.2 b/metadata/md5-cache/dev-java/lucene-3.6.2
deleted file mode 100644
index ae87b9bdae42..000000000000
--- a/metadata/md5-cache/dev-java/lucene-3.6.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 contrib? ( dev-java/commons-beanutils:1.7 >=dev-java/commons-codec-1.6:0 dev-java/commons-collections:0 dev-java/commons-compress:0 dev-java/commons-digester:0 dev-java/commons-logging:0 dev-java/jakarta-regexp:1.4 ) dev-java/ant-nodeps:0 test? ( >=dev-java/junit-4.12:4 dev-java/hamcrest-core ) dev-java/ant-junit:0 >=dev-java/ant-ivy-2.2.0:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=High-performance, full-featured text search engine written entirely in Java
-EAPI=3
-HOMEPAGE=http://lucene.apache.org
-IUSE=elibc_FreeBSD doc source test contrib elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.5 contrib? ( dev-java/commons-beanutils:1.7 >=dev-java/commons-codec-1.6:0 dev-java/commons-collections:0 dev-java/commons-compress:0 dev-java/commons-digester:0 dev-java/commons-logging:0 dev-java/jakarta-regexp:1.4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.6
-SRC_URI=mirror://apache/lucene/java/3.6.2/lucene-3.6.2-src.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2addcfa73ecc5cb9cce4bec1ec326526
diff --git a/metadata/md5-cache/dev-java/lucene-3.6.2-r1 b/metadata/md5-cache/dev-java/lucene-3.6.2-r1
new file mode 100644
index 000000000000..0b06a269618c
--- /dev/null
+++ b/metadata/md5-cache/dev-java/lucene-3.6.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=dev-java/ant-ivy:2 dev-java/ant-junit:0 dev-java/ant-nodeps:0 dev-java/hamcrest-core:0 contrib? ( dev-java/jakarta-regexp:1.4 dev-java/commons-compress:0 dev-java/commons-collections:0 dev-java/commons-digester:0 dev-java/commons-logging:0 dev-java/commons-beanutils:1.7 ) >=virtual/jdk-1.6 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=High-performance, full-featured text search engine written entirely in Java
+EAPI=6
+HOMEPAGE=https://lucene.apache.org
+IUSE=elibc_FreeBSD doc source test contrib elibc_FreeBSD
+KEYWORDS=amd64 x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/ant-ivy:2 dev-java/ant-junit:0 dev-java/ant-nodeps:0 dev-java/hamcrest-core:0 contrib? ( dev-java/jakarta-regexp:1.4 dev-java/commons-compress:0 dev-java/commons-collections:0 dev-java/commons-digester:0 dev-java/commons-logging:0 dev-java/commons-beanutils:1.7 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=3.6
+SRC_URI=mirror://apache/lucene/java/3.6.2/lucene-3.6.2-src.tgz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0073a120b71a9fdd968874c81086ff6f