gentoo resync : 11.01.2018

4 files changed, 124 insertions, 3 deletions

diff --git a/www-apps/rutorrent/Manifest b/www-apps/rutorrent/Manifest
index 602d9c9b4277..081c825176ae 100644
--- a/www-apps/rutorrent/Manifest
+++ b/www-apps/rutorrent/Manifest
@@ -1,4 +1,7 @@
 DIST plugins-3.4.tar.gz 674444 BLAKE2B ccbd132c5868684b3c25357d85e6aaa27b3e871730b6b64a1fe4dec765a9548be282a1aa98a39efc6b63df0fe1ebcf01ef7b74ea1ca293a636813684f8887406 SHA512 85d9ada4bd07cd50fdf88f4ae1a1bc682b6e54d5600356be73481094111cc21fad6fb2acac4b854ba815f986b3859caf824bc55c5bbac68872db8920e0c5fd9f
 DIST rutorrent-3.4.tar.gz 241253 BLAKE2B 7ff5423b36cd9a237b9cb656f65696948f31c1978460d4c17874a5fab6e7f1adf6bf7f5e1f165936913f79350aa6de81dffd929d0c7f406c7f125d36f2f0db43 SHA512 2fee5dd21e0d63fa9059c96ad3e8d09f3ce556adbfd1cb148224af998edcdb82c2fe05cb56daac0cdb8c3d50346536611d019fddb1833b06fa2ebc30cd884a0a
-EBUILD rutorrent-3.4-r1.ebuild 1334 BLAKE2B 55e7ee6281f1a3d34aed82bc135504df91f16f1f086b007aff0a286001c84a2b9bd8ffadee8cf419461fd3dc5d037dd6a41fd9dd1604cff6584882e40ece05e8 SHA512 02b3325e7ebfab527cb23ca49dce90517094e549fc5cb0f5b3a15394a66295032ad1aeae9ec9c6d2f580d173d741869e200201d8f7e2790571c638b47110fc03
+DIST rutorrent-3.8.tar.gz 1241643 BLAKE2B c432e8691d35447cd0698eee8edeee4060238dc39cc8cbb178c1169f166fa1d483493181ce0d2f468106ae01dd0f58d4fbb2f334de393fabb2b0aa73363e2b7f SHA512 ea3dfa74234a1eafcbc9e71d6c6d953a46fdf8e189237b8df0ec58cf46ac30404f7a15bb783ec7567ab6f28daa3987ee219039dd360e3c48d16aea244263c9b6
+EBUILD rutorrent-3.4-r1.ebuild 1343 BLAKE2B ea3ad97ae6495029caf170574f2a2211e08ec5e9b56b1531d053ea97642c9055dec8985ed651a310b089c463f7fa668314764da4bdab0c7eab9d012ae3717f93 SHA512 d83f9819f2f479dad57aa23359b77665d9a8f0fd615874831f49a606fcce0ada83921def3d800f0ac0baa1a01053af51f5b8d57068ea8bfdeb39263a034c1175
+EBUILD rutorrent-3.8-r1.ebuild 1459 BLAKE2B 579dc77ea961e691dbca5832ef86aab583d4fa94ff2242e04206cf0290be60e3f487c217d15baeba102826074f3af7362563bf47e4063497f613dbbbe5c10f9d SHA512 815ff584b0d4f633cc4f9b354cfa3015fb4ea94d543a9da61d022f5480061119550c1ac47aeec833856092937dbaa2e2ce3b9c35682f2f8cf5920c7a88ba74d5
+EBUILD rutorrent-9999.ebuild 1467 BLAKE2B ec857f6942731695b6ddfee49e6934fda166810cc55cc5c7f67c5d3a284db6db804abc796d1b63b3017b7f31d68b7ffe7349e7fc006080fa62fa1064cbf48375 SHA512 8201bc55f8ad87d40f69be72b171c587606f6ea6ff73751cef531e1b8334efd8276b02aa1a7a53b094be044fca4eeae90a61bdbb47831d32f365b2da65653b9d
 MISC metadata.xml 384 BLAKE2B e147aafe9fb919ad4bab6c3acb9ae2bdd7bf04a8f5744c79561e074c38435ea1f5e0389735a83e2c9cf7f14cdbd9f3e1de043b464bb04d06805ee619f4768a4a SHA512 4ce6c3cdef62943df6a9071634912c9686317111dae1936fa765aba03808b286e90bb69ca3f79a263dc6a9913399645890481131bfe5071eb3bd7f7d6c7c42d3
