Remove older verions, drop virtual/httpd-php to dev-lang/php since it pulls in apache

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

5 files changed, 32 insertions, 158 deletions

diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog
index 5ce2b7317eaf..a90d7b0ae0d8 100644
--- a/www-servers/monkeyd/ChangeLog
+++ b/www-servers/monkeyd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/monkeyd
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.50 2012/11/21 11:02:51 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.51 2013/01/05 21:47:02 blueness Exp $
+
+  05 Jan 2013; Anthony G. Basile <blueness@gentoo.org> -monkeyd-1.0.1-r1.ebuild,
+  -monkeyd-1.0.1.ebuild, monkeyd-1.1.1.ebuild:
+  Remove older verions, drop virtual/httpd-php to dev-lang/php since it pulls in
+  apache
 
   21 Nov 2012; Agostino Sarubbo <ago@gentoo.org> monkeyd-1.1.1.ebuild:
   Stable for x86, wrt bug #439346
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index 243ae07cb925..f8c78777873b 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -1,9 +1,26 @@
+-----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.0.1.tar.gz 339773 SHA256 aea57483f46e5c5723f851cfbdd2a17a45ea8b7baa65d499e8b34216df617abc SHA512 42fa75370361328428eebed1d6a914137ab471022dff95f9efe8eec2ae59ef75753fa180bfd527beea2b83d5e33c394555ddbe13105f2901ceca4a44df382844 WHIRLPOOL 0ff51cd7396eb24d194341f4605b5541ac4360a85933d833cd3e4ebfce92e38509f99de2565e1df5adca4e827e9d5aeffe736cd9c4a6630b8f5acdbb28a7d408
 DIST monkey-1.1.1.tar.gz 404633 SHA256 5b6cf4b4a5cc2e6c7e2ac08515f542636884d7f85684f87005c6020e3567c7f4 SHA512 37a7806995d70a432d1f42e01f31a25012c7f39077613a4a0a772946ba512b52438d4ea3b798e09cc514833256775030a67ede5f66ac7ca93323642fba003008 WHIRLPOOL e490e34fe12a8f7f7fb63cb980fff6b642cbd341c56451ed4067fdb90445cacb6101b692e752f0771626846970651e1d07d1cb281e355be2fefa2581e96fe242
-EBUILD monkeyd-1.0.1-r1.ebuild 2057 SHA256 e90322f55c2420e9fd0edb7c4cd4f2d09ca745cc85c26c5ddb7c8d82cda3493f SHA512 38c012467b7bfb7b12599f28ce6739747b7bf185e9d137d7597645dea97f2e6631fccd0f7639bb0662f09b57c56dd15afa3afa1d81121beb507ea3c7e88cf31f WHIRLPOOL 51a96ca582d06232830d100d23bfc6016b576d9d3804de24cbfa54e50c4738dd6789be818fb2fca24cdf474acac18994c2f27ff8d11815aa1850c28e918b71b6
-EBUILD monkeyd-1.0.1.ebuild 1859 SHA256 efe78ee434c52e123d34f79f837a526fe30adfc3c78922e8f2e33936599570fa SHA512 1467a4d223f539192b55b1ab200a3aee758ed982801cc5ddd22ad772176bb17692087548a1416764ec8d0145b5af280184f771daf085e6e01c6820eb57593fea WHIRLPOOL 4f7dd9a41a40d436bd3ae06c3bbd83ac14901b8b9b0668b34a834668e62146274eed19d064ed09158936441f53afcd88b2e22752f6b4addf8f1a853ebedf81a5
-EBUILD monkeyd-1.1.1.ebuild 2044 SHA256 891714efd21c8a7c32aa013f19304899eebcd965b3e44c064c33d6d1ed0b1715 SHA512 1d9a84695f0e5f12c6933359ca087b4e4da2244666849a23012c6734cc68f61288aa8aab73072c5457dd481e1efb64648e87fa13c43008b42e9a05aec6242615 WHIRLPOOL 82c7ffb974026843637f0e22c06bfe896afb9da493507b08f1ffc35320ef5e884592d169a870f36637427138f9f539e001cdbdfb8607cce9935a048aad7401e6
-MISC ChangeLog 8445 SHA256 12b713dac52b24ac65d067f6c4addf08e3919221ddb5807fd510111cf55a6de4 SHA512 dd1732bd5f2d52abb0ab2134e5da8d0b5157265200f243ced36d10c7af7d5a2704e69c5ba100cfa5e141297b32e1492c800637346e9a3043b30797a7f658df8e WHIRLPOOL c473a3e3b752e06cc2f45c9197e9af1191665c7f4303dfca1334e0ee539f05792d2dae1cd8a7d2e93f5820b6f76602e9a04f25b361704b83e6fc06da55ed7a4b
+EBUILD monkeyd-1.1.1.ebuild 2044 SHA256 8929978ca500523871a1707816a12de6f47950d3b90efde6a29fe960ef1d6c80 SHA512 d8b549bd1df2543928a132226969ae6352ae245ce9afd98199a5c4497fd335fb0832687c7c3a789b43e7da6c6bb02a9daa7c8e14c81a6b6b57d9af545d74dfc1 WHIRLPOOL b399c1df3a3bdf5c4eb2093d154e9c3195c4233afccad725cf736492cd3c684a600c9eff53764cf486c7a964940e60a73c0a7fe5f2a47a267aa876bbc4f7d593
+MISC ChangeLog 8669 SHA256 deb33409117a3013795d2ab7e736b96077926649acdd37ac154c429c1ff11300 SHA512 100ee0c0a5ba3bf56ccda5d0c9b3f96baccf4f46efb9c7d7fdf313eb77b5d3b8743cfea8aa11726d5e22f6f91b66889f95f742fe546d8ff743f3d273cbc14806 WHIRLPOOL f9cbf78fa1182f67b567bd819c5dfe554bd78a0d8aa25be6b4c1a48fad856d453e35f79531aaf391c1248d12beaea0bcef40cb746674a4a201193e45574b66e7
 MISC metadata.xml 234 SHA256 86b598d5029ad9988722ec63434ea041be297ddbb0b2e290025f3b9737427ae9 SHA512 6bae37c6cc1d1145120c93ca1e2dcfe44019a51ef00edbc4ce132dbbe1f349a0eb854d6b0c1e4585fb4026a2142d23cc6ea493fc8ceb1aba7d8e3a404ad81491 WHIRLPOOL ee79d3a53e7c3d2b2af95c299347c823a6e6270eb7130c5dabaf966ef7615c063fced95a444e81165cf7c04543247654afa1195c2dc085e34cc8194a9a63f75e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQ6J9bAAoJEJOE+m71LUu6Kl4P/jAmJ3/EHHoDUTalDttXlhMY
