| 1 |
blueness 13/05/28 23:52:23 |
| 2 |
|
| 3 |
Modified: metadata.xml monkeyd-1.2.0.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Incorporate suggestions from gentoo-dev ML, thanks mgorny |
| 6 |
|
| 7 |
(Portage version: 2.1.11.62/cvs/Linux x86_64, unsigned Manifest commit) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.7 www-servers/monkeyd/metadata.xml |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/metadata.xml?rev=1.7&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/metadata.xml?rev=1.7&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/metadata.xml?r1=1.6&r2=1.7 |
| 15 |
|
| 16 |
Index: metadata.xml |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/monkeyd/metadata.xml,v |
| 19 |
retrieving revision 1.6 |
| 20 |
retrieving revision 1.7 |
| 21 |
diff -u -r1.6 -r1.7 |
| 22 |
--- metadata.xml 28 May 2013 12:55:02 -0000 1.6 |
| 23 |
+++ metadata.xml 28 May 2013 23:52:23 -0000 1.7 |
| 24 |
@@ -7,6 +7,6 @@ |
| 25 |
</maintainer> |
| 26 |
<use> |
| 27 |
<flag name="debug">Enable lots of debugging info</flag> |
| 28 |
- <flag name="shared-lib">Install shared lib</flag> |
| 29 |
+ <flag name="minimal">Do not install shared lib and include files</flag> |
| 30 |
</use> |
| 31 |
</pkgmetadata> |
| 32 |
|
| 33 |
|
| 34 |
|
| 35 |
1.2 www-servers/monkeyd/monkeyd-1.2.0.ebuild |
| 36 |
|
| 37 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.0.ebuild?rev=1.2&view=markup |
| 38 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.0.ebuild?rev=1.2&content-type=text/plain |
| 39 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.0.ebuild?r1=1.1&r2=1.2 |
| 40 |
|
| 41 |
Index: monkeyd-1.2.0.ebuild |
| 42 |
=================================================================== |
| 43 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.0.ebuild,v |
| 44 |
retrieving revision 1.1 |
| 45 |
retrieving revision 1.2 |
| 46 |
diff -u -r1.1 -r1.2 |
| 47 |
--- monkeyd-1.2.0.ebuild 28 May 2013 12:55:02 -0000 1.1 |
| 48 |
+++ monkeyd-1.2.0.ebuild 28 May 2013 23:52:23 -0000 1.2 |
| 49 |
@@ -1,6 +1,6 @@ |
| 50 |
-# Copyright 1999-2013 Gentoo Foundation |
| 51 |
+# Copyright 1999- Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.0.ebuild,v 1.1 2013/05/28 12:55:02 blueness Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.0.ebuild,v 1.2 2013/05/28 23:52:23 blueness Exp $ |
| 55 |
|
| 56 |
EAPI="5" |
| 57 |
|
| 58 |
@@ -15,13 +15,15 @@ |
| 59 |
SLOT="0" |
| 60 |
KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" |
| 61 |
|
| 62 |
-PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah cgi monkeyd_plugins_dirlisting fastcgi |
| 63 |
-monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_polarssl" |
| 64 |
-IUSE="-debug php shared-lib uclibc ${PLUGINS}" |
| 65 |
+PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah cgi monkeyd_plugins_dirlisting fastcgi monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_polarssl" |
| 66 |
+IUSE="-debug php minimal ssl uclibc ${PLUGINS}" |
| 67 |
|
| 68 |
# uclibc is often compiled without backtrace info so we should |
| 69 |
# force this off. If someone complains, consider relaxing it. |
| 70 |
-REQUIRED_USE="uclibc? ( !debug )" |
| 71 |
+REQUIRED_USE=" |
| 72 |
+ uclibc? ( !debug ) |
| 73 |
+ ssl? ( monkeyd_plugins_polarssl ) |
| 74 |
+" |
| 75 |
|
| 76 |
RDEPEND="php? ( dev-lang/php )" |
| 77 |
|
| 78 |
@@ -50,7 +52,7 @@ |
| 79 |
sed -i -e '/$STRIP /d' -e 's/install -s -m 644/install -m 755/' configure || die "No configure file" |
| 80 |
|
| 81 |
# We don't need the includes, sym link to libmonkey.so, or monkey.cp when not installing the .so |
| 82 |
- use shared-lib || { |
| 83 |
+ use minimal && { |
| 84 |
sed -i '/install -d \\$(INCDIR)/d' configure || die "No configure file" |
| 85 |
sed -i '/install -m 644 src\/include\/\*.h \\$(INCDIR)/d' configure || die "No configure file" |
| 86 |
sed -i '/ln -sf/d' configure || die "No configure file" |
| 87 |
@@ -80,7 +82,7 @@ |
| 88 |
myconf+=" --no-backtrace" |
| 89 |
fi |
| 90 |
|
| 91 |
- use shared-lib && myconf+=" --enable-shared" |
| 92 |
+ use minimal || myconf+=" --enable-shared" |
| 93 |
|
| 94 |
local enable_plugins="" |
| 95 |
local disable_plugins="" |
| 96 |
|
| 97 |
|
| 98 |
|
| 99 |
1.53 www-servers/monkeyd/ChangeLog |
| 100 |
|
| 101 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/ChangeLog?rev=1.53&view=markup |
| 102 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/ChangeLog?rev=1.53&content-type=text/plain |
| 103 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/ChangeLog?r1=1.52&r2=1.53 |
| 104 |
|
| 105 |
Index: ChangeLog |
| 106 |
=================================================================== |
| 107 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v |
| 108 |
retrieving revision 1.52 |
| 109 |
retrieving revision 1.53 |
| 110 |
diff -u -r1.52 -r1.53 |
| 111 |
--- ChangeLog 28 May 2013 12:55:02 -0000 1.52 |
| 112 |
+++ ChangeLog 28 May 2013 23:52:23 -0000 1.53 |
| 113 |
@@ -1,6 +1,9 @@ |
| 114 |
# ChangeLog for www-servers/monkeyd |
| 115 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 116 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.52 2013/05/28 12:55:02 blueness Exp $ |
| 117 |
+# Copyright 1999- Gentoo Foundation; Distributed under the GPL v2 |
| 118 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.53 2013/05/28 23:52:23 blueness Exp $ |
| 119 |
+ |
| 120 |
+ ; Anthony G. Basile <blueness@g.o> metadata.xml, monkeyd-1.2.0.ebuild: |
| 121 |
+ Incorporate suggestions from gentoo-dev ML, thanks mgorny |
| 122 |
|
| 123 |
*monkeyd-1.2.0 (28 May 2013) |
Archives