diff --git a/www-apps/rutorrent/rutorrent-3.4-r1.ebuild b/www-apps/rutorrent/rutorrent-3.4-r1.ebuild
index 2837a1ea1407..6aebd9832c59 100644
--- a/www-apps/rutorrent/rutorrent-3.4-r1.ebuild
+++ b/www-apps/rutorrent/rutorrent-3.4-r1.ebuild
@@ -18,9 +18,9 @@ IUSE=""
 need_httpd_cgi
 
 DEPEND="
-	|| ( dev-lang/php[xml,gd] dev-lang/php[xml,gd-external] )
+	|| ( <dev-lang/php-7[xml,gd] <dev-lang/php-7[xml,gd-external] )
 "
-RDEPEND="virtual/httpd-php"
+RDEPEND="<virtual/httpd-php-7"
 
 S="${WORKDIR}"
 
diff --git a/www-apps/rutorrent/rutorrent-3.8-r1.ebuild b/www-apps/rutorrent/rutorrent-3.8-r1.ebuild
new file mode 100644
index 000000000000..a45b892d7649
--- /dev/null
+++ b/www-apps/rutorrent/rutorrent-3.8-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+DESCRIPTION="ruTorrent is a front-end for the popular Bittorrent client rTorrent"
+HOMEPAGE="https://github.com/Novik/ruTorrent"
+SRC_URI="https://github.com/Novik/ruTorrent/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+
+need_httpd_cgi
+
+DEPEND="
+	|| ( dev-lang/php[xml,gd] dev-lang/php[xml,gd-external] )
+"
+RDEPEND="virtual/httpd-php"
+
+S="${WORKDIR}/ruTorrent-${PV}"
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_prepare() {
+	default
+	find -name '\.gitignore' -type f -exec rm -rf {} \;
+	# The 3.8 release of ruTorrent includes an .htaccess file that defines a .htpasswd that doesn't exist
+	rm '.htaccess'
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	chmod +x "${ED}${MY_HTDOCSDIR}"/plugins/*/*.sh \
+		"$ED${MY_HTDOCSDIR}"/php/test.sh || die "chmod failed"
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/share
+	webapp_serverowned "${MY_HTDOCSDIR}"/share/settings
+	webapp_serverowned "${MY_HTDOCSDIR}"/share/torrents
+	webapp_serverowned "${MY_HTDOCSDIR}"/share/users
+
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/.htaccess
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/config.php
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/access.ini
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/plugins.ini
+	webapp_configfile "${MY_HTDOCSDIR}"/share/.htaccess
+
+	webapp_src_install
+}
diff --git a/www-apps/rutorrent/rutorrent-9999.ebuild b/www-apps/rutorrent/rutorrent-9999.ebuild
new file mode 100644
index 000000000000..28165b2caaa4
--- /dev/null
+++ b/www-apps/rutorrent/rutorrent-9999.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+DESCRIPTION="ruTorrent is a front-end for the popular Bittorrent client rTorrent"
+HOMEPAGE="https://github.com/Novik/ruTorrent"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Novik/ruTorrent.git"
+else
+	SRC_URI="https://github.com/Novik/ruTorrent/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+fi
+
+LICENSE="GPL-2"
+IUSE=""
+
+need_httpd_cgi
+
+DEPEND="
+	|| ( dev-lang/php[xml,gd] dev-lang/php[xml,gd-external] )
+"
+RDEPEND="virtual/httpd-php"
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_prepare() {
+	default
+	find -name '\.gitignore' -type f -exec rm -rf {} \;
+	if [[ ${PV} == 9999 ]]; then
+		rm -rf .git
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	chmod +x "${ED}${MY_HTDOCSDIR}"/plugins/*/*.sh \
+		"$ED${MY_HTDOCSDIR}"/php/test.sh || die "chmod failed"
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/share
+	webapp_serverowned "${MY_HTDOCSDIR}"/share/settings
+	webapp_serverowned "${MY_HTDOCSDIR}"/share/torrents
+	webapp_serverowned "${MY_HTDOCSDIR}"/share/users
+
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/.htaccess
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/config.php
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/access.ini
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/plugins.ini
+	webapp_configfile "${MY_HTDOCSDIR}"/share/.htaccess
+
+	webapp_src_install
+}