Attachment #90873 for bug #139215

View | Details | Raw Unified | Return to bug 139215 | Differences between
Collapse All | Expand All




KEYWORDS="~amd64 ~x86"
LICENSE="Apache-2.0"

RDEPEND="=dev-java/eclipse-ecj-3.1*
		=dev-java/eclipse-ecj-3.1*
		=dev-java/commons-beanutils-1.7*
		>=dev-java/commons-collections-3.1
		>=dev-java/commons-daemon-1.0.1
		>=dev-java/commons-dbcp-1.2.1
		>=dev-java/commons-digester-1.7
		>=dev-java/commons-fileupload-1.0
		>=dev-java/commons-httpclient-2.0
		>=dev-java/commons-el-1.0
		>=dev-java/commons-launcher-0.9
		>=dev-java/commons-logging-1.0.4
		>=dev-java/commons-modeler-1.1
		>=dev-java/commons-pool-1.2
		~dev-java/jaxen-1.0
		>=dev-java/junit-3.8.1
		=dev-java/mx4j-3*
		>=dev-java/log4j-1.2.9
		>=dev-java/saxpath-1.0
		~dev-java/servletapi-2.4
		|| (
			>=virtual/jre-1.5
			(
				>=dev-java/commons-httpclient-2.0
				=virtual/jre-1.4
				=dev-java/gnu-jaf-1*
				=virtual/jdk-1.4
				~dev-java/jaxen-1.0
				>=dev-java/junit-3.8.1
				=dev-java/mx4j-3*
				>=dev-java/saxpath-1.0
				>=dev-java/xerces-2.7.1
			)
		)
		struts? =dev-java/struts-1.2*"
DEPEND=">=virtual/jdk-1.4
	${RDEPEND}
	sys-apps/sed
	dev-java/ant"
IUSE="doc examples source test struts"

S="${WORKDIR}/${MY_P}"


	unpack ${A}
	cd ${S}

	if java-config --java-version  | head -n 1 | grep "\"1.4" > /dev/null 2>&1; then
		JDK_1_4=1
	fi

	local PATCHES="
		mainbuild-xml.patch
		tomcatbuild-xml.patch


	mkdir ./bin && cd ./bin
	java-pkg_jar-from commons-logging commons-logging-api.jar
	java-pkg_jar-from mx4j-3.0 mx4j.jar jmx.jar
	java-pkg_jar-from mx4j-3.0 mx4j-rjmx.jar jmx-remote.jar
	java-pkg_jar-from commons-daemon
	
	if [ -n "${JDK_1_4}" ]; then
		java-pkg_jar-from mx4j-3.0 mx4j.jar jmx.jar
		java-pkg_jar-from mx4j-3.0 mx4j-rjmx.jar jmx-remote.jar
	fi

	mkdir ../common/endorsed && cd ../common/endorsed
	if [ -n "${JDK_1_4}" ]; then
		java-pkg_jar-from xerces-2 xml-apis.jar
		java-pkg_jar-from xerces-2 xercesImpl.jar
	fi

	mkdir ../lib && cd ../lib
	java-pkg_jar-from ant-core

