From: | "Miroslav Sulc (fordfrog)" <fordfrog@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in dev-java/tomcat-servlet-api: tomcat-servlet-api-7.0.32.ebuild tomcat-servlet-api-6.0.36.ebuild ChangeLog |
Date: | Mon, 29 Oct 2012 10:55:25 |
Message-Id: | 20121029105515.C94EF21600@flycatcher.gentoo.org |
1 | fordfrog 12/10/29 10:55:15 |
2 | |
3 | Modified: ChangeLog |
4 | Added: tomcat-servlet-api-7.0.32.ebuild |
5 | tomcat-servlet-api-6.0.36.ebuild |
6 | Log: |
7 | dev-java/tomcat-servlet-api: version bump |
8 | |
9 | (Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit) |
10 | |
11 | Revision Changes Path |
12 | 1.137 dev-java/tomcat-servlet-api/ChangeLog |
13 | |
14 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog?rev=1.137&view=markup |
15 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog?rev=1.137&content-type=text/plain |
16 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog?r1=1.136&r2=1.137 |
17 | |
18 | Index: ChangeLog |
19 | =================================================================== |
20 | RCS file: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v |
21 | retrieving revision 1.136 |
22 | retrieving revision 1.137 |
23 | diff -u -r1.136 -r1.137 |
24 | --- ChangeLog 29 Sep 2012 17:58:23 -0000 1.136 |
25 | +++ ChangeLog 29 Oct 2012 10:55:15 -0000 1.137 |
26 | @@ -1,6 +1,13 @@ |
27 | # ChangeLog for dev-java/tomcat-servlet-api |
28 | # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
29 | -# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.136 2012/09/29 17:58:23 grobian Exp $ |
30 | +# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.137 2012/10/29 10:55:15 fordfrog Exp $ |
31 | + |
32 | +*tomcat-servlet-api-7.0.32 (29 Oct 2012) |
33 | +*tomcat-servlet-api-6.0.36 (29 Oct 2012) |
34 | + |
35 | + 29 Oct 2012; Miroslav Ć ulc <fordfrog@g.o> |
36 | + +tomcat-servlet-api-6.0.36.ebuild, +tomcat-servlet-api-7.0.32.ebuild: |
37 | + version bump |
38 | |
39 | 29 Sep 2012; Fabian Groffen <grobian@g.o> |
40 | tomcat-servlet-api-4.1.36.ebuild: |
41 | |
42 | |
43 | |
44 | 1.1 dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.32.ebuild |
45 | |
46 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.32.ebuild?rev=1.1&view=markup |
47 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.32.ebuild?rev=1.1&content-type=text/plain |
48 | |
49 | Index: tomcat-servlet-api-7.0.32.ebuild |
50 | =================================================================== |
51 | # Copyright 1999-2012 Gentoo Foundation |
52 | # Distributed under the terms of the GNU General Public License v2 |
53 | # $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.32.ebuild,v 1.1 2012/10/29 10:55:15 fordfrog Exp $ |
54 | |
55 | EAPI="2" |
56 | JAVA_PKG_IUSE="source" |
57 | |
58 | inherit eutils java-pkg-2 java-ant-2 |
59 | |
60 | MY_A="apache-${P}-src" |
61 | MY_P="${MY_A/-servlet-api/}" |
62 | DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation" |
63 | HOMEPAGE="http://tomcat.apache.org/" |
64 | SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz" |
65 | |
66 | LICENSE="Apache-2.0" |
67 | SLOT="3.0" |
68 | KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
69 | IUSE="" |
70 | |
71 | DEPEND=">=virtual/jdk-1.6" |
72 | RDEPEND=">=virtual/jre-1.6" |
73 | |
74 | S="${WORKDIR}/${MY_P}/" |
75 | |
76 | java_prepare() { |
77 | cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml" |
78 | rm -fR */*/build.xml |
79 | einfo "Removing bundled jars and classes" |
80 | find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -delete |
81 | } |
82 | |
83 | src_install() { |
84 | java-pkg_dojar "${S}"/output/build/lib/*.jar |
85 | use source && java-pkg_dosrc java/javax/servlet/ |
86 | } |
87 | |
88 | |
89 | |
90 | 1.1 dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.36.ebuild |
91 | |
92 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.36.ebuild?rev=1.1&view=markup |
93 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.36.ebuild?rev=1.1&content-type=text/plain |
94 | |
95 | Index: tomcat-servlet-api-6.0.36.ebuild |
96 | =================================================================== |
97 | # Copyright 1999-2012 Gentoo Foundation |
98 | # Distributed under the terms of the GNU General Public License v2 |
99 | # $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.36.ebuild,v 1.1 2012/10/29 10:55:15 fordfrog Exp $ |
100 | |
101 | EAPI="2" |
102 | JAVA_PKG_IUSE="source" |
103 | |
104 | inherit eutils java-pkg-2 java-ant-2 |
105 | |
106 | MY_A="apache-${P}-src" |
107 | MY_P="${MY_A/-servlet-api/}" |
108 | DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation" |
109 | HOMEPAGE="http://tomcat.apache.org/" |
110 | SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz" |
111 | |
112 | LICENSE="Apache-2.0" |
113 | SLOT="2.5" |
114 | KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
115 | IUSE="" |
116 | |
117 | DEPEND=">=virtual/jdk-1.5" |
118 | RDEPEND=">=virtual/jre-1.5" |
119 | |
120 | S="${WORKDIR}/${MY_P}/" |
121 | |
122 | java_prepare() { |
123 | cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml" |
124 | rm */*/build.xml |
125 | } |
126 | |
127 | src_install() { |
128 | java-pkg_dojar "${S}"/output/build/lib/*.jar |
129 | use source && java-pkg_dosrc java/javax/servlet/ |
130 | } |