gentoo resync : 25.01.2019

7 files changed, 76 insertions, 292 deletions

diff --git a/app-emulation/phpvirtualbox/Manifest b/app-emulation/phpvirtualbox/Manifest
index b6e74e42b436..e13ebaabd0d8 100644
--- a/app-emulation/phpvirtualbox/Manifest
+++ b/app-emulation/phpvirtualbox/Manifest
@@ -1,10 +1,5 @@
+AUX README.gentoo 607 BLAKE2B f6836398730c601219df5c5e293f0e693f9bd663a540f048fe911f3d1d3c1e01e235600ddfd05c2374591889415444f68b343397aadd95ffb80de499e8c66ba8 SHA512 d94fb5a595d54ee47c75a724c7c60d1b2b6a055ca2f56bc8ad3ec52807662bf115f87829f2b5f10faeb7dc06e03d900d8e5b11bac893ae1e97afee8b1e865b6b
 AUX vboxinit-initd 1137 BLAKE2B 6f9d010fa083da3a89648c9550e24080097c5b2314dd747f12d450d5de3d36bc952dc413e56e395673a97a2b232c9db42ffc5e287f2b3eda498c27d4d05043dd SHA512 f58deaa89e34a05664f072dea2602fbc08c29301d9501631ded31a4fb0d996e756e269cbebd357dcdf7758c1927602384de0bb2c65366e0a0a858cedb9288770
-DIST phpvirtualbox-4.2-7.zip 3425805 BLAKE2B c5e9bb629b346af378ee585b940c2f41cef4025caef66809212bab2f5cfd6621e3980fc2c7e5a9140fb3d16545df81af452d6733f2a3ba8f6f23d1a914472b6f SHA512 a066f127115a83c6061e8c0ff6447464818511f3ab7805c119f75ddc88459efd144d45fb358ce52959301f2f1a4f2609f7f42c2bb24213a5be98f2036085a81b
-DIST phpvirtualbox-4.3-0.zip 4231805 BLAKE2B 8f9c995c3c7112b6ec73a49b322f210ae2befcd711ac9459ea0eea9a7216c2e3322489ada69a91940af76a276a8c053384e0632b209250c7b3ca37291a574e57 SHA512 fd49a6a4c79d75f37fd40d74743f295a148548373ab046cf1f31ef7b982008ea6b9d2838cdad2dc37a1d266ed630cd2ddb7f7423ea62af1e0f8f9f76a12c0e9d
-DIST phpvirtualbox-5.0-3.zip 4092132 BLAKE2B c781b9d49ed20fb2748a7aa7d8685d5f2c10ba72268e6bbdb53a041873c6390605376a09bc4a7cfd5cca3de9d3045c60a2e515668ba1d5f49b623aee9e5cf568 SHA512 b632ff3be2028bd011ce27b580996638dfc89e09350c459f16bd1c8c5c3eefbab93f42d7facfb99279eb2ee1c6a38854ea999654ca2090a39c7bfa0afa7fe2d5
-DIST phpvirtualbox-5.0-5.zip 4093766 BLAKE2B 77c453a2d43558ae3db23c3b2b20d08b713731c5444c7613a2018edef77774e97d8dc25345606520df10df7802d86efedf38d73670ec0dacb48606e4785ed0cd SHA512 5478e4a5eb74786eb409a87e7c962c80df558655342f541dddceb7e4cf153a4e5f0bda9b83c2a8a921326f6210c2c3bd344c4a9ce30547f25acce5966c4d6135
-EBUILD phpvirtualbox-4.2.7.ebuild 1779 BLAKE2B cb00f1b29079bb61f1e6ebcdecb6a21b8ef48383a7bbd8dcb6b779343f73a2fb15828d11c51c69425da3555c3fe997c70a22ae850b84db12177189b79a41fa63 SHA512 d23aef6bd479d68d40e17a09d3d93930869e8e2cd2fe83047f82532a40919b36ed607c165b301595ac0e5f0bfd25123d99bd46b08439363c67fce981767688da
-EBUILD phpvirtualbox-4.3.0.ebuild 1771 BLAKE2B d6acaaf564ca5cd7e415d1c88a1a552a0addf35630e8c8d992fadbc1bb75d51ae579ef3254be9f297f1024c6f69abd595fa66a772142d0ade2503373c192ab45 SHA512 72cbe2fe6dca2e61fea66e5da7c10b844bf1a4f650ff9a32572b04136b06d989deb2aa110bdb63133ea9946a90103b6f2f3cc588b6f151e943e3175b2f7489fd
-EBUILD phpvirtualbox-5.0.3.ebuild 1779 BLAKE2B d28d5f08e63ee87387f3bcce1c3b99fe62848311b81095ff3b15f426dab4febf2787c0f919c4c00628432d757478b93ff84d2cfcbbaa46a9097ec0ae5488836b SHA512 ee7a040f11c7660fad03907e8e181620e066e7a7fc421b23e50f1e88b73e6288e47ff68f9a47c72d1e8be6c9b50cd4f5099f6e02f8fc2803a54820cb6cc76b3c
-EBUILD phpvirtualbox-5.0.5.ebuild 1777 BLAKE2B ab3e9649df822905f20c36e7d128b4a048b202ecb2f6d22742d8ae25ae786183732a0094f5302bfd781279e1712f72d050f6d80d3a10deb5f73f16d8698673e5 SHA512 faf7326b0df465ad260b07632bfb6b5a4c7f0e164d560d65956cffc17210ebd1d32fb14f6b082280afe7e73f44b9a5b84c4c2e99e2da3c4698275ab402f6be2d
+DIST phpvirtualbox-5.2-1.tar.gz 3882921 BLAKE2B 6eb76d3f4372bbd83648f4c1b1f37ec7478a1818e7dcef345bddf603d9ae51314f6fd0a448b42d7434389a364e4c8e177f4b13936f50c6c30a58e00aa0b714e7 SHA512 6805f58a3abdfdac9bb34170d3980ba3fae1118526bbb587b67a55032cc2c25923bf2d7bec01ed60439b3070f2e0668079f73e41ca29d18dd9e24abe3219830c
+EBUILD phpvirtualbox-5.2.1.ebuild 1276 BLAKE2B 922562a7dcb39c2fb6f6ccb15022e215d4349ca9dbaf93c9552ce69f34a740d16fbef971067f5d3e896a838666f6ae33c5c7f7274b61f375d3e70919d7d65ee2 SHA512 fe80198a4922228b11f532ba08e176889653ea44e467f2b43493c9bd391f8915baddfec6fa0526f121176c37350e258691ddfebbaf9543bb21f7529f75b0f18b
 MISC metadata.xml 308 BLAKE2B 15cefacb57d5c54d20459ab621b5fe04eb087955f51e427ccdf87c3739379999238939cdf6d2fd5113ad1e47d0d4d3732060f68cc8834a28a7a7d12c3f7cec49 SHA512 26be35e054b6129811d4144bf4f5f37f2a7dc7d1876635fe8e105dd96ff480914fcc71e05968e76f8f257de7779d399f5e95228d95640188e54846697ba13d52
