gentoo resync : 14.04.2018

4 files changed, 2 insertions, 102 deletions

diff --git a/dev-java/resin-servlet-api/Manifest b/dev-java/resin-servlet-api/Manifest
index dd157659b5c2..c5fe97d5826f 100644
--- a/dev-java/resin-servlet-api/Manifest
+++ b/dev-java/resin-servlet-api/Manifest
@@ -1,15 +1,11 @@
 DIST resin-3.0.25-src.zip 10690692 BLAKE2B dde17819f958053bfe2e1ac0068db0a56c068185d676dce047769ffcd219036318e0f1adc0fee1757136aa4d5f8c75e112e286cb66d445bd30a283afe2c6ebba SHA512 f80f109b120cfbb484614c733cd10e0e057b7a704a7a00d2a6b83d95876558e4800ecc6d9fe3a3b8ddc32f9d556a51145edc3d08a8625937b8c06f413a335057
 DIST resin-3.1.12-src.zip 13579367 BLAKE2B 4c5205296f4fd35bbcfd2c0b9a665d83308def83d31df9e919d1823a2bf256f4668fd8b75c05681277e6f3d87a3a5a76c9761ebbd1aad9489b88245a3d0e39b5 SHA512 5d348482175962e4e0401437fa69ce3c7569e514ab7b02ef236937686cfb5185b5cef2deef831d510cf458a41d786457041f579d551c9f1f1aab49829015ff6f
-DIST resin-4.0.26-src.zip 17879008 BLAKE2B 3c8a510fbcbeb1576033841a90ec3e1ffdcae63f4e5b64196e078ce8d1fa6a29aa436ff48f38bb030be8c6d8cd4ca2528b140b10d902d1b8513d6f55a059d63a SHA512 aae0304664c67667b9abf304ccc3dbaf073be42fcd1dd6aa380d841a34a2a44f0187fa91abe6bf92bf66f394b4b2d4eda7c4c9a55b5cb8a76436446cca3d5512
 DIST resin-4.0.27-src.zip 17990178 BLAKE2B 2da8c4bae7328f0a39fc7cc84c2d7a25408a8242150a9b324cc34a15e0342ed709b9e1db8773873d804d59b47f0c62945433d211fe06ded03db1aad39c46a6d6 SHA512 ce1d7eb19ab722c2942d82b6ce80ddd193907d6062df361501d28adbbe57e6b7a2effc734e7820bc73d7743b2546799bc6badbcc2187c7da75cab0b9294b8a53
-DIST resin-4.0.44-src.zip 40342346 BLAKE2B 3ad80e84bcc18a44d6af3441f042b43d74a98318d4d906883ac6074f33420c7bb02dfd6b264e918865f10e48f36dfeb8e8d9ec18b995cedb6ea2010c13912fab SHA512 bef7cc8e42522396b6041e6b38858f8f2ef92f0a753b7a86e191f62f6060810930765cb834eeb53404e08f8b9b3f2e4c4d3b632cb9b80edf929b4a41bbb3d5f8
 DIST resin-4.0.46-src.zip 40400255 BLAKE2B e31505ba82a8e87ea0b28634b3055c3a01d6629483c2d5ab6af4b428c9cb5d7803b7ed7de58181222bae669412c239458c43be35f23922f3414ce7ac0173ee56 SHA512 49f468706a3269f851a6b359d6020b01dadb312890c97208b1a66353fb82b2d95625947a472d8d3e535d0c52ec6ad3e110eb4d227014fe7a89f313ae1df6970f
 DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 BLAKE2B df087e05a80442c44969ccd20099ad5ff5d1e6ab92886255cfa262bcce73043f07b01109e84e224dd991c43730d6c0795bf63bde3b8aaa5fa6dbf749dfbb78f5 SHA512 23ce290e97f18248e08e0b3b7ccf37f60a4b0bf2c3aa28d856384295a286b3eeb9636e299e0620c2c858f8e523806707fe1d4531070ee7ffb4037ad483e6d035
 DIST resin-gentoo-patches-3.1.12.tar.bz2 1618 BLAKE2B 672ff977f307d0abe225bdc57bed8778d0855c175532a39f8984dae39aaecb4a708f569179e76d5dbdd47df25f9ca7ae75f7880c8adc85f74a3ab52dc3ecc8fb SHA512 12dfd508765c46a9c9ca782e1b63def2989a3d2e025b3e8a7b15e5b389976aeba898e1659044a737156d953c0eaca9a4a461a9c71dc601aaaeddac8cd5da03ea
 EBUILD resin-servlet-api-3.0.25.ebuild 865 BLAKE2B 1429e7888ec44189bd47ab530b4089e034632022fcf83a61bd7c99a1e2e1eaa3107292dc7c625469c722067df315a249fa0dc24d6e8abf0c9d55760c6a0268b9 SHA512 83efdc313c63c98eb07c8a2ef130f69aff349b4e39619c08c89816933f4ee9d6aff18f8df6b97734e28069d4b36c2fdc705fedce77ef141aa3811c8bdc61743f
 EBUILD resin-servlet-api-3.1.12.ebuild 1103 BLAKE2B 2a26ff67220cb360c1bd7909bae7b36076ddacfac8dac56009a846af90062d5cf1339ad5b582decc7d05847e8a558e9ac2d75a6404e0f12db7cf437e91a1a227 SHA512 368faeff8853b60deef26c056c82181e182810a92786e947e7a578797d8ebde6253701e4ced228dc06edc960be31e9210b7e0cccdf6062b03f428d21468df319