src_compile(){
	local antflags="-Dbase.path=${T}"

	antflags="${antflags} -Dactivation.jar=$(java-config -p gnu-jaf-1)"
	antflags="${antflags} -Dcommons-collections.jar=$(java-config -p commons-collections)"
	antflags="${antflags} -Dcommons-daemon.jar=$(java-config -p commons-daemon)"
	antflags="${antflags} -Dcommons-digester.jar=$(java-config -p commons-digester)"
	antflags="${antflags} -Dcommons-dbcp.jar=$(java-config -p commons-dbcp)"
	antflags="${antflags} -Dcommons-el.jar=$(java-config -p commons-el)"
	antflags="${antflags} -Dcommons-httpclient.jar=$(java-config -p commons-httpclient)"
	antflags="${antflags} -Dcommons-pool.jar=$(java-config -p commons-pool)"
	antflags="${antflags} -Dcommons-fileupload.jar=$(java-config -p commons-fileupload)"
	antflags="${antflags} -Dcommons-launcher.jar=$(java-config -p commons-launcher)"

	antflags="${antflags} -Djunit.jar=$(java-config -p junit)"
	antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.1 ecj.jar)"
	antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)"
	antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts-1.2 struts.jar)"
	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"
	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
	antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)"
	antflags="${antflags} -Djaxen.jar=$(java-pkg_getjar jaxen jaxen-full.jar)"
	antflags="${antflags} -Djmx.jar=$(java-pkg_getjar mx4j-3.0 mx4j.jar)"
	antflags="${antflags} -Djmx-remote.jar=$(java-pkg_getjar mx4j-3.0 mx4j-rjmx.jar)"
	antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"
	antflags="${antflags} -DxercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)"
	antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xerces-2 xml-apis.jar)"
	antflags="${antflags} -Dstruts.home=/usr/share/struts"
	antflags="${antflags} -Djasper.home=${S}/jasper"
	if [ -n "${JDK_1_4}" ]; then
		antflags="${antflags} -Dcommons-httpclient.jar=$(java-config -p commons-httpclient)"
		antflags="${antflags} -Dactivation.jar=$(java-config -p gnu-jaf-1)"
		antflags="${antflags} -Djaxen.jar=$(java-pkg_getjar jaxen jaxen-full.jar)"
		antflags="${antflags} -Djmx.jar=$(java-pkg_getjar mx4j-3.0 mx4j.jar)"
		antflags="${antflags} -Djmx-remote.jar=$(java-pkg_getjar mx4j-3.0 mx4j-rjmx.jar)"
		antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"
		antflags="${antflags} -DxercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)"
		antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xerces-2 xml-apis.jar)"
		antflags="${antflags} -Dstruts.home=/usr/share/struts"
	fi
	if use struts; then
		antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts-1.2 struts.jar)"
	fi

	ant ${antflags} || die "compile failed"


		cd ${base}
	done

	if use struts; then
		# replace a packed struts.jar
		cd server/webapps/admin/WEB-INF/lib
		rm -f struts.jar
		java-pkg_jar-from struts-1.2 struts.jar
		cd ${base}
	fi

	# replace the default pw with a random one, see #92281 
	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)

Return to bug 139215

Lines 13-46 HOMEPAGE="http://jakarta.apache.org/tomc Link Here

(-)tomcat-5.5.17.ebuild (-30 / +51 lines)
13	KEYWORDS="~amd64 ~x86"	13	KEYWORDS="~amd64 ~x86"
14	LICENSE="Apache-2.0"	14	LICENSE="Apache-2.0"
15		15
16	RDEPEND=">=virtual/jdk-1.4	16	RDEPEND="=dev-java/eclipse-ecj-3.1*
17	=dev-java/eclipse-ecj-3.1*
18	=dev-java/commons-beanutils-1.7*	17	=dev-java/commons-beanutils-1.7*
19	>=dev-java/commons-collections-3.1	18	>=dev-java/commons-collections-3.1
20	>=dev-java/commons-daemon-1.0.1	19	>=dev-java/commons-daemon-1.0.1
21	>=dev-java/commons-dbcp-1.2.1	20	>=dev-java/commons-dbcp-1.2.1
22	>=dev-java/commons-digester-1.7	21	>=dev-java/commons-digester-1.7
23	>=dev-java/commons-fileupload-1.0	22	>=dev-java/commons-fileupload-1.0
24	>=dev-java/commons-httpclient-2.0
25	>=dev-java/commons-el-1.0	23	>=dev-java/commons-el-1.0
26	>=dev-java/commons-launcher-0.9	24	>=dev-java/commons-launcher-0.9
27	>=dev-java/commons-logging-1.0.4	25	>=dev-java/commons-logging-1.0.4
28	>=dev-java/commons-modeler-1.1	26	>=dev-java/commons-modeler-1.1
29	>=dev-java/commons-pool-1.2	27	>=dev-java/commons-pool-1.2
30	~dev-java/jaxen-1.0
31	>=dev-java/junit-3.8.1
32	=dev-java/mx4j-3*
33	>=dev-java/log4j-1.2.9	28	>=dev-java/log4j-1.2.9
34	>=dev-java/saxpath-1.0
35	~dev-java/servletapi-2.4	29	~dev-java/servletapi-2.4
36	=dev-java/struts-1.2*	30	\|\| (
37	=dev-java/gnu-jaf-1*	31	>=virtual/jre-1.5
38	>=dev-java/xerces-2.7.1"	32	(
		33	>=dev-java/commons-httpclient-2.0
		34	=virtual/jre-1.4
		35	=dev-java/gnu-jaf-1*
		36	=virtual/jdk-1.4
		37	~dev-java/jaxen-1.0
		38	>=dev-java/junit-3.8.1
		39	=dev-java/mx4j-3*
		40	>=dev-java/saxpath-1.0
		41	>=dev-java/xerces-2.7.1
		42	)
		43	)
		44	struts? =dev-java/struts-1.2*"
