app-emulation/phpvirtualbox: Replace need_php_httpd with virtual/httpd-php (#552848). Drop old

Package-Manager: portage-2.2.20.1

8 files changed, 4 insertions, 218 deletions

diff --git a/app-emulation/phpvirtualbox/Manifest b/app-emulation/phpvirtualbox/Manifest
index b8425709c3ab..4a7ff9c6cf9f 100644
--- a/app-emulation/phpvirtualbox/Manifest
+++ b/app-emulation/phpvirtualbox/Manifest
@@ -1,7 +1,4 @@
 DIST phpvirtualbox-4.1-11.zip 2763347 SHA256 91a78c7dead035edf8138a363c6b3cb89d8f348fa3c38455af232f51bcf592ef SHA512 c5eb1b9fd0bba20e3dda9cbe6985c60d953a340d77b9427f344e8b595a06a5d9805209cf73704fb93de5ee2f412e02cb1434ed0e983b0622cf8a8172d7dff9a5 WHIRLPOOL ca95767f63f3c018738de36dede1859e0b6185cd22d4f7a40128dd5a14791ca9402a2ef54c4928c1a4c4408ddcb62b312a4d05743c0722f9a8fee1555df4021a
-DIST phpvirtualbox-4.1-7.zip 2760199 SHA256 16c27cd1bcc843b464752c3dd7091247b690218bca06fcecbdd130c5daf70b7c SHA512 657d5c5424d540ef3da9db54e638d227b68fcc336ec097f8a319a689990a53ad9f17af6fd0cd4be699212e83f06468bb65c4da03faf0a65ff77386f23aaf9409 WHIRLPOOL f2327749d6333bc07dce1f28f42e297f8e24777b556967513218d429e78db1fdd00112cca5ddd91d94012a8b0c5ab7c475c7209b3f12e2bad95085ce112f6f3d
-DIST phpvirtualbox-4.2-3b.zip 3184088 SHA256 23134a05d22ac9429524abb9d7165eb4c0ef7c52c917e9ced317e9ff71d0405f SHA512 c0ebf5fb2defd23b5999d7616e47a93696259973b563e2e0cd415db0a9f5be5f3798ac9e6d242c44208ce2c51ba2ab7cf43288ae8108563b45bd119ba2fa8c2f WHIRLPOOL 467385c219fc525151285390fa5a68b273b52be699e97a308f77c74bdeab911a845a7e28343b665ee2d6126aca2f0c3021816adbaa23b0d563ea06d7ec20c62c
-DIST phpvirtualbox-4.2-4.zip 3663173 SHA256 dd2681dc9703ec68a995cac98719863dca9e0720e45f5e0322dbb6fa3858138b SHA512 51e3b90bb5fcedbd45a6e54cf3ea6cc74cd764bdc107f97f9cb24c27f2c5d53a862781b808ab7d53cdbbd9d4cff93734d7578676b409d10326895dd1c5dcdc15 WHIRLPOOL 1678790492df50f7ae63bd4b44dbcd0ddd892c1bef9d455bf47bb20f1dcdac4955645fe71d549095ccc4a19f5960abf0f34fa1d95c4f4c8d82a34848a405fe06
 DIST phpvirtualbox-4.2-7.zip 3425805 SHA256 3dc078d7058d75aa5745f531a6d485a11fff18972df1a638a749f019e0196e4e SHA512 a066f127115a83c6061e8c0ff6447464818511f3ab7805c119f75ddc88459efd144d45fb358ce52959301f2f1a4f2609f7f42c2bb24213a5be98f2036085a81b WHIRLPOOL d6cf095b9768b7a9c0113c8df354dad124a0b2dc0a52e8518dfde230823c95dcad6b6e3df56cc41a4474b8b73cb281f3bfc91f417078e0b6f1136acd70dca4cf
 DIST phpvirtualbox-4.3-0.zip 4231805 SHA256 e33eea5553fb134ba6a1203e33e212bc5764c05b28164dcc02c6d66af565c293 SHA512 fd49a6a4c79d75f37fd40d74743f295a148548373ab046cf1f31ef7b982008ea6b9d2838cdad2dc37a1d266ed630cd2ddb7f7423ea62af1e0f8f9f76a12c0e9d WHIRLPOOL 1c96ec2fe19092dabac9e04be596974cc4dbaa9993c34e76b938036e8e04c67dc4f4f344be8afd636d603a478ce0c85435a75f8d6cf59bbdc3a11c6fd575b6c1
 DIST phpvirtualbox-5.0-3.zip 4092132 SHA256 8e23eee4ee36ff8cf765afb6842338e8ea8190956882ec0baa30f09ff4fe134b SHA512 b632ff3be2028bd011ce27b580996638dfc89e09350c459f16bd1c8c5c3eefbab93f42d7facfb99279eb2ee1c6a38854ea999654ca2090a39c7bfa0afa7fe2d5 WHIRLPOOL 38070a6935e3a4e5155f84db395c9e82603583957b26fcf166a654446052b15aa3d3b7653a9f7d56a33382dc82058e55413575e75c26b4c97f782bb868cc66e8
diff --git a/app-emulation/phpvirtualbox/phpvirtualbox-4.1.11.ebuild b/app-emulation/phpvirtualbox/phpvirtualbox-4.1.11.ebuild
index 2e5ce9c4d278..adf58b45d031 100644
--- a/app-emulation/phpvirtualbox/phpvirtualbox-4.1.11.ebuild
+++ b/app-emulation/phpvirtualbox/phpvirtualbox-4.1.11.ebuild
@@ -19,11 +19,10 @@ IUSE=""
 
 RDEPEND="
 	dev-lang/php[session,unicode,soap,gd]
+	virtual/httpd-php
 "
 DEPEND="app-arch/unzip"
 
-need_php_httpd
-
 src_install() {
 	webapp_src_preinst
 
diff --git a/app-emulation/phpvirtualbox/phpvirtualbox-4.1.7-r2.ebuild b/app-emulation/phpvirtualbox/phpvirtualbox-4.1.7-r2.ebuild
deleted file mode 100644
index 2e5ce9c4d278..000000000000
--- a/app-emulation/phpvirtualbox/phpvirtualbox-4.1.7-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit versionator eutils webapp depend.php
-
-MY_PV="$(replace_version_separator 2 '-')"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Web-based administration for VirtualBox in PHP"
-HOMEPAGE="https://sourceforge.net/projects/phpvirtualbox/"
-SRC_URI="https://${PN}.googlecode.com/files/${MY_P}.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-lang/php[session,unicode,soap,gd]
-"
-DEPEND="app-arch/unzip"
-
-need_php_httpd
-
-src_install() {
-	webapp_src_preinst
-
-	cd ${MY_P}
-
-	dodoc CHANGELOG.txt LICENSE.txt README.txt || die
-	rm -f CHANGELOG.txt LICENSE.txt README.txt
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config.php-example
-	webapp_serverowned "${MY_HTDOCSDIR}"/config.php-example
-
-	webapp_src_install
-	if has_version app-emulation/virtualbox[vboxwebsrv] || \
-		has_version app-emulation/virtualbox-bin[vboxwebsrv]
-	then
-		newinitd "${FILESDIR}"/vboxinit-initd vboxinit
-	fi
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-	elog "Local or remote virtualbox hosts must be compiled with"
-	elog "'vboxwebsrv' useflag and the respective init script"
-	elog "must be running to use this interface"
-	elog " /etc/init.d/vboxwebsrv start"
-	elog
-	elog "To enable the automatic startup mode feature uncomment the"
-	elog "following line in the config.php file:"
-	elog " var \$startStopConfig = true;"
-	elog
-	elog "You should also add the /etc/init.d/vboxinit script to the"
-	elog "default runlevel on the virtualbox host:"
-	elog "\`rc-update add vboxinit default\`"
-	elog "If the server is on a remote host, than the script must be"
-	elog "copied manually from"
-	elog "${FILESDIR}/vboxinit-initd to /etc/init.d/vboxinit"
-	elog "on the remote host."
-}
diff --git a/app-emulation/phpvirtualbox/phpvirtualbox-4.2.3b.ebuild b/app-emulation/phpvirtualbox/phpvirtualbox-4.2.3b.ebuild
deleted file mode 100644
index 2e5ce9c4d278..000000000000
--- a/app-emulation/phpvirtualbox/phpvirtualbox-4.2.3b.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit versionator eutils webapp depend.php
-
-MY_PV="$(replace_version_separator 2 '-')"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Web-based administration for VirtualBox in PHP"
-HOMEPAGE="https://sourceforge.net/projects/phpvirtualbox/"
-SRC_URI="https://${PN}.googlecode.com/files/${MY_P}.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-lang/php[session,unicode,soap,gd]
-"
-DEPEND="app-arch/unzip"
-
-need_php_httpd
-
-src_install() {
-	webapp_src_preinst
-
-	cd ${MY_P}
-
-	dodoc CHANGELOG.txt LICENSE.txt README.txt || die
-	rm -f CHANGELOG.txt LICENSE.txt README.txt
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config.php-example
-	webapp_serverowned "${MY_HTDOCSDIR}"/config.php-example
-
-	webapp_src_install
-	if has_version app-emulation/virtualbox[vboxwebsrv] || \
-		has_version app-emulation/virtualbox-bin[vboxwebsrv]
-	then
-		newinitd "${FILESDIR}"/vboxinit-initd vboxinit
-	fi
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-	elog "Local or remote virtualbox hosts must be compiled with"
-	elog "'vboxwebsrv' useflag and the respective init script"
-	elog "must be running to use this interface"
-	elog " /etc/init.d/vboxwebsrv start"
-	elog
-	elog "To enable the automatic startup mode feature uncomment the"
-	elog "following line in the config.php file:"
-	elog " var \$startStopConfig = true;"
-	elog
-	elog "You should also add the /etc/init.d/vboxinit script to the"
-	elog "default runlevel on the virtualbox host:"
-	elog "\`rc-update add vboxinit default\`"
-	elog "If the server is on a remote host, than the script must be"
-	elog "copied manually from"
-	elog "${FILESDIR}/vboxinit-initd to /etc/init.d/vboxinit"
-	elog "on the remote host."
-}
diff --git a/app-emulation/phpvirtualbox/phpvirtualbox-4.2.4.ebuild b/app-emulation/phpvirtualbox/phpvirtualbox-4.2.4.ebuild
deleted file mode 100644
index b9d97f925bd6..000000000000
--- a/app-emulation/phpvirtualbox/phpvirtualbox-4.2.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit versionator eutils webapp depend.php readme.gentoo
-
-MY_PV="$(replace_version_separator 2 '-')"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Web-based administration for VirtualBox in PHP"
-HOMEPAGE="https://sourceforge.net/projects/phpvirtualbox/"
-SRC_URI="https://${PN}.googlecode.com/files/${MY_P}.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-lang/php[session,unicode,soap,gd]
-"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"/${MY_P}
-
-need_php_httpd
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Local or remote virtualbox hosts must be compiled with
-'vboxwebsrv' useflag and the respective init script
-must be running to use this interface:
-/etc/init.d/vboxwebsrv start
-
-To enable the automatic startup mode feature uncomment the
-following line in the config.php file:
-var \$startStopConfig = true;
-
-You should also add the /etc/init.d/vboxinit script to the
-default runlevel on the virtualbox host:
-\`rc-update add vboxinit default\`
-If the server is on a remote host, than the script must be
-copied manually from
-'${FILESDIR}'/vboxinit-initd to
-/etc/init.d/vboxinit on the remote host."
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc CHANGELOG.txt LICENSE.txt README.txt
-	rm -f CHANGELOG.txt LICENSE.txt README.txt
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config.php-example
-	webapp_serverowned "${MY_HTDOCSDIR}"/config.php-example
-
-	webapp_src_install
-	if has_version app-emulation/virtualbox[vboxwebsrv] || \
-		has_version app-emulation/virtualbox-bin[vboxwebsrv]
-	then
-		newinitd "${FILESDIR}"/vboxinit-initd vboxinit
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/phpvirtualbox/phpvirtualbox-4.2.7.ebuild b/app-emulation/phpvirtualbox/phpvirtualbox-4.2.7.ebuild
index a54923a4471b..591b528b8170 100644
--- a/app-emulation/phpvirtualbox/phpvirtualbox-4.2.7.ebuild
+++ b/app-emulation/phpvirtualbox/phpvirtualbox-4.2.7.ebuild
@@ -19,13 +19,12 @@ IUSE=""
 
 RDEPEND="
 	dev-lang/php[session,unicode,soap,gd]
+	virtual/httpd-php:*
 "
 DEPEND="app-arch/unzip"
 
 S="${WORKDIR}"/${MY_P}
 
-need_php_httpd
-
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="
 Local or remote virtualbox hosts must be compiled with
diff --git a/app-emulation/phpvirtualbox/phpvirtualbox-4.3.0.ebuild b/app-emulation/phpvirtualbox/phpvirtualbox-4.3.0.ebuild
index 287392f5c305..951edd15e003 100644
--- a/app-emulation/phpvirtualbox/phpvirtualbox-4.3.0.ebuild
+++ b/app-emulation/phpvirtualbox/phpvirtualbox-4.3.0.ebuild
@@ -19,13 +19,12 @@ IUSE=""
 
 RDEPEND="
 	dev-lang/php[session,unicode,soap,gd]
+	virtual/httpd-php:*
 "
 DEPEND="app-arch/unzip"
 
 S="${WORKDIR}"
 
-need_php_httpd
-
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="
 Local or remote virtualbox hosts must be compiled with
diff --git a/app-emulation/phpvirtualbox/phpvirtualbox-5.0.3.ebuild b/app-emulation/phpvirtualbox/phpvirtualbox-5.0.3.ebuild
index e14574da6d31..5d046cb1bc34 100644
--- a/app-emulation/phpvirtualbox/phpvirtualbox-5.0.3.ebuild
+++ b/app-emulation/phpvirtualbox/phpvirtualbox-5.0.3.ebuild
@@ -19,13 +19,12 @@ IUSE=""
 
 RDEPEND="
 	dev-lang/php[session,unicode,soap,gd]
+	virtual/httpd-php:*
 "
 DEPEND="app-arch/unzip"
 
 S="${WORKDIR}/${MY_P}"
 
-need_php_httpd
-
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="
 Local or remote virtualbox hosts must be compiled with