1 |
commit: 340102ed2869c45f1867da615988d79d95c1eba4 |
2 |
Author: Tiziano Müller <tm <AT> dev-zero <DOT> ch> |
3 |
AuthorDate: Tue Nov 29 22:55:48 2011 +0000 |
4 |
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 29 22:55:48 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=340102ed |
7 |
|
8 |
build ruby plugins, fix building perl plugin, make capability and uuid support configurable |
9 |
|
10 |
--- |
11 |
www-servers/uwsgi/Manifest | 2 +- |
12 |
www-servers/uwsgi/uwsgi-1.0_rc7.ebuild | 32 ++++++++++++++++++++++++++------ |
13 |
2 files changed, 27 insertions(+), 7 deletions(-) |
14 |
|
15 |
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest |
16 |
index 129edd2..c00b589 100644 |
17 |
--- a/www-servers/uwsgi/Manifest |
18 |
+++ b/www-servers/uwsgi/Manifest |
19 |
@@ -4,7 +4,7 @@ AUX uwsgi.initd 2386 RMD160 a799175f2b94eb96dc19ff9b8b4d5c18a52cbd38 SHA1 ffa187 |
20 |
DIST uwsgi-0.9.8.6.tar.gz 359620 RMD160 78b92fe3a9b272ca5a2704b0db7d1956b9149a0b SHA1 bb835c3c14310640b24ebdbcf0aa91e8ce8bd5a6 SHA256 14379c0055063dbfbc4ce9ba10dfd6eec827286a462300d98947174d9694d981 |
21 |
DIST uwsgi-1.0-rc7.tar.gz 447066 RMD160 4e2ff2bbfbafd3e0402c3a551c43af88d7d370dc SHA1 9ab26a73ba6204ae509adc129ed2acc22413ab05 SHA256 7439578f62a3bf1adcfeb58b192405a77032b6b792bef3cd54dd3ae7ec4b1df2 |
22 |
EBUILD uwsgi-0.9.8.6.ebuild 4304 RMD160 ce533908cedae761db93ae26b811ae09e12847fc SHA1 29710c3c36fe5cffb34c180f9c6a48d7ace001e5 SHA256 5bf9203180bfa41622cad1f8c414b0a00af7b901e70017784f7648be43316b28 |
23 |
-EBUILD uwsgi-1.0_rc7.ebuild 4494 RMD160 7bdd37f424fe0d24595fcae20219cbdb98222006 SHA1 a0580b78bcd9a682d93ef8443f3d23f08d4dfbb1 SHA256 3022965197bf679019c3be27acbb274df31da095afeea2b06658c136bb7e86aa |
24 |
+EBUILD uwsgi-1.0_rc7.ebuild 5266 RMD160 dd1dd5587cf7073ef117eafc6d55dbbb96666196 SHA1 af20ef6642e1eac12671a2b1082b8a69c158d05f SHA256 05c9b91e01014eb999eda4b8a962f15c359dffce5a7170fabe4015930930c341 |
25 |
EBUILD uwsgi-9999.ebuild 4443 RMD160 114d797de425d0d5b3bfe23cfbc426aa9567fc99 SHA1 e26121b379a91b18edb6fcd2d94a5ef6377f0282 SHA256 37dc74d9d4d4224d419bca0f3805e7a936a303867cc94f6d26c8103a7dc3d45c |
26 |
MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 80e5cd4bd06fa22b86e439e7260064260df14d37 SHA256 418abb3d30490aae32336efcb4c27ee96af8a09f1f9bbfc629384efe8c2363a9 |
27 |
MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35 |
28 |
|
29 |
diff --git a/www-servers/uwsgi/uwsgi-1.0_rc7.ebuild b/www-servers/uwsgi/uwsgi-1.0_rc7.ebuild |
30 |
index 0641b06..bc63942 100644 |
31 |
--- a/www-servers/uwsgi/uwsgi-1.0_rc7.ebuild |
32 |
+++ b/www-servers/uwsgi/uwsgi-1.0_rc7.ebuild |
33 |
@@ -5,10 +5,11 @@ |
34 |
EAPI="4" |
35 |
PYTHON_DEPEND="python? 2:2.4:2.7 3:3.1:3.2" |
36 |
SUPPORT_PYTHON_ABIS="1" |
37 |
+USE_RUBY="ruby18 ree18 ruby19" |
38 |
|
39 |
MY_P="${P/_/-}" |
40 |
|
41 |
-inherit apache-module python multilib |
42 |
+inherit apache-module python multilib ruby-ng |
43 |
|
44 |
DESCRIPTION="uWSGI server for Python web applications" |
45 |
HOMEPAGE="http://projects.unbit.it/uwsgi/" |
46 |
@@ -17,9 +18,11 @@ SRC_URI="http://projects.unbit.it/downloads/${MY_P}.tar.gz" |
47 |
LICENSE="GPL-2" |
48 |
SLOT="0" |
49 |
KEYWORDS="~amd64 ~x86" |
50 |
-IUSE="apache2 +carbon debug json ldap lua +nagios +pcre perl python ruby rrdtool sqlite +xml yaml zeromq" |
51 |
+IUSE="apache2 +caps +carbon debug json ldap lua +nagios +pcre perl python ruby rrdtool sqlite +uuid +xml yaml zeromq" |
52 |
|
53 |
-CDEPEND="json? ( dev-libs/jansson ) |
54 |
+CDEPEND="uuid? ( sys-apps/util-linux ) |
55 |
+ caps? ( sys-libs/libcap ) |
56 |
+ json? ( dev-libs/jansson ) |
57 |
ldap? ( net-nds/openldap ) |
58 |
lua? ( dev-lang/lua ) |
59 |
pcre? ( dev-libs/libpcre ) |
60 |
@@ -48,6 +51,10 @@ use_true_false() { |
61 |
fi |
62 |
} |
63 |
|
64 |
+src_unpack() { |
65 |
+ default |
66 |
+} |
67 |
+ |
68 |
pkg_setup() { |
69 |
depend.apache_pkg_setup |
70 |
python_pkg_setup |
71 |
@@ -117,6 +124,19 @@ embed_config = |
72 |
paste = true |
73 |
web3 = true |
74 |
EOF |
75 |
+ use caps || sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed" |
76 |
+ use uuid || sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed" |
77 |
+} |
78 |
+ |
79 |
+each_ruby_compile() { |
80 |
+ cd "${WORKDIR}/${MY_P}" |
81 |
+ |
82 |
+ sed -i -e "s|^NAME=.*|NAME='rack_${RUBY##*/}'|" plugins/rack/uwsgiplugin.py || die "sed failed" |
83 |
+ UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo || die "building plugin for ${RUBY} failed" |
84 |
+ |
85 |
+ if [[ "${RUBY}" == *ruby19 ]] ; then |
86 |
+ UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/ruby19 gentoo || die "building plugin for ${RUBY} failed" |
87 |
+ fi |
88 |
} |
89 |
|
90 |
src_compile() { |
91 |
@@ -129,7 +149,7 @@ src_compile() { |
92 |
fi |
93 |
|
94 |
if use perl ; then |
95 |
- python uwsgiconfig.py --plugin plugins/perl gentoo || die "building plugin for perl failed" |
96 |
+ python uwsgiconfig.py --plugin plugins/psgi gentoo || die "building plugin for perl failed" |
97 |
fi |
98 |
|
99 |
if use python ; then |
100 |
@@ -139,7 +159,7 @@ src_compile() { |
101 |
fi |
102 |
|
103 |
if use ruby ; then |
104 |
- echo "TODO" |
105 |
+ ruby-ng_src_compile |
106 |
fi |
107 |
|
108 |
if use apache2 ; then |
109 |
@@ -189,6 +209,6 @@ pkg_postinst() { |
110 |
|
111 |
if use lua || use perl || use ruby || use python; then |
112 |
elog "The lua, perl and ruby modules are built as plugins." |
113 |
- elog "Use '--plugins lua', '--plugins psgi', '--plugins rack' or '--plugins python27' to load them." |
114 |
+ elog "Use '--plugins lua', '--plugins psgi', '--plugins rack_ruby18' or '--plugins python27' to load them." |
115 |
fi |
116 |
} |