summaryrefslogtreecommitdiff
path: root/www-servers/tomcat
diff options
context:
space:
mode:
Diffstat (limited to 'www-servers/tomcat')
-rw-r--r--www-servers/tomcat/Manifest12
-rw-r--r--www-servers/tomcat/tomcat-7.0.106.ebuild10
-rw-r--r--www-servers/tomcat/tomcat-7.0.107.ebuild12
-rw-r--r--www-servers/tomcat/tomcat-8.5.60.ebuild10
-rw-r--r--www-servers/tomcat/tomcat-8.5.61.ebuild10
-rw-r--r--www-servers/tomcat/tomcat-9.0.40.ebuild10
-rw-r--r--www-servers/tomcat/tomcat-9.0.41.ebuild10
7 files changed, 25 insertions, 49 deletions
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 68fc0fba58e8..1f8938aeddb6 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -16,10 +16,10 @@ DIST apache-tomcat-9.0.40-src.tar.gz 6017562 BLAKE2B 1c90511911363bb3b154124382f
DIST apache-tomcat-9.0.41-src.tar.gz 6022059 BLAKE2B 6e97390aec956c16f271e57a2fa8805b6f49f593434f0dff8d82e14bc9abc199b00a7523dbb8da335a7ffa9dfee6790430c30f8b0ee90bcd133694c8da42197f SHA512 094e7cbd2519a4b812a2ca865f92802ece3385a20826c5e29b5f7cda8b9265d01ede6f598999f8aa2f1b04bcaca2e67e3f0132781b3f22007356df49ab6b1838
DIST biz.aQute.bnd-5.1.1.jar 16088761 BLAKE2B 59906cc39ea27ef20cbf82de1ba78096f34dc417da6dc5c28e21f6e92c0625efecf14cec6c5faf0ab17551c31a6c87a24614c2ac75ac902cfea30199ecc0d39f SHA512 8092b083e7b86e75bf27233964763b88bee74d8ae141c85e387c1cc8bd0cbf3a54be27afea29931fb3ae950700a515fd4a28cfe8e7f26cbaaec506aa06357a37
DIST biz.aQute.bndlib-5.1.1.jar 3652944 BLAKE2B dad9f9835fb407a36e0eae4b65fa2fda147e06ab3f3211a2ed2f1631aeccd6d14d198c325793cb1ce9a57b719a836db230d0452715744ba5a4a6c2983c17916b SHA512 d7da056ba541ae0862159bf5e38e1a5351b2ab5388c88733b46601c2d7dab8970f16af00df186a6cb67fbe81ef53f2c8402db9d28a8c6819dadf60a1df40879b
-EBUILD tomcat-7.0.106.ebuild 4224 BLAKE2B 9ff5e9fa663926e0609ffc15804c5426e95d4eb6dacd1e4e9f27ca06dd167f22bccf44e8b2cfc323532490846f7ae04672494f000e5efcddbf21c1126ae17a67 SHA512 9160d59093bbe4fe7260ac0bb26f124f70574cc4564f52f02d2987f7d6ca46825fe973cdbc69f1493d6a5a9c62ba5059ccabf5bb618ccdfd162c631b1a347b3e
-EBUILD tomcat-7.0.107.ebuild 4225 BLAKE2B 3f82018ea97e47df2439b4230ad19a2bd22163d0558acfafb26d8a1c006cc49cdd0074204b2ac8707f2fbc6a062a62ed8d016fcd0467d38ac51850059f23b818 SHA512 45587f442b61cf66e7fe35bf28a8d8053471e65d81fa982f555b132a58cf9157fb73e500c1049ec411c26dd22073c703d1cd6d0289456ce6d0ac1ba73fcbb160
-EBUILD tomcat-8.5.60.ebuild 4804 BLAKE2B d08021370f64aaa56711a3e74aa75fdba984a42d50c8cd83a4a3f20721f419d83ad9baad6f2798d034d4078ab4d34a6efafe835b2a9aa42e97546268dc05395a SHA512 3a63dc1a26f8add53950ed7ffd24b720605129bad73ba57ce9add5165a30cb27aa7acc1107bf3bb0bfa4c55ea50c1130fd7217304b27787eda7283dd193a3cd4
-EBUILD tomcat-8.5.61.ebuild 4805 BLAKE2B 216c508e3f22ba203f43654eda6a567e78562d29d154172aab0e550c4426bf94e5f5bb56a664173a6a6bd626b899087b9d302a9fff5e73cc28bb52e93bc5a918 SHA512 d441136e62c130070a69b91f4aff6375857cf3ccae2f1697d37c70f31a912fbf977e892f84bbf7121f1bb5f1ca65f40f1c1af485242100d203151fc13b550eba
-EBUILD tomcat-9.0.40.ebuild 5684 BLAKE2B 3a405f0221f549637f77104a6bf32f1c8d4a52050fc8fb3801206e78218a6e373f2fda62e0f759093a86d10991949f319591238540d0314310ee63dae80596cb SHA512 86a1c7b19d7b905ba92e4d151e04aa66976d7d1719027c4fdcc3ab4007b746d0b7fd348f248a430cb70f2b4a5a96fdd6c2006f2382d73853f6315fc7dcd8b68a
-EBUILD tomcat-9.0.41.ebuild 5700 BLAKE2B 479a370db447265b240073fabf1cc631041d65ee089e8342e7a2d304bed7709cd0fbb7e5c19d582f11d1c3fe0d193346956083e79dd0fff687a254ed427e8e07 SHA512 026101900a77cbd0930e57b634d9e15231bc8736cac8c5b64c08dc4197a461df2243980f846a741431f087d976bfc4d3651166dfd6a1d002ecd9e3e1cd973a52
+EBUILD tomcat-7.0.106.ebuild 4154 BLAKE2B 2020b3a15d3e33f4638f74511f6beb8d82db9f68fe920c95ec0efa24ebcfd5d5ec8dcc174ef4fc927063738c710931decf749ec442c948ef9c547b5bcabf22b2 SHA512 7f1e205ae31ec9b0bf98bb0ae86ab8f761314be5bc3fe25f07480c4e97f80c1eb148df3b6b484be2cf23c08df6207d034ca433404a90b0d0e422b9a0d9f9c249
+EBUILD tomcat-7.0.107.ebuild 4154 BLAKE2B 2020b3a15d3e33f4638f74511f6beb8d82db9f68fe920c95ec0efa24ebcfd5d5ec8dcc174ef4fc927063738c710931decf749ec442c948ef9c547b5bcabf22b2 SHA512 7f1e205ae31ec9b0bf98bb0ae86ab8f761314be5bc3fe25f07480c4e97f80c1eb148df3b6b484be2cf23c08df6207d034ca433404a90b0d0e422b9a0d9f9c249
+EBUILD tomcat-8.5.60.ebuild 4734 BLAKE2B 77bbb881cc3df699a5025cddfc2af9d995d06ff86252abd611e92e27e0c0612804b24cd103b48c1c9a7709a2449e45f54ff8f91cbef211ae6cd33b7109ef4bc4 SHA512 97e085fb4167de694bbbbb279282e367505f623fa92a5929fddcbfa234d7a47a0557bae969de6d97792453f7f86ebc36a762c5221bab1e6fa418cea9e6d68d02
+EBUILD tomcat-8.5.61.ebuild 4735 BLAKE2B c8b1703cec5858318af77487a357f64297ea50b6f88396c336f8146b84ae4a76ad622d8104f4a62a182dc4921fecf4b0ee1ed2c2579d152e9267014265049086 SHA512 44882cef93c2f0b1d4117939405053520d0ad0ede1562698c219288e248bc1302e859a9c90fc12b5f3cb09d48bcd44586ecba911283c5cbfe2156e6f79ccbe9c
+EBUILD tomcat-9.0.40.ebuild 5614 BLAKE2B efc50844ed5ed77b781bd0acc9122d0e8b2410fdff49573b378500b476c5448cfdcaca9efc560b50c4f8a24b1e8c978276269df43772a6b96a6c80aae896a6ed SHA512 b53c9064b9d51bff523df465da459f0ee26a9f703d0cfcf6e0cb9d931c7b847769565148067e142454197677efcc36a220b131c33ce9328dc33f645d2954dbff
+EBUILD tomcat-9.0.41.ebuild 5630 BLAKE2B c219a31f70d97b85b928550b9545979caa3e165a0154fd1a1624847fe5bdd9a70772052495e0c30929542bcad1856fdd6143791da4931ebb2d0bab4af1366f36 SHA512 baca0dfa996031d7be20f7a15127554301efcece3f2469296edaf0dd2bfc7bab38e0a334b6e497593acd55532f1054d31209bd34521a0099c7d305e24f2fbd15
MISC metadata.xml 712 BLAKE2B 3e0a9b1bd07334015006678c0e1d933dc3d7b65291425754f7bcaec673f2316ba85b2e7df2c79a90f0d53dfbc443329cbea8ddfde7d4c93a1635b6140a3b18b6 SHA512 bc7c894d5f945a732078cc4d9a7fa9d0374ebb6aec449487f8968b22aed07bc5e20094448fda9be7516206121d0dfec8c6d6e48ee818786999703ea778a82109
diff --git a/www-servers/tomcat/tomcat-7.0.106.ebuild b/www-servers/tomcat/tomcat-7.0.106.ebuild
index a905c145be4a..84121125211a 100644
--- a/www-servers/tomcat/tomcat-7.0.106.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.106.ebuild
@@ -5,7 +5,7 @@ EAPI=7
JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-2 java-ant-2 prefix user
+inherit eutils java-pkg-2 java-ant-2 prefix
MY_P="apache-${P}-src"
@@ -26,6 +26,8 @@ SAPI_SLOT="3.0"
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
virtual/jre"
DEPEND="${COMMON_DEP}
virtual/jdk:1.8
@@ -33,12 +35,6 @@ DEPEND="${COMMON_DEP}
S=${WORKDIR}/${MY_P}
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
src_prepare() {
default
diff --git a/www-servers/tomcat/tomcat-7.0.107.ebuild b/www-servers/tomcat/tomcat-7.0.107.ebuild
index acdb9985f254..84121125211a 100644
--- a/www-servers/tomcat/tomcat-7.0.107.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.107.ebuild
@@ -5,7 +5,7 @@ EAPI=7
JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-2 java-ant-2 prefix user
+inherit eutils java-pkg-2 java-ant-2 prefix
MY_P="apache-${P}-src"
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="7"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="extra-webapps websockets"
RESTRICT="test" # can we run them on a production system?
@@ -26,6 +26,8 @@ SAPI_SLOT="3.0"
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
virtual/jre"
DEPEND="${COMMON_DEP}
virtual/jdk:1.8
@@ -33,12 +35,6 @@ DEPEND="${COMMON_DEP}
S=${WORKDIR}/${MY_P}
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
src_prepare() {
default
diff --git a/www-servers/tomcat/tomcat-8.5.60.ebuild b/www-servers/tomcat/tomcat-8.5.60.ebuild
index ae1fd17bba26..3a82c34d5f2c 100644
--- a/www-servers/tomcat/tomcat-8.5.60.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.60.ebuild
@@ -5,7 +5,7 @@ EAPI=7
JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-2 java-ant-2 prefix user
+inherit eutils java-pkg-2 java-ant-2 prefix
MY_P="apache-${P}-src"
@@ -26,6 +26,8 @@ SAPI_SLOT="3.1"
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
virtual/jre"
DEPEND="${COMMON_DEP}
app-admin/pwgen
@@ -42,12 +44,6 @@ DEPEND="${COMMON_DEP}
S=${WORKDIR}/${MY_P}
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
src_prepare() {
default
diff --git a/www-servers/tomcat/tomcat-8.5.61.ebuild b/www-servers/tomcat/tomcat-8.5.61.ebuild
index 86d3e5d65919..43b89effd490 100644
--- a/www-servers/tomcat/tomcat-8.5.61.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.61.ebuild
@@ -5,7 +5,7 @@ EAPI=7
JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-2 java-ant-2 prefix user
+inherit eutils java-pkg-2 java-ant-2 prefix
MY_P="apache-${P}-src"
@@ -26,6 +26,8 @@ SAPI_SLOT="3.1"
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
virtual/jre"
DEPEND="${COMMON_DEP}
app-admin/pwgen
@@ -42,12 +44,6 @@ DEPEND="${COMMON_DEP}
S=${WORKDIR}/${MY_P}
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
src_prepare() {
default
diff --git a/www-servers/tomcat/tomcat-9.0.40.ebuild b/www-servers/tomcat/tomcat-9.0.40.ebuild
index 41d3c02f7744..f85b6b5aea23 100644
--- a/www-servers/tomcat/tomcat-9.0.40.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.40.ebuild
@@ -5,7 +5,7 @@ EAPI=7
JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-2 java-ant-2 prefix user
+inherit eutils java-pkg-2 java-ant-2 prefix
MY_P="apache-${PN}-${PV}-src"
@@ -36,6 +36,8 @@ COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
dev-java/wsdl4j:0"
RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
virtual/jre"
DEPEND="${COMMON_DEP}
app-admin/pwgen
@@ -65,12 +67,6 @@ src_unpack() {
ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
}
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
src_prepare() {
default
diff --git a/www-servers/tomcat/tomcat-9.0.41.ebuild b/www-servers/tomcat/tomcat-9.0.41.ebuild
index 7f7ed06bb02d..94eda2d7236b 100644
--- a/www-servers/tomcat/tomcat-9.0.41.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.41.ebuild
@@ -5,7 +5,7 @@ EAPI=7
JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-2 java-ant-2 prefix user
+inherit eutils java-pkg-2 java-ant-2 prefix
MY_P="apache-${PN}-${PV}-src"
@@ -36,6 +36,8 @@ COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
dev-java/wsdl4j:0"
RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
virtual/jre"
DEPEND="${COMMON_DEP}
app-admin/pwgen
@@ -65,12 +67,6 @@ src_unpack() {
ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
}
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
src_prepare() {
default