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