[gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-servlet-api/ - gentoo-commits

From:	"Miroslav Šulc" <fordfrog@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-servlet-api/
Date:	Thu, 10 Aug 2017 10:35:51
Message-Id:	`1502361334.03c1483b57bbb5f29b482ef9b118aefc5b140837.fordfrog@gentoo`

1

commit:     03c1483b57bbb5f29b482ef9b118aefc5b140837

2

Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>

3

AuthorDate: Thu Aug 10 10:28:55 2017 +0000

4

Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>

5

CommitDate: Thu Aug 10 10:35:34 2017 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03c1483b

7

8

dev-java/tomcat-servlet-api: removed obsolete ebuilds for main version 8.5

9

10

Package-Manager: Portage-2.3.6, Repoman-2.3.3

11

12

 dev-java/tomcat-servlet-api/Manifest               |  3 --

13

 .../tomcat-servlet-api-8.5.13.ebuild               | 39 ----------------------

14

 .../tomcat-servlet-api-8.5.14.ebuild               | 39 ----------------------

15

 .../tomcat-servlet-api-8.5.15.ebuild               | 39 ----------------------

16

 4 files changed, 120 deletions(-)

17

18

diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest

19

index 8704b455770..d61c4016066 100644

20

--- a/dev-java/tomcat-servlet-api/Manifest

21

+++ b/dev-java/tomcat-servlet-api/Manifest

22

@@ -9,9 +9,6 @@ DIST apache-tomcat-7.0.79-src.tar.gz 4682119 SHA256 b5373951afe41ffd27348bb57cff

23

 DIST apache-tomcat-8.0.43-src.tar.gz 4962788 SHA256 5ca1feb8ae5bd637a379ed409300fac0d463a8ec878d60f1ca54d3e7f2013f43 SHA512 aa15046ba3404c206b7983f42837d30debca69b18b85345d1376a853ad6e9fb5c0cbf42732f835779b10d39e2eae77f6d1688dadc5280b50236bf3432e251e9b WHIRLPOOL d1517c25b56a2ef4dd41977daf4ab5639b991ce38b6f5279a4e09f9232d73625be623beb678de8b3ec4e718cb50284cbebae67726622699738ad28be6d735414

24

 DIST apache-tomcat-8.0.45-src.tar.gz 4978313 SHA256 450fd2890b12e56692cb203f95651f9a873dce056b7b4362e142bc817032b291 SHA512 80e4281f5b6e4d6bf607179840bc6cb923ea9f57ec8231a451c3b5a1f8938f72ec1097290059afba0ef7b56edeb56d63636849517b69b91c7093cb15ff0eaa04 WHIRLPOOL c893cd5c26637f8881c19353e269145e33fa11e02eb10ef93a41590ad2e1e6c6ffa1b3f6c3c7c318630765f666be07447fd3a21c70c2c381e75c458b60383ea0

25

 DIST apache-tomcat-8.5.11-src.tar.gz 4996153 SHA256 81fb94243600d950375c4622f76b39c06c5615b7a8a6f70d387ea249bed1dddf SHA512 d1a9513535773805c26825f8843fa502e044c9f1ccc22176db5418a7a0abb6d1bcff3db401b449a5867065359abbc8277d14085d807fe00c95dd267d9091620d WHIRLPOOL 41ff9daec144c2481d3bb7a49bcd071eb2d21b34c11356a9911a139b404779971c31282f73b7b336b7e02d16156749e8e816dca8d5c727ef871ff0216577398d

26

-DIST apache-tomcat-8.5.13-src.tar.gz 5021333 SHA256 70db8d68f3a702e0997220a91d0c1ed59de4bbdc32d8482532412c1e31666a0b SHA512 4855e0b686dcdc10224e3bba804c7c944a8b2f48761dd0e4fca12a59cfc308fd5f26db6a02b3b7c39b595506c920fdf8f19eedb26a8acb7f1580f4e4b597fb5b WHIRLPOOL 6ad3150416e17396c81e6b638e035f55e695388fb2cdfd65a6803195894dee3391aac56243879faa850b2765d29f3ae13c74cefd66c349bd53bf14900e59dea6

27

-DIST apache-tomcat-8.5.14-src.tar.gz 5024579 SHA256 f52ce43e74b9a8b1930971dc0f7ca6f2fd06f517b02541b71f6b54148dff0955 SHA512 f51172f2bd079b18c2aa87a4513e128ab729cb9c80ecfe7ba3e817cc944ab310f2ea934655405c7241aa09e551b63ffe4c663b57ed7d38c756dc193e2acb2cea WHIRLPOOL 8cd9f2100a882619455a4eb914e7a1bc7ecae21f7aaf612ba901ac7c60a0920cd2bf9f7aa3b71eef459d6a981193b763b71e3a4f5489dcd2c87382040afe1dbd

28

-DIST apache-tomcat-8.5.15-src.tar.gz 5028654 SHA256 941e1e936af46dbe233e41f770e68b09e2ac0d88b6ee01f7b2116a67220cb323 SHA512 222d53ed53b1b3e18ff42dc0a987627e75de93048d9a36ce08448272f167ed7ab91ac6d44158a2de9f2f960e53c36497841649e941305e583e6b70e13f55c970 WHIRLPOOL c5f63ca2ac4b7f48041bbbbdb93c15dbd224e09998abaa89c79c22537615935b6ce87a1b4667ddd92ec28bfad9d84c723aed8dc20780d966bdf4b094a87fdfa9

29

 DIST apache-tomcat-8.5.16-src.tar.gz 5054513 SHA256 0dd3589779bd43624a6027ec5e26262d10128dd46dcd08ed4107b8f453416c23 SHA512 187f32ebeeca9099f2bf679613dd89198268d361d352550e09db23ef8df483543ec67604c58ddebb8259c46ab510519e8fa75a803d2e86ab815b231ae327222e WHIRLPOOL d241aed38921a76f75451f7d3c676e97548b843bec724c8c80a6534638cd27095f4ba790cbef56c8913cd6d96e63536855359c5a271aa41c7d3b97e25de26253

30

 DIST apache-tomcat-9.0.0.M26-src.tar.gz 5011957 SHA256 02ba2c9a3a2d78994fc14f2b304c3b3f46615538a48a9193e475b08565cb9b7e SHA512 8c25932aa244edb46eee26aa837636e78c8104ca6617cb5ba924e0e45c2f9dbcd7d196ddf69ee2f1c1b6053dda818a3b92f8f46c156f3048c46cee919fc22c13 WHIRLPOOL 11e00a6e6a5822bd4e357e375b026dd732bf33319e30dde25f11bc1b99994617be3ce6d4976870f725e56646e5ffee92acb6fc23f46b53a46ebbf6c53707ea07

31

 DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1

32

33

diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.13.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.13.ebuild

34

deleted file mode 100644

35

index dd03de7b76e..00000000000

36

--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.13.ebuild

37

+++ /dev/null

38

@@ -1,39 +0,0 @@

39

-# Copyright 1999-2017 Gentoo Foundation

40

-# Distributed under the terms of the GNU General Public License v2

41

-

42

-EAPI="6"

43

-JAVA_PKG_IUSE="source"

44

-

45

-inherit eutils java-pkg-2 java-ant-2

46

-

47

-MY_A="apache-${P}-src"

48

-MY_P="${MY_A/-servlet-api/}"

49

-DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"

50

-HOMEPAGE="http://tomcat.apache.org/"

51

-SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"

52

-

53

-LICENSE="Apache-2.0"

54

-SLOT="3.1"

55

-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"

56

-IUSE=""

57

-

58

-DEPEND=">=virtual/jdk-1.7"

59

-RDEPEND=">=virtual/jre-1.7"

60

-

61

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

62

-

63

-src_prepare() {

64

-	default

65

-

66

-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"

67

-	rm -fR */*/build.xml

68

-	einfo "Removing bundled jars and classes"

69

-	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +

70

-

71

-	java-pkg-2_src_prepare

72

-}

73

-

74

-src_install() {

75

-	java-pkg_dojar "${S}"/output/build/lib/*.jar

76

-	use source && java-pkg_dosrc java/javax/servlet/

77

-}

78

79

diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.14.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.14.ebuild

80

deleted file mode 100644

81

index dd03de7b76e..00000000000

82

--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.14.ebuild

83

+++ /dev/null

84

@@ -1,39 +0,0 @@

85

-# Copyright 1999-2017 Gentoo Foundation

86

-# Distributed under the terms of the GNU General Public License v2

87

-

88

-EAPI="6"

89

-JAVA_PKG_IUSE="source"

90

-

91

-inherit eutils java-pkg-2 java-ant-2

92

-

93

-MY_A="apache-${P}-src"

94

-MY_P="${MY_A/-servlet-api/}"

95

-DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"

96

-HOMEPAGE="http://tomcat.apache.org/"

97

-SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"

98

-

99

-LICENSE="Apache-2.0"

100

-SLOT="3.1"

101

-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"

102

-IUSE=""

103

-

104

-DEPEND=">=virtual/jdk-1.7"

105

-RDEPEND=">=virtual/jre-1.7"

106

-

107

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

108

-

109

-src_prepare() {

110

-	default

111

-

112

-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"

113

-	rm -fR */*/build.xml

114

-	einfo "Removing bundled jars and classes"

115

-	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +

116

-

117

-	java-pkg-2_src_prepare

118

-}

119

-

120

-src_install() {

121

-	java-pkg_dojar "${S}"/output/build/lib/*.jar

122

-	use source && java-pkg_dosrc java/javax/servlet/

123

-}

124

125

diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.15.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.15.ebuild

126

deleted file mode 100644

127

index fc6ef9151ec..00000000000

128

--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.15.ebuild

129

+++ /dev/null

130

@@ -1,39 +0,0 @@

131

-# Copyright 1999-2017 Gentoo Foundation

132

-# Distributed under the terms of the GNU General Public License v2

133

-

134

-EAPI="6"

135

-JAVA_PKG_IUSE="source"

136

-

137

-inherit eutils java-pkg-2 java-ant-2

138

-

139

-MY_A="apache-${P}-src"

140

-MY_P="${MY_A/-servlet-api/}"

141

-DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"

142

-HOMEPAGE="http://tomcat.apache.org/"

143

-SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"

144

-

145

-LICENSE="Apache-2.0"

146

-SLOT="3.1"

147

-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"

148

-IUSE=""

149

-

150

-DEPEND=">=virtual/jdk-1.7"

151

-RDEPEND=">=virtual/jre-1.7"

152

-

153

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

154

-

155

-src_prepare() {

156

-	default

157

-

158

-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"

159

-	rm -fR */*/build.xml

160

-	einfo "Removing bundled jars and classes"

161

-	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +

162

-

163

-	java-pkg-2_src_prepare

164

-}

165

-

166

-src_install() {

167

-	java-pkg_dojar "${S}"/output/build/lib/*.jar

168

-	use source && java-pkg_dosrc java/javax/servlet/

169

-}

1	commit: 03c1483b57bbb5f29b482ef9b118aefc5b140837
2	Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3	AuthorDate: Thu Aug 10 10:28:55 2017 +0000
4	Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5	CommitDate: Thu Aug 10 10:35:34 2017 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03c1483b
7
8	dev-java/tomcat-servlet-api: removed obsolete ebuilds for main version 8.5
9
10	Package-Manager: Portage-2.3.6, Repoman-2.3.3
11
12	dev-java/tomcat-servlet-api/Manifest \| 3 --
13	.../tomcat-servlet-api-8.5.13.ebuild \| 39 ----------------------
14	.../tomcat-servlet-api-8.5.14.ebuild \| 39 ----------------------
15	.../tomcat-servlet-api-8.5.15.ebuild \| 39 ----------------------
16	4 files changed, 120 deletions(-)
17
18	diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
19	index 8704b455770..d61c4016066 100644
20	--- a/dev-java/tomcat-servlet-api/Manifest
21	+++ b/dev-java/tomcat-servlet-api/Manifest
22	@@ -9,9 +9,6 @@ DIST apache-tomcat-7.0.79-src.tar.gz 4682119 SHA256 b5373951afe41ffd27348bb57cff
23	DIST apache-tomcat-8.0.43-src.tar.gz 4962788 SHA256 5ca1feb8ae5bd637a379ed409300fac0d463a8ec878d60f1ca54d3e7f2013f43 SHA512 aa15046ba3404c206b7983f42837d30debca69b18b85345d1376a853ad6e9fb5c0cbf42732f835779b10d39e2eae77f6d1688dadc5280b50236bf3432e251e9b WHIRLPOOL d1517c25b56a2ef4dd41977daf4ab5639b991ce38b6f5279a4e09f9232d73625be623beb678de8b3ec4e718cb50284cbebae67726622699738ad28be6d735414
24	DIST apache-tomcat-8.0.45-src.tar.gz 4978313 SHA256 450fd2890b12e56692cb203f95651f9a873dce056b7b4362e142bc817032b291 SHA512 80e4281f5b6e4d6bf607179840bc6cb923ea9f57ec8231a451c3b5a1f8938f72ec1097290059afba0ef7b56edeb56d63636849517b69b91c7093cb15ff0eaa04 WHIRLPOOL c893cd5c26637f8881c19353e269145e33fa11e02eb10ef93a41590ad2e1e6c6ffa1b3f6c3c7c318630765f666be07447fd3a21c70c2c381e75c458b60383ea0
25	DIST apache-tomcat-8.5.11-src.tar.gz 4996153 SHA256 81fb94243600d950375c4622f76b39c06c5615b7a8a6f70d387ea249bed1dddf SHA512 d1a9513535773805c26825f8843fa502e044c9f1ccc22176db5418a7a0abb6d1bcff3db401b449a5867065359abbc8277d14085d807fe00c95dd267d9091620d WHIRLPOOL 41ff9daec144c2481d3bb7a49bcd071eb2d21b34c11356a9911a139b404779971c31282f73b7b336b7e02d16156749e8e816dca8d5c727ef871ff0216577398d
26	-DIST apache-tomcat-8.5.13-src.tar.gz 5021333 SHA256 70db8d68f3a702e0997220a91d0c1ed59de4bbdc32d8482532412c1e31666a0b SHA512 4855e0b686dcdc10224e3bba804c7c944a8b2f48761dd0e4fca12a59cfc308fd5f26db6a02b3b7c39b595506c920fdf8f19eedb26a8acb7f1580f4e4b597fb5b WHIRLPOOL 6ad3150416e17396c81e6b638e035f55e695388fb2cdfd65a6803195894dee3391aac56243879faa850b2765d29f3ae13c74cefd66c349bd53bf14900e59dea6
27	-DIST apache-tomcat-8.5.14-src.tar.gz 5024579 SHA256 f52ce43e74b9a8b1930971dc0f7ca6f2fd06f517b02541b71f6b54148dff0955 SHA512 f51172f2bd079b18c2aa87a4513e128ab729cb9c80ecfe7ba3e817cc944ab310f2ea934655405c7241aa09e551b63ffe4c663b57ed7d38c756dc193e2acb2cea WHIRLPOOL 8cd9f2100a882619455a4eb914e7a1bc7ecae21f7aaf612ba901ac7c60a0920cd2bf9f7aa3b71eef459d6a981193b763b71e3a4f5489dcd2c87382040afe1dbd
28	-DIST apache-tomcat-8.5.15-src.tar.gz 5028654 SHA256 941e1e936af46dbe233e41f770e68b09e2ac0d88b6ee01f7b2116a67220cb323 SHA512 222d53ed53b1b3e18ff42dc0a987627e75de93048d9a36ce08448272f167ed7ab91ac6d44158a2de9f2f960e53c36497841649e941305e583e6b70e13f55c970 WHIRLPOOL c5f63ca2ac4b7f48041bbbbdb93c15dbd224e09998abaa89c79c22537615935b6ce87a1b4667ddd92ec28bfad9d84c723aed8dc20780d966bdf4b094a87fdfa9
29	DIST apache-tomcat-8.5.16-src.tar.gz 5054513 SHA256 0dd3589779bd43624a6027ec5e26262d10128dd46dcd08ed4107b8f453416c23 SHA512 187f32ebeeca9099f2bf679613dd89198268d361d352550e09db23ef8df483543ec67604c58ddebb8259c46ab510519e8fa75a803d2e86ab815b231ae327222e WHIRLPOOL d241aed38921a76f75451f7d3c676e97548b843bec724c8c80a6534638cd27095f4ba790cbef56c8913cd6d96e63536855359c5a271aa41c7d3b97e25de26253
30	DIST apache-tomcat-9.0.0.M26-src.tar.gz 5011957 SHA256 02ba2c9a3a2d78994fc14f2b304c3b3f46615538a48a9193e475b08565cb9b7e SHA512 8c25932aa244edb46eee26aa837636e78c8104ca6617cb5ba924e0e45c2f9dbcd7d196ddf69ee2f1c1b6053dda818a3b92f8f46c156f3048c46cee919fc22c13 WHIRLPOOL 11e00a6e6a5822bd4e357e375b026dd732bf33319e30dde25f11bc1b99994617be3ce6d4976870f725e56646e5ffee92acb6fc23f46b53a46ebbf6c53707ea07
31	DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1
32
33	diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.13.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.13.ebuild
34	deleted file mode 100644
35	index dd03de7b76e..00000000000
36	--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.13.ebuild
37	+++ /dev/null
38	@@ -1,39 +0,0 @@
39	-# Copyright 1999-2017 Gentoo Foundation
40	-# Distributed under the terms of the GNU General Public License v2
41	-
42	-EAPI="6"
43	-JAVA_PKG_IUSE="source"
44	-
45	-inherit eutils java-pkg-2 java-ant-2
46	-
47	-MY_A="apache-${P}-src"
48	-MY_P="${MY_A/-servlet-api/}"
49	-DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
50	-HOMEPAGE="http://tomcat.apache.org/"
51	-SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
52	-
53	-LICENSE="Apache-2.0"
54	-SLOT="3.1"
55	-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
56	-IUSE=""
57	-
58	-DEPEND=">=virtual/jdk-1.7"
59	-RDEPEND=">=virtual/jre-1.7"
60	-
61	-S="${WORKDIR}/${MY_P}/"
62	-
63	-src_prepare() {
64	- default
65	-
66	- cp "${FILESDIR}/${SLOT}-build.xml" build.xml \|\| die "Could not replace build.xml"
67	- rm -fR //build.xml
68	- einfo "Removing bundled jars and classes"
69	- find "${S}" '(' -name '.class' -o -name '.jar' ')' -exec rm -frv {} +
70	-
71	- java-pkg-2_src_prepare
72	-}
73	-
74	-src_install() {
75	- java-pkg_dojar "${S}"/output/build/lib/*.jar
76	- use source && java-pkg_dosrc java/javax/servlet/
77	-}
78
79	diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.14.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.14.ebuild
80	deleted file mode 100644
81	index dd03de7b76e..00000000000
82	--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.14.ebuild
83	+++ /dev/null
84	@@ -1,39 +0,0 @@
85	-# Copyright 1999-2017 Gentoo Foundation
86	-# Distributed under the terms of the GNU General Public License v2
87	-
88	-EAPI="6"
89	-JAVA_PKG_IUSE="source"
90	-
91	-inherit eutils java-pkg-2 java-ant-2
92	-
93	-MY_A="apache-${P}-src"
94	-MY_P="${MY_A/-servlet-api/}"
95	-DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
96	-HOMEPAGE="http://tomcat.apache.org/"
97	-SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
98	-
99	-LICENSE="Apache-2.0"
100	-SLOT="3.1"
101	-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
102	-IUSE=""
103	-
104	-DEPEND=">=virtual/jdk-1.7"
105	-RDEPEND=">=virtual/jre-1.7"
106	-
107	-S="${WORKDIR}/${MY_P}/"
108	-
109	-src_prepare() {
110	- default
111	-
112	- cp "${FILESDIR}/${SLOT}-build.xml" build.xml \|\| die "Could not replace build.xml"
113	- rm -fR //build.xml
114	- einfo "Removing bundled jars and classes"
115	- find "${S}" '(' -name '.class' -o -name '.jar' ')' -exec rm -frv {} +
116	-
117	- java-pkg-2_src_prepare
118	-}
119	-
120	-src_install() {
121	- java-pkg_dojar "${S}"/output/build/lib/*.jar
122	- use source && java-pkg_dosrc java/javax/servlet/
123	-}
124
125	diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.15.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.15.ebuild
126	deleted file mode 100644
127	index fc6ef9151ec..00000000000
128	--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.15.ebuild
129	+++ /dev/null
130	@@ -1,39 +0,0 @@
131	-# Copyright 1999-2017 Gentoo Foundation
132	-# Distributed under the terms of the GNU General Public License v2
133	-
134	-EAPI="6"
135	-JAVA_PKG_IUSE="source"
136	-
137	-inherit eutils java-pkg-2 java-ant-2
138	-
139	-MY_A="apache-${P}-src"
140	-MY_P="${MY_A/-servlet-api/}"
141	-DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
142	-HOMEPAGE="http://tomcat.apache.org/"
143	-SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
144	-
145	-LICENSE="Apache-2.0"
146	-SLOT="3.1"
147	-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
148	-IUSE=""
149	-
150	-DEPEND=">=virtual/jdk-1.7"
151	-RDEPEND=">=virtual/jre-1.7"
152	-
153	-S="${WORKDIR}/${MY_P}/"
154	-
155	-src_prepare() {
156	- default
157	-
158	- cp "${FILESDIR}/${SLOT}-build.xml" build.xml \|\| die "Could not replace build.xml"
159	- rm -fR //build.xml
160	- einfo "Removing bundled jars and classes"
161	- find "${S}" '(' -name '.class' -o -name '.jar' ')' -exec rm -frv {} +
162	-
163	- java-pkg-2_src_prepare
164	-}
165	-
166	-src_install() {
167	- java-pkg_dojar "${S}"/output/build/lib/*.jar
168	- use source && java-pkg_dosrc java/javax/servlet/
169	-}

Gentoo Archives: gentoo-commits