gentoo resync : 25.01.2018

2 files changed, 5 insertions, 6 deletions

diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 4faae3ad7cb9..0dae496206a9 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -16,7 +16,7 @@ DIST apache-tomcat-8.0.48-src.tar.gz 5009969 BLAKE2B 4b1db654d74b02f5fd589590197
 DIST apache-tomcat-8.5.11-src.tar.gz 4996153 BLAKE2B c529fc37a12c14c942f4be23751acc0b7fe91de0c84ef3ad7c5a451499a86572d36fd5973dc60bfc97d07cb7d82b4e9a2d36d55eb31cccf2f6b15b2b3fb5d7c7 SHA512 d1a9513535773805c26825f8843fa502e044c9f1ccc22176db5418a7a0abb6d1bcff3db401b449a5867065359abbc8277d14085d807fe00c95dd267d9091620d
 DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef
 DIST apache-tomcat-8.5.24-src.tar.gz 5101516 BLAKE2B c19c46cca562f0c4c4733608ec007dd423f9a8ed0595bfb835554a7d08be06b791933e4beacbb0fe472589feae82f7d1a46934c0fb68930343cb2f4589bf6530 SHA512 f4ef9a66f2cafb3207c5a38c0f88efc1189e72f02fa88ef2a1b3626a03a57d0ba505b099f6185d747d5ab858aa3f8f3446ae60789312a900ec443eac45233efc
-DIST apache-tomcat-9.0.2-src.tar.gz 5047832 BLAKE2B 7be9cb7569fc771fab849cfe0b3e8154482fd97c2b74f46ebf457084e7f40d8bc70dd9d96793b6b6b43bcb64537dfab4360ea2fe6d3c437788263871944c19cc SHA512 463c0e8daa656dcd8193b3cdbec89bffa762c90b15933755fa51bc2268c28e142544fe71da1d459befb42b70d14834313de30a7f49a082e5121cf3f553c35cbe
+DIST apache-tomcat-9.0.4-src.tar.gz 5073991 BLAKE2B 7efffbba395d78d5ab051dd2bdb7a1491cb04159421bec17deebcb901bbca5cfec67a651f8e1fcd9a394ba3e0650fc61e7da039f0f979ae60a87f477bc4bc3b8 SHA512 bb8777f6fff861a53381b15a4196053abd9cc01e080f0511032f69eb6f57f5c6ed0eafd8a94155f19a4654bce4fad39e0fcaa2e5473cb269bceeb46a2ea43557
 DIST jakarta-servletapi-src.tar.gz 65342 BLAKE2B 03674ca65e0cc509b04a6255d5dd20d26aa5053ed54588e9ba655330c56c9c523c5b382804aee9816cb9aa2ac19cccc1ad288ed06b2af85ba535854bc72bed73 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084
 EBUILD tomcat-servlet-api-3.ebuild 851 BLAKE2B 9c746f46ebda7ed63c25c2374e3b56e4d09c170faf2348f20897ff5935221d5a244498eb5d535281fdbbe2323ccbbb3671c1fcd7058a288926792bb354398317 SHA512 bfd11aea2c322478caf3b70ea098c9f3fe060e094fd52a81e0bf89e47db33374ae6a13205c065da5e21571269ab678f65f1f0eb0385704a54a955a38f243cef0
 EBUILD tomcat-servlet-api-4.1.36.ebuild 984 BLAKE2B da61c35c91151f3714592e412f21e75451b0455e699a5f52d33fdf177ff10af36129cf04467c42502ce8528bac9f33bb66f867bfd8eead03b4307e0f56082ddf SHA512 7c0ea4dac09a7d916213bc78c5b3824f0b34703810d8d6ab27fe43b2310b352dcd74a1178e607d1ef3f24af424354b6d1955013b67bd6419de4d0501e1825e63
@@ -31,5 +31,5 @@ EBUILD tomcat-servlet-api-8.0.48.ebuild 987 BLAKE2B cd69ed7724756db420f1dbd49912
 EBUILD tomcat-servlet-api-8.5.11.ebuild 1026 BLAKE2B 491898f79d1185a9a0c0580ca30936b5ccceab95eada32b7c12ba77f802bfabc92b22c6bfb253eb2346ab0cae1264c664b4a63efee67ec4b2c66d4cf40881386 SHA512 2832c7f1e4e310ba6e220f7f69529d257e77b655a82dc1cf44e1580032773d31edffdef902c99b139bd8b52b913d7aa1578af2860d5d1967332a5f6a86dff48b
 EBUILD tomcat-servlet-api-8.5.23.ebuild 1033 BLAKE2B 6c5d35a13ac371445d39b9359cf1ac917a7d8d08692d6ea730c1d4c2a305319eac90697305d6d1bd3625478d63af74c4c62f15b78b33638d1f3a5c8d2b328ba4 SHA512 c6c829d08c1b04a737bcc0519396bd97dc52993e33bdfb550c7dcb8e2e8cedba93123e7c852f6c7100f989c9af882b2ab2d81925ce545e95172dd7c3f1a75c5c
 EBUILD tomcat-servlet-api-8.5.24.ebuild 1035 BLAKE2B 45ce444889c27792361db95b35b2d10e235e2778d44b01725f1cdae10c6088d4f3f2b9c941ce9b255505665ac328f1bd86a2c8542b3a8375b8e2de0b4cc95bb9 SHA512 355eee48ce5c0c5b0db44a7d4d0199ed4b11b2f59ea9b2395164673432245511df316e84402289ab7d93df223a3e1ba434ff2edc4aa1085b9a4e92a42950fc7b
-EBUILD tomcat-servlet-api-9.0.2_beta.ebuild 1057 BLAKE2B 09d2eae655c8c3bac49cd39b48851f6062625eae1706e8f85ec2f4b218c055deeca1a47882fb1c8c386483c666b0fc2cafe483c7957b29f40176f42792c88d0a SHA512 f8c9dde308a0a45c0bf05068474a87219ec43148507986acfe52aa08c35a7cc02421597f89c18f03da8bd4f68a7a4bbd8f1e7d539b21698593ee8023ee2575c4
+EBUILD tomcat-servlet-api-9.0.4.ebuild 1030 BLAKE2B 6bda3cd784afd3e70a4919028c0d03d521f61ae31591ae6dbdde242c81d60f0b182b9b27104100998eba967aa8b20ee4bac78e4ad9d98c5e3ae177811cad305e SHA512 ea50c666f43f3ab29a11ebddc060269e0650d9f87c4d06baebd1ec71c32b0235d6e2edef90ca0c04ac17a421a63b972d691e73d5dcf9ddda5cb5f5b5d9201ccc
 MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.2_beta.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.4.ebuild
index 94987d88ef53..16548ef959d5 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.2_beta.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,12 +6,11 @@ JAVA_PKG_IUSE="source"
 
 inherit eutils java-pkg-2 java-ant-2
 
-MY_PV="${PV/_beta/}"
-MY_A="apache-${PN}-${MY_PV}-src"
+MY_A="apache-${PN}-${PV}-src"
 MY_P="${MY_A/-servlet-api/}"
 DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation"
 HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-9/v${MY_PV}/src/${MY_P}.tar.gz"
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"