39	DEPEND=">=virtual/jdk-1.4	45	DEPEND=">=virtual/jdk-1.4
40	${RDEPEND}	46	${RDEPEND}
41	sys-apps/sed	47	sys-apps/sed
42	dev-java/ant"	48	dev-java/ant"
43	IUSE="doc examples source test"	49	IUSE="doc examples source test struts"
44		50
45	S="${WORKDIR}/${MY_P}"	51	S="${WORKDIR}/${MY_P}"
46		52
Lines 57-62 src_unpack() { Link Here
57	unpack ${A}	63	unpack ${A}
58	cd ${S}	64	cd ${S}
59		65
		66	if java-config --java-version \| head -n 1 \| grep "\"1.4" > /dev/null 2>&1; then
		67	JDK_1_4=1
		68	fi
		69
60	local PATCHES="	70	local PATCHES="
61	mainbuild-xml.patch	71	mainbuild-xml.patch
62	tomcatbuild-xml.patch	72	tomcatbuild-xml.patch
Lines 73-85 src_unpack() { Link Here
73		83
74	mkdir ./bin && cd ./bin	84	mkdir ./bin && cd ./bin
75	java-pkg_jar-from commons-logging commons-logging-api.jar	85	java-pkg_jar-from commons-logging commons-logging-api.jar
76	java-pkg_jar-from mx4j-3.0 mx4j.jar jmx.jar
77	java-pkg_jar-from mx4j-3.0 mx4j-rjmx.jar jmx-remote.jar
78	java-pkg_jar-from commons-daemon	86	java-pkg_jar-from commons-daemon
		87
		88	if [ -n "${JDK_1_4}" ]; then
		89	java-pkg_jar-from mx4j-3.0 mx4j.jar jmx.jar
		90	java-pkg_jar-from mx4j-3.0 mx4j-rjmx.jar jmx-remote.jar
		91	fi
79		92
80	mkdir ../common/endorsed && cd ../common/endorsed	93	mkdir ../common/endorsed && cd ../common/endorsed
81	java-pkg_jar-from xerces-2 xml-apis.jar	94	if [ -n "${JDK_1_4}" ]; then
82	java-pkg_jar-from xerces-2 xercesImpl.jar	95	java-pkg_jar-from xerces-2 xml-apis.jar
		96	java-pkg_jar-from xerces-2 xercesImpl.jar
		97	fi
83		98
84	mkdir ../lib && cd ../lib	99	mkdir ../lib && cd ../lib
85	java-pkg_jar-from ant-core	100	java-pkg_jar-from ant-core
Lines 99-111 src_unpack() { Link Here
99	src_compile(){	114	src_compile(){
100	local antflags="-Dbase.path=${T}"	115	local antflags="-Dbase.path=${T}"
101		116
102	antflags="${antflags} -Dactivation.jar=$(java-config -p gnu-jaf-1)"
103	antflags="${antflags} -Dcommons-collections.jar=$(java-config -p commons-collections)"	117	antflags="${antflags} -Dcommons-collections.jar=$(java-config -p commons-collections)"
104	antflags="${antflags} -Dcommons-daemon.jar=$(java-config -p commons-daemon)"	118	antflags="${antflags} -Dcommons-daemon.jar=$(java-config -p commons-daemon)"
105	antflags="${antflags} -Dcommons-digester.jar=$(java-config -p commons-digester)"	119	antflags="${antflags} -Dcommons-digester.jar=$(java-config -p commons-digester)"
106	antflags="${antflags} -Dcommons-dbcp.jar=$(java-config -p commons-dbcp)"	120	antflags="${antflags} -Dcommons-dbcp.jar=$(java-config -p commons-dbcp)"
107	antflags="${antflags} -Dcommons-el.jar=$(java-config -p commons-el)"	121	antflags="${antflags} -Dcommons-el.jar=$(java-config -p commons-el)"
108	antflags="${antflags} -Dcommons-httpclient.jar=$(java-config -p commons-httpclient)"
109	antflags="${antflags} -Dcommons-pool.jar=$(java-config -p commons-pool)"	122	antflags="${antflags} -Dcommons-pool.jar=$(java-config -p commons-pool)"
110	antflags="${antflags} -Dcommons-fileupload.jar=$(java-config -p commons-fileupload)"	123	antflags="${antflags} -Dcommons-fileupload.jar=$(java-config -p commons-fileupload)"
111	antflags="${antflags} -Dcommons-launcher.jar=$(java-config -p commons-launcher)"	124	antflags="${antflags} -Dcommons-launcher.jar=$(java-config -p commons-launcher)"
Lines 113-130 src_compile(){ Link Here
113	antflags="${antflags} -Djunit.jar=$(java-config -p junit)"	126	antflags="${antflags} -Djunit.jar=$(java-config -p junit)"
114	antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.1 ecj.jar)"	127	antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.1 ecj.jar)"
115	antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)"	128	antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)"
116	antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts-1.2 struts.jar)"
117	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"	129	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"
118	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"	130	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
119	antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)"	131	antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)"
120	antflags="${antflags} -Djaxen.jar=$(java-pkg_getjar jaxen jaxen-full.jar)"
121	antflags="${antflags} -Djmx.jar=$(java-pkg_getjar mx4j-3.0 mx4j.jar)"
122	antflags="${antflags} -Djmx-remote.jar=$(java-pkg_getjar mx4j-3.0 mx4j-rjmx.jar)"
123	antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"
124	antflags="${antflags} -DxercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)"
125	antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xerces-2 xml-apis.jar)"
126	antflags="${antflags} -Dstruts.home=/usr/share/struts"
127	antflags="${antflags} -Djasper.home=${S}/jasper"	132	antflags="${antflags} -Djasper.home=${S}/jasper"
		133	if [ -n "${JDK_1_4}" ]; then
		134	antflags="${antflags} -Dcommons-httpclient.jar=$(java-config -p commons-httpclient)"
		135	antflags="${antflags} -Dactivation.jar=$(java-config -p gnu-jaf-1)"
		136	antflags="${antflags} -Djaxen.jar=$(java-pkg_getjar jaxen jaxen-full.jar)"
		137	antflags="${antflags} -Djmx.jar=$(java-pkg_getjar mx4j-3.0 mx4j.jar)"
		138	antflags="${antflags} -Djmx-remote.jar=$(java-pkg_getjar mx4j-3.0 mx4j-rjmx.jar)"
		139	antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"
		140	antflags="${antflags} -DxercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)"
		141	antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xerces-2 xml-apis.jar)"
		142	antflags="${antflags} -Dstruts.home=/usr/share/struts"
		143	fi
		144	if use struts; then
		145	antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts-1.2 struts.jar)"
		146	fi
128		147
129	ant ${antflags} \|\| die "compile failed"	148	ant ${antflags} \|\| die "compile failed"
130		149
Lines 184-194 src_install() { Link Here
184	cd ${base}	203	cd ${base}
185	done	204	done
186		205
187	# replace a packed struts.jar	206	if use struts; then
188	cd server/webapps/admin/WEB-INF/lib	207	# replace a packed struts.jar
189	rm -f struts.jar	208	cd server/webapps/admin/WEB-INF/lib
190	java-pkg_jar-from struts-1.2 struts.jar	209	rm -f struts.jar
191	cd ${base}	210	java-pkg_jar-from struts-1.2 struts.jar
		211	cd ${base}
		212	fi
192		213
193	# replace the default pw with a random one, see #92281	214	# replace the default pw with a random one, see #92281
194	local randpw=$(echo ${RANDOM}\|md5sum\|cut -c 1-15)	215	local randpw=$(echo ${RANDOM}\|md5sum\|cut -c 1-15)