diff options
author | Alexys Jacob <ultrabug@gentoo.org> | 2020-05-11 18:51:05 +0200 |
---|---|---|
committer | Alexys Jacob <ultrabug@gentoo.org> | 2020-05-11 18:51:43 +0200 |
commit | bc7526794a5c9d0d3dc039a34a7153ba62c44ffc (patch) | |
tree | 03be5657ba542831d07809e99c8f752f7ad9b2db | |
parent | net-misc/ntp: x86 stable wrt bug #717798 (diff) | |
download | gentoo-bc7526794a5c9d0d3dc039a34a7153ba62c44ffc.tar.gz gentoo-bc7526794a5c9d0d3dc039a34a7153ba62c44ffc.tar.bz2 gentoo-bc7526794a5c9d0d3dc039a34a7153ba62c44ffc.zip |
www-servers/uwsgi: ebuilds cleanup fix #721528 #710582
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
-rw-r--r-- | www-servers/uwsgi/metadata.xml | 1 | ||||
-rw-r--r-- | www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild | 28 | ||||
-rw-r--r-- | www-servers/uwsgi/uwsgi-2.0.17.1.ebuild | 408 | ||||
-rw-r--r-- | www-servers/uwsgi/uwsgi-2.0.17.ebuild | 28 | ||||
-rw-r--r-- | www-servers/uwsgi/uwsgi-2.0.18.ebuild | 28 |
5 files changed, 9 insertions, 484 deletions
diff --git a/www-servers/uwsgi/metadata.xml b/www-servers/uwsgi/metadata.xml index d7c339a2f35c..8981ee1518d8 100644 --- a/www-servers/uwsgi/metadata.xml +++ b/www-servers/uwsgi/metadata.xml @@ -8,7 +8,6 @@ <flag name="embedded">Embed plugins instead of building them as real plugins. When disabling this USE flag make sure you specify all used plugins in your uWSGI configuration. Note: Language plugins will always be built as real plugins.</flag> <flag name="go">Build the gccgo plugin to run Go applications.</flag> <flag name="json">Support json as a configuration file format.</flag> - <flag name="pypy">Build the pypy plugin to run your code using <pkg>dev-python/pypy</pkg>.</flag> <flag name="python_asyncio">Use the EXPERIMENTAL asyncio (tulip) for python3.4 async request dispatching and as LoopEngine (see http://uwsgi-docs.readthedocs.org/en/latest/asyncio.html).</flag> <flag name="python_gevent">Use <pkg>dev-python/gevent</pkg> for async request dispatching and as LoopEngine (see http://projects.unbit.it/uwsgi/wiki/Gevent).</flag> <flag name="routing">Enable routing support</flag> diff --git a/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild index 92346204f3c1..e0ae7ed0b2c4 100644 --- a/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild +++ b/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild @@ -12,7 +12,7 @@ USE_RUBY="ruby23 ruby24 ruby25" PHP_EXT_INI="no" PHP_EXT_NAME="dummy" PHP_EXT_OPTIONAL_USE="php" -USE_PHP="php5-6 php7-1 php7-2 php7-3" # deps must be registered separately below +USE_PHP="php7-2 php7-3 php7-4" # deps must be registered separately below MY_P="${P/_/-}" @@ -42,7 +42,7 @@ UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix ) LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process -LANG_SUPPORT_EXTENDED=( go lua php pypy python python_asyncio python_gevent ruby ) +LANG_SUPPORT_EXTENDED=( go lua php python python_asyncio python_gevent ruby ) # plugins to be ignored (for now): # cheaper_backlog2: example plugin @@ -67,7 +67,6 @@ REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) - pypy? ( python_targets_python2_7 ) python? ( ${PYTHON_REQUIRED_USE} ) python_asyncio? ( || ( $(python_gen_useflags -3) ) ) python_gevent? ( python ) @@ -116,12 +115,10 @@ CDEPEND=" mono? ( dev-lang/mono:= ) perl? ( dev-lang/perl:= ) php? ( - php_targets_php5-6? ( dev-lang/php:5.6[embed] ) - php_targets_php7-1? ( dev-lang/php:7.1[embed] ) php_targets_php7-2? ( dev-lang/php:7.2[embed] ) php_targets_php7-3? ( dev-lang/php:7.3[embed] ) + php_targets_php7-4? ( dev-lang/php:7.4[embed] ) ) - pypy? ( dev-python/pypy ) python? ( ${PYTHON_DEPS} ) python_asyncio? ( virtual/python-greenlet[${PYTHON_USEDEP}] ) python_gevent? ( >=dev-python/gevent-1.3.5[${PYTHON_USEDEP}] ) @@ -245,11 +242,6 @@ python_compile_plugins() { EPYV=${EPYTHON/.} PYV=${EPYV/python} - if [[ ${EPYTHON} == pypy* ]]; then - einfo "skipping because pypy is not meant to build plugins on its own" - return - fi - ${PYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed" if use python_asyncio ; then @@ -265,15 +257,6 @@ python_compile_plugins() { if use python_gevent || use python_asyncio; then ${PYTHON} uwsgiconfig.py --plugin plugins/greenlet gentoo greenlet${PYV} || die "building plugin for greenlet-support in ${EPYTHON} failed" fi - - if use pypy ; then - if [[ "${PYV}" == "27" ]] ; then - # TODO: do some proper patching ? The wiki didn't help... I gave up for now. - # QA: RWX --- --- usr/lib64/uwsgi/pypy_plugin.so - append-ldflags -Wl,-z,noexecstack - ${PYTHON} uwsgiconfig.py --plugin plugins/pypy gentoo pypy || die "building plugin for pypy-support in ${EPYTHON} failed" - fi - fi } python_install_symlinks() { @@ -367,11 +350,6 @@ pkg_postinst() { EPYV=${EPYTHON/.} PYV=${EPYV/python} - if [[ ${EPYTHON} == pypy* ]] ; then - elog " '--plugins pypy' for pypy" - return - fi - elog " " elog " '--plugins ${EPYV}' for ${EPYTHON}" if use python_asyncio ; then diff --git a/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild deleted file mode 100644 index 27d9201c28b9..000000000000 --- a/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild +++ /dev/null @@ -1,408 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{6,7} ) -PYTHON_REQ_USE="threads(+)" - -RUBY_OPTIONAL="yes" -USE_RUBY="ruby23 ruby24" - -PHP_EXT_INI="no" -PHP_EXT_NAME="dummy" -PHP_EXT_OPTIONAL_USE="php" -USE_PHP="php5-6 php7-1 php7-2 php7-3" # deps must be registered separately below - -MY_P="${P/_/-}" - -inherit apache-module eutils flag-o-matic multilib pax-utils php-ext-source-r3 python-r1 ruby-ng versionator - -DESCRIPTION="uWSGI server for Python web applications" -HOMEPAGE="http://projects.unbit.it/uwsgi/" -SRC_URI="https://github.com/unbit/uwsgi/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux" - -UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool - http ugreen signal syslog rsyslog - router_{uwsgi,redirect,basicauth,rewrite,http,cache,static,memcached,redis,hash,expires,metrics} - {core,fast,raw,ssl}router - redislog mongodblog log{file,socket} - spooler cheaper_busyness symcall - transformation_{chunked,gzip,offload,tofile} - zergpool ) -UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron - dumbloop echo emperor_{amqp,pg,zeromq} forkptyrouter - geoip graylog2 legion_cache_fetch ldap log{crypto,pipe} notfound pam - rados router_{access,radius,spnego,xmldir} - sqlite ssi stats_pusher_statsd - systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix ) - -LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process -LANG_SUPPORT_EXTENDED=( go lua php pypy python python_asyncio python_gevent ruby ) - -# plugins to be ignored (for now): -# cheaper_backlog2: example plugin -# coroae: TODO -# cplusplus: partially example code, needs explicit class -# dummy: no idea -# example: example plugin -# exception_log: example plugin -# *java*: TODO -# v8: TODO -# matheval: TODO -IUSE="apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing selinux +ssl +xml yajl yaml zeromq" - -for plugin in ${UWSGI_PLUGINS_STD[@]}; do IUSE="${IUSE} +uwsgi_plugins_${plugin}"; done -for plugin in ${UWSGI_PLUGINS_OPT[@]}; do IUSE="${IUSE} uwsgi_plugins_${plugin}"; done -IUSE="${IUSE} ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]}" - -REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} ) - uwsgi_plugins_logcrypto? ( ssl ) - uwsgi_plugins_sslrouter? ( ssl ) - routing? ( pcre ) - uwsgi_plugins_emperor_zeromq? ( zeromq ) - uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) - uwsgi_plugins_router_xmldir? ( xml !expat ) - pypy? ( python_targets_python2_7 ) - python? ( ${PYTHON_REQUIRED_USE} ) - python_asyncio? ( || ( $(python_gen_useflags -3) ) python_gevent ) - python_gevent? ( python ) - expat? ( xml )" - -# util-linux is required for libuuid when requesting zeromq support -# Order: -# 1. Unconditional -# 2. General features -# 3. Plugins -# 4. Language/app support -CDEPEND="sys-libs/zlib - caps? ( sys-libs/libcap ) - json? ( !yajl? ( dev-libs/jansson ) - yajl? ( dev-libs/yajl ) ) - pcre? ( dev-libs/libpcre:3 ) - ssl? ( - !libressl? ( dev-libs/openssl:0 ) - libressl? ( dev-libs/libressl ) - ) - xml? ( !expat? ( dev-libs/libxml2 ) - expat? ( dev-libs/expat ) ) - yaml? ( dev-libs/libyaml ) - zeromq? ( net-libs/zeromq sys-apps/util-linux ) - uwsgi_plugins_alarm_curl? ( net-misc/curl ) - uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) - uwsgi_plugins_curl_cron? ( net-misc/curl ) - uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) - uwsgi_plugins_geoip? ( dev-libs/geoip ) - uwsgi_plugins_ldap? ( net-nds/openldap ) - uwsgi_plugins_pam? ( sys-libs/pam ) - uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) - uwsgi_plugins_rados? ( sys-cluster/ceph ) - uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) - uwsgi_plugins_router_spnego? ( virtual/krb5 ) - uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) - uwsgi_plugins_webdav? ( dev-libs/libxml2 ) - uwsgi_plugins_xslt? ( dev-libs/libxslt ) - go? ( sys-devel/gcc:=[go] ) - lua? ( dev-lang/lua:= ) - mono? ( =dev-lang/mono-4* ) - perl? ( dev-lang/perl:= ) - php? ( - php_targets_php5-6? ( dev-lang/php:5.6[embed] ) - php_targets_php7-1? ( dev-lang/php:7.1[embed] ) - php_targets_php7-2? ( dev-lang/php:7.2[embed] ) - php_targets_php7-3? ( dev-lang/php:7.3[embed] ) - ) - pypy? ( dev-python/pypy ) - python? ( ${PYTHON_DEPS} ) - python_gevent? ( >=dev-python/gevent-1.3.5[${PYTHON_USEDEP}] ) - ruby? ( $(ruby_implementations_depend) )" -DEPEND="${CDEPEND} - virtual/pkgconfig" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-uwsgi ) - uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool )" - -want_apache2 - -S="${WORKDIR}/${MY_P}" -APXS2_S="${S}/apache2" -APACHE2_MOD_CONF="42_mod_uwsgi-r2 42_mod_uwsgi" - -src_unpack() { - default -} - -pkg_setup() { - python_setup - use ruby && ruby-ng_pkg_setup - depend.apache_pkg_setup -} - -src_prepare() { - default - - sed -i \ - -e "s|'-O2', ||" \ - -e "s|'-Werror', ||" \ - -e "s|uc.get('plugin_dir')|uc.get('plugin_build_dir')|" \ - uwsgiconfig.py || die "sed failed" - - sed -i \ - -e "s|/lib|/$(get_libdir)|" \ - plugins/php/uwsgiplugin.py || die "sed failed" -} - -src_configure() { - local embedded_plugins=() - local plugins=() - local malloc_impl="libc" - local json="false" - local xml="false" - - for p in ${UWSGI_PLUGINS_STD[@]} ${UWSGI_PLUGINS_OPT[@]} ; do - use uwsgi_plugins_${p} && embedded_plugins+=("${p}") - done - for p in ${LANG_SUPPORT_SIMPLE[@]} ; do - use ${p} && plugins+=("${p}") - done - - # do not embed any plugins - if ! use embedded; then - plugins=( ${plugins[@]} ${embedded_plugins[@]} ) - embedded_plugins=() - fi - - # flatten the arrays - plugins=${plugins[@]} - embedded_plugins=${embedded_plugins[@]} - - # rename some of the use flags, language plugins are always real plugins - plugins="${plugins/perl/psgi}" - plugins="${plugins/sqlite/sqlite3}" - embedded_plugins="${embedded_plugins/sqlite/sqlite3}" - - # override defaults as requested by the user - if use xml; then - use expat && xml="expat" || xml="libxml2" - fi - if use json; then - use yajl && json="yajl" || json="jansson" - fi - use jemalloc && malloc_impl="jemalloc" - - # prepare the buildconf for gentoo - cp "${FILESDIR}"/gentoo.buildconf buildconf/gentoo.ini || die - sed -i \ - -e "s|VAR_XML|${xml}|" \ - -e "s|VAR_YAML|$(usex yaml libyaml true)|" \ - -e "s|VAR_JSON|${json}|" \ - -e "s|VAR_SSL|$(usex ssl true false)|" \ - -e "s|VAR_PCRE|$(usex pcre true false)|" \ - -e "s|VAR_ZMQ|$(usex zeromq true false)|" \ - -e "s|VAR_ROUTING|$(usex routing true false)|" \ - -e "s|VAR_DEBUG|$(usex debug true false)|" \ - -e "s|VAR_MALLOC|${malloc_impl}|" \ - -e "s|VAR_PLUGINS|${plugins// /, }|" \ - -e "s|VAR_PLUGIN_DIR|${EPREFIX}/usr/$(get_libdir)/uwsgi|" \ - -e "s|VAR_BUILD_DIR|${T}/plugins|" \ - -e "s|VAR_EMBEDDED|${embedded_plugins// /, }|" \ - buildconf/gentoo.ini || die "sed failed" - - if ! use caps; then - sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed" - fi - - if ! use zeromq; then - sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed" - fi - - if use uwsgi_plugins_emperor_pg ; then - PGPV="$(best_version dev-db/postgresql)" - PGSLOT="$(get_version_component_range 1-2 ${PGPV##dev-db/postgresql-})" - sed -i \ - -e "s|pg_config|pg_config${PGSLOT/.}|" \ - plugins/emperor_pg/uwsgiplugin.py || die "sed failed" - fi -} - -each_ruby_compile() { - cd "${WORKDIR}/${MY_P}" || die "sed failed" - - UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo rack_${RUBY##*/} || die "building plugin for ${RUBY} failed" - UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/fiber gentoo fiber_${RUBY##*/}|| die "building fiber plugin for ${RUBY} failed" - UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rbthreads gentoo rbthreads_${RUBY##*/}|| die "building rbthreads plugin for ${RUBY} failed" -} - -python_compile_plugins() { - local EPYV - local PYV - EPYV=${EPYTHON/.} - PYV=${EPYV/python} - - if [[ ${EPYTHON} == pypy* ]]; then - einfo "skipping because pypy is not meant to build plugins on its own" - return - fi - - ${PYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed" - - if use python_asyncio ; then - if [[ "${PYV}" == "34" || "${PYV}" == "35" ]] ; then - ${PYTHON} uwsgiconfig.py --plugin plugins/asyncio gentoo asyncio${PYV} || die "building plugin for asyncio-support in ${EPYTHON} failed" - fi - fi - - if use python_gevent ; then - ${PYTHON} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${PYV} || die "building plugin for gevent-support in ${EPYTHON} failed" - fi - - if use pypy ; then - if [[ "${PYV}" == "27" ]] ; then - # TODO: do some proper patching ? The wiki didn't help... I gave up for now. - # QA: RWX --- --- usr/lib64/uwsgi/pypy_plugin.so - append-ldflags -Wl,-z,noexecstack - ${PYTHON} uwsgiconfig.py --plugin plugins/pypy gentoo pypy || die "building plugin for pypy-support in ${EPYTHON} failed" - fi - fi -} - -python_install_symlinks() { - dosym uwsgi /usr/bin/uwsgi_${EPYTHON/.} -} - -src_compile() { - mkdir -p "${T}/plugins" || die - - python uwsgiconfig.py --build gentoo || die "building uwsgi failed" - - if use go ; then - python uwsgiconfig.py --plugin plugins/gccgo gentoo || die "building plugin for go failed" - fi - - if use lua ; then - # setting the name for the pkg-config file to lua, since we don't have - # slotted lua - UWSGICONFIG_LUAPC="lua" python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed" - fi - - if use php ; then - for s in $(php_get_slots); do - UWSGICONFIG_PHPDIR="/usr/$(get_libdir)/${s}" python uwsgiconfig.py --plugin plugins/php gentoo ${s/.} || die "building plugin for ${s} failed" - done - fi - - if use python ; then - python_foreach_impl python_compile_plugins - fi - - if use ruby ; then - ruby-ng_src_compile - fi - - if use apache2 ; then - for m in proxy_uwsgi Ruwsgi uwsgi ; do - APXS2_ARGS="-c mod_${m}.c" - apache-module_src_compile - done - fi -} - -src_install() { - dobin uwsgi - pax-mark m "${D}"/usr/bin/uwsgi - - insinto /usr/$(get_libdir)/uwsgi - doins "${T}/plugins"/*.so - - use cgi && dosym uwsgi /usr/bin/uwsgi_cgi - use go && dosym uwsgi /usr/bin/uwsgi_go - use lua && dosym uwsgi /usr/bin/uwsgi_lua - use mono && dosym uwsgi /usr/bin/uwsgi_mono - use perl && dosym uwsgi /usr/bin/uwsgi_psgi - - if use php ; then - for s in $(php_get_slots); do - dosym uwsgi /usr/bin/uwsgi_${s/.} - done - fi - - if use python ; then - python_foreach_impl python_install_symlinks - python_foreach_impl python_domodule uwsgidecorators.py - fi - - if use apache2; then - for m in proxy_uwsgi Ruwsgi uwsgi ; do - APACHE2_MOD_FILE="${APXS2_S}/.libs/mod_${m}.so" - apache-module_src_install - done - fi - - newinitd "${FILESDIR}"/uwsgi.initd-r7 uwsgi - newconfd "${FILESDIR}"/uwsgi.confd-r4 uwsgi - keepdir /etc/"${PN}".d - use uwsgi_plugins_spooler && keepdir /var/spool/"${PN}" -} - -pkg_postinst() { - if use apache2 ; then - elog "Three Apache modules have been installed: mod_proxy_uwsgi, mod_uwsgi and mod_Ruwsgi." - elog "You can enable them with -D PROXY_UWSGI, -DUWSGI or -DRUWSGI in /etc/conf.d/apache2." - elog "mod_uwsgi and mod_Ruwsgi have the same configuration interface and define the same symbols." - elog "Therefore you can enable only one of them at a time." - elog "mod_uwsgi is commercially supported by Unbit and stable but a bit hacky." - elog "mod_Ruwsgi is newer and more Apache-API friendly but not commercially supported." - elog "mod_proxy_uwsgi is a proxy module, considered stable and is now the recommended module." - fi - - elog "Append the following options to the uwsgi call to load the respective language plugin:" - use cgi && elog " '--plugins cgi' for cgi" - use lua && elog " '--plugins lua' for lua" - use mono && elog " '--plugins mono' for mono" - use perl && elog " '--plugins psgi' for perl" - - if use php ; then - for s in $(php_get_slots); do - elog " '--plugins ${s/.}' for ${s}" - done - fi - - python_pkg_postinst() { - local EPYV - local PYV - EPYV=${EPYTHON/.} - PYV=${EPYV/python} - - if [[ ${EPYTHON} == pypy* ]] ; then - elog " '--plugins pypy' for pypy" - return - fi - - elog " " - elog " '--plugins ${EPYV}' for ${EPYTHON}" - if use python_asyncio ; then - if [[ ${EPYV} == python34 ]] ; then - elog " '--plugins ${EPYV},asyncio${PYV}' for asyncio support in ${EPYTHON}" - else - elog " (asyncio is only supported in python3.4)" - fi - fi - if use python_gevent ; then - elog " '--plugins ${EPYV},gevent${PYV}' for gevent support in ${EPYTHON}" - fi - } - - use python && python_foreach_impl python_pkg_postinst - - if use ruby ; then - for ruby in $(ruby_get_use_implementations) ; do - elog " '--plugins rack_${ruby/.}' for ${ruby}" - elog " '--plugins fiber_${ruby/.}' for ${ruby} fibers" - elog " '--plugins rbthreads_${ruby/.}' for ${ruby} rbthreads" - done - fi -} diff --git a/www-servers/uwsgi/uwsgi-2.0.17.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.ebuild index 3f85d6aa41a0..f1a7b478018b 100644 --- a/www-servers/uwsgi/uwsgi-2.0.17.ebuild +++ b/www-servers/uwsgi/uwsgi-2.0.17.ebuild @@ -12,7 +12,7 @@ USE_RUBY="ruby23 ruby24" PHP_EXT_INI="no" PHP_EXT_NAME="dummy" PHP_EXT_OPTIONAL_USE="php" -USE_PHP="php5-6 php7-1 php7-2 php7-3" # deps must be registered separately below +USE_PHP="php7-2 php7-3 php7-4" # deps must be registered separately below MY_P="${P/_/-}" @@ -42,7 +42,7 @@ UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix ) LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process -LANG_SUPPORT_EXTENDED=( go lua php pypy python python_asyncio python_gevent ruby ) +LANG_SUPPORT_EXTENDED=( go lua php python python_asyncio python_gevent ruby ) # plugins to be ignored (for now): # cheaper_backlog2: example plugin @@ -67,7 +67,6 @@ REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) - pypy? ( python_targets_python2_7 ) python? ( ${PYTHON_REQUIRED_USE} ) python_asyncio? ( || ( $(python_gen_useflags -3) ) python_gevent ) python_gevent? ( python ) @@ -111,12 +110,10 @@ CDEPEND="sys-libs/zlib mono? ( =dev-lang/mono-4* ) perl? ( dev-lang/perl:= ) php? ( - php_targets_php5-6? ( dev-lang/php:5.6[embed] ) - php_targets_php7-1? ( dev-lang/php:7.1[embed] ) php_targets_php7-2? ( dev-lang/php:7.2[embed] ) php_targets_php7-3? ( dev-lang/php:7.3[embed] ) + php_targets_php7-4? ( dev-lang/php:7.4[embed] ) ) - pypy? ( dev-python/pypy ) python? ( ${PYTHON_DEPS} ) python_gevent? ( >=dev-python/gevent-1.2.1[${PYTHON_USEDEP}] ) ruby? ( $(ruby_implementations_depend) )" @@ -248,11 +245,6 @@ python_compile_plugins() { EPYV=${EPYTHON/.} PYV=${EPYV/python} - if [[ ${EPYTHON} == pypy* ]]; then - einfo "skipping because pypy is not meant to build plugins on its own" - return - fi - ${PYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed" if use python_asyncio ; then @@ -264,15 +256,6 @@ python_compile_plugins() { if use python_gevent ; then ${PYTHON} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${PYV} || die "building plugin for gevent-support in ${EPYTHON} failed" fi - - if use pypy ; then - if [[ "${PYV}" == "27" ]] ; then - # TODO: do some proper patching ? The wiki didn't help... I gave up for now. - # QA: RWX --- --- usr/lib64/uwsgi/pypy_plugin.so - append-ldflags -Wl,-z,noexecstack - ${PYTHON} uwsgiconfig.py --plugin plugins/pypy gentoo pypy || die "building plugin for pypy-support in ${EPYTHON} failed" - fi - fi } python_install_symlinks() { @@ -382,11 +365,6 @@ pkg_postinst() { EPYV=${EPYTHON/.} PYV=${EPYV/python} - if [[ ${EPYTHON} == pypy* ]] ; then - elog " '--plugins pypy' for pypy" - return - fi - elog " " elog " '--plugins ${EPYV}' for ${EPYTHON}" if use python_asyncio ; then diff --git a/www-servers/uwsgi/uwsgi-2.0.18.ebuild b/www-servers/uwsgi/uwsgi-2.0.18.ebuild index 90852dcf06c3..53316bf30aa2 100644 --- a/www-servers/uwsgi/uwsgi-2.0.18.ebuild +++ b/www-servers/uwsgi/uwsgi-2.0.18.ebuild @@ -12,7 +12,7 @@ USE_RUBY="ruby23 ruby24 ruby25 ruby26" PHP_EXT_INI="no" PHP_EXT_NAME="dummy" PHP_EXT_OPTIONAL_USE="php" -USE_PHP="php5-6 php7-1 php7-2 php7-3" # deps must be registered separately below +USE_PHP="php7-2 php7-3 php7-4" # deps must be registered separately below MY_P="${P/_/-}" @@ -42,7 +42,7 @@ UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix ) LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process -LANG_SUPPORT_EXTENDED=( go lua php pypy python python_asyncio python_gevent ruby ) +LANG_SUPPORT_EXTENDED=( go lua php python python_asyncio python_gevent ruby ) # plugins to be ignored (for now): # cheaper_backlog2: example plugin @@ -67,7 +67,6 @@ REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) - pypy? ( python_targets_python2_7 ) python? ( ${PYTHON_REQUIRED_USE} ) python_asyncio? ( || ( $(python_gen_useflags -3) ) ) python_gevent? ( python ) @@ -117,12 +116,10 @@ CDEPEND=" perl? ( dev-lang/perl:= ) php? ( net-libs/libnsl - php_targets_php5-6? ( dev-lang/php:5.6[embed] ) - php_targets_php7-1? ( dev-lang/php:7.1[embed] ) php_targets_php7-2? ( dev-lang/php:7.2[embed] ) php_targets_php7-3? ( dev-lang/php:7.3[embed] ) + php_targets_php7-4? ( dev-lang/php:7.4[embed] ) ) - pypy? ( dev-python/pypy ) python? ( ${PYTHON_DEPS} ) python_asyncio? ( virtual/python-greenlet[${PYTHON_USEDEP}] ) python_gevent? ( >=dev-python/gevent-1.3.5[${PYTHON_USEDEP}] ) @@ -246,11 +243,6 @@ python_compile_plugins() { EPYV=${EPYTHON/.} PYV=${EPYV/python} - if [[ ${EPYTHON} == pypy* ]]; then - einfo "skipping because pypy is not meant to build plugins on its own" - return - fi - ${PYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed" if use python_asyncio ; then @@ -266,15 +258,6 @@ python_compile_plugins() { if use python_gevent || use python_asyncio; then ${PYTHON} uwsgiconfig.py --plugin plugins/greenlet gentoo greenlet${PYV} || die "building plugin for greenlet-support in ${EPYTHON} failed" fi - - if use pypy ; then - if [[ "${PYV}" == "27" ]] ; then - # TODO: do some proper patching ? The wiki didn't help... I gave up for now. - # QA: RWX --- --- usr/lib64/uwsgi/pypy_plugin.so - append-ldflags -Wl,-z,noexecstack - ${PYTHON} uwsgiconfig.py --plugin plugins/pypy gentoo pypy || die "building plugin for pypy-support in ${EPYTHON} failed" - fi - fi } python_install_symlinks() { @@ -368,11 +351,6 @@ pkg_postinst() { EPYV=${EPYTHON/.} PYV=${EPYV/python} - if [[ ${EPYTHON} == pypy* ]] ; then - elog " '--plugins pypy' for pypy" - return - fi - elog " " elog " '--plugins ${EPYV}' for ${EPYTHON}" if use python_asyncio ; then |