diff options
-rw-r--r-- | www-servers/tomcat/ChangeLog | 5 | ||||
-rw-r--r-- | www-servers/tomcat/Manifest | 24 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-7.0.59.ebuild | 8 |
3 files changed, 17 insertions, 20 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 0057677eb13f..1ea5ac47c9bb 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-servers/tomcat # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.354 2015/06/05 09:00:08 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.355 2015/06/08 22:28:50 monsieurp Exp $ + + 08 Jun 2015; Patrice Clement <monsieurp@gentoo.org> tomcat-7.0.59.ebuild: + Add back ~ppc and ~ppc64 keywords to make repoman happy. 05 Jun 2015; Agostino Sarubbo <ago@gentoo.org> tomcat-6.0.44.ebuild, tomcat-7.0.59.ebuild: diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 7d70035c63c7..fa9843c9d6e3 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -26,25 +26,19 @@ EBUILD tomcat-6.0.43.ebuild 4110 SHA256 6363592a6e1243af3df13a463b3487f53e7d1bee EBUILD tomcat-6.0.44.ebuild 3983 SHA256 46e6fbc8d69036bbac3aa9e523e4dd063bb747ce6258adbd3f95318c37024b16 SHA512 23ce9e2d28a2b51ada92e22dd4c388d03425d6f666f2497bc7230d45d31939895523635ee9027f9ee460eece04e08ca8165c5461f542662e5585a666868a18a2 WHIRLPOOL 7b5b668d8f944e7a6aeb4e7acd176193b005378822593ee928af870fee0f35ff98955942ec8fda3550b9d0299e0926bbf6014aa4071ceedd9e8093335f0f5676 EBUILD tomcat-7.0.56.ebuild 4371 SHA256 db945adcb5004588375531121daa5082637efc30fcceae9434633aacaa4e604f SHA512 079428d37e46adfb8c2a5b243679dec148703dab9cc62349afac867423735e492ea369dd67efc614c756240479cbe5333b057ae38a8fc7d1cc13fda818fd9eff WHIRLPOOL a676f331cf55f9f986adbcd4ed1498494b4bfa58b21a606baaa0219103d2acc740dd318a1eecc9a706ce4b294624e6b211b6ca40efb0a12ff6c18dbdf49eb12d EBUILD tomcat-7.0.57.ebuild 4352 SHA256 89ff2b254a4b023229b5029f0c7faf76c7d84a33adfc95ee474434a24282be4a SHA512 ea9589065bae4f00f049d9cd61df5410a72ce53f006a09a269dbd2356e625a0fc2086fa52bafe277dabb417c3e0a84e7a0608be4f3de9ec6ea5eb9c7b3511c04 WHIRLPOOL 74f8c008f1bac9f62f1f390f61f4229b07cd075d7494f2d5e3308e41081c44a6a3a85ca32e89d44dc7f56466cb3d5cdf6e84db204c0e526071c94b0585e332ab -EBUILD tomcat-7.0.59.ebuild 4345 SHA256 8d03c1c11c22ad8ded23d70d41ef2d4e2dc05b438cd601245efa97b01179e94b SHA512 c21ff9bd51d0e1fd39219d9a5f0d74b6015384a81eae569da6e15ad4641b9c57d117d4a7e8ba479507c84280feb6f13bb5633e69d6f92828b4adb6bce30effb0 WHIRLPOOL 957d5b4bee5b9c4ba1bc64c7649181420cfc7c32fa34f61773cdd3ba942d226096f2f02ce203ce3471c1cd3416ef50f61d48acd501389a564c04093a059ae361 +EBUILD tomcat-7.0.59.ebuild 4363 SHA256 6eca84f3a86190f0515d6eb671fe801de8b0f548f232146f806f33e2ec81d2f8 SHA512 c36436de2cd4efd2384951842adac467f32fefa64e547c3f3c328ba4e226c5fd8fef2631fb5b46db17c435612b1012ee6b1e4d24a60e86f64f78b881db28ff2b WHIRLPOOL f3a2b078c2cd9ab3e2051ad298f8e9e4fe4db09652098fea1d099e55bb76d71430390f117d72b45cf97d93f51b7d4dc23853202557f99e76e8120730e4b0833f EBUILD tomcat-8.0.22.ebuild 4195 SHA256 2432204f654fdaf8b06c756ee85368ce89673ff474d166b44a93cea76eecb78b SHA512 28a0c3589d5c59b6e95746f0a3cb35c6875345d8705ac49f9d7c18313a8bba7450e85a474f651bc7b848eda509bc0b74eba3a0a9c60478a78f5ae55ff9f0582c WHIRLPOOL 4c96d6071d8bcf4a25d9ddff4acec3af01d527219fe0a87492b5f84ab100930357dcead1a0a2eb4c66637a6e0021faec247d53bcd61330f8c5f6b650e67dd707 EBUILD tomcat-8.0.23.ebuild 4195 SHA256 a3d63d0ac2e032f06f87e8be7c6dd6205e25ff090d26e2a4545b13c15027678c SHA512 632113159f1bcf2ec364ce4d4d5774316fcfeaab1f52101ea1298e7aecf5551b62cb291488f594edb6b2b040b60eb3856f421cc3f45fac4cea88b94e5af141dd WHIRLPOOL 29aaa1db8b67f239c4b271a7d277b22179a6ca4dd3490c6af51ba8585a3e4c862236d6250c3a9244861755f47668b4caf96bd7423ee8b96b1c91e5e8532b2c95 -MISC ChangeLog 83862 SHA256 1e8ea89bda49d58f30832dab72e0c4817eea86bd7ec32bbd8f99be8343cc2d84 SHA512 3b342512b8d60c11c807a5a2e935792f83e3124c2605e049465502f8646131141f7d600611553a41bde16adc42fa92e2654435d9d02cfd84700f5aad0c4df4e2 WHIRLPOOL 8619ad009370e1cbea2dde9eecb066e128779755ac0869cc9f2638637e8c9b24b93bfe8e997808e45b06759b0a84357bbd83384f650dbd8a6e7dd5a3e99f373c +MISC ChangeLog 84004 SHA256 faaaeb250e2c6f870cadde8e5f4a6202ef96224f1f4f724438a3e0d9ddc995d5 SHA512 cae19e005a5a99b71f416315060077204fab408b8108dd0205372893e6ea54948482cf21830eeb6e13ee6c1e1c3638836e4a0f83db72e4a25c024014c5ec48e3 WHIRLPOOL 68e535efe3c5a52b0d11d0638ea9f8a986c8d75220ec6826b636928ceeaad6b1850e94356471f8c212cace49fe3278705cf7d079c237f102a7a8cd932a73c949 MISC metadata.xml 652 SHA256 ec9dcba0295a5c3eff6b20d7d8038e09c6438d2fc56e45b5cfc3c27206f4bfd8 SHA512 07bc791d1240d11cb34a117657187a9efe4ef4bcdfee76d99f9656caa6fde1c1ffb67b78fe5e552c2a44ddb7e595d4175ada50f0426f2b0d832f0162f6b0afac WHIRLPOOL e1cc5d3799a6b7f6249f5c1420248600b5fec9228dd803fd673b1a75e26900c6539222a1da07e83bb4560e17681ecdf9ff31fe5dcc4d0fb15a694e9402991d7e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJVcWUZAAoJELp701BxlEWfhaEP/0ys2bOqwefjVPvn7aEjti45 -CMTcBrcEkVu5S8VPcM23Uonn+Uj5/srxZu4Qn/lTC5FzZSN+FsoMnL5zmtSLUyB0 -blwzqWD16kMKcz0d973Q+QOLek8unv328f7x2QNNp/pxYRIWGROLsqn5kgSmGNVU -ImTa3+8o9JQB0mMPgIn7mH+0dPCwo1GgYbZMneJIruJtChlLHPRQWvu2uKRC7B/y -gB2JIIiQ8icdeZJz4DNxsw6ODPqOQw0HjM3jVK6/gqDzmmayOFah4KTWfOxxdi+i -nBdeD/0+A/qpCXt36AMJ/otS1+MPvsja/I2s6uVq+wlB7VsSC0wW47ai/SdAx4U8 -0uKlqO6jOc62UQZAW8lkpnbzRxBIhSybuzIFYlKXQ8R/q3o27A1g/xR1a0D2V8KV -Qd+8XUc5O+W+nSxN2h2++EYze3bynIN9aU5CMDxaiXWFKud/dOj0P0oPoOoeK4AX -P/33MVL6q8Y6sUEz3IVX3ag7Y3tT/FXvOjVvoqxMhIZVFmlumWXv5dP/NpSfyuIr -Ggrigl3o34hjcF4svtmS4oYcWjORma5sqk6AMIG6ZSYUYIUCo9aDE37FFPGXhvVY -dioYqBwZwfzJ5vQzhRBI3BxurlS6ppkaEmo6nwFRXVzNndzFgU5YaMYj75CaCeGC -niRkezOXuIeaDocMU15G -=kV9c +iQEcBAEBCAAGBQJVdhasAAoJEJGRpfGTSRu4qW8H/0n6LlNN1F9ZALMgcJlUe0sw +FBFbeq+5zCVFViRdDHK28Evbs5Av6rWxXGUpALVoy1X3XPkR4y8YzBQ3+YhICPbW +T9Lv+Tsqduzcdqidii9YLcfHJWoUs7ml7dr2melxBNIL59F7iweBmDgYLL3lT+R9 +lz7PvR9/2ISWsW66mZ2XPa/t7Mr3Ofn3SlSR2ZweoGxWv6EsLcos6itvO7OuGDBP +zP0cxee446qJZGAlrZ4/65TruepLCFSSSNKABpmPj4QTpNRWf5BPKdkmnl8IMToT +sSLWRahnhQPcGiN1Sf77vkBI2zw9p1CGeYdobUCTyR6G4oVjrgjInqdEBlGbMj0= +=0O2h -----END PGP SIGNATURE----- diff --git a/www-servers/tomcat/tomcat-7.0.59.ebuild b/www-servers/tomcat/tomcat-7.0.59.ebuild index 3f9c01b94996..ad1f61c0ea10 100644 --- a/www-servers/tomcat/tomcat-7.0.59.ebuild +++ b/www-servers/tomcat/tomcat-7.0.59.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.59.ebuild,v 1.3 2015/06/05 09:00:08 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.59.ebuild,v 1.4 2015/06/08 22:28:50 monsieurp Exp $ EAPI=5 @@ -16,7 +16,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="7" -KEYWORDS="amd64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="amd64 x86 ~ppc ~ppc64 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" IUSE="extra-webapps websockets" RESTRICT="test" # can we run them on a production system? @@ -29,11 +29,11 @@ COMMON_DEP=" ~dev-java/tomcat-servlet-api-${PV} extra-webapps? ( dev-java/jakarta-jstl:0 )" RDEPEND="${COMMON_DEP} - websockets? ( >=virtual/jre-1.7 ) + websockets? ( >=virtual/jre-1.6 ) !websockets? ( >=virtual/jre-1.6 ) !<dev-java/tomcat-native-1.1.24" DEPEND="${COMMON_DEP} - websockets? ( >=virtual/jdk-1.7 ) + websockets? ( >=virtual/jdk-1.6 ) !websockets? ( >=virtual/jdk-1.6 ) >=dev-java/ant-core-1.8.1:0 test? ( |