diff options
author | Alexys Jacob <ultrabug@gentoo.org> | 2012-12-12 09:48:36 +0000 |
---|---|---|
committer | Alexys Jacob <ultrabug@gentoo.org> | 2012-12-12 09:48:36 +0000 |
commit | 8060bb4e0f504cdd200593d64ad9da2b3219361e (patch) | |
tree | 94bf4f8a22af7dad87ade7f4f3e9a8543bbffe4c /www-servers | |
parent | Remove old version; bump to 2.0.9, adding missing test dependencies and avoid... (diff) | |
download | historical-8060bb4e0f504cdd200593d64ad9da2b3219361e.tar.gz historical-8060bb4e0f504cdd200593d64ad9da2b3219361e.tar.bz2 historical-8060bb4e0f504cdd200593d64ad9da2b3219361e.zip |
Version bump, drop old
Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13
Diffstat (limited to 'www-servers')
-rw-r--r-- | www-servers/uwsgi/ChangeLog | 8 | ||||
-rw-r--r-- | www-servers/uwsgi/Manifest | 17 | ||||
-rw-r--r-- | www-servers/uwsgi/uwsgi-1.3-r1.ebuild | 310 | ||||
-rw-r--r-- | www-servers/uwsgi/uwsgi-1.4.3.ebuild (renamed from www-servers/uwsgi/uwsgi-1.4.1-r1.ebuild) | 21 |
4 files changed, 27 insertions, 329 deletions
diff --git a/www-servers/uwsgi/ChangeLog b/www-servers/uwsgi/ChangeLog index c8019f13dfee..aa89d42a7e8c 100644 --- a/www-servers/uwsgi/ChangeLog +++ b/www-servers/uwsgi/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-servers/uwsgi # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/ChangeLog,v 1.34 2012/11/28 11:12:27 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/ChangeLog,v 1.35 2012/12/12 09:48:32 ultrabug Exp $ + +*uwsgi-1.4.3 (12 Dec 2012) + + 12 Dec 2012; Ultrabug <ultrabug@gentoo.org> -uwsgi-1.3-r1.ebuild, + -uwsgi-1.4.1-r1.ebuild, +uwsgi-1.4.3.ebuild: + Version bump, drop old *uwsgi-1.4.2 (28 Nov 2012) diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest index c717415fcc96..3c1def9422e9 100644 --- a/www-servers/uwsgi/Manifest +++ b/www-servers/uwsgi/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX 1.1.2-threaded-php.patch 1098 SHA256 e5f03fcdf2ebf7d2867b21e640f2c44f23da169108b2ea964e96fea44152d49b SHA512 d213c827710b75c1e4e1a1ad657515a7d2cacf02fa1f2f309d5cf986b3650ea20529077e2d2df5a22ed6edf60e43e755378ec6ea556c43c844cf534552239d75 WHIRLPOOL 1b0e42b83aa45a3bb17edaf4f9d7b260bc9dae8d7e8f06a38c97045361e64ddd9e774a1df1244e521c7973b27d27d40cbca4d8d2b16d0f9765ca2daa00cc3be8 AUX 1.2.3-pyerl.patch 1015 SHA256 1da74cb8d108f46c4faa39548f73de2f74849dde81d1012b71c7c91ab939596b SHA512 b298feccb2604b9459a15699d786c26be9d830f88a4a00beca69fba3ff0d5d78cc239e6dcce51da32121c8bb4d72af41a6e57e5594a3005cfceb4feebbffaed2 WHIRLPOOL 60ff1374e1f13c9ffaa65996a24d87d86d64d7f4edb9d1378d0b7287bfeb285d5123da4532c6e0fb022ff78d80a6b5eba9d6bb8c36536145d4a11cbdecee23f6 AUX 1.2.6-fixed-typecasting.patch 740 SHA256 491e9b4e6c7af6bdc38224c5b54ed7ffe86e729f4e0ae4ce762e0b4fbe4a43fa SHA512 e49f905b75c8d859aaf193944f2d563143c4e8f17563c2e924d743f55a2a20d54e09f8f91fe1243aa25ac21748e5bd8180b5f2571b00827322d1bf5e49f78442 WHIRLPOOL 785e60e111efb63d02ef2ba574acf7a0cfb1d72667584292577247def67e5d3a1c8d047f4592f71301558f39f438a782a58c2629bf1c829e00b0471c5042641d @@ -14,22 +11,14 @@ AUX uwsgi.initd-r1 3352 SHA256 857940e7c6c97c0e23db85015a47d295a102607100f0662ae DIST uwsgi-1.0.2.1.tar.gz 465250 SHA256 78280b57a970db7842e4481f8b00f13d011f27b340c869dc1ad28d564d716439 SHA512 de7761b24ae92aea62b4b5d4523d1b812dd5c25c09551baf7007a0e1a97461c62033762cb02e90a9bd85f2aef78477c5151c5a359c8b878150a0c926e3a759ee WHIRLPOOL 47ca0115d55a09b99006fff9c6fb6b5daa71b0b4ea64bbc65390ff64c05f62a661a17b1ec172e05f78f75dd9a36efad3d9dacb57c980639038be6f718480d7b6 DIST uwsgi-1.2.5.tar.gz 515481 SHA256 e208a90f335725589361ac7f7e548ddf7a906dbe6bd50e83b1c5fc9884976ee4 SHA512 85bc94a80c235f2a35f0d8c7118eac8d98ea142f6ad584addbe4ffca011e61e158454202d69b9accda3319e3237d9c38b45c647c248b0ef2f2e75dc76256848a WHIRLPOOL e05edf639b22586be4dc6d7320b4fb75e448cbd57a0fd846ab0e2a1b6d19f400c72c0b40f64753b32cfe8fd35cb008ef38e8dff4423f004c047d5af08e143806 DIST uwsgi-1.2.6.tar.gz 515869 SHA256 49d2fbedbd42b3c95a684f7ddf43302f881297f3614c7edd0af4a4c44e2032a5 SHA512 79297cc3d348e6fbbd1d7da5fb4d03844cc14ce36411ce55d6951e8f0c50614d87c3038de6986589362e9e84543aec9754a871c52002065d5f17a27a7ad32f01 WHIRLPOOL cdd74205572f0fce1390f3335e4f3cd6413d3cd5be9fb91a259a38c7330fe6b53057985e3ed6b8a67f6fba5339609506be4fbf2ae10251518406d6b02c831f09 -DIST uwsgi-1.3.tar.gz 560035 SHA256 506d4e482e3a808ea0f83015ba9bfcebc5428fd4aee48aeb3ff193032f587eb2 SHA512 fdc05f1625ba0586736c74e9147c1396b832fa12a444a3589585aaa946f4f590155658db668ce448db41a95167caaf99993b9390955849f04c30e812cbcb2a53 WHIRLPOOL a36073c705157b7da995e88a42464f32f5c29c691981d5470dc13807ed8be2ff63def1ec1d2b60c2afed00f45c6d93dfd902844e4edaea168fb84e9cfd8893ac DIST uwsgi-1.4.1.tar.gz 585500 SHA256 a72e3b57e9d46d6b92df9d445aa9bf243a9529f0c3660fecb5fb1d21d2f1791e SHA512 cf9866e1e40c4f69f1a5a5df76e20ae97a379a05cac08ebbbe7ca245228fac1fcb61c0b8b1c426b8b726c6f305bbfc55339b70821dd62120362d01b2b67a8522 WHIRLPOOL 381ff98cf1ef24773b57e489519d2434fda6913da56a9a4e6373a9a084cea2f5065baeecebed38eeb42df4805d646ca915add8a8ac036955372ab540b99ccf56 DIST uwsgi-1.4.2.tar.gz 585946 SHA256 51d23d4e55a9a63b92f006e493151f3443e200ab46e6095ac52510cdcbd8a5e6 SHA512 0daebbdec5540e174c04e4442de73657c98afdcec3a1329c46fd160ebb0336ed085e30418ca55119a60267da64d2bdfae8dbf049c16cdc567c89bd2834c70587 WHIRLPOOL 4edc07eb65c5cfd745a376c1c3bbcb5bb84171a45a3e811eae0c25295c1b9bb38a7e010ad36ef751764c873612f945a649a429c6f815893a695afaf9f1eb9e35 +DIST uwsgi-1.4.3.tar.gz 586760 SHA256 b591b5f8c974d3b508047033dcc2822c84daa5b776c90b14bf5c6dd46c0b5ace SHA512 454494f845e8b2d5f4b9d2e40dcd14291517ee8715fdea8df2992437ad49df926820d0fee2bc5f5cfffe0349e950d9fbe5e0a9a3eed4d28e766039db871a9e96 WHIRLPOOL f22676e29135960ff4d9c00119da5a9181a0adbe751bb4206fa48ebe38b3786649c6ffc9bb5a412a4f7dff39efb1d4cc0310d4a7034f0274c0e35c273f03f09b EBUILD uwsgi-1.0.2.1.ebuild 1891 SHA256 1078d427a2cd4abe8a7ed4a5ec4a477fea989c2b75e20d5a27128032359c61d5 SHA512 857cd70e9002e7f1ebb521ced5453cffd43f4ff5805363ebfecd10d929ec6a4ab0283f51ceb5563e531d371a190a16b7d8ab162a56715c8aac5a0ee1e62dd5ee WHIRLPOOL 6fcf9f03d8325ddc061ac95970568a02d2d86d883b3b936acda41368c6b9d7b806f37c9701a10a70375cd577608fe444fb6405785a8dd9605fbaf72b03196b3c EBUILD uwsgi-1.2.5.ebuild 8610 SHA256 8bddca1e7fafbd7201c22d0527a1f34c0a9ced7f0e6909cfeb196832217f4d50 SHA512 746b61eece930d74ed174a7ee74fa1e90632a9ced239e62409784a63a178c290053514339b68c11003ea627e9e541c6476c1e3916526d21bbd37236cc52395d3 WHIRLPOOL a5f8bcf17cb634946019f051267798e12919e1a40001fb476b5d531d18ad40d0db80b210444fdd8847eacb0eb504de68f50bb632c75421bfd4d8d7bb9c43166d EBUILD uwsgi-1.2.6.ebuild 8658 SHA256 98585a8e43e7af3f9bf516994fc7778e817a1857bca75658eacde9d1389c6033 SHA512 9b53d4ade90665886881c02869b8619e4128fcdeaa3340efec02b8dc645de3f99cba69a827cc4b0273dc8c94af72c2bc9ec0021f7f76616c14f21e6f41275b24 WHIRLPOOL b18455b534307639fe9b37fd54d3047c5ebbbceaa8438688bb6d89f9b4b63ccf4c0b03590e23ba1c6d2fa70224ce5bb5b135c87d74df0389dfb07407784569aa -EBUILD uwsgi-1.3-r1.ebuild 8703 SHA256 343134c334d7008d29948db8c942780400e5af5ccccd80476ba3a93e85b224f5 SHA512 f4b48beffba85e1656975228f76a918e8375bc06289b5ae849998cc65e5ea6f5e05cb2d6192b030a13d70427a8978f8e8d200f3355943604f795ccfb1e2c56d8 WHIRLPOOL 67ae830a84477f1bdf3f3458c68213ed930e22dc298f52dbce41e96526ed108586fcad751c779e511db2862a8ede874736997963be4eb2096ca520bfabc786d9 -EBUILD uwsgi-1.4.1-r1.ebuild 9102 SHA256 b7b7228c392e898433f085f21ffa7471550e646612573cc0af10c05df7cc704b SHA512 b08ca91d544fca920858d8b42a37ebbf13396a9ce5cc379304a272c1ce4e5d12225662df939c0795aa4cad5bb6e029a3d56dfe0d4d991c9121828fa6c9ad3193 WHIRLPOOL b10f99b8ce689cf173ab47f1c5f05c6ec3e0fa2402859e3e3ac94058ed788b79115183d01c78a8d73e2e2506e648fcaceaaef3d81383fdca5a9dea3c63d8aebb EBUILD uwsgi-1.4.1-r2.ebuild 9562 SHA256 e7ff83d11c82b7a9c81db6180a8c6280763ee78de68a996d3ee55f294b57ef14 SHA512 2c2c6a067c8ccc4a8caa0420f14807d2a5ee95c6376268336c2c8ec6607260e49839867948f24f0b077cc76bc8be19a6cc93d381c2f4bcb95c8a571307d43b53 WHIRLPOOL d15a128d923414c63b9d7d78343a830a7f4437532c376194757e98cf74b034f31ff4d712cf64fbaac2a9032a5e9a8913553cbb2937eda4a7f5a28462e8db1f0b EBUILD uwsgi-1.4.2.ebuild 9559 SHA256 4a91f8fa5b065fa267f93d87fef9752eea38e5f5ca8abb119ed65f199294722b SHA512 ce3f0d6fe1a3e37f089bbaa3f7e0d68cae7047957a073fff3b23684238f4933dd100e6c47ca7262fe3ae0234849668e1bc7942153100c3105b6cd1997f07ba20 WHIRLPOOL 8c8642ac04c024597515f6c75449fb9368035e75540be514ca3983f8b33d466ecfb5e6620223962c5f0277f5042a191855bfc84e86a4f0d706d30152a7ee074e -MISC ChangeLog 6387 SHA256 1de67387c5355be3e86c9a3a78f842ea870db6e3da53d84b6e03e0f1acdd3dfa SHA512 dbb9fe3b3cca5a36b94aa35d47436e2c9ac4496712261ec106ab417e36b4294a8b6699358b6c9231f9240a3dd29e4ddaeca51364bce245851ddee7a1243c68a5 WHIRLPOOL fafa46ae552c6d37c6885b98bb9267fe2583b8705c369d4b3ae2bde0b508d9272c1cd6ef2d2aba5c0b042dd46d1764880e9b6aedb891ae27c157e80412a51de2 +EBUILD uwsgi-1.4.3.ebuild 9559 SHA256 19d0eef742d2ef299af93b3cd2ad9c9e485d9a92b49cf2e5f0688efa7d6f44c3 SHA512 86a4e3c87a4fbb29b69b3945ba5eaec7255b4ce2d02d290050c9d011e9f72368b4f723fac9fab6aae1e1c9f787d44fdb7c5c1262e088f6fc3d5ed19c026d99bc WHIRLPOOL b01f470cda1a64505b2659efd6c6d678ef39f72cb035d345e8b8d107c0220a498c2df7f92f59d3cdca40c6539a58671b073ba5eaa90d386fd1098c82005a5910 +MISC ChangeLog 6556 SHA256 419d9a5dd8559d3c631fb260cfb0bb576cf985e4d7db5110a6e562f306bce6f9 SHA512 74f12e145841f8d762880d0864c88c7061ffcd226399689691101a3afac9af531526109209cb429b6e686f771a96b6843a8cf5d8e746adc898324d1753b86ce7 WHIRLPOOL bc529aeab7fd769d08d80bf6027dc2e19a2ff19f96219d0a3a16181b6e9ca4d3a595de3d5f0e99c9f3080122adfd504bdad7c4b066736ff4beefb0704dda724b MISC metadata.xml 1857 SHA256 eec5b1ed09980d423c5e6fec1c85ade0459bb589bba1bb863dc378f7f348abcf SHA512 a3e9aee2176ce686259cc4be0166545cc323e5aa17f28f797b80bd6d711ab1af43a64a51480baf0b87ad53b0b6ecd7158c950768dd6154817daf7faf9021bd10 WHIRLPOOL b5383be7268e47688cde206a9635b7d6d52f21986e3274b2d0ed308e56d693f07ada4fed3405c7c82741259ab1f09eaa617bdd5c279ee733918db0b347e06c10 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iF4EAREIAAYFAlC18aEACgkQKiQSS7ZY+hNZxgEA1PZWuQPmae3sSPHLViE553bL -RUiDqoI2jmGQcwXcOpcBAMpW7nMA//3PDFc687IiCo/3i//31JOSGIgeaA/ADd6O -=d/st ------END PGP SIGNATURE----- diff --git a/www-servers/uwsgi/uwsgi-1.3-r1.ebuild b/www-servers/uwsgi/uwsgi-1.3-r1.ebuild deleted file mode 100644 index c8a51c6417b5..000000000000 --- a/www-servers/uwsgi/uwsgi-1.3-r1.ebuild +++ /dev/null @@ -1,310 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-1.3-r1.ebuild,v 1.1 2012/10/29 21:59:47 ultrabug Exp $ - -EAPI="4" -PYTHON_DEPEND="python? *" -PYTHON_MODNAME="uwsgidecorators" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*" -USE_RUBY="ruby18 ree18 ruby19" -RUBY_OPTIONAL="yes" -PHP_EXT_NAME="dummy" -PHP_EXT_INI="no" -USE_PHP="php5-3 php5-4" # deps must be registered separately below -PHP_EXT_OPTIONAL_USE="php" - -MY_P="${P/_/-}" - -inherit apache-module eutils python multilib pax-utils php-ext-source-r2 ruby-ng - -DESCRIPTION="uWSGI server for Python web applications" -HOMEPAGE="http://projects.unbit.it/uwsgi/" -SRC_URI="http://projects.unbit.it/downloads/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="apache2 +caps +carbon cgi debug erlang gevent graylog2 json ldap lua +nagios pam perl +pcre php +python rrdtool rsyslog ruby spooler sqlite syslog +xml yaml zeromq" -REQUIRED_USE="|| ( cgi erlang lua perl php python ruby )" - -# util-linux is required for libuuid when requesting zeromq support -CDEPEND="caps? ( sys-libs/libcap ) - json? ( dev-libs/jansson ) - erlang? ( dev-lang/erlang ) - gevent? ( >=dev-python/gevent-1.0_beta2 ) - graylog2? ( sys-libs/zlib ) - ldap? ( net-nds/openldap ) - lua? ( dev-lang/lua ) - pcre? ( dev-libs/libpcre ) - perl? ( dev-lang/perl ) - php? ( - php_targets_php5-3? ( dev-lang/php:5.3[embed] ) - php_targets_php5-4? ( dev-lang/php:5.4[embed] ) - ) - ruby? ( $(ruby_implementations_depend) ) - sqlite? ( dev-db/sqlite:3 ) - rsyslog? ( app-admin/rsyslog ) - xml? ( dev-libs/libxml2 ) - yaml? ( dev-libs/libyaml ) - zeromq? ( net-libs/zeromq sys-apps/util-linux )" -DEPEND="${CDEPEND} - virtual/pkgconfig" -RDEPEND="${CDEPEND} - rrdtool? ( net-analyzer/rrdtool )" - -S="${WORKDIR}/${MY_P}" -APXS2_S="${S}/apache2" -APACHE2_MOD_CONF="42_mod_uwsgi-r1 42_mod_uwsgi" - -want_apache2_2 - -use_true_false() { - if use $1 ; then - echo "true" - else - echo "false" - fi -} - -src_unpack() { - default -} - -pkg_setup() { - depend.apache_pkg_setup - python_pkg_setup -} - -src_prepare() { - epatch \ - "${FILESDIR}/1.1.2-threaded-php.patch" \ - "${FILESDIR}/1.2.3-pyerl.patch" - - 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|python\([0-9].[0-9]\)-config|python-config-\1|' \ - plugins/python/uwsgiplugin.py || die "sed failed" - - sed -i \ - -e "s|/lib|/$(get_libdir)|" \ - plugins/php/uwsgiplugin.py || die "sed failed" -} - -src_configure() { - local plugins="" - use carbon && plugins+=", carbon" - use graylog2 && plugins+=", graylog2" - use nagios && plugins+=", nagios" - use pam && plugins+=", pam" - use rrdtool && plugins+=", rrdtool" - use rsyslog && plugins+=", rsyslog" - use syslog && plugins+=", syslog" - - cat > "buildconf/gentoo.ini" << EOF -[uwsgi] -xml = $(use_true_false xml) -ini = true -yaml = $(use_true_false yaml) -json = $(use_true_false json) -sqlite3 = $(use_true_false sqlite) -zeromq = $(use_true_false zeromq) -snmp = true -sctp = false -spooler = true -embedded = true -ssl = auto -udp = true -multicast = true -threading = true -sendfile = true -minterpreters = true -async = true -evdis = false -ldap = $(use_true_false ldap) -pcre = $(use_true_false pcre) -routing = auto -alarm = auto -debug = $(use_true_false debug) -unbit = false -xml_implementation = libxml2 -yaml_implementation = libyaml -malloc_implementation = libc -plugins = -bin_name = uwsgi -append_version = -plugin_dir = /usr/$(get_libdir)/uwsgi -plugin_build_dir = ${T}/plugins -embedded_plugins = ping, cache, rpc, corerouter, fastrouter, http, ugreen, signal, logsocket, router_uwsgi, router_redirect, router_basicauth, zergpool, redislog, router_rewrite, router_http, mongodblog ${plugins} -as_shared_library = false - -locking = auto -event = auto -timer = auto -filemonitor = auto - -embed_files = - -embed_config = -[python] -paste = true -web3 = true -EOF - use caps || sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed" - use zeromq || sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed" -} - -each_ruby_compile() { - cd "${WORKDIR}/${MY_P}" - - UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo rack_${RUBY##*/} || die "building plugin for ${RUBY} failed" - - if [[ "${RUBY}" == *ruby19 ]] ; then - UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/fiber gentoo || die "building fiber plugin for ${RUBY} failed" - fi -} - -install_python_lib() { - insinto $(python_get_sitedir) - doins uwsgidecorators.py -} - -src_compile() { - python uwsgiconfig.py --build gentoo || die "building uwsgi failed" - - mkdir -p "${T}/plugins" - - if use erlang ; then - python uwsgiconfig.py --plugin plugins/erlang gentoo || die "building plugin for erlang failed" - fi - - if use lua ; then - python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed" - fi - - if use perl ; then - python uwsgiconfig.py --plugin plugins/psgi gentoo || die "building plugin for perl 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 - for a in ${PYTHON_ABIS} ; do - python${a} uwsgiconfig.py --plugin plugins/python gentoo python${a/.} || die "building plugin for python-${a} failed" - - if use gevent ; then - python${a} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${a/.} || die "building plugin for gevent-support in python-${a} failed" - fi - if use erlang ; then - python${a} uwsgiconfig.py --plugin plugins/pyerl gentoo pyerl${a/.} || die "building plugin for erlang-support in python failed" - fi - done - fi - - if use ruby ; then - ruby-ng_src_compile - fi - - if use spooler ; then - python uwsgiconfig.py --plugin plugins/spooler gentoo || die "building plugin for spooler failed" - fi - - if use cgi ; then - python uwsgiconfig.py --plugin plugins/cgi gentoo || die "building plugin for cgi failed" - 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 erlang && dosym uwsgi /usr/bin/uwsgi_erlang - use lua && dosym uwsgi /usr/bin/uwsgi_lua - 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_execute_function install_python_lib - for a in ${PYTHON_ABIS} ; do - dosym uwsgi /usr/bin/uwsgi_python${a/.} - done - 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-r1 uwsgi - newconfd "${FILESDIR}"/uwsgi.confd-r1 uwsgi - keepdir /etc/"${PN}".d - use 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 the newest and not considered ready for production yet." - fi - - elog "Append the following options to the uwsgi call to load the respective language plugin:" - use cgi && elog " '--plugins cgi' for cgi" - use erlang && elog " '--plugins erlang' for erlang" - use lua && elog " '--plugins lua' for lua" - 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 - - if use python ; then - for a in ${PYTHON_ABIS} ; do - elog " '--plugins python${a/.}' for python-${a}" - use gevent && elog " '--plugins python${a/.},gevent${a/.}' for gevent support in python-${a}" - use erlang && elog " '--plugins python${a/.},erlang,pyerl${a/.}' for erlang support in python-${a}" - done - fi - - if use ruby ; then - for ruby in $USE_RUBY; do - use ruby_targets_${ruby} && elog " '--plugins rack_${ruby/.}' for ${ruby}" - if [[ "${ruby}" == *ruby19 ]] ; then - elog " '--plugins fibre' for ruby-1.9 fibres" - fi - done - fi -} diff --git a/www-servers/uwsgi/uwsgi-1.4.1-r1.ebuild b/www-servers/uwsgi/uwsgi-1.4.3.ebuild index 0f1a99ad205b..032914eccabc 100644 --- a/www-servers/uwsgi/uwsgi-1.4.1-r1.ebuild +++ b/www-servers/uwsgi/uwsgi-1.4.3.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-1.4.1-r1.ebuild,v 1.1 2012/11/21 10:27:20 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-1.4.3.ebuild,v 1.1 2012/12/12 09:48:32 ultrabug Exp $ -EAPI="4" +EAPI="5" PYTHON_DEPEND="python? *" PYTHON_MODNAME="uwsgidecorators" SUPPORT_PYTHON_ABIS="1" @@ -16,7 +16,7 @@ PHP_EXT_OPTIONAL_USE="php" MY_P="${P/_/-}" -inherit apache-module eutils python multilib pax-utils php-ext-source-r2 ruby-ng +inherit apache-module eutils python multilib pax-utils php-ext-source-r2 ruby-ng versionator DESCRIPTION="uWSGI server for Python web applications" HOMEPAGE="http://projects.unbit.it/uwsgi/" @@ -25,7 +25,7 @@ SRC_URI="http://projects.unbit.it/downloads/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="apache2 +caps +carbon cgi debug erlang gevent graylog2 json ldap lua +nagios pam perl +pcre php +python rrdtool rsyslog ruby spooler sqlite syslog +xml yaml zeromq" +IUSE="apache2 +caps +carbon cgi debug erlang gevent graylog2 json ldap lua +nagios pam perl +pcre php probepg +python rrdtool rsyslog ruby spooler sqlite syslog +xml yaml zeromq" REQUIRED_USE="|| ( cgi erlang lua perl php python ruby )" # util-linux is required for libuuid when requesting zeromq support @@ -42,6 +42,7 @@ CDEPEND="caps? ( sys-libs/libcap ) php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) + probepg? ( dev-db/postgresql-base:= ) ruby? ( $(ruby_implementations_depend) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) @@ -161,6 +162,14 @@ web3 = true EOF use caps || sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed" use zeromq || sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed" + + if use probepg ; then + PGPV="$(best_version dev-db/postgresql-base)" + PGSLOT="$(get_version_component_range 1-2 ${PGPV##dev-db/postgresql-base-})" + sed -i \ + -e "s|pg_config|pg_config${PGSLOT/.}|" \ + plugins/probepg/uwsgiplugin.py || die "sed failed" + fi } each_ruby_compile() { @@ -228,6 +237,10 @@ src_compile() { python uwsgiconfig.py --plugin plugins/cgi gentoo || die "building plugin for cgi failed" fi + if use probepg ; then + python uwsgiconfig.py --plugin plugins/probepg gentoo || die "building plugin for postgresql probe failed" + fi + if use apache2 ; then for m in proxy_uwsgi Ruwsgi uwsgi ; do APXS2_ARGS="-c mod_${m}.c" |