Incorporate suggestions from gentoo-dev ML, thanks mgorny

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64

4 files changed, 19 insertions, 34 deletions

diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog
index 0b8279e7ceee..0b62dbec0fa5 100644
--- a/www-servers/monkeyd/ChangeLog
+++ b/www-servers/monkeyd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/monkeyd
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.52 2013/05/28 12:55:02 blueness Exp $
+# Copyright 1999- Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.53 2013/05/28 23:52:23 blueness Exp $
+
+  ; Anthony G. Basile <blueness@gentoo.org> metadata.xml, monkeyd-1.2.0.ebuild:
+  Incorporate suggestions from gentoo-dev ML, thanks mgorny
 
 *monkeyd-1.2.0 (28 May 2013)
 
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index 30fdcb5156c1..644d6e77fd28 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -1,28 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX monkeyd.confd 288 SHA256 ba8e0113f3d90f4c5681fb9c76ab523b56ffa409f8b388db9f83e54bd1700eee SHA512 0ed5e3e7f86564d157d833f980e715ebbc0017530f967b21581a1df8c0990a15ff8af538f664c03da3b10affa02773ad78e4dcd03a3d3f670d7661ecaf0ca00f WHIRLPOOL 1f736bab1f63324c0020d2d236bb84bf253978d76db8087ff0d71849bece6ae7531dfa6ab250e2f136301ef265f35061d059eb45536fc1b8220c9fbd78b83ef2
 AUX monkeyd.initd 716 SHA256 3e1c3d1fcf12bde4847f86c06eaf82c1230af8c56040d56f25d22a6fbbae285d SHA512 9f5ac51a06c0255d5d2b09c19228c849c5314f8f9d4ef2dbc837028620462897dd81b504cbf53bd36bd4896e72fcc17b2b0043e038de7bd3d39aa1be26dc8126 WHIRLPOOL e3d4788d4b78a7e1b8482581547350e1dc989ca561484283533d696eea3419f89643fe45610c6e793a3e2c26a1ef7e6ef24cba9fba99f8e06a4cfcbe25cc57c6
 DIST monkey-1.1.1.tar.gz 404633 SHA256 5b6cf4b4a5cc2e6c7e2ac08515f542636884d7f85684f87005c6020e3567c7f4 SHA512 37a7806995d70a432d1f42e01f31a25012c7f39077613a4a0a772946ba512b52438d4ea3b798e09cc514833256775030a67ede5f66ac7ca93323642fba003008 WHIRLPOOL e490e34fe12a8f7f7fb63cb980fff6b642cbd341c56451ed4067fdb90445cacb6101b692e752f0771626846970651e1d07d1cb281e355be2fefa2581e96fe242
 DIST monkey-1.2.0.tar.gz 425807 SHA256 b15b7f5df57a57ffea42380454e2de9896297f3326756f77b39ca8386d9fb22f SHA512 6358e817e75cf8160f95ec8185eb7db21793b1dde916c8a5e38b85f788e284a00175fa82cf764451db6a4b656b50c25908baf6f52d73037e4f597eb84c05c356 WHIRLPOOL bf717c8c873935031955bf7f5d940f01d132347fc9b5e4f5b3d4f93bdcf2bce65b19644d5e5b12d6b1409f4734b6a28c90576e603086d7a52817fd7f0ea11840
 EBUILD monkeyd-1.1.1.ebuild 2044 SHA256 8929978ca500523871a1707816a12de6f47950d3b90efde6a29fe960ef1d6c80 SHA512 d8b549bd1df2543928a132226969ae6352ae245ce9afd98199a5c4497fd335fb0832687c7c3a789b43e7da6c6bb02a9daa7c8e14c81a6b6b57d9af545d74dfc1 WHIRLPOOL b399c1df3a3bdf5c4eb2093d154e9c3195c4233afccad725cf736492cd3c684a600c9eff53764cf486c7a964940e60a73c0a7fe5f2a47a267aa876bbc4f7d593