+dq3bXy6k4NjxR3S/YGq3QiPSYDhzC6WZTT2YXTkXeWLeA89ejZeYOe/AIA6qefP8
+VkVqWtCjDyzlyHVbAzcnj+sjhIfxPFETzvbjUKWt7XDf3ca93UKhcbo1958Blruq
+6pH9wtfIGZB8Vti4AeZh4DflJuGFI0VFpYGhWi5gbZjyBf2+zrW0Ljk8CxlT/2C/
+HhSRMa2jKUSZks8cx4nSU4eo0CA6sAv/+J42vaaPq0vfEKvuen6jGg+GDsTXTQFa
+/17uD3vfNOpRVHn6as7e3GmqTinJjnS+HHBK8RUOXjx9tFXiW+DgFcndDkYW7aMv
+qLz+jegXcWhsuESlvXp8fIV7NFOkxoMUZ4XrWZzjRwP54Z6lJc9DQ33yErSE8Gpu
+5chzQVDbGCVoSwN77x+3RUYklSKeW7aW5Bz1cLg1Juf77GdI64nHbL6KGxUiI5rq
+BQp0d1pz6+nsEvoHF41R6Wvqy2DIEwfhGfnD6ZG7gCXDa2gLncGIntIoTLGGXI7N
+CZabTORnu9Uuavp/mWgIvtbtgqofaar43lfmyPPD0tku2j7xB0CHLHu+Tb4K1vsq
+jD3qafNb6xWj99KEmBhvtkqhVpRHlpaj81cq4U37F7pd3yJvnzk5feKfZ7jfZQkZ
+fp7T3EYosg7HSNVZPpIt
+=beks
+-----END PGP SIGNATURE-----
diff --git a/www-servers/monkeyd/monkeyd-1.0.1-r1.ebuild b/www-servers/monkeyd/monkeyd-1.0.1-r1.ebuild
deleted file mode 100644
index 338b3ceff807..000000000000
--- a/www-servers/monkeyd/monkeyd-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.0.1-r1.ebuild,v 1.2 2012/08/08 12:35:24 blueness Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs depend.php multilib
-
-MY_P="${PN/d}-${PV}"
-DESCRIPTION="A small, fast, and scalable web server"
-HOMEPAGE="http://www.monkey-project.com/"
-SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="php"
-
-RDEPEND="php? ( virtual/httpd-php )"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBROOT="/var/www/localhost"
-
-pkg_setup() {
-	use php && require_php_cgi
-}
-
-src_prepare() {
-	# Don't install the banana script, we use ${FILESDIR}/monkeyd.initd
-	sed -i '/install -m 755 bin\/banana/d' configure || die "sed banana"
-
-	# Don't explicitly strip files
-	sed -i -e '/$STRIP /d' -e 's/install -s -m 644/install -m 755/' configure || die
-}
-
-src_configure() {
-	# Non-autotools configure
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--datadir=${WEBROOT}/htdocs \
-		--logdir=/var/log/${PN} \
-		--mandir=/usr/share/man \
-		--plugdir=/usr/$(get_libdir)/monkeyd/plugins \
-		--sysconfdir=/etc/${PN} \
-		|| die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-
-	# Don't install the banana script man page
-	rm "${S}"/man/banana.1
-}
-
-src_install() {
-	default
-
-	if use php ; then
-		sed -i -e '/^#AddScript application\/x-httpd-php/s:^#::' "${D}"/etc/monkeyd/monkey.conf || die
-		sed -i -e 's:/home/my_home/php/bin/php:/usr/bin/php-cgi:' "${D}"/etc/monkeyd/monkey.conf || die
-	fi
-
-	sed -i -e "s:/var/log/monkeyd/monkey.pid:/var/run/monkey.pid:" "${D}"/etc/monkeyd/monkey.conf || die
-	newinitd "${FILESDIR}"/monkeyd.initd monkeyd
-	newconfd "${FILESDIR}"/monkeyd.confd monkeyd
-
-	#move htdocs to docdir, bug #429632
-	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
-	mv "${D}"${WEBROOT}/htdocs \
-		"${D}"/usr/share/doc/"${PF}"/htdocs.dist
-	mkdir "${D}"${WEBROOT}/htdocs
-
-	keepdir \
-		/var/log/monkeyd \
-		${WEBROOT}/htdocs
-}
diff --git a/www-servers/monkeyd/monkeyd-1.0.1.ebuild b/www-servers/monkeyd/monkeyd-1.0.1.ebuild
deleted file mode 100644
index 437dd4df2ab0..000000000000
--- a/www-servers/monkeyd/monkeyd-1.0.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.0.1.ebuild,v 1.6 2012/08/01 15:57:03 blueness Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs depend.php multilib
-
-WEBROOT="/var/www/localhost"
-
-MY_P="${PN/d}-${PV}"
-DESCRIPTION="A small, fast, and scalable web server"
-HOMEPAGE="http://www.monkey-project.com/"
-SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 x86"
-IUSE="php"
-
-RDEPEND="php? ( virtual/httpd-php )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use php && require_php_cgi
-}
-
-src_prepare() {
-	# Don't install the banana script, we use ${FILESDIR}/monkeyd.initd
-	sed -i '/install -m 755 bin\/banana/d' configure || die "sed banana"
-
-	# Don't explicitly strip files
-	sed -i -e '/$STRIP /d' -e 's/install -s -m 644/install -m 755/' configure || die
-}
-
-src_configure() {
-	# Non-autotools configure
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--datadir=${WEBROOT}/htdocs \
-		--logdir=/var/log/${PN} \
-		--mandir=/usr/share/man \
-		--plugdir=/usr/$(get_libdir)/monkeyd/plugins \
-		--sysconfdir=/etc/${PN} \
-		|| die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-
-	# Don't install the banana script man page
-	rm "${S}"/man/banana.1
-}
-
-src_install() {
-	default
-
-	if use php ; then
-		sed -i -e '/^#AddScript application\/x-httpd-php/s:^#::' "${D}"/etc/monkeyd/monkey.conf || die
-		sed -i -e 's:/home/my_home/php/bin/php:/usr/bin/php-cgi:' "${D}"/etc/monkeyd/monkey.conf || die
-	fi
-
-	mv "${D}"${WEBROOT}/htdocs/{index,index-monkey}.html
-
-	sed -i -e "s:/var/log/monkeyd/monkey.pid:/var/run/monkey.pid:" "${D}"/etc/monkeyd/monkey.conf || die
-	newinitd "${FILESDIR}"/monkeyd.initd monkeyd
-	newconfd "${FILESDIR}"/monkeyd.confd monkeyd
-}
diff --git a/www-servers/monkeyd/monkeyd-1.1.1.ebuild b/www-servers/monkeyd/monkeyd-1.1.1.ebuild
index 158baa783ee2..2604cbcf8c03 100644
--- a/www-servers/monkeyd/monkeyd-1.1.1.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.1.1.ebuild,v 1.5 2012/11/21 11:02:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.1.1.ebuild,v 1.6 2013/01/05 21:47:02 blueness Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 arm ~mips ppc ppc64 x86"
 IUSE="php"
 
-RDEPEND="php? ( virtual/httpd-php )"
+RDEPEND="php? ( dev-lang/php )"
 
 S="${WORKDIR}/${MY_P}"