-EBUILD resin-servlet-api-4.0.26.ebuild 1139 BLAKE2B 60264990c2f7ab4bd58fd509f42c3f680b372acdec7a8c02a12c3501037a4ae5d2050259bc3fdddb48af88e2ab99dfa3e49fe76759bb37c2340864b766c26daf SHA512 4e33c22526558a60581893879519735b9e75cd653968020b58e74ffbf39adb64273f7faa0bdd22520faa3c47b52418ecd3eb924363c1fa12cf55fbf45fad4757
-EBUILD resin-servlet-api-4.0.27.ebuild 1128 BLAKE2B 813e48c9553ec7634ab5812a669ea475e0f70da568df68e02303de0b490d3f5df82386b6c436501b437cc5fdd5349ef39f49bf3f5422d853d9819796f3c8e0d0 SHA512 66a5d9c3f148221a55594e9b7b252512947aa40f2b19041fae3d2c68d657a963a5f075c5c2ab07f732dcf13035baf7cad9f778c0b32b2796fa4ef10debcd6adb
-EBUILD resin-servlet-api-4.0.44.ebuild 1130 BLAKE2B 2f6725b53f1474c6c02150b70c30f89087ded68f61f0510217203c2a8ecb5327ca5b2886e793163084d9e4839cc8cb7319912520d45b819ec0af0e2407ed68db SHA512 2dd96a756b7433887aa4f9b521c4e385a1dc1e5c887acd73525a42df41e28807ef1070e233f40081eb2d0cac9d0820a145bd95923344e549aaad8503f18e9f9c
+EBUILD resin-servlet-api-4.0.27.ebuild 1127 BLAKE2B ef2e0779a6ba6ec6bc211fdbffb138aa6dc2442b8c556120e3d3b73abe79942851c3ddc19b560e26037ac04c4e900aaf0e6ea25147237586b7fc14a8260730b1 SHA512 c76c4f45a84e7b1806bdd2b0348e7251e84f4e571ad4c3651a42c5a49672257939a7e9e4a70230d63be6c240d1a4b79d291da5fa7bd94743cbb07332294083db
 EBUILD resin-servlet-api-4.0.46.ebuild 1130 BLAKE2B 2f6725b53f1474c6c02150b70c30f89087ded68f61f0510217203c2a8ecb5327ca5b2886e793163084d9e4839cc8cb7319912520d45b819ec0af0e2407ed68db SHA512 2dd96a756b7433887aa4f9b521c4e385a1dc1e5c887acd73525a42df41e28807ef1070e233f40081eb2d0cac9d0820a145bd95923344e549aaad8503f18e9f9c
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.26.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.26.ebuild
deleted file mode 100644
index e73b7d1f7ece..000000000000
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.26.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Resin Servlet API 3.0/JSP API 2.1 implementation"
-HOMEPAGE="http://www.caucho.com/"
-SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip"
-
-LICENSE="GPL-2"
-SLOT="3.0"
-KEYWORDS="amd64 ppc64 x86"
-
-IUSE=""
-
-COMMON_DEP=""
-
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${COMMON_DEP}"
-
-S="${WORKDIR}/resin-${PV}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	rm -f modules/ext/*.jar project-jars/*.jar webapp-jars/*.jar
-	java-ant_bsfix_files build-common.xml || die
-}
-
-EANT_BUILD_TARGET="servlet16"
-EANT_DOC_TARGET=""
-
-src_install() {
-	java-pkg_newjar "modules/servlet16/dist/servlet-16.jar"
-	use source && java-pkg_dosrc "${S}"/modules/servlet16/src/*
-
-	dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
-	java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
-	dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
-	java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
-}
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
index 0f94a41e68c8..62503ad641b1 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip"
 
 LICENSE="GPL-2"
 SLOT="3.0"
-KEYWORDS="amd64 ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 IUSE=""
 
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.44.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.44.ebuild
deleted file mode 100644
index 0263bbaf7018..000000000000
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.44.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Resin Servlet API 3.0/JSP API 2.1 implementation"
-HOMEPAGE="http://www.caucho.com/"
-SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip"
-
-LICENSE="GPL-2"
-SLOT="3.1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-IUSE=""
-
-COMMON_DEP=""
-
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${COMMON_DEP}"
-
-S="${WORKDIR}/resin-${PV}"
-
-java_prepare() {
-	cd "${S}"
-	rm -f modules/ext/*.jar project-jars/*.jar webapp-jars/*.jar
-	java-ant_bsfix_files build-common.xml || die
-}
-
-EANT_BUILD_TARGET="servlet16"
-EANT_DOC_TARGET=""
-
-src_install() {
-	java-pkg_newjar "modules/servlet16/dist/servlet-16.jar"
-	use source && java-pkg_dosrc "${S}"/modules/servlet16/src/*
-
-	dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
-	java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
-	dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
-	java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
-}