1 |
commit: f9ccbaed4befa026b11f93e9f33527c6f74424ce |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 11 15:15:31 2019 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 11 15:18:36 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9ccbaed |
7 |
|
8 |
www-servers/tomcat-8.5.30: removed obsolete version |
9 |
|
10 |
Package-Manager: Portage-2.3.55, Repoman-2.3.12 |
11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
12 |
|
13 |
www-servers/tomcat/Manifest | 1 - |
14 |
www-servers/tomcat/tomcat-8.5.30.ebuild | 158 -------------------------------- |
15 |
2 files changed, 159 deletions(-) |
16 |
|
17 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
18 |
index e687d6ab45e..c081f4a4c77 100644 |
19 |
--- a/www-servers/tomcat/Manifest |
20 |
+++ b/www-servers/tomcat/Manifest |
21 |
@@ -1,5 +1,4 @@ |
22 |
DIST apache-tomcat-7.0.90-src.tar.gz 4752747 BLAKE2B 5062ead2756aa8461de5e8387f14838661c082b6e397934fc92c91403f1950d84d79f05b9d4420a973d1b4921515b66c2c847550e1a06d75e722b62d9aa3f8bd SHA512 b32cb6902866ef72337c721d99d77f1a645311bb7694f51b82f7acec500c6197df15fb41be444fc6089652e8c825fb193f1a9de8c1b9b6fabd9d95f784565f6a |
23 |
DIST apache-tomcat-8.0.52-src.tar.gz 5039683 BLAKE2B 36318d0ae50fbca3f2a97e0210d0a8da8314f1ef79d0b047971bca30a5b0cc937faf013b5090f6e6b8aec4127b6185dc54ae589f5b57143b62c71c09f8bd5e9d SHA512 6d846213db0b15f9add8d80f30f304afdaf879ab6d7f85d212183a93f4f360ebfeeb079813bdea83cbd13f507504473028bbf8279e89b800b6f150b83086fa56 |
24 |
-DIST apache-tomcat-8.5.30-src.tar.gz 5143270 BLAKE2B 3bdcff663ca509efc3b2ee92ce140a3a22abf7fc0e32b5fa9a0ee713bdc1065ebde0b77cf624cedc2e0893194518d10e1f5df5b2f41edf76cb61157ac4d02862 SHA512 53729cfd1859872109f816df2642e3cd776a7faf8c55b1d50df0459f12958aacbf36debe6e8f10c19ab0a5bb2973fa63a2fec57f83ecaf19f4cf9d82e4a20265 |
25 |
DIST apache-tomcat-8.5.31-src.tar.gz 5154531 BLAKE2B cce0388e5c8c5fb5fcb3dba3b5961dc21d9f19d9a2f6177660a41410bddf241f73dda1e52c3875e28cfa13041c85a458a92c9a23c509b645f042cfa472081fde SHA512 659137ef4809af329ae4dd6f5825a603c1408ef3e48153abe7480a722e7f4bebef68a64af9cbef4a4ad9a7e8da76494f825035bbadbb983a097525f476f32f33 |
26 |
DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2 |
27 |
|
28 |
diff --git a/www-servers/tomcat/tomcat-8.5.30.ebuild b/www-servers/tomcat/tomcat-8.5.30.ebuild |
29 |
deleted file mode 100644 |
30 |
index 52f5424f793..00000000000 |
31 |
--- a/www-servers/tomcat/tomcat-8.5.30.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,158 +0,0 @@ |
34 |
-# Copyright 1999-2018 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=6 |
38 |
- |
39 |
-JAVA_PKG_IUSE="doc source test" |
40 |
- |
41 |
-inherit eutils java-pkg-2 java-ant-2 prefix user |
42 |
- |
43 |
-MY_P="apache-${P}-src" |
44 |
- |
45 |
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" |
46 |
-HOMEPAGE="https://tomcat.apache.org/" |
47 |
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
48 |
- |
49 |
-LICENSE="Apache-2.0" |
50 |
-SLOT="8.5" |
51 |
-KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
52 |
-IUSE="extra-webapps" |
53 |
- |
54 |
-RESTRICT="test" # can we run them on a production system? |
55 |
- |
56 |
-ECJ_SLOT="4.5" |
57 |
-SAPI_SLOT="3.1" |
58 |
- |
59 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
60 |
- >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}" |
61 |
-RDEPEND="${COMMON_DEP} |
62 |
- !<dev-java/tomcat-native-1.1.24 |
63 |
- >=virtual/jre-1.7" |
64 |
-DEPEND="${COMMON_DEP} |
65 |
- app-admin/pwgen |
66 |
- >=virtual/jdk-1.7 |
67 |
- test? ( |
68 |
- >=dev-java/ant-junit-1.9:0 |
69 |
- dev-java/easymock:3.2 |
70 |
- )" |
71 |
- |
72 |
-S=${WORKDIR}/${MY_P} |
73 |
- |
74 |
-pkg_setup() { |
75 |
- java-pkg-2_pkg_setup |
76 |
- enewgroup tomcat 265 |
77 |
- enewuser tomcat 265 -1 /dev/null tomcat |
78 |
-} |
79 |
- |
80 |
-src_prepare() { |
81 |
- default |
82 |
- |
83 |
- find -name '*.jar' -type f -delete -print || die |
84 |
- |
85 |
- # Remove bundled servlet-api |
86 |
- rm -rv java/javax/{el,servlet} || die |
87 |
- |
88 |
- eapply "${FILESDIR}/${PN}-8.5.27-build.xml.patch" |
89 |
- |
90 |
- # For use of catalina.sh in netbeans |
91 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
92 |
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
93 |
- bin/catalina.sh || die |
94 |
- |
95 |
- java-pkg-2_src_prepare |
96 |
-} |
97 |
- |
98 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
99 |
- |
100 |
-EANT_BUILD_TARGET="deploy" |
101 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
102 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
103 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
104 |
-EANT_NEEDS_TOOLS="true" |
105 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false" |
106 |
- |
107 |
-# revisions of the scripts |
108 |
-IM_REV="-r2" |
109 |
-INIT_REV="-r1" |
110 |
- |
111 |
-src_compile() { |
112 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
113 |
- java-pkg-2_src_compile |
114 |
-} |
115 |
- |
116 |
-src_test() { |
117 |
- java-pkg-2_src_test |
118 |
-} |
119 |
- |
120 |
-src_install() { |
121 |
- local dest="/usr/share/${PN}-${SLOT}" |
122 |
- |
123 |
- java-pkg_jarinto "${dest}"/bin |
124 |
- java-pkg_dojar output/build/bin/*.jar |
125 |
- exeinto "${dest}"/bin |
126 |
- doexe output/build/bin/*.sh |
127 |
- |
128 |
- java-pkg_jarinto "${dest}"/lib |
129 |
- java-pkg_dojar output/build/lib/*.jar |
130 |
- |
131 |
- dodoc RELEASE-NOTES RUNNING.txt |
132 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
133 |
- use source && java-pkg_dosrc java/* |
134 |
- |
135 |
- ### Webapps ### |
136 |
- |
137 |
- # add missing docBase |
138 |
- local apps="host-manager manager" |
139 |
- for app in ${apps}; do |
140 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
141 |
- output/build/webapps/${app}/META-INF/context.xml || die |
142 |
- done |
143 |
- |
144 |
- insinto "${dest}"/webapps |
145 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
146 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
147 |
- |
148 |
- ### Config ### |
149 |
- |
150 |
- # create "logs" directory in $CATALINA_BASE |
151 |
- # and set correct perms, see #458890 |
152 |
- dodir "${dest}"/logs |
153 |
- fperms 0750 "${dest}"/logs |
154 |
- |
155 |
- # replace the default pw with a random one, see #92281 |
156 |
- local randpw="$(pwgen -s -B 15 1)" |
157 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
158 |
- |
159 |
- # prepend gentoo.classpath to common.loader, see #453212 |
160 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
161 |
- |
162 |
- insinto "${dest}" |
163 |
- doins -r output/build/conf |
164 |
- |
165 |
- ### rc ### |
166 |
- |
167 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
168 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
169 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
170 |
- |
171 |
- insinto "${dest}"/gentoo |
172 |
- doins "${T}"/tomcat.conf |
173 |
- exeinto "${dest}"/gentoo |
174 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
175 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
176 |
-} |
177 |
- |
178 |
-pkg_postinst() { |
179 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
180 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
181 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
182 |
- |
183 |
- elog "To manage Tomcat instances, run:" |
184 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
185 |
- |
186 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
187 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
188 |
- |
189 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
190 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
191 |
-} |