diff --git a/app-emulation/phpvirtualbox/files/README.gentoo b/app-emulation/phpvirtualbox/files/README.gentoo
new file mode 100644
index 000000000000..45699ef72f06
--- /dev/null
+++ b/app-emulation/phpvirtualbox/files/README.gentoo
@@ -0,0 +1,16 @@
+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-@@SLOT@@ script to the
+default runlevel on the virtualbox host:
+`rc-update add vboxinit-@@SLOT@@ 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.
diff --git a/app-emulation/phpvirtualbox/phpvirtualbox-4.2.7.ebuild b/app-emulation/phpvirtualbox/phpvirtualbox-4.2.7.ebuild
deleted file mode 100644
index c87ab7614462..000000000000
--- a/app-emulation/phpvirtualbox/phpvirtualbox-4.2.7.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit versionator eutils webapp 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="mirror://sourceforge/${PN}/${MY_P}.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-lang/php[session,unicode,soap,gd]
-	virtual/httpd-php:*
-"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"/${MY_P}
-
-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.3.0.ebuild b/app-emulation/phpvirtualbox/phpvirtualbox-4.3.0.ebuild
deleted file mode 100644
index 05e465bd19fa..000000000000
--- a/app-emulation/phpvirtualbox/phpvirtualbox-4.3.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit versionator eutils webapp 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="mirror://sourceforge/${PN}/${MY_P}.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-lang/php[session,unicode,soap,gd]
-	virtual/httpd-php:*
-"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-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-5.0.3.ebuild b/app-emulation/phpvirtualbox/phpvirtualbox-5.0.3.ebuild
deleted file mode 100644
index d299a2e28b04..000000000000
--- a/app-emulation/phpvirtualbox/phpvirtualbox-5.0.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit versionator eutils webapp 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="mirror://sourceforge/${PN}/${MY_P}.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-lang/php[session,unicode,soap,gd]
-	virtual/httpd-php:*
-"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${MY_P}"
-
-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-5.0.5.ebuild b/app-emulation/phpvirtualbox/phpvirtualbox-5.0.5.ebuild
deleted file mode 100644
index b6cb641a6e5a..000000000000
--- a/app-emulation/phpvirtualbox/phpvirtualbox-5.0.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit versionator eutils webapp 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="mirror://sourceforge/${PN}/${MY_P}.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-lang/php[session,unicode,soap,gd]
-	virtual/httpd-php:*
-"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${MY_P}"
-
-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.md
-	rm -f CHANGELOG.txt LICENSE.txt README.md
-
-	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-5.2.1.ebuild b/app-emulation/phpvirtualbox/phpvirtualbox-5.2.1.ebuild
new file mode 100644
index 000000000000..4738dfe6851e
--- /dev/null
+++ b/app-emulation/phpvirtualbox/phpvirtualbox-5.2.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver webapp readme.gentoo-r1
+
+MY_PV="$(ver_rs 2 '-')"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Web-based administration for VirtualBox in PHP"
+HOMEPAGE="https://sourceforge.net/projects/phpvirtualbox/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-lang/php:*[gd,session,soap,unicode]
+	virtual/httpd-php:*
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+
+	local DISABLE_AUTOFORMATTING="true"
+	local DOC_CONTENTS=$(sed -e "s;@@FILESDIR@@;${FILESDIR};" \
+				 -e "s;@@SLOT@@;${SLOT};" "${FILESDIR}/README.gentoo")
+
+	webapp_src_preinst
+
+	dodoc CHANGELOG.txt README.md
+	rm -f CHANGELOG.txt LICENSE.txt README.md
+
+	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-${SLOT}
+	fi
+
+	readme.gentoo_create_doc
+
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	readme.gentoo_print_elog
+}