-EBUILD monkeyd-1.2.0.ebuild 4251 SHA256 9c7bf2f34dcfeca0283a5a72a2b9d0a616cfcdf42fa9b66689206c7c50698496 SHA512 b9f0121ac4f00d45c25f9b408016cfd252acf40ad119fe5c04f7f20150e54c9056f240a1f0d9fe0dcdb99ca500c3a08943d6f5d06d906a69d28b2621cc827c9e WHIRLPOOL f22beaae33084606e4f9cdb6ddc9085681aa73e5d3dc950eecfae149cdc946d23d5e1a766e8fce4db2810c7a79c9e0db5e90defd1684de2c258e849fdc19ceb9
-MISC ChangeLog 8809 SHA256 268ddfd0ccf843e727108c1d43aa67876be3c1f00a32d9f6c93b3247c5925640 SHA512 c79da412a766efa4139fff677220c77e76c96d54f79e5b1f33becc176cba4dfcf4ec7cd9cae6f7c97902d13ca1852ef37d91de47903ff7fee9d848f1d376aa85 WHIRLPOOL d3cccc4e4ffdcfa612ceb82ad0ef4671037357c3aefada911878b6b84a1b3a0e46587b34dfc1b2a8771e9f20dac15f3b75975defc91e0f40e9642cfc799eaba1
-MISC metadata.xml 363 SHA256 fbfae392fe1ae496e54604944b1b3dcd5e20441cc614f3affe878e44af60d116 SHA512 1b0b3d73f924f4278ba67b28be35fb2aa69d0840d262d767ab303f492baf8f8254f4abef6d35bf68b51e41f9a53b73628d7976284cbfd3fd05db30340860a621 WHIRLPOOL f581574f4e4c923e626e075477f316d21d30e9bfbca19ccc401f9c71ca238aae1cbca5b32da11fdb23ee1d8dff15825ffa9132cc807c77a67ac937004cec7934
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJRpKk7AAoJEJOE+m71LUu6T1gQAJd1u7zTz0/iNBBkl0yd4vdh
-rusgOImfQZQfSPaW5c9XKKpSZP3xtVeJxxWqNLV57k1PqmXsOLYmndZPnQ2b56c7
-OSBACztoapm4/J4D4K6W+02AA/7pJ1PMvk5COzWV9/hFcXrRpaDerE8Swk4iOb9e
-Si1p9ggUrSqreIW9UBlVNyUn5s5s20b7GTae3+pJ6dqVnNtM6Fi9nSOwAPZAI8B4
-6oNPyuz+OSs/d68kVG4xbE358z5sckx7X7JYLJ0r4nX4g3ar2TI+eHJfxXe2Mi1p
-YvHoUlG9FpQHw4Pg67z6qWadI//idV8Tu6G5+4/KMJ4FVDwW4a7qfO/cOf/g5RCW
-FXpEO6wTLR82i/xjqdQP4S7JFtqGBj/oNPG9eqtfJM3D2Xw3d3o5W6b2lCCSissm
-wgBl5U+ztWdIO6wZkIpiPsrlS7/ZMeY/DfgIxjVWZ5zQDGYdDOEXeBmZS4ldQWrP
-jm2yf4MjDqYhBlUJ/+4T6wdvrgKgA3nknjnzwi4ocCJHn0I1GhLFXX9F7Lo/M5bS
-HN4GANrYlbyL67k7PyCghGH0fimnZDDLkGZHzi8TvW3l6l1XeXqUcCgkOqR9Hy6l
-bQaxcwosOy5fB7Y7E58BqF6H1U2fhMcVB/o55GSI1nuPOi/fVLQKZht3OKBAbzUH
-CH4tzFQ0M/fkzBIZEDqo
-=6aAo
------END PGP SIGNATURE-----
+EBUILD monkeyd-1.2.0.ebuild 4280 SHA256 595a523ac4b27b6baa3320e42a1089de794315f1221765807c7278fc5467dd3f SHA512 e6439044b55e1ee22890b98697b7702d446efaa8a538235f7a0cd75a6ef24ccb7897e47e5dcbb8fc9b6fbb5a691d23c04a8979cdca4444d9e57d256c88d2139c WHIRLPOOL 75e5a37bbcba13b0f68a9b01cc8ba56dc96a0907f9cb5a1c941fbd78e5f9720c2de5e6bf0554ce44d67e849a584ff4b39616f57f87c64d41e9927ca411f25aa6
+MISC ChangeLog 8946 SHA256 62b5c72034d0e32b62a2a88e4952138798d84ee4185e77530933ff6a0acd9440 SHA512 3882d91d0c5c56523f801c0818fb22589b0d3f2ffd010d76fae9c7ff8c03b688aba5b79ba930e951bb2512ac7cce14e89c327c0469e4ebb47362057eff419666 WHIRLPOOL ecaeb10e9744cb53c5c6e342d5c62fe482b404fde033736ef43b1e93bebf65487b768d7096411f8bae24f14c9aed79499f2b4059682a4211469276211a43ad35
+MISC metadata.xml 385 SHA256 88901f1e630c8bb995da2ece6f50de69a82b845f63e51742c6f90b26f31c5321 SHA512 863daa33d3ce733a5b84927dba2f0bb28f24802b27f0b2ef225b4c5e8251977f8500ea015f0f21febda32cc7933c95daf9add6fe9563cce979ecf8096babb242 WHIRLPOOL b61c7a2b8e851a98662ebbc76cfb826a0980c6c9654f119d152f226add3cce42b8ed2e2d354e6c994b9e10badd3521b611d133bdc0983a00c75e920717959269
diff --git a/www-servers/monkeyd/metadata.xml b/www-servers/monkeyd/metadata.xml
index 0f40c54bf1e1..560c188cd6b4 100644
--- a/www-servers/monkeyd/metadata.xml
+++ b/www-servers/monkeyd/metadata.xml
@@ -7,6 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="debug">Enable lots of debugging info</flag>
-		<flag name="shared-lib">Install shared lib</flag>
+		<flag name="minimal">Do not install shared lib and include files</flag>
 	</use>
 </pkgmetadata>
