From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RVSnm-0006fi-TC for garchives@archives.gentoo.org; Tue, 29 Nov 2011 18:53:14 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CB9D321C136; Tue, 29 Nov 2011 18:52:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 877F521C136 for ; Tue, 29 Nov 2011 18:52:53 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E9AA81B4043 for ; Tue, 29 Nov 2011 18:52:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D707680052 for ; Tue, 29 Nov 2011 18:52:50 +0000 (UTC) From: "Tiziano Müller" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tiziano Müller" Message-ID: Subject: [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/ X-VCS-Repository: dev/dev-zero X-VCS-Files: www-servers/uwsgi/Manifest www-servers/uwsgi/files/uwsgi-0.9.8-fix-psgi-flags.patch www-servers/uwsgi/files/uwsgi-9999-fix-destdir.patch www-servers/uwsgi/files/uwsgi.initd www-servers/uwsgi/uwsgi-9999.ebuild X-VCS-Directories: www-servers/uwsgi/files/ www-servers/uwsgi/ X-VCS-Committer: dev-zero X-VCS-Committer-Name: Tiziano Müller X-VCS-Revision: a0481da457074bce07aebbe3cd1a2f9e10e885ed Date: Tue, 29 Nov 2011 18:52:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 4bc7de25-b09c-48ac-b9ce-e538a4658d1d X-Archives-Hash: 05a32bd8c4093bcab7a241628b62d518 commit: a0481da457074bce07aebbe3cd1a2f9e10e885ed Author: Tiziano M=C3=BCller dev-zero ch> AuthorDate: Tue Nov 29 18:52:44 2011 +0000 Commit: Tiziano M=C3=BCller gentoo org> CommitDate: Tue Nov 29 18:52:44 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/dev-zero.git;a= =3Dcommit;h=3Da0481da4 dropped all patches, merged changes to live ebuild --- www-servers/uwsgi/Manifest | 8 +- .../uwsgi/files/uwsgi-0.9.8-fix-psgi-flags.patch | 13 --- .../uwsgi/files/uwsgi-9999-fix-destdir.patch | 11 -- www-servers/uwsgi/files/uwsgi.initd | 2 +- www-servers/uwsgi/uwsgi-9999.ebuild | 110 +++++++++++++-= ------ 5 files changed, 73 insertions(+), 71 deletions(-) diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest index d5ec9d4..579f9cc 100644 --- a/www-servers/uwsgi/Manifest +++ b/www-servers/uwsgi/Manifest @@ -1,14 +1,10 @@ AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db= 7 SHA1 24624a805c16778aaa4e24b74d2e8230ee381aec SHA256 b759712baa7b8abab2= ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861 -AUX uwsgi-0.9.8-fix-psgi-flags.patch 640 RMD160 6556801682d2c35e30b39481= 2bf3c695b3f234da SHA1 6e305e2d1d9c8b3f5f0d41b72bcd058a2a1d0cc1 SHA256 f27= db595c0c9e9002163d978fc5f7075e1aa8fd453395ac6c43848b1a96bdb42 -AUX uwsgi-0.9.8-no-werror.patch 624 RMD160 ef3ebbfff1c6b4a49297e780b5eb5= 545786f8173 SHA1 a4e0923cb5ebaab19cee5b4495b1625f54c7510b SHA256 8650fe56= 0d25d9b6facf8034bb5edfedc8aa74f22a716da702d2b97a1d298998 -AUX uwsgi-0.9.8.3-fix-destdir.patch 385 RMD160 86e055c560079c61035107943= d63c48d3689c35c SHA1 44b54276acf2ea61da824bf8aab054e662cdc8aa SHA256 b9fc= af3b7a76ab7a5150b85df4a39ecf578a7f181d9880c36d1e6e876bcb0ed7 -AUX uwsgi-9999-fix-destdir.patch 385 RMD160 86e055c560079c61035107943d63= c48d3689c35c SHA1 44b54276acf2ea61da824bf8aab054e662cdc8aa SHA256 b9fcaf3= b7a76ab7a5150b85df4a39ecf578a7f181d9880c36d1e6e876bcb0ed7 AUX uwsgi.confd 1247 RMD160 f3cbb0ed1e83385e917949b7df1b8953792b9464 SHA= 1 2cba8d1990f0138f7bea113fec924b1656d53a8c SHA256 26c52f22137ffd44ef4c094= ce9cf3b55f1c418f1602e0451462103a5117174a4 -AUX uwsgi.initd 2388 RMD160 32dcbde8f29c55f3aba996396880d543fc51f97d SHA= 1 24276db0dd82a5b5cdd756772ed81ae5c86e6e45 SHA256 6497afcc6208d54f01ef853= bff0ee33eb4f5f63e0eb3e024bc206ee78966986b +AUX uwsgi.initd 2386 RMD160 a799175f2b94eb96dc19ff9b8b4d5c18a52cbd38 SHA= 1 ffa1870c2e14871764447bc97e6d7b9f24364a28 SHA256 d523238595e83b7f82001de= a41ffa3298836fd0027859ed3e1bf4f84d75e1370 DIST uwsgi-0.9.8.6.tar.gz 359620 RMD160 78b92fe3a9b272ca5a2704b0db7d1956= b9149a0b SHA1 bb835c3c14310640b24ebdbcf0aa91e8ce8bd5a6 SHA256 14379c00550= 63dbfbc4ce9ba10dfd6eec827286a462300d98947174d9694d981 DIST uwsgi-1.0-rc6.tar.gz 441757 RMD160 67ba49700adc523a73ce9cc49ce86d74= 2352c32e SHA1 bc2da6d7572222bf13cb6f3423e7dd4d38b7e3ce SHA256 e3878ac5fef= 7a9c4e5ebffe4c79a424c2aff34ebc5f6a6b2f88f16cb515552e2 EBUILD uwsgi-0.9.8.6.ebuild 4304 RMD160 ce533908cedae761db93ae26b811ae09= e12847fc SHA1 29710c3c36fe5cffb34c180f9c6a48d7ace001e5 SHA256 5bf9203180b= fa41622cad1f8c414b0a00af7b901e70017784f7648be43316b28 EBUILD uwsgi-1.0_rc6.ebuild 4494 RMD160 7bdd37f424fe0d24595fcae20219cbdb= 98222006 SHA1 a0580b78bcd9a682d93ef8443f3d23f08d4dfbb1 SHA256 3022965197b= f679019c3be27acbb274df31da095afeea2b06658c136bb7e86aa -EBUILD uwsgi-9999.ebuild 3714 RMD160 eb0a5686a9620fc309649c47b1c912dcb7a= 2948b SHA1 c45150e52d072f8b63ebb40fa3cf5c4d8cb67b6f SHA256 74251b3da8ff0d= 99aa12ee0905b4b20fe3ab581afd7054a6c8fb09a2d6622c64 +EBUILD uwsgi-9999.ebuild 4443 RMD160 114d797de425d0d5b3bfe23cfbc426aa956= 7fc99 SHA1 e26121b379a91b18edb6fcd2d94a5ef6377f0282 SHA256 37dc74d9d4d422= 4d419bca0f3805e7a936a303867cc94f6d26c8103a7dc3d45c MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 = 80e5cd4bd06fa22b86e439e7260064260df14d37 SHA256 418abb3d30490aae32336efcb= 4c27ee96af8a09f1f9bbfc629384efe8c2363a9 MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SH= A1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba7465= 7f3a332c7427c1bd24a5609d2ff887f63901d9cd35 diff --git a/www-servers/uwsgi/files/uwsgi-0.9.8-fix-psgi-flags.patch b/w= ww-servers/uwsgi/files/uwsgi-0.9.8-fix-psgi-flags.patch deleted file mode 100644 index a65e6d2..0000000 --- a/www-servers/uwsgi/files/uwsgi-0.9.8-fix-psgi-flags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/plugins/psgi/uwsgiplugin.py b/plugins/psgi/uwsgiplugin.py -index 9100824..8651fbb 100644 ---- a/plugins/psgi/uwsgiplugin.py -+++ b/plugins/psgi/uwsgiplugin.py -@@ -2,6 +2,6 @@ import os,sys -=20 - NAME=3D'psgi' - CFLAGS =3D [os.popen('perl -MExtUtils::Embed -e ccopts').read().rstrip(= )] --LDFLAGS =3D [os.popen('perl -MExtUtils::Embed -e ldopts').read().rstrip= ()] --LIBS =3D [] -+LDFLAGS =3D [os.popen('perl -MExtUtils::Embed -e ldopts | | grep -E "\= -W\S+"').read().rstrip()] -+LIBS =3D [os.popen('perl -MExtUtils::Embed -e ldopts | grep -o -E "\-[L= ].*"').read().rstrip()] - GCC_LIST =3D ['uwsgi_plmodule', 'psgi_loader', 'psgi_response', 'psgi_p= lugin'] diff --git a/www-servers/uwsgi/files/uwsgi-9999-fix-destdir.patch b/www-s= ervers/uwsgi/files/uwsgi-9999-fix-destdir.patch deleted file mode 100644 index a7c47b6..0000000 --- a/www-servers/uwsgi/files/uwsgi-9999-fix-destdir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- uwsgiconfig.py.orig 2011-08-08 17:56:14.649325030 +0200 -+++ uwsgiconfig.py 2011-08-08 17:58:00.085329500 +0200 -@@ -670,7 +670,7 @@ - else: - p_cflags.append("-D%s_plugin=3D%s_plugin" % (up.NAME, name)) -=20 -- plugin_dest =3D uc.get('plugin_dir') + '/' + name + '_plugin' -+ plugin_dest =3D uc.get('plugin_build_dir') + '/' + name + '_plugin' -=20 - shared_flag =3D '-shared' -=20 diff --git a/www-servers/uwsgi/files/uwsgi.initd b/www-servers/uwsgi/file= s/uwsgi.initd index f203af4..bb3ba6d 100644 --- a/www-servers/uwsgi/files/uwsgi.initd +++ b/www-servers/uwsgi/files/uwsgi.initd @@ -22,7 +22,7 @@ start() { =20 if [ "${SVCNAME}" =3D "uwsgi" ]; then eerror "You are not supposed to run this script directly. Create a sym= link" - eerror "for the FastCGI application you want to run as well as a copy = of the" + eerror "for the uwsgi application you want to run as well as a copy of= the" eerror "configuration file and modify it appropriately like so..." eerror eerror " ln -s uwsgi /etc/init.d/uwsgi.trac" diff --git a/www-servers/uwsgi/uwsgi-9999.ebuild b/www-servers/uwsgi/uwsg= i-9999.ebuild index 9a8d231..917af91 100644 --- a/www-servers/uwsgi/uwsgi-9999.ebuild +++ b/www-servers/uwsgi/uwsgi-9999.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-0.9.8.ebuild,= v 1.1 2011/06/08 18:00:13 maksbotan Exp $ +# $Header: $ =20 -EAPI=3D"3" -PYTHON_DEPEND=3D"*" +EAPI=3D"4" +PYTHON_DEPEND=3D"python? 2:2.4:2.7 3:3.1:3.2" SUPPORT_PYTHON_ABIS=3D"1" =20 -inherit eutils python toolchain-funcs apache-module multilib mercurial +inherit apache-module python multilib mercurial =20 DESCRIPTION=3D"uWSGI server for Python web applications" HOMEPAGE=3D"http://projects.unbit.it/uwsgi/" @@ -15,9 +15,9 @@ EHG_REPO_URI=3D"http://projects.unbit.it/hg/uwsgi" LICENSE=3D"GPL-2" SLOT=3D"0" KEYWORDS=3D"" -IUSE=3D"debug json ldap lua pcre perl ruby sqlite +xml yaml zeromq" +IUSE=3D"apache2 +carbon debug json ldap lua +nagios +pcre perl python ru= by rrdtool sqlite +xml yaml zeromq" =20 -RDEPEND=3D"json? ( dev-libs/jansson ) +CDEPEND=3D"json? ( dev-libs/jansson ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) @@ -27,21 +27,15 @@ RDEPEND=3D"json? ( dev-libs/jansson ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq )" -DEPEND=3D"${RDEPEND} +DEPEND=3D"${CDEPEND} dev-util/pkgconfig" +RDEPEND=3D"${CDEPEND} + rrdtool? ( net-analyzer/rrdtool )" =20 APXS2_S=3D"${S}/apache2" APACHE2_MOD_CONF=3D"42_mod_${PN}" want_apache2_2 =20 -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-0.9.8-no-werror.patch \ - "${FILESDIR}"/${P}-fix-destdir.patch - - python_copy_sources -} - use_true_false() { if use $1 ; then echo "true" @@ -50,15 +44,29 @@ use_true_false() { fi } =20 +pkg_setup() { + depend.apache_pkg_setup + python_pkg_setup +} + +src_prepare() { + 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" +} src_configure() { - configure() { - local plugins - use lua && plugins+=3D", lua" - use perl && plugins+=3D", psgi" - use ruby && plugins+=3D", rack" - plugins=3D"${plugins:1}" - - cat > "buildconf/default.ini" << EOF + local plugins=3D"" + use carbon && plugins+=3D", carbon" + use nagios && plugins+=3D", nagios" + use rrdtool && plugins+=3D", rrdtool" + + cat > "buildconf/gentoo.ini" << EOF [uwsgi] xml =3D $(use_true_false xml) ini =3D true @@ -84,12 +92,13 @@ unbit =3D false xml_implementation =3D libxml2 yaml_implementation =3D libyaml malloc_implementation =3D libc -plugins =3D ${plugins} +plugins =3D bin_name =3D uwsgi append_version =3D -plugin_build_dir =3D plugins plugin_dir =3D /usr/$(get_libdir)/uwsgi -embedded_plugins =3D python, ping, cache, nagios, rpc, fastrouter, http= , ugreen +plugin_build_dir =3D ${T}/plugins +embedded_plugins =3D ping, cache, rpc, fastrouter, http, ugreen, signal= , ${plugins:1} +as_shared_library =3D false =20 locking =3D auto event =3D auto @@ -105,12 +114,30 @@ paste =3D true web3 =3D true =20 EOF - } - python_execute_function -s configure } =20 src_compile() { - python_src_compile CC=3D"$(tc-getCC)" + python uwsgiconfig.py --build gentoo || die "building uwsgi failed" + + mkdir -p "${T}/plugins" + + if use lua ; then + python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plu= gin for lua failed" + fi + + if use perl ; then + python uwsgiconfig.py --plugin plugins/perl gentoo || die "building pl= ugin for perl failed" + fi + + if use python ; then + for a in ${PYTHON_ABIS} ; do + python uwsgiconfig.py --plugin plugins/python${a/.} gentoo || die "bu= ilding plugin for python-${a} failed" + done + fi + + if use ruby ; then + echo "TODO" + fi =20 if use apache2 ; then for m in Ruwsgi uwsgi ; do @@ -121,17 +148,20 @@ src_compile() { } =20 src_install() { - installation() { - newbin uwsgi uwsgi-${PYTHON_ABI} + dobin uwsgi + + insinto /usr/$(get_libdir)/uwsgi + doins "${T}/plugins"/*.so + + use lua && dosym uwsgi /usr/bin/uwsgi_lua =20 - if use lua || use perl || use ruby ; then - insinto /usr/$(get_libdir)/uwsgi - doins plugins/*.so - fi - } - python_execute_function -s installation + use perl && dosym uwsgi /usr/bin/uwsgi_perl =20 - python_generate_wrapper_scripts "${ED}usr/bin/uwsgi" + if use python ; then + for a in ${PYTHON_ABIS} ; do + dosym uwsgi /usr/bin/uwsgi_python${a/.} + done + fi =20 if use apache2; then for m in Ruwsgi uwsgi ; do @@ -155,8 +185,8 @@ pkg_postinst() { elog "mod_Ruwsgi is newer and more Apache-API friendly but not commerc= ially supported." fi =20 - if use lua || use perl || use ruby ; then + if use lua || use perl || use ruby || use python; then elog "The lua, perl and ruby modules are built as plugins." - elog "Use '--plugins lua', '--plugins psgi' or '--plugins rack' to loa= d them." + elog "Use '--plugins lua', '--plugins psgi', '--plugins rack' or '--pl= ugins python27' to load them." fi }