diff options
Diffstat (limited to 'www-apache')
-rw-r--r-- | www-apache/Manifest.gz | bin | 6258 -> 6258 bytes | |||
-rw-r--r-- | www-apache/libapreq2/Manifest | 2 | ||||
-rw-r--r-- | www-apache/libapreq2/libapreq2-2.15-r1.ebuild | 76 | ||||
-rw-r--r-- | www-apache/mod_wsgi/Manifest | 5 | ||||
-rw-r--r-- | www-apache/mod_wsgi/metadata.xml | 5 | ||||
-rw-r--r-- | www-apache/mod_wsgi/mod_wsgi-4.7.1.ebuild | 51 | ||||
-rw-r--r-- | www-apache/mod_wsgi/mod_wsgi-4.9.0.ebuild | 2 | ||||
-rw-r--r-- | www-apache/passenger/Manifest | 8 | ||||
-rw-r--r-- | www-apache/passenger/passenger-6.0.11.ebuild | 4 | ||||
-rw-r--r-- | www-apache/passenger/passenger-6.0.12.ebuild | 126 | ||||
-rw-r--r-- | www-apache/passenger/passenger-6.0.13.ebuild | 3 | ||||
-rw-r--r-- | www-apache/passenger/passenger-6.0.8.ebuild | 130 |
12 files changed, 10 insertions, 402 deletions
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz Binary files differindex b1afbb10cd7e..b8f60ca06940 100644 --- a/www-apache/Manifest.gz +++ b/www-apache/Manifest.gz diff --git a/www-apache/libapreq2/Manifest b/www-apache/libapreq2/Manifest index d74dc71bc789..9fd7fc27a0aa 100644 --- a/www-apache/libapreq2/Manifest +++ b/www-apache/libapreq2/Manifest @@ -1,7 +1,5 @@ AUX 76_mod_apreq.conf 316 BLAKE2B 368a404fae7bf917eb61090c90b19d090d607f54ffb717f1fa7154af6db0c1b71f6022e4ee38b1588c56b6777adb5eee4402377a33c4d78601bb19d0074a8de3 SHA512 2a4d7c8415162d27ae182f091b8a2219c2865ff7ace0a5b8944e853cd256955888482877ab7cce55342a3d30686f9d7932bbbfdcc8c037e15c92e60de9eab20b AUX libapreq2-2.08-doc.patch 1188 BLAKE2B 296bf0b1e23389c0d418df23768e68932c22f0b4f51f1b7e3e4e2d0f4d96dde2a687c9c2e5885fbdba2b936efd5947d13c3aacc7ba69d40ce5a956593fce4ca4 SHA512 dc889d7890d9059efdb3fcd4d6b1e485929b69c073ff6266b90f82e89efe5bdd633fd4dc09ccd4aac3f8816271c00dca69b39ffe4706baf7d3094404784cd766 -DIST libapreq2-2.15.tar.gz 839618 BLAKE2B 875aa8091512cf6b43c8654579b3d4779ea50835784380dcf69ca048f9b8d4ef6e573fef5ee03c0e47a929dcd8c4643d5dc861d875122095024bca6e8fbbf38c SHA512 abdc34f4867ba891966e7296c8110cffaa723f9b966522a1de352bc459e89e5cfc60de25dcd20cf0fa9b7cdf9282719b0276b621af8aa7bb770c89a7fbae4701 DIST libapreq2-2.16.tar.gz 839264 BLAKE2B 6a79e0281bb24962775f6c2fcc906d07a2f7643f608871018a647a225329c45516f1afe12e27c432449765463b2a4e823a728051fa73938e97ddc828b94c4732 SHA512 aa9e751a3f0d6a9cb587aa1c5408e8d9a073560860d7f653776196fe3739516df16abe943c9cb0460cfb9b68a2d79ad651cfd5e4a30a2ca34d6dc3ced73f628c -EBUILD libapreq2-2.15-r1.ebuild 1618 BLAKE2B 3effb3175ab39c4f7d8a6fd07445551feb9fa8f9dafcfbcdbe5dd4c6c6d367961bb9a75e4d4457a678de4bcee14f5e3cd000fefde85b7a9adf31889fae79585a SHA512 cb87ee9200bba15780063feeda555728163d424289ecafefe8515c8e150ae10491326a99ad64e45846fc9e192c71df21e3decb234f1765dc593b2bd8cf4904f1 EBUILD libapreq2-2.16.ebuild 1678 BLAKE2B 038bc31535beeef479f03cd94bf8531bf06333e37966f92f32dca62d832448f64ee85c57f18e483d67611dac0e259fb83a82c70d9072af6a596c81a6952a07e8 SHA512 36b759b3a184538dbcefb2f3a06b53b9800ded7aaa35bd657ed58e9e14dae542b005c84df6ae68efab2557e392c0c8eddea462652ebbc1bd4f932c3d3a2f90af MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/www-apache/libapreq2/libapreq2-2.15-r1.ebuild b/www-apache/libapreq2/libapreq2-2.15-r1.ebuild deleted file mode 100644 index 35a9342e6d45..000000000000 --- a/www-apache/libapreq2/libapreq2-2.15-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit apache-module perl-module - -DESCRIPTION="A library for manipulating client request data via the Apache API" -SRC_URI="mirror://apache/httpd/libapreq/${P}.tar.gz" -HOMEPAGE="https://httpd.apache.org/apreq/" - -LICENSE="Apache-2.0" -SLOT="2" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="perl test" -RESTRICT="!test? ( test )" - -RDEPEND=" - || ( - dev-libs/apr-util[openssl] - dev-libs/apr-util[nss] - ) - perl? ( - >=dev-perl/ExtUtils-XSBuilder-0.23 - virtual/perl-version - >=www-apache/mod_perl-2 - ) -" -DEPEND="${RDEPEND} - test? ( dev-perl/Apache-Test ) -" - -PATCHES=( - "${FILESDIR}"/libapreq2-2.08-doc.patch -) - -APACHE2_MOD_FILE="module/apache2/.libs/mod_apreq2.so" -APACHE2_MOD_CONF="76_mod_apreq" -APACHE2_MOD_DEFINE="APREQ" -DOCFILES="docs/html/*.html CHANGES README INSTALL MANIFEST" - -need_apache2 - -pkg_setup() { - perl_set_version -} - -src_prepare() { - default - - sed -i -e "s/PERL \$PERL_OPTS/PERL/" "${S}"/acinclude.m4 || die - sed -i -e "s/PERL \$PERL_OPTS/PERL/" "${S}"/aclocal.m4 || die - sed -i -e "s/PERL \$PERL_OPTS/PERL/" "${S}"/configure || die -} - -src_configure() { - econf \ - --with-apache2-apxs=${APXS} \ - $(use_enable perl perl-glue) -} - -src_install() { - APACHE_MODULESDIR="/usr/$(get_libdir)/apache2/modules" - apache-module_src_install - - make DESTDIR="${D}" INSTALLDIRS=vendor install || die "make install failed" - doman docs/man/man3/*.3 - - perl_delete_localpod - - for i in $(find "${D}" -type f -not -name '*.so'); do - if file ${i} | grep -i " text"; then - sed -i -e "s:${D}:/:g" ${i} || die - fi - done -} diff --git a/www-apache/mod_wsgi/Manifest b/www-apache/mod_wsgi/Manifest index 7115373275b1..7e6c6666844d 100644 --- a/www-apache/mod_wsgi/Manifest +++ b/www-apache/mod_wsgi/Manifest @@ -3,6 +3,5 @@ AUX mod_wsgi-4.7.1-py310.patch 4484 BLAKE2B c58f1dff4ad997e18aa46f96d4dae6a11891 DIST mod_wsgi-4.7.1.tar.gz 696111 BLAKE2B 69fea421077f1ecbf1cef5c9eac4ba296fa676e0bfbb860ca8a7cb701701f405edb3760486b87e8d9dd93efcb4c23385197d770ca32e16a473d5d252d292fb76 SHA512 cbb5ec53d55e47a83f2b0630527c6a52b48ef21d5d2c18adcb875fc455795b39b3c93f4a86dfbf9738c0bd554d86cc4912cc9ff83c428af302ab94a61f66b5b4 DIST mod_wsgi-4.9.0.tar.gz 699891 BLAKE2B 7ee6ffc28e86baf8ee92973479a26964f7c183c2b113b49a48af02c622f8d8f698abffcd4f522a1ecca5b89325f94856cbe89db5a81d2ac2e87438ee90be97b0 SHA512 9dc34d431171321094a9713444895d9754eff4e69ad1e86c8d3cd77bc1ca0a4c10b697e7f8cf14902d6bfaf205c8842e62fa944bb38f66f1c54fd36af95a09d6 EBUILD mod_wsgi-4.7.1-r1.ebuild 1275 BLAKE2B d9a5dbad4c0a788bf12df888bb42d9ce4598bc80bcaa317e11ef8ef444e7a0564bd7139df91957a1dc7dc3dec858b24c2f24e1aa6717aee7cacaaf7b219a20e9 SHA512 6e4e8254bfa149cc95045624c5635456a5253ba6d0fa4168a10c8b49ad163ecc6c6bea107821a99079a74580a0f5d677561ec6d9d25e7b51f10c60497d40a375 -EBUILD mod_wsgi-4.7.1.ebuild 1228 BLAKE2B dc5ab6545e2acfe51ee4f77dd6335f3b7ed56170f64a6fc043f57faa7b0d7d00a04d227611565da142e0a2e9bc4bfa5b315c0f54c1c9e519e0fa552030c2f98a SHA512 aaf4516e8304d1312b1ce3977281c86f866baaf9d7b1de3da3dd5b471f59e547b0b002aa966cb72dfbefd22efa26124e15ec4a377b64aa5a2f49196aeb58e1c3 -EBUILD mod_wsgi-4.9.0.ebuild 1111 BLAKE2B 69c4c4584a991bdc542eaa795c1669a29f35755e197d9aaf50705223dd937f78ca9428a1430d92b5e50b2edbbaf32c62284c517fa28a3ad62266afd350a577e2 SHA512 fd135f4833b251a74c8f3e69c0622238f95f07eb83f8921b1032e3a6faefe0dc5b065e014bb8a2fc222026699bbcc6fae203f73d6c0c98d6d22708d1fefe416d -MISC metadata.xml 381 BLAKE2B 604d6931a9a17c2521e907f719286c798028c6c51788ece43f81a09744eb545f9cc5b530177fbc7580df88855cdfe72d9204e3eeec660daaca7b72d9387fd650 SHA512 b8e16b976555de98f41b1ecee63c1cb2b1c518ae7b70d517024a7f1b03c2b1f89b54cc2f978792bdf79768cdd8d89abc11ee668db2d78786b1455afcf097a085 +EBUILD mod_wsgi-4.9.0.ebuild 1108 BLAKE2B 676a71a8cf5ce47688af631f0107a0a969577800fe01a14f2a48f3c5539544e989c7e19f377394965f41774488b02f52ef611427984977fe8195b5cda56bbb57 SHA512 5dcbe0c3c3b345e17008b41c92ec27a5d2c4c235746e5b5528253abeef2932e73e0d5cdebe92ebda52d49c57e8652a0f832081290dab80ab2bc286e471e328b7 +MISC metadata.xml 303 BLAKE2B 3b6303fa847f0f5b287faece9a7f0ce422531e0a0a130035cb5a032049daccba08c5460fc58af8a68d2eede0b8f5e76502e9c64109f33f219757ace3b2e82b98 SHA512 d24e5bcec7363bc5bb7f3c5798aa6978aefaee6990f5917ff133362fdcc32927a7b68a939b90cf38ebddbcf04c5b6310a1654a92d0a5eece5ba27245b8df0550 diff --git a/www-apache/mod_wsgi/metadata.xml b/www-apache/mod_wsgi/metadata.xml index 2290805ab6f5..f979b3fa5e10 100644 --- a/www-apache/mod_wsgi/metadata.xml +++ b/www-apache/mod_wsgi/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>djc@gentoo.org</email> - <name>Dirkjan Ochtman</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="pypi">mod_wsgi</remote-id> <remote-id type="github">GrahamDumpleton/mod_wsgi</remote-id> diff --git a/www-apache/mod_wsgi/mod_wsgi-4.7.1.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.7.1.ebuild deleted file mode 100644 index 7621b99b57d4..000000000000 --- a/www-apache/mod_wsgi/mod_wsgi-4.7.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{7,8} ) -PYTHON_REQ_USE="threads(+)" - -inherit apache-module python-single-r1 - -DESCRIPTION="An Apache2 module for running Python WSGI applications" -HOMEPAGE="https://github.com/GrahamDumpleton/mod_wsgi" -SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="" -RDEPEND="${PYTHON_DEPS}" - -APACHE2_MOD_CONF="70_${PN}" -APACHE2_MOD_DEFINE="WSGI" -APACHE2_MOD_FILE="${S}/src/server/.libs/${PN}.so" - -DOCFILES="README.rst" - -need_apache2 - -pkg_setup() { - python-single-r1_pkg_setup - - # Calling depend.apache_pkg_setup fails because we do not have - # "apache2" in IUSE but the function expects this in order to call - # _init_apache2_late which sets the APACHE_MODULESDIR variable. - _init_apache2 - _init_apache2_late -} - -src_configure() { - # configure.ac contains bashisms - # (https://github.com/GrahamDumpleton/mod_wsgi/issues/567) - CONFIG_SHELL="/bin/bash" \ - econf --with-apxs="${APXS}" --with-python="${PYTHON}" -} - -src_compile() { - default -} diff --git a/www-apache/mod_wsgi/mod_wsgi-4.9.0.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.9.0.ebuild index 09d2547237d1..79712946763f 100644 --- a/www-apache/mod_wsgi/mod_wsgi-4.9.0.ebuild +++ b/www-apache/mod_wsgi/mod_wsgi-4.9.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.t LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest index e6d4791b9598..da0508398fa6 100644 --- a/www-apache/passenger/Manifest +++ b/www-apache/passenger/Manifest @@ -2,11 +2,7 @@ AUX 30_mod_passenger-5.0.0.conf 2737 BLAKE2B 781ffa4831313356b6caa493fc94a784f6b AUX passenger-5.1.1-isnan.patch 1155 BLAKE2B bb11276f94f4be93a7ef089e09079d36971ca028df4f8962e4220880361b96c3640475ac537f62d5e7ad198fdfb477fe15f34dbd86db4143b24246d11278eb58 SHA512 a80a9a229f1eeb34780236d0b2418fe5d2f57b9ae8c3c4ccdec729806f4afad8979de4ab3ea0834cdb76218192825ee4bfaf02b48f3bda240c2db441bcc870d9 AUX passenger-5.1.11-gentoo.patch 1068 BLAKE2B 635bc4c4a2313dc00a038cb9c871b5b2f0163f320d4f4d1bbd9d34ec34ec81f2fd2e7d9ea6f3d03c4a611f13095c4ad414ba7c0920064f8408837a2600d2d2e9 SHA512 c75442ac0403131e5fdbe76ec52acdcffcb6947af81ce79e003ebbb9e97d25a855651bd62c0aad66dd22d8cd4dff2221fc84b0ce74da3908f06f272c8b133c2d DIST passenger-6.0.11.tar.gz 8183414 BLAKE2B 9767c3f198d7a779dfefed1d1a2ab07e3dda964a61718475470266e3b4448a45d2c5e7416a2e148afa66241f74e91e98ccbec7f2a08f5d4d1e2eff2ac7de5f63 SHA512 977d8adb261c17d5f21115703b9b18c4d3bfc17f998fb880d3a28f68392db2f9e6a2cb7612211f08bc913fd2f417cb2b689fcab2317707e17e8ddea6aeb967d2 -DIST passenger-6.0.12.tar.gz 8234023 BLAKE2B fd045160b8ce457ca4e136431b6caaa2e97628b73be77883f6aaae4d5352f7d4ea1827dd1c3cac4c35140bb85789533d53bf8331eadd22abca88b0c07e85e4c2 SHA512 eee627e2ca8ac6f0bdab33e3670dc27933f29b021a232026ae6b30cec6134e8f58a92bf8223001820eb08817f475956a19069177901110ec8d67c1e87004e25b DIST passenger-6.0.13.tar.gz 8216169 BLAKE2B 592b65ccfd7a043a6fcc1ea8061da3acaafd773caa2b5270e39906ee7f07cf3fb45654c5864eef53687d10c3079003a7ba8d3e8dfba50616b43516e1d457ce11 SHA512 25867f7bb7b7b09def800969884f5c3a2a5cf9dbb20817e02121a471e2eb6fb1e93d8ca3a4b103c5d17d6a61e33bf8edc29f54d496118b88c25147de85629d88 -DIST passenger-6.0.8.tar.gz 7567855 BLAKE2B ea8577c07a57eaea4e3b2b236808c9e54badb35368e948132af04220026b2676a71d066625a64cd98ce35118ae613bcbca8a0a1f8e0bc2a8d321c1165dec72f5 SHA512 ad35bee4a1c855b8f5401ab44e2a9b0cf3281e7fb1d8e09c8b12c54a465545d43285301c7d0fe16914e3c0fd5407d0d5cef31bb296f850d787903e6e006b368f -EBUILD passenger-6.0.11.ebuild 3925 BLAKE2B 2ef01f9223eccda33aaaa61e832256f20d51a933b7b8589105c96c8dee46b526b9ea7e6a663fd22f7d8bf1e2192cf6ee805b2058f751354781e3a8a5513acb8b SHA512 6ad1e68393a428707016c36d176dca7d0cb959cba53a9038f99edcda36b7f1a4f17228b60f6e975e761bfc1a030569b822e2232c4ecb3c9e8051f4c32275838d -EBUILD passenger-6.0.12.ebuild 3927 BLAKE2B d90e5ed563016960f6d234ef95be2b02b435c8d584de8b6cfdd4abd1b2cc85f8113ab9c6c4f18249126b110c3d1d4f4d07ed5897868bce245225f73975edfdaf SHA512 e915cd09d488a3f52f23503d1754c5ef9a0811847a892125da2120bf06136526bfa50aa004b584b0523b667e8a101eea2dc4931f748ea349bf7f81f304eb6a1e -EBUILD passenger-6.0.13.ebuild 3918 BLAKE2B 69d7854becc0d7a1baae8399669f43afc9aeacae7b01d9830ceb055cc869ec57f4113a521d02fcd0c503e3c82ff4fe2bbd9f992462f85a4786d2ac74317e49a4 SHA512 10cb3e52e007eef7c20823b0800e8d6184cbb2282faf646c72a8ba647b51ab0d6f8a0ed7f73529f6b7129ad7107358ee0cd0052202e454860c2d888f0dd4cffa -EBUILD passenger-6.0.8.ebuild 4076 BLAKE2B c715fd27326957b5398514c2288562ab600628cf00d37c7bd8309859587ae3d7a5da6f3d9e5ba339bd0c44c2ec67afeefa080399591eb4ae4616599bb70c8665 SHA512 ab6c553a6a1850915e70228e31f48867fe6e825089a350a7cfa30eab7bf04db3258e9848ff62012a925dc714e8fe0b2612deef577e50d0315b357a2aa9a96fc6 +EBUILD passenger-6.0.11.ebuild 3937 BLAKE2B 38225fdc2ed6b7508017871093c41b1078b4a67b14b0b3c7e8fc8badb39157fe0d9a85cbfb91335178645d29c6e7ce0a49cbe1ec3f91deb713df8e65327b51f6 SHA512 bbbfd0ce8483d603d3539351c06f311efa42652fdb4462503c8136c74c9a7de273feec4bde5430c141d4fd150380c53738999729eea994cec2ee595e8667a3d7 +EBUILD passenger-6.0.13.ebuild 4021 BLAKE2B e08908037a90ceba1cad877b4a77fad19ab7c5b970a64b20ab2d6ec736bcf8b2ef86eaf08c500241f168644be36028e27c1544d04d9c83b7e150f66040d135a4 SHA512 d28e2ffb9c2cd0ad53647b4c1f28c7016255dfafe8bf61395a1161e7dbe7f96b5a1b08cb0335f97b345e7cbec7396235a86ac72a6e7ccbb4b874b42f43d32a5b MISC metadata.xml 331 BLAKE2B 5cc7b65a8ac511e9065cdb9fc6f4a04923029f718f02ba0da718c798e0bb3a554a8da7f05e639daa88c2fec34888e6e1316ccab4a44a0d99b616354006e7c762 SHA512 95f21209228559e1b775f8b44c49e1d311a6c2955ba26fb24fb72bf64afd42048d9d0186828be8b733963b4aec245f5abc4540c1ca8baa14ee59b2fba0c33086 diff --git a/www-apache/passenger/passenger-6.0.11.ebuild b/www-apache/passenger/passenger-6.0.11.ebuild index 7e7f44448921..b28f752d8329 100644 --- a/www-apache/passenger/passenger-6.0.11.ebuild +++ b/www-apache/passenger/passenger-6.0.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze" HOMEPAGE="https://www.phusionpassenger.com/" SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="Boost-1.0 MIT BSD" SLOT="0" KEYWORDS="amd64 ~ppc ~ppc64 x86" IUSE="apache2 debug" diff --git a/www-apache/passenger/passenger-6.0.12.ebuild b/www-apache/passenger/passenger-6.0.12.ebuild deleted file mode 100644 index ace4e92b8d8c..000000000000 --- a/www-apache/passenger/passenger-6.0.12.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -USE_RUBY="ruby26 ruby27 ruby30" - -inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs - -DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze" -HOMEPAGE="https://www.phusionpassenger.com/" -SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="apache2 debug" - -ruby_add_bdepend "dev-ruby/rake" - -ruby_add_rdepend " - >=dev-ruby/rack-1.0.0:* - >=dev-ruby/rake-0.8.1" - -# libev is bundled but with adapations that do not seem to be accepted -# upstream, so we must use the bundled version :-( -CDEPEND=" - >=dev-libs/libuv-1.8.0 - net-misc/curl[ssl] - apache2? ( www-servers/apache[apache2_modules_unixd(+)] )" - -RDEPEND="${RDEPEND} ${CDEPEND}" -DEPEND="${DEPEND} ${CDEPEND}" - -APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}" -APACHE2_MOD_DEFINE="PASSENGER" - -want_apache2 - -pkg_setup() { - use debug && append-flags -DPASSENGER_DEBUG - depend.apache_pkg_setup -} - -all_ruby_prepare() { - eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch - - # Change these with sed instead of a patch so that we can easily use - # the toolchain-funcs methods. - sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \ - -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \ - -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die - - # Avoid fixed debugging CFLAGs. - sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die - - # Use sed here so that we can dynamically set the documentation directory. - sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \ - -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \ - src/ruby_supportlib/phusion_passenger.rb || die - sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die - - # Don't install a tool that won't work in our setup. - sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die - rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script." - - # Make sure we use the system-provided version where possible - rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code." - - # Fix hard-coded use of AR - sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die - - # Make sure apache support is not attempted with -apache2 - if ! use apache2 ; then - sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die - fi -} - -all_ruby_compile() { - if use apache2 ; then - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - FS_LIBDIR='/usr/'$(get_libdir) \ - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ - RANLIB=$(tc-getRANLIB) \ - ruby -S rake apache2 || die "rake failed" - fi -} - -each_ruby_compile() { - append-flags -fno-strict-aliasing - - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - FS_LIBDIR='/usr/'$(get_libdir) \ - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ - RANLIB=$(tc-getRANLIB) \ - ${RUBY} -S rake native_support || die "rake failed" -} - -all_ruby_install() { - if use apache2 ; then - APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so" - apache-module_src_install - - # Patch in the correct libdir - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die - fi - - dodoc CHANGELOG README.md doc/*.md -} - -each_ruby_install() { - DISTDIR="${D}" \ - RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \ - RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - FS_DOCDIR="/usr/share/doc/${P}" \ - FS_LIBDIR='/usr/'$(get_libdir) \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ - RANLIB=$(tc-getRANLIB) \ - ${RUBY} -S rake fakeroot || die "rake failed" -} diff --git a/www-apache/passenger/passenger-6.0.13.ebuild b/www-apache/passenger/passenger-6.0.13.ebuild index aca5b882f5ed..eeae56538f93 100644 --- a/www-apache/passenger/passenger-6.0.13.ebuild +++ b/www-apache/passenger/passenger-6.0.13.ebuild @@ -10,7 +10,8 @@ DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze" HOMEPAGE="https://www.phusionpassenger.com/" SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz" -LICENSE="GPL-2" +# Passenger is licensed MIT, but vendored code licenses should also be taken into account. +LICENSE="Boost-1.0 MIT BSD" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="apache2 debug" diff --git a/www-apache/passenger/passenger-6.0.8.ebuild b/www-apache/passenger/passenger-6.0.8.ebuild deleted file mode 100644 index 4d290110e58a..000000000000 --- a/www-apache/passenger/passenger-6.0.8.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -USE_RUBY="ruby25 ruby26 ruby27 ruby30" - -inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs - -DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze" -HOMEPAGE="https://www.phusionpassenger.com/" -SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="apache2 debug" - -ruby_add_bdepend "dev-ruby/rake" - -ruby_add_rdepend " - >=dev-ruby/rack-1.0.0:* - >=dev-ruby/rake-0.8.1" - -# libev is bundled but with adapations that do not seem to be accepted -# upstream, so we must use the bundled version :-( -CDEPEND=" - >=dev-libs/libuv-1.8.0 - net-misc/curl[ssl] - apache2? ( www-servers/apache[apache2_modules_unixd(+)] )" - -RDEPEND="${RDEPEND} ${CDEPEND}" -DEPEND="${DEPEND} ${CDEPEND}" - -APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}" -APACHE2_MOD_DEFINE="PASSENGER" - -want_apache2 - -pkg_setup() { - use debug && append-flags -DPASSENGER_DEBUG - depend.apache_pkg_setup -} - -all_ruby_prepare() { - eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch - eapply "${FILESDIR}"/${PN}-5.1.1-isnan.patch - - # Change these with sed instead of a patch so that we can easily use - # the toolchain-funcs methods. - sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \ - -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \ - -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die - - # Avoid fixed debugging CFLAGs. - sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die - - # Use sed here so that we can dynamically set the documentation directory. - sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \ - -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \ - src/ruby_supportlib/phusion_passenger.rb || die - sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die - - # Don't install a tool that won't work in our setup. - sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die - rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script." - - # Make sure we use the system-provided version where possible - rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code." - - # Avoid building documentation to avoid a dependency on mizuho. - #sed -i -e 's/, :doc//' build/packaging.rb || die - touch doc/*.html || die - - # Fix hard-coded use of AR - sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die - - # Make sure apache support is not attempted with -apache2 - if ! use apache2 ; then - sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die - fi -} - -all_ruby_compile() { - if use apache2 ; then - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - FS_LIBDIR='/usr/'$(get_libdir) \ - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ - RANLIB=$(tc-getRANLIB) \ - ruby -S rake apache2 || die "rake failed" - fi -} - -each_ruby_compile() { - append-flags -fno-strict-aliasing - - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - FS_LIBDIR='/usr/'$(get_libdir) \ - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ - RANLIB=$(tc-getRANLIB) \ - ${RUBY} -S rake native_support || die "rake failed" -} - -all_ruby_install() { - if use apache2 ; then - APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so" - apache-module_src_install - - # Patch in the correct libdir - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die - fi - - dodoc CHANGELOG README.md -} - -each_ruby_install() { - DISTDIR="${D}" \ - RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \ - RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - FS_LIBDIR='/usr/'$(get_libdir) \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ - RANLIB=$(tc-getRANLIB) \ - ${RUBY} -S rake fakeroot || die "rake failed" -} |