[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:	Mon, 25 Nov 2019 12:26:33
Message-Id:	`1574684782.adf316a6aa11e2524aaed56785133341d23a841a.fordfrog@gentoo`

1

commit:     adf316a6aa11e2524aaed56785133341d23a841a

2

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

3

AuthorDate: Mon Nov 25 12:22:52 2019 +0000

4

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

5

CommitDate: Mon Nov 25 12:26:22 2019 +0000

6

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

7

8

dev-java/tomcat-servlet-api-{6.0.53,8.5.46,9.0.26}: removed old

9

10

Package-Manager: Portage-2.3.79, Repoman-2.3.18

11

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

12

13

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

14

 .../tomcat-servlet-api-6.0.53.ebuild               | 34 -------------------

15

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

16

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

17

 4 files changed, 114 deletions(-)

18

19

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

20

index 67a9c399e6f..13f2fe3e255 100644

21

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

22

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

23

@@ -2,10 +2,8 @@ DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc387

24

 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7

25

 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c

26

 DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421fbd6b12b55918aa7c15bc8209b4c762d7f422a7315e4cbe9b4ae2da754b6d8493bc11ae6a5c99f11a1ac3b23473e05fa26c83 SHA512 5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0

27

-DIST apache-tomcat-8.5.46-src.tar.gz 5599021 BLAKE2B 3755f15612e63ac06cbfa097f1531dc36542ba559a6ef60230b133e45d14bb4c4c54d4dcc8b05b9996f54ac253fb1630f6a6e900ee00e4af0a9200f83455a952 SHA512 02e93cc6fb4226e81b03ae60f479e15b438b1c68c1a4104200db9cc473939b92d66eea12f0783727b06f643d11ebe3da2a81c80cbe486ed497a3280e8cdb2e62

28

 DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce SHA512 1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051

29

 DIST apache-tomcat-8.5.49-src.tar.gz 5633029 BLAKE2B a01e88df94e27446a7792cccea64ffd30580db40d5473445e62ec15cb21046fb1baf2155fa36462f72aa477a15fb1c892b2494a93e601eebcd49241d5316a9f6 SHA512 c90615ed1548ed6f7bcec77dbebb6b4b95c91086042cba53c207bf1475ab6183a435f3c2c1e3f8fb769f9a144216e64a6dd08b3f9dd56fe2e4b143e00a35161d

30

-DIST apache-tomcat-9.0.26-src.tar.gz 5750303 BLAKE2B 582acae0f24cab5fdd44c085b36e771508020d124f9329036b3bf0698da1fb2cda69d6f4254eeaca00ce3c34c3740fe69c077637107167fface60b9fa74c8869 SHA512 8f430439c66f5a43c7a35bc99edd11549100be28b17fb44e17ec432f72e1797cdebd641a7f19c1d918635e51c164ecd1c9d1399a63abfce05d9a8c37db381837

31

 DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8

32

 DIST apache-tomcat-9.0.29-src.tar.gz 5783830 BLAKE2B e724bb6b35e9a466d39e95a8004751e982e50cdf303097fef6af1d6b3feac5442d38e1c30c141dbf91cd4b262954f0d266baab489d4e369e6c4056e101d9e6b5 SHA512 f4ea845ea4f6161ebc43f84b66704357ca507afe534d37f7605ccb7a0dfc22e6fdc53507d9c11108f01c458b937033472b8b5b01ecf50d082d21ef90aa516fdd

33

 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2

34

35

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

36

deleted file mode 100644

37

index b1a2ab2e5ec..00000000000

38

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

39

+++ /dev/null

40

@@ -1,34 +0,0 @@

41

-# Copyright 1999-2019 Gentoo Authors

42

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

43

-

44

-EAPI="5"

45

-JAVA_PKG_IUSE="source"

46

-

47

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

48

-

49

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

50

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

51

-DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation"

52

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

53

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

54

-

55

-LICENSE="Apache-2.0"

56

-SLOT="2.5"

57

-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"

58

-IUSE=""

59

-

60

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

61

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

62

-

63

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

64

-

65

-java_prepare() {

66

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

67

-	rm -r */*/build.xml java/javax/{annotation,ejb,mail,persistence,xml}/ || die

68

-	find -name '*.jar' -delete || die

69

-}

70

-

71

-src_install() {

72

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

73

-	use source && java-pkg_dosrc java/javax

74

-}

75

76

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

77

deleted file mode 100644

78

index 9b931baf0d4..00000000000

79

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

80

+++ /dev/null

81

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

82

-# Copyright 1999-2019 Gentoo Authors

83

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

84

-

85

-EAPI="6"

86

-JAVA_PKG_IUSE="source"

87

-

88

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

89

-

90

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

91

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

92

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

93

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

94

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

95

-

96

-LICENSE="Apache-2.0"

97

-SLOT="3.1"

98

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

99

-IUSE=""

100

-

101

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

102

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

103

-

104

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

105

-

106

-src_prepare() {

107

-	default

108

-

109

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

110

-	rm -fR */*/build.xml

111

-	einfo "Removing bundled jars and classes"

112

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

113

-

114

-	java-pkg-2_src_prepare

115

-}

116

-

117

-src_install() {

118

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

119

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

120

-}

121

122

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

123

deleted file mode 100644

124

index d66f7a81553..00000000000

125

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

126

+++ /dev/null

127

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

128

-# Copyright 1999-2019 Gentoo Authors

129

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

130

-

131

-EAPI="6"

132

-JAVA_PKG_IUSE="source"

133

-

134

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

135

-

136

-MY_A="apache-${PN}-${PV}-src"

137

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

138

-DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation"

139

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

140

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

141

-

142

-LICENSE="Apache-2.0"

143

-SLOT="4.0"

144

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

145

-IUSE=""

146

-

147

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

148

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

149

-

150

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

151

-

152

-src_prepare() {

153

-	default

154

-

155

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

156

-	rm -fR */*/build.xml

157

-	einfo "Removing bundled jars and classes"

158

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

159

-

160

-	java-pkg-2_src_prepare

161

-}

162

-

163

-src_install() {

164

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

165

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

166

-}

1	commit: adf316a6aa11e2524aaed56785133341d23a841a
2	Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3	AuthorDate: Mon Nov 25 12:22:52 2019 +0000
4	Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5	CommitDate: Mon Nov 25 12:26:22 2019 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adf316a6
7
8	dev-java/tomcat-servlet-api-{6.0.53,8.5.46,9.0.26}: removed old
9
10	Package-Manager: Portage-2.3.79, Repoman-2.3.18
11	Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
12
13	dev-java/tomcat-servlet-api/Manifest \| 2 --
14	.../tomcat-servlet-api-6.0.53.ebuild \| 34 -------------------
15	.../tomcat-servlet-api-8.5.46.ebuild \| 39 ----------------------
16	.../tomcat-servlet-api-9.0.26.ebuild \| 39 ----------------------
17	4 files changed, 114 deletions(-)
18
19	diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
20	index 67a9c399e6f..13f2fe3e255 100644
21	--- a/dev-java/tomcat-servlet-api/Manifest
22	+++ b/dev-java/tomcat-servlet-api/Manifest
23	@@ -2,10 +2,8 @@ DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc387
24	DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
25	DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
26	DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421fbd6b12b55918aa7c15bc8209b4c762d7f422a7315e4cbe9b4ae2da754b6d8493bc11ae6a5c99f11a1ac3b23473e05fa26c83 SHA512 5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0
27	-DIST apache-tomcat-8.5.46-src.tar.gz 5599021 BLAKE2B 3755f15612e63ac06cbfa097f1531dc36542ba559a6ef60230b133e45d14bb4c4c54d4dcc8b05b9996f54ac253fb1630f6a6e900ee00e4af0a9200f83455a952 SHA512 02e93cc6fb4226e81b03ae60f479e15b438b1c68c1a4104200db9cc473939b92d66eea12f0783727b06f643d11ebe3da2a81c80cbe486ed497a3280e8cdb2e62
28	DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce SHA512 1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051
29	DIST apache-tomcat-8.5.49-src.tar.gz 5633029 BLAKE2B a01e88df94e27446a7792cccea64ffd30580db40d5473445e62ec15cb21046fb1baf2155fa36462f72aa477a15fb1c892b2494a93e601eebcd49241d5316a9f6 SHA512 c90615ed1548ed6f7bcec77dbebb6b4b95c91086042cba53c207bf1475ab6183a435f3c2c1e3f8fb769f9a144216e64a6dd08b3f9dd56fe2e4b143e00a35161d
30	-DIST apache-tomcat-9.0.26-src.tar.gz 5750303 BLAKE2B 582acae0f24cab5fdd44c085b36e771508020d124f9329036b3bf0698da1fb2cda69d6f4254eeaca00ce3c34c3740fe69c077637107167fface60b9fa74c8869 SHA512 8f430439c66f5a43c7a35bc99edd11549100be28b17fb44e17ec432f72e1797cdebd641a7f19c1d918635e51c164ecd1c9d1399a63abfce05d9a8c37db381837
31	DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8
32	DIST apache-tomcat-9.0.29-src.tar.gz 5783830 BLAKE2B e724bb6b35e9a466d39e95a8004751e982e50cdf303097fef6af1d6b3feac5442d38e1c30c141dbf91cd4b262954f0d266baab489d4e369e6c4056e101d9e6b5 SHA512 f4ea845ea4f6161ebc43f84b66704357ca507afe534d37f7605ccb7a0dfc22e6fdc53507d9c11108f01c458b937033472b8b5b01ecf50d082d21ef90aa516fdd
33	DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
34
35	diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild
36	deleted file mode 100644
37	index b1a2ab2e5ec..00000000000
38	--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild
39	+++ /dev/null
40	@@ -1,34 +0,0 @@
41	-# Copyright 1999-2019 Gentoo Authors
42	-# Distributed under the terms of the GNU General Public License v2
43	-
44	-EAPI="5"
45	-JAVA_PKG_IUSE="source"
46	-
47	-inherit eutils java-pkg-2 java-ant-2
48	-
49	-MY_A="apache-${P}-src"
50	-MY_P="${MY_A/-servlet-api/}"
51	-DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation"
52	-HOMEPAGE="http://tomcat.apache.org/"
53	-SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
54	-
55	-LICENSE="Apache-2.0"
56	-SLOT="2.5"
57	-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
58	-IUSE=""
59	-
60	-DEPEND=">=virtual/jdk-1.6"
61	-RDEPEND=">=virtual/jre-1.6"
62	-
63	-S="${WORKDIR}/${MY_P}"
64	-
65	-java_prepare() {
66	- cp "${FILESDIR}/${SLOT}-build-r1.xml" build.xml \|\| die "Could not replace build.xml"
67	- rm -r //build.xml java/javax/{annotation,ejb,mail,persistence,xml}/ \|\| die
68	- find -name '*.jar' -delete \|\| die
69	-}
70	-
71	-src_install() {
72	- java-pkg_dojar "${S}"/output/build/lib/*.jar
73	- use source && java-pkg_dosrc java/javax
74	-}
75
76	diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.46.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.46.ebuild
77	deleted file mode 100644
78	index 9b931baf0d4..00000000000
79	--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.46.ebuild
80	+++ /dev/null
81	@@ -1,39 +0,0 @@
82	-# Copyright 1999-2019 Gentoo Authors
83	-# Distributed under the terms of the GNU General Public License v2
84	-
85	-EAPI="6"
86	-JAVA_PKG_IUSE="source"
87	-
88	-inherit eutils java-pkg-2 java-ant-2
89	-
90	-MY_A="apache-${P}-src"
91	-MY_P="${MY_A/-servlet-api/}"
92	-DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
93	-HOMEPAGE="https://tomcat.apache.org/"
94	-SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
95	-
96	-LICENSE="Apache-2.0"
97	-SLOT="3.1"
98	-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
99	-IUSE=""
100	-
101	-DEPEND=">=virtual/jdk-1.7"
102	-RDEPEND=">=virtual/jre-1.7"
103	-
104	-S="${WORKDIR}/${MY_P}/"
105	-
106	-src_prepare() {
107	- default
108	-
109	- cp "${FILESDIR}/${SLOT}-build.xml" build.xml \|\| die "Could not replace build.xml"
110	- rm -fR //build.xml
111	- einfo "Removing bundled jars and classes"
112	- find "${S}" '(' -name '.class' -o -name '.jar' ')' -exec rm -frv {} +
113	-
114	- java-pkg-2_src_prepare
115	-}
116	-
117	-src_install() {
118	- java-pkg_dojar "${S}"/output/build/lib/*.jar
119	- use source && java-pkg_dosrc java/javax/servlet/
120	-}
121
122	diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.26.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.26.ebuild
123	deleted file mode 100644
124	index d66f7a81553..00000000000
125	--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.26.ebuild
126	+++ /dev/null
127	@@ -1,39 +0,0 @@
128	-# Copyright 1999-2019 Gentoo Authors
129	-# Distributed under the terms of the GNU General Public License v2
130	-
131	-EAPI="6"
132	-JAVA_PKG_IUSE="source"
133	-
134	-inherit eutils java-pkg-2 java-ant-2
135	-
136	-MY_A="apache-${PN}-${PV}-src"
137	-MY_P="${MY_A/-servlet-api/}"
138	-DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation"
139	-HOMEPAGE="https://tomcat.apache.org/"
140	-SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
141	-
142	-LICENSE="Apache-2.0"
143	-SLOT="4.0"
144	-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
145	-IUSE=""
146	-
147	-DEPEND=">=virtual/jdk-1.8"
148	-RDEPEND=">=virtual/jre-1.8"
149	-
150	-S="${WORKDIR}/${MY_P}/"
151	-
152	-src_prepare() {
153	- default
154	-
155	- cp "${FILESDIR}/${SLOT}-build.xml" build.xml \|\| die "Could not replace build.xml"
156	- rm -fR //build.xml
157	- einfo "Removing bundled jars and classes"
158	- find "${S}" '(' -name '.class' -o -name '.jar' ')' -exec rm -frv {} +
159	-
160	- java-pkg-2_src_prepare
161	-}
162	-
163	-src_install() {
164	- java-pkg_dojar "${S}"/output/build/lib/*.jar
165	- use source && java-pkg_dosrc java/javax/servlet/
166	-}

Gentoo Archives: gentoo-commits