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 <gentoo-commits+bounces-370069-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1Qqj9R-0000Dv-VU
for garchives@archives.gentoo.org; Tue, 09 Aug 2011 10:03:10 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 72A2A21C05B;
Tue, 9 Aug 2011 10:03:01 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 33FC921C05B
for <gentoo-commits@lists.gentoo.org>; Tue, 9 Aug 2011 10:03:01 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 7DB4F1B4054
for <gentoo-commits@lists.gentoo.org>; Tue, 9 Aug 2011 10:03:00 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 9970980040
for <gentoo-commits@lists.gentoo.org>; Tue, 9 Aug 2011 10:02:59 +0000 (UTC)
From: "Tiziano Müller" <dev-zero@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Tiziano Müller" <dev-zero@gentoo.org>
Message-ID: <cbe548d673af5f78f7ec32ebc87ddc87511515aa.dev-zero@gentoo>
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-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: cbe548d673af5f78f7ec32ebc87ddc87511515aa
Date: Tue, 9 Aug 2011 10:02:59 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: a5053ddf154bc90081b1788162451111
commit: cbe548d673af5f78f7ec32ebc87ddc87511515aa
Author: Tiziano Mueller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 8 16:06:21 2011 +0000
Commit: Tiziano M=C3=BCller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Mon Aug 8 16:06:21 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/dev-zero.git;a=
=3Dcommit;h=3Dcbe548d6
Fix building and installing plugins.
---
www-servers/uwsgi/Manifest | 5 ++-
.../uwsgi/files/uwsgi-9999-fix-destdir.patch | 11 +++++++++
www-servers/uwsgi/files/uwsgi.initd | 8 ++++++
www-servers/uwsgi/uwsgi-9999.ebuild | 24 ++++++++++++++=
+----
4 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index b04b601..13ba6bf 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -2,9 +2,10 @@ MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f=
57a1be9b5a SHA1 80e5cd4b
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-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 2258 RMD160 567652a6d348494e8f74c002a4af48c361fe4202 SHA=
1 7119489ea985984735fc11e9f1414cc737d3c09e SHA256 38df43560b1a4de0bef8b34=
55bec46942917c97465da9ab167a4fc33ab1d53f8
+AUX uwsgi.initd 2392 RMD160 d90a00358cfafc341889882989593ee567c3b153 SHA=
1 af23d4a1646560acd7a9d82dc2ac98196392075a SHA256 98859da43ac2def62b9b7d8=
527207481cdb4fbfbb17e9de6a1f2853d3271654d
MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SH=
A1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba7465=
7f3a332c7427c1bd24a5609d2ff887f63901d9cd35
EBUILD uwsgi-0.9.8.3.ebuild 3329 RMD160 21e4b09e5fb03a56bfdd225636799224=
4de8396c SHA1 8aab4fe9a179c896615d66a3b1b487338e640744 SHA256 fc595c2be57=
e1e2a8ff92fdd1e79470be7abc104f2167e7326af560bfe6bc65f
-EBUILD uwsgi-9999.ebuild 3396 RMD160 8d77416b104053e16e133a4e75c59f2a7bb=
b66b1 SHA1 35c54016e8ea95302f304a3b516586d9750f5a5f SHA256 3896af58a9a0b9=
15a9d84910595db9e015f13e952bc89fdb2ea006d0d97c941c
+EBUILD uwsgi-9999.ebuild 3701 RMD160 12064bd8202d62b224b6bb20739461a7c68=
bd003 SHA1 619c859ebb2e70ea545ee31ec9725bd9da966d65 SHA256 58bd6e5bc09b03=
ce9bc82c21e61c55536de61c985dde11befad0bb6c72d83245
DIST uwsgi-0.9.8.3.tar.gz 351168 RMD160 8bfdaa9a503516378e834bca60dfa828=
b7bee9d2 SHA1 780a96a2c32a0f7bb7f5a63353acca2fbd23a8e6 SHA256 2b529a8408b=
b4938ebccd3c4264af5af4f17ee5bd6043376ef3909c2411f611f
diff --git a/www-servers/uwsgi/files/uwsgi-9999-fix-destdir.patch b/www-s=
ervers/uwsgi/files/uwsgi-9999-fix-destdir.patch
new file mode 100644
index 0000000..a7c47b6
--- /dev/null
+++ b/www-servers/uwsgi/files/uwsgi-9999-fix-destdir.patch
@@ -0,0 +1,11 @@
+--- 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 580f967..5877449 100644
--- a/www-servers/uwsgi/files/uwsgi.initd
+++ b/www-servers/uwsgi/files/uwsgi.initd
@@ -9,6 +9,8 @@ UWSGI_EXEC=3D/usr/bin/uwsgi
PIDPATH=3D/var/run/uwsgi
PIDFILE=3D"${PIDPATH}/${PROGNAME}.pid"
=20
+opts=3D"${opts} reload"
+
depend() {
need net
}
@@ -86,3 +88,9 @@ stop() {
start-stop-daemon --stop --pidfile "${PIDFILE}" --signal 3
eend $?
}
+
+reload() {
+ elog "Reloading uWSGI"
+ start-stop-daemon --signal HUP --pidfile "${PIDFILE}"
+ eend $?
+}
diff --git a/www-servers/uwsgi/uwsgi-9999.ebuild b/www-servers/uwsgi/uwsg=
i-9999.ebuild
index f2d9356..80ed927 100644
--- a/www-servers/uwsgi/uwsgi-9999.ebuild
+++ b/www-servers/uwsgi/uwsgi-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=3D"3"
PYTHON_DEPEND=3D"*"
SUPPORT_PYTHON_ABIS=3D"1"
=20
-inherit eutils python toolchain-funcs apache-module mercurial
+inherit eutils python toolchain-funcs apache-module multilib mercurial
=20
DESCRIPTION=3D"uWSGI server for Python web applications"
HOMEPAGE=3D"http://projects.unbit.it/uwsgi/"
@@ -37,7 +37,8 @@ want_apache2_2
src_prepare() {
epatch \
"${FILESDIR}"/${PN}-0.9.8-no-werror.patch \
- "${FILESDIR}"/${PN}-0.9.8-fix-psgi-flags.patch
+ "${FILESDIR}"/${P}-fix-destdir.patch
+
python_copy_sources
}
=20
@@ -55,6 +56,7 @@ src_configure() {
use lua && plugins+=3D", lua"
use perl && plugins+=3D", psgi"
use ruby && plugins+=3D", rack"
+ plugins=3D"${plugins:1}"
=20
cat > "buildconf/default.ini" << EOF
[uwsgi]
@@ -82,11 +84,12 @@ unbit =3D false
xml_implementation =3D libxml2
yaml_implementation =3D libyaml
malloc_implementation =3D libc
-plugins =3D python, ping, cache, nagios, rpc, fastrouter, http, ugreen${=
plugins}
+plugins =3D ${plugins}
bin_name =3D uwsgi
append_version =3D
-plugin_dir =3D plugins
-#embedded_plugins =3D python, ping, cache, nagios, rpc, fastrouter, htt=
p, ugreen${plugins}
+plugin_build_dir =3D plugins
+plugin_dir =3D /usr/$(get_libdir)/uwsgi
+embedded_plugins =3D python, ping, cache, nagios, rpc, fastrouter, http=
, ugreen
=20
locking =3D auto
event =3D auto
@@ -120,6 +123,11 @@ src_compile() {
src_install() {
installation() {
newbin uwsgi uwsgi-${PYTHON_ABI}
+
+ if use lua || use perl || use ruby ; then
+ insinto /usr/$(get_libdir)/uwsgi
+ doins plugins/*.so
+ fi
}
python_execute_function -s installation
=20
@@ -134,6 +142,7 @@ src_install() {
=20
newinitd "${FILESDIR}"/uwsgi.initd uwsgi
newconfd "${FILESDIR}"/uwsgi.confd uwsgi
+
}
=20
pkg_postinst() {
@@ -145,4 +154,9 @@ pkg_postinst() {
elog "mod_uwsgi is commercially supported by Unbit and stable but a bi=
t hacky."
elog "mod_Ruwsgi is newer and more Apache-API friendly but not commerc=
ially supported."
fi
+
+ if use lua || use perl || use ruby ; then
+ elog "The lua, perl and ruby modules are built as real plugins."
+ elog "Use '--plugins lua', '--plugins psgi' or '--plugins rack' to loa=
d them."
+ fi
}