Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apache/mod_caucho/
Date: Sat, 20 Feb 2016 14:29:14
Message-Id: 1455978540.72e05a0caa5d4fd43e67d0ac2dcd33f21aa5ba9e.chewi@gentoo
1 commit: 72e05a0caa5d4fd43e67d0ac2dcd33f21aa5ba9e
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 20 14:28:12 2016 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 20 14:29:00 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72e05a0c
7
8 www-apache/mod_caucho: Remove old
9
10 This drops the only stable version but there are no revdeps and we
11 need to clear this for the removal of Java 6. I recommend not marking
12 it stable again until someone has done more than just build it. I
13 don't use Resin or Apache and I'm not entirely confident that it would
14 work.
15
16 Package-Manager: portage-2.2.27
17
18 www-apache/mod_caucho/Manifest | 2 -
19 www-apache/mod_caucho/mod_caucho-4.0.26-r1.ebuild | 53 -----------------------
20 www-apache/mod_caucho/mod_caucho-4.0.26.ebuild | 48 --------------------
21 3 files changed, 103 deletions(-)
22
23 diff --git a/www-apache/mod_caucho/Manifest b/www-apache/mod_caucho/Manifest
24 index ec19af8..7211ad8 100644
25 --- a/www-apache/mod_caucho/Manifest
26 +++ b/www-apache/mod_caucho/Manifest
27 @@ -1,3 +1 @@
28 -DIST resin-4.0.26-src.zip 17879008 SHA256 0f7bbea8bd4803d499e1d212a49ac8672500ede80194c4daa12c980ad405e34e SHA512 aae0304664c67667b9abf304ccc3dbaf073be42fcd1dd6aa380d841a34a2a44f0187fa91abe6bf92bf66f394b4b2d4eda7c4c9a55b5cb8a76436446cca3d5512 WHIRLPOOL a536b28cad14219ce5c8aaa791a859d21539176b6f729072483e6278fa9b45de2bb367d6696225c1bafe0148c86c3bb0e46ec81595222160aa742ffdf9d5674c
29 DIST resin-4.0.47-src.tar.gz 33022378 SHA256 b97ce450a1059336a4cdf05a16d072128009f7172d028a3b1c2f4eefba4d353a SHA512 c070277c970144a990c45afc86b0626d424618c0ec8122cd7e0e60745339a7f79f5d47483b5a33c24f7fb192e72a2d49823155718b8565a2c273333119279703 WHIRLPOOL 3e703a7c68c0c6cc930277e918656d11a1ff65e5f8bbfccb9dac7ea41b22a7f65b2d28efae8fdbaa181402d0416d87db56f9c974f76f2d5d075db92df8a32f0c
30 -DIST resin-gentoo-patches-4.0.26.tar.bz2 3826 SHA256 adff1fb68e38af68add2e16e3832406a105e14532ee022ad315a955d6d6f4f31 SHA512 fc23c6b82f55b76c063276169e8b6be40ab697dfa07ab8f8f560db33b9c48993526f07190b137406f952e0d1a548cc45f30b6a9ceb4983e2a9eed5de8f4ab5d3 WHIRLPOOL cf7403adcdd0b98fcab2ace7733af7e9fa57361f9e2b2fb128ee8c3a9d787c5e8437f6749889cea1aacbf1ec9b9725647e6737fe4e3d1a98d69d1965c129c2d2
31
32 diff --git a/www-apache/mod_caucho/mod_caucho-4.0.26-r1.ebuild b/www-apache/mod_caucho/mod_caucho-4.0.26-r1.ebuild
33 deleted file mode 100644
34 index 7549272..0000000
35 --- a/www-apache/mod_caucho/mod_caucho-4.0.26-r1.ebuild
36 +++ /dev/null
37 @@ -1,53 +0,0 @@
38 -# Copyright 1999-2016 Gentoo Foundation
39 -# Distributed under the terms of the GNU General Public License v2
40 -# $Id$
41 -
42 -EAPI=5
43 -inherit eutils apache-module autotools
44 -
45 -DESCRIPTION="mod_caucho connects Resin and Apache2"
46 -HOMEPAGE="http://www.caucho.com/"
47 -SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip
48 - mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
49 -
50 -LICENSE="GPL-2"
51 -SLOT="0"
52 -KEYWORDS="~amd64 ~ppc64 ~x86"
53 -IUSE=""
54 -
55 -DEPEND="app-arch/unzip
56 - ~virtual/jre-1.6.0"
57 -RDEPEND="~virtual/jre-1.6.0"
58 -
59 -S="${WORKDIR}/resin-${PV}"
60 -
61 -# See apache-module.eclass for more information.
62 -APACHE2_MOD_CONF="88_${PN}"
63 -APACHE2_MOD_DEFINE="CAUCHO"
64 -APACHE2_MOD_FILE="${S}/modules/c/src/apache2/.libs/${PN}.so"
65 -
66 -need_apache2_4
67 -
68 -src_prepare() {
69 - # Apache 2.4
70 - sed -i \
71 - -e 's/remote_ip/client_ip/g' \
72 - -e 's/remote_addr/client_addr/g' \
73 - modules/c/src/apache2/mod_caucho.c || die
74 -
75 - for i in "${WORKDIR}"/${PV}/mod_caucho-*; do
76 - epatch "${i}"
77 - done
78 -
79 - mkdir m4
80 - eautoreconf
81 - chmod 755 ./configure
82 -}
83 -
84 -src_configure() {
85 - econf --with-apxs=${APXS} --with-java-home=/usr
86 -}
87 -
88 -src_compile() {
89 - emake -C "${S}/modules/c/src/apache2/"
90 -}
91
92 diff --git a/www-apache/mod_caucho/mod_caucho-4.0.26.ebuild b/www-apache/mod_caucho/mod_caucho-4.0.26.ebuild
93 deleted file mode 100644
94 index aa80f16..0000000
95 --- a/www-apache/mod_caucho/mod_caucho-4.0.26.ebuild
96 +++ /dev/null
97 @@ -1,48 +0,0 @@
98 -# Copyright 1999-2016 Gentoo Foundation
99 -# Distributed under the terms of the GNU General Public License v2
100 -# $Id$
101 -
102 -EAPI="2"
103 -
104 -inherit eutils apache-module autotools
105 -
106 -DESCRIPTION="mod_caucho connects Resin and Apache2"
107 -HOMEPAGE="http://www.caucho.com/"
108 -SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip
109 - mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
110 -
111 -LICENSE="GPL-2"
112 -SLOT="0"
113 -KEYWORDS="amd64 ~ppc64 x86"
114 -IUSE=""
115 -
116 -DEPEND="app-arch/unzip
117 - ~virtual/jre-1.6.0"
118 -RDEPEND="~virtual/jre-1.6.0"
119 -
120 -S="${WORKDIR}/resin-${PV}"
121 -
122 -# See apache-module.eclass for more information.
123 -APACHE2_MOD_CONF="88_${PN}"
124 -APACHE2_MOD_DEFINE="CAUCHO"
125 -APACHE2_MOD_FILE="${S}/modules/c/src/apache2/.libs/${PN}.so"
126 -
127 -need_apache2_2
128 -
129 -src_prepare() {
130 - for i in "${WORKDIR}"/${PV}/mod_caucho-*; do
131 - epatch "${i}"
132 - done
133 -
134 - mkdir m4
135 - eautoreconf
136 - chmod 755 ./configure
137 -}
138 -
139 -src_configure() {
140 - econf --with-apxs=${APXS} --with-java-home=/usr || die "econf failed"
141 -}
142 -
143 -src_compile() {
144 - emake -C "${S}/modules/c/src/apache2/" || die "emake failed"
145 -}