diff --git a/www-servers/monkeyd/monkeyd-1.2.0.ebuild b/www-servers/monkeyd/monkeyd-1.2.0.ebuild
index a80f8afe0ed7..e6865987a8ba 100644
--- a/www-servers/monkeyd/monkeyd-1.2.0.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999- Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.0.ebuild,v 1.1 2013/05/28 12:55:02 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.0.ebuild,v 1.2 2013/05/28 23:52:23 blueness Exp $
 
 EAPI="5"
 
@@ -15,13 +15,15 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 
-PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah cgi monkeyd_plugins_dirlisting fastcgi
-monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_polarssl"
-IUSE="-debug php shared-lib uclibc ${PLUGINS}"
+PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah cgi monkeyd_plugins_dirlisting fastcgi monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_polarssl"
+IUSE="-debug php minimal ssl uclibc ${PLUGINS}"
 
 # uclibc is often compiled without backtrace info so we should
 # force this off.  If someone complains, consider relaxing it.
-REQUIRED_USE="uclibc? ( !debug )"
+REQUIRED_USE="
+	uclibc? ( !debug )
+	ssl? ( monkeyd_plugins_polarssl )
+"
 
 RDEPEND="php? ( dev-lang/php )"
 
@@ -50,7 +52,7 @@ src_prepare() {
 	sed -i -e '/$STRIP /d' -e 's/install -s -m 644/install -m 755/' configure || die "No configure file"
 
 	# We don't need the includes, sym link to libmonkey.so, or monkey.cp when not installing the .so
-	use shared-lib || {
+	use minimal && {
 		sed -i '/install -d \\$(INCDIR)/d' configure || die "No configure file"
 		sed -i '/install -m 644 src\/include\/\*.h \\$(INCDIR)/d' configure || die "No configure file"
 		sed -i '/ln -sf/d' configure || die "No configure file"
@@ -80,7 +82,7 @@ src_configure() {
 		myconf+=" --no-backtrace"
 	fi
 
-	use shared-lib && myconf+=" --enable-shared"
+	use minimal || myconf+=" --enable-shared"
 
 	local enable_plugins=""
 	local disable_plugins=""