Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/
Date: Fri, 03 Mar 2023 17:47:40
Message-Id: 1677865654.f043d0706a142d8b995fe101bd37f710edc49780.fordfrog@gentoo
1 commit: f043d0706a142d8b995fe101bd37f710edc49780
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 3 17:47:23 2023 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 3 17:47:34 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f043d070
7
8 www-servers/tomcat: bump to 9.0.73, dropped 9.0.72 + updated post-install info
9
10 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
11
12 www-servers/tomcat/Manifest | 4 ++--
13 www-servers/tomcat/tomcat-10.1.6.ebuild | 8 ++------
14 www-servers/tomcat/tomcat-8.5.86.ebuild | 8 ++------
15 www-servers/tomcat/{tomcat-9.0.72.ebuild => tomcat-9.0.73.ebuild} | 8 ++------
16 4 files changed, 8 insertions(+), 20 deletions(-)
17
18 diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
19 index 25b05656fda8..921b1de30026 100644
20 --- a/www-servers/tomcat/Manifest
21 +++ b/www-servers/tomcat/Manifest
22 @@ -8,8 +8,8 @@ DIST apache-tomcat-8.5.86-src.tar.gz 6038952 BLAKE2B b57a203fb2e215f0a07485d5ae7
23 DIST apache-tomcat-8.5.86-src.tar.gz.asc 849 BLAKE2B ff388f97a189c9b45eaac42a1e670c8cddf52903421f053ec1df0518937f3c8b0bc650009cc93bb0a7440aa0607f955bbc219d80a34ab050851554b5736f3235 SHA512 85e961b6569e6c8421b83246653c86a53843232dc7a3eb5d466e6f11fb4b4f1a5dcee43403a43c8950774395acf7f576f7184c7dfa84084f08ff9a203b6104fd
24 DIST apache-tomcat-9.0.71-src.tar.gz 6222516 BLAKE2B 41b4ea0006e813a1be885cd48cb76e7debde4794e79b88e1110d505b179ac7c45b516265fd0e2f90cd20f0cac6ec7d04577ba1b3384570531902e00a7f599f0a SHA512 0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930
25 DIST apache-tomcat-9.0.71-src.tar.gz.asc 833 BLAKE2B 137f8f2ba0ec727e478291bd82000f0eb3bb411c5e27916892424cbfc49e75e52d0f14da732946d1e8e5cf06493392b604952b5bfea3288753a4fc53fd90b743 SHA512 398c4782de8339c332381156dd36f05f2006f8c5a78bd78ee32ef05fbb1ab121a21020b3726020282e632bdc14f98cf2828f329c229801d63a06d55cab8f3c80
26 -DIST apache-tomcat-9.0.72-src.tar.gz 6227773 BLAKE2B f784df0dd40539f38343942d818f3735521fbd3c978a3fa9c1c4cb7a4a46b71a23bdd55530b2ba6ae4a6ae89bf651a1c73fea0380e485097eb77cc75ac4d7075 SHA512 5dfcf1b4ce90b41164170eada109ccccb9c4357ca979f88dc89548284164b482c5d87788d93188de20b68ae346e870ab01525a980be3f8ee72af27e83f82d3a1
27 -DIST apache-tomcat-9.0.72-src.tar.gz.asc 833 BLAKE2B f79bd955a01d846427a454d9a50f9a614e16757edf79beeeef7b9498e79356944085b0f39bd8e1a1181e7152e042a06ce310ccf7da3549b8b16acee2eaf4ba56 SHA512 4e8afa0ae0d7eded96f33d2391c018bac7dbf44754cbf98bc965fd0d3c2c3fbbac9c68304066e93cb4e9e36bc8bcf2f8378f5b357df360582df0aae239b61585
28 +DIST apache-tomcat-9.0.73-src.tar.gz 6229040 BLAKE2B 97b1348e532eea75c4d0723c314cc24a9c13bd4a948a8eea4d1ee1c5121472f2fedec7d30c240b2617a51ef57898fbd96c254f9d84c9e943ebe808f1dba4cf16 SHA512 1691a0087ceaf2100ce17fe9b9a973d079c39b20effbe0c0d68f92d2684a681e001b0c2b8bde40c289754ac02ba02f9eb4dfac617fccb8f451c96dfdd4741237
29 +DIST apache-tomcat-9.0.73-src.tar.gz.asc 833 BLAKE2B 0d9e81e16e356aded1f02dc02833f24875584794358591b70a2fe54d67d116c7305dc5a477d158395afe3b72b2958c2dc0e102a893b8ef504a3f24acec14ba41 SHA512 fda56cb885fd6ab0bb00907084977217c2e23bbfb2fe25374bea1bd9f863f5275dd8949e3ff2a88d5d10f37788978b484ae59460c1bb43d2ca0ac814426efcac
30 DIST biz.aQute.bnd-6.3.1.jar 16703723 BLAKE2B 97cc171a926be326abe95695e795ccb575bc6ca770b4c4df7764bdedbd6dfcf5643673484f50cc34f845f27d03ddf8a971c1c502b3b63db2541266c2b35e8e23 SHA512 59d3a50575ea8fcfc5f5c2178f7d40248c987c77ae8afeb0a8c9ec397ce9e4ceae277ba3b26dafc245bd2185bbafeaef219dd1af0988921631b6a8fe0cbd0abf
31 DIST biz.aQute.bnd-6.4.0.jar 16303123 BLAKE2B 73cdeb9e63c04b41db26f91efc3b01fdfd7c8796d6b1f556c77f90bcdbe048f374b5164b885689f3e62ca45b8ca8b97fce70e1fa13d807d2f76869155c8ba7f5 SHA512 b113177f97894b0ed5cfbc38f96c995d6425e981ec8c7b27d99044793ff77dd2450367ad9ee977f443fba349fe1d68fc26f3aaa737eba0a402abcf29716b2e85
32 DIST biz.aQute.bndlib-6.3.1.jar 3183076 BLAKE2B 73bef88e8f3c8015d259ac36b953672ed9cb0aa5d9dfca3361033a7f37646bb65bbea8be4ef1fb425518e85ec8a9cc63032815671ece5f956b754ecf555dc174 SHA512 7c3f7bc0280beb1b15182c558ef23f431719c046da8473545efe9aeec935776ebf6682cabbb7e7f53dcf2ccca168d8df35859be77121dab04340a5ec7e993608
33
34 diff --git a/www-servers/tomcat/tomcat-10.1.6.ebuild b/www-servers/tomcat/tomcat-10.1.6.ebuild
35 index 9c25e9b767b7..17af3cdb9074 100644
36 --- a/www-servers/tomcat/tomcat-10.1.6.ebuild
37 +++ b/www-servers/tomcat/tomcat-10.1.6.ebuild
38 @@ -174,12 +174,8 @@ src_install() {
39 }
40
41 pkg_postinst() {
42 - elog "Ebuilds of Tomcat support running multiple instances. If you used prior version"
43 - elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
44 - elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
45 -
46 - elog "To manage Tomcat instances, run:"
47 - elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
48 + einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:"
49 + einfo " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
50
51 ewarn "Please note that since version 10 the primary package for all implemented APIs"
52 ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
53
54 diff --git a/www-servers/tomcat/tomcat-8.5.86.ebuild b/www-servers/tomcat/tomcat-8.5.86.ebuild
55 index 717b0f622eb2..e1506972d167 100644
56 --- a/www-servers/tomcat/tomcat-8.5.86.ebuild
57 +++ b/www-servers/tomcat/tomcat-8.5.86.ebuild
58 @@ -146,12 +146,8 @@ src_install() {
59 }
60
61 pkg_postinst() {
62 - elog "Ebuilds of Tomcat support running multiple instances. If you used prior version"
63 - elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
64 - elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
65 -
66 - elog "To manage Tomcat instances, run:"
67 - elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
68 + einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:"
69 + einfo " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
70
71 einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
72 einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
73
74 diff --git a/www-servers/tomcat/tomcat-9.0.72.ebuild b/www-servers/tomcat/tomcat-9.0.73.ebuild
75 similarity index 93%
76 rename from www-servers/tomcat/tomcat-9.0.72.ebuild
77 rename to www-servers/tomcat/tomcat-9.0.73.ebuild
78 index 77edaf178766..106615a65169 100644
79 --- a/www-servers/tomcat/tomcat-9.0.72.ebuild
80 +++ b/www-servers/tomcat/tomcat-9.0.73.ebuild
81 @@ -178,12 +178,8 @@ src_install() {
82 }
83
84 pkg_postinst() {
85 - elog "Ebuilds of Tomcat support running multiple instances. If you used prior version"
86 - elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
87 - elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
88 -
89 - elog "To manage Tomcat instances, run:"
90 - elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
91 + einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:"
92 + einfo " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
93
94 einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
95 einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
Report Message
Find on MARC Find on Google Groups