gentoo resync : 17.05.2018

12 files changed, 291 insertions, 148 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 922e4029a232..b43b5170acde 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index e2d58bbd37a7..6b662a741791 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -2,12 +2,14 @@ AUX config-r1.php 1780 BLAKE2B 1d80339f97771f5f4cce03f49d055598269fd50832d6f98d5
 AUX config.php 718 BLAKE2B b12392f83a9feaaad4ad5ac7c7e3ff27670b9aad959db5528900472cc6cd10f19c9a371c17f0412b7c0c985f4ba1bcf39ecea8c7ef9e0a8ed50012cc64f4b72b SHA512 38347d3a275397074abe3cc8cd1521c7fe2deb45f4702d7a8a3e3c30ab6e2c1c51fa2c1f58d7fc99f0b72f2dcd243b8dcfdd7b3641c22c41399705aab6b59479
 AUX postinstall-en.txt 6524 BLAKE2B 68262eaf6318780a468d9e6f98c3b2cce43164964de6ea6626da43b1ac481b6edea6d0314cc4038adb511c4354a8f18dfd9da9145901d26665f84e746ab14e9b SHA512 bb3e5187db6be49707801cfde15ebced065f2d4b8c1a04fef2f4ced0a67dab2440b8e79d110685056cad84647f8ebb587c697452df8e2b0eab07b015d01b92cf
 AUX postinstall-nodb-en.txt 171 BLAKE2B ee2aa857cf365815b705b5e60c5b2fef0cdb0bcd8acef0375e0173f13c004e336df9b2dbc6cac376bea939e8fe73a72f06d52961500d05ee2137a8fea82286b1 SHA512 b0cf4787351f904caf06573c5bc50275b6a11361170b4006acc24224f44efde69cfe3a9b6340d6787c5805c605dc89f07072bf992b0ee255c97fba90e5d5617e
-DIST moodle-3.1.11.tgz 38028187 BLAKE2B 00f9afc6da046c44245de0cdd5e498b116b99ecb58c8858556df5121a4ad8972c37930efea9f962239c6ba35ba35384977e3237e6806cc3ffba4de466b7a1abc SHA512 3dd87b982f8806884ffc78251b6ce63b73113f46da0637779ccf45f5eb06741b175cfce47dabf7ae0dcd17a87cd868ccf4a036abce6cc51d08c6b6cce727dcf8
-DIST moodle-3.2.8.tgz 40323405 BLAKE2B c593d04235c5e0f3b8eb53037e22b0245d0b7279484055720c35a42bad8cdb3e26c433355be34c96a19d2201f311f5e6d478246d49fcfad8c9d0788bd2a90dbf SHA512 f684e77f54c040ad3ab782b376db478da896e761e1dc07a6b00c82382b5c2a5c999bac4d7990c43bee2e06da3d7563e774302b51371606043ee4ced0fa7c0fb6
-DIST moodle-3.3.5.tgz 44374771 BLAKE2B 9a57ff007d5f78d084ca8c5ba4c121d95f627d1fa10e8d6e7dc8a3ecce40d6d1020bf5213905fea8fb3caed57397ec13a48209a03967f423b0b0b3ee0729621f SHA512 77ef398d0fff56a54d6fc3fbf05726c0442599a7b269903ed7cb7ffe4ff891a77347f448a6d35d7c700dedc233cb33a8eb6fe3eef7aac6f455ecf45b159091a6
-DIST moodle-3.4.2.tgz 45012231 BLAKE2B bc9f06a40118721fe31a57ccc52497f62e55f4a9a2728a2a1f377210cf3e8c873de88a8b7fce32a71f05e1d763f63af9bcba7c548dc229a4e3431ff1c7e6bcda SHA512 29d81dac0aff688d5ee9c2ddfdbba71a9dbfc8422923b950e8d3a5d8c4da45fa6a953f225c237250ee73324bce5ce55f42bd470f070a4ecf58ed746c80bdf643
-EBUILD moodle-3.1.11.ebuild 2940 BLAKE2B fd1e914e7f7e855cb50447fb213259116d4ad418253db19e4d05bb7dda22178df4c302eecc5b258c728a581088493c11bd70ea302049069ef38f90c6828900b9 SHA512 47d2571d4e7a8e6217edbb2a491427ec39067649d61aed699bb41ce4a7912ea2bdcc773d3e6ab75426f8c3c163339f1b49a54a6e18dfaa6715d230495d69fbac
-EBUILD moodle-3.2.8.ebuild 2940 BLAKE2B 8d5ae724882dd03edddcd58f582e3ca54426b9b5da1f75b3749a0eef4d83d305f4f4a30c4047313d8235470d6461eee1892b8b50ce552dee631244ceea30d255 SHA512 b48d12a304316cca3dfc2065f1adc03f5912af2ba78cce7e8c1af7c1016beabdddab620ad0a8f343e757a03abb141215ef2877107140afbdb10dc118639e6e08
-EBUILD moodle-3.3.5.ebuild 2954 BLAKE2B 537ddca9825bc9113b92ac1e32dd25bf045f0d9d7937a964260752d1d9114e68fe45cbde22a7d8c800ae2e89dd31db2e2b338fd3c363b765637178a735a8f3fe SHA512 190fea32bf4412a827f7e603bdc1c6a55433f19fa2181edba843527e95fec71d4133ee4e43e2fb4ea80688240905046920510851cc68bf61bebc4951af6b3ac2
-EBUILD moodle-3.4.2.ebuild 2952 BLAKE2B d41d38833dac8c16aa78d7ff71750cfa500a5398a505fdf3825b26a20609630eebf22209bdb054c1751ea3cc49b12f9b9663746467ce9224ade7d9c40236c8e2 SHA512 bf2475f92a8d07c49c89d0dcd0653a078f7569c25028271ed8691dd14cb375adb73c21300e773c54fb26979ce1f4e1bc0079716b27e8d172c200967c2a4eb47c
+DIST moodle-3.1.12.tgz 38023724 BLAKE2B f6903d2603eaab37c2da3e53c00b942a00ecd28fc14b927dd3dad3785e1f64e71745ba207f9e12669b2b74c2406c314fd7eef4b61a9e9f7fe3b25f4657399854 SHA512 0c32fe968e2b676806e400bb57f0fc2cea29282ea27f8d13892ac804fbe77885afe83ccef9515224d1ee5f201de2bace620a5ff63aa94c9e5293e65a97608142
+DIST moodle-3.2.9.tgz 40333782 BLAKE2B 8ca8d01e2f15eafa11f06fa064e891f6d0669b788211c6b713c8dd73fd08eb6e728eced3d2f2d776218ddab1fc3e06797e9b6a05b6f63ddbd9ee6e2f9e3839e8 SHA512 983c7905123bb2c6a798ce7acc66f025e90fee937fa6d2811b56d3952e7a82daa3d9c6fb140deb525d931310f462d24b52bc7004ec8573ef920326058a59dfbb
+DIST moodle-3.3.6.tgz 44870790 BLAKE2B 4f603532043d853cc0bd95e77146487b279ac8957f807b7e386268a01e929385737d6995d3de9ffaf3eb8e94cf8abbed5494728d8d3fd3c2dd678bca3f945a2f SHA512 f0ef461b4863a03dcf258499302769a1dba807c9a5797c61f6feb8ed3e06cc9cff1ac2a8a17f48eb52084a91b0ecec18f45a10aa2197afc870ba8535b364193f
+DIST moodle-3.4.3.tgz 45524224 BLAKE2B fc4096875368b33774fb2751e91e32cb4c5796424c31f7fb3b6e547c6de051ad6ada4b0ea7b97d190830829e3e99eec105480d860b7d5caa98463c2450d40ec6 SHA512 c201f75584b39676d10e33c03a39fa7c73a757b8c6066df5299cdde9c9db68a4d58ebb98b6ec5b0d89b0c4f258a8114083b0bb71a32d04c55d1045dd66b9ce21
+DIST moodle-3.5.tgz 46268566 BLAKE2B 5bc4b309ab210942369d22c27cc3e79cec2d06e93a60b7977db9a493ec1257c877caea9b40f65c9151f1cf0e6356793fdd0843639819b77cb73db0cb3ab2307a SHA512 7c0b5a42f839953fbe9d90767aefb2df589b2ec67db3f99ef61d21e57282d430c06c2758a8153c58ff4aa7a5977618bac9bed47c2866b2ef33decfc08e68059e
+EBUILD moodle-3.1.12.ebuild 2940 BLAKE2B fd1e914e7f7e855cb50447fb213259116d4ad418253db19e4d05bb7dda22178df4c302eecc5b258c728a581088493c11bd70ea302049069ef38f90c6828900b9 SHA512 47d2571d4e7a8e6217edbb2a491427ec39067649d61aed699bb41ce4a7912ea2bdcc773d3e6ab75426f8c3c163339f1b49a54a6e18dfaa6715d230495d69fbac
+EBUILD moodle-3.2.9.ebuild 2940 BLAKE2B 8d5ae724882dd03edddcd58f582e3ca54426b9b5da1f75b3749a0eef4d83d305f4f4a30c4047313d8235470d6461eee1892b8b50ce552dee631244ceea30d255 SHA512 b48d12a304316cca3dfc2065f1adc03f5912af2ba78cce7e8c1af7c1016beabdddab620ad0a8f343e757a03abb141215ef2877107140afbdb10dc118639e6e08
+EBUILD moodle-3.3.6.ebuild 2954 BLAKE2B 537ddca9825bc9113b92ac1e32dd25bf045f0d9d7937a964260752d1d9114e68fe45cbde22a7d8c800ae2e89dd31db2e2b338fd3c363b765637178a735a8f3fe SHA512 190fea32bf4412a827f7e603bdc1c6a55433f19fa2181edba843527e95fec71d4133ee4e43e2fb4ea80688240905046920510851cc68bf61bebc4951af6b3ac2
+EBUILD moodle-3.4.3.ebuild 2952 BLAKE2B d41d38833dac8c16aa78d7ff71750cfa500a5398a505fdf3825b26a20609630eebf22209bdb054c1751ea3cc49b12f9b9663746467ce9224ade7d9c40236c8e2 SHA512 bf2475f92a8d07c49c89d0dcd0653a078f7569c25028271ed8691dd14cb375adb73c21300e773c54fb26979ce1f4e1bc0079716b27e8d172c200967c2a4eb47c
+EBUILD moodle-3.5.ebuild 2952 BLAKE2B d41d38833dac8c16aa78d7ff71750cfa500a5398a505fdf3825b26a20609630eebf22209bdb054c1751ea3cc49b12f9b9663746467ce9224ade7d9c40236c8e2 SHA512 bf2475f92a8d07c49c89d0dcd0653a078f7569c25028271ed8691dd14cb375adb73c21300e773c54fb26979ce1f4e1bc0079716b27e8d172c200967c2a4eb47c
 MISC metadata.xml 355 BLAKE2B 68d10d39dd24da3d570f13edec9c4adae89b7620bb455c1c30377c3cebe56c4961d1548360adedc96fce780067b308193fdb7560478a60ab56c364b774b1984a SHA512 f02e5404a714cb20207e494f635fb0e98870576c4b5f6affc4dc27fccfcabdd1af1c7411a83cfd4e01b51ecc24d11944d1e612757ff45ab4405f6099ed9b1278
diff --git a/www-apps/moodle/moodle-3.1.11.ebuild b/www-apps/moodle/moodle-3.1.12.ebuild
index 0c8f962ab4a7..0c8f962ab4a7 100644
--- a/www-apps/moodle/moodle-3.1.11.ebuild
+++ b/www-apps/moodle/moodle-3.1.12.ebuild
diff --git a/www-apps/moodle/moodle-3.2.8.ebuild b/www-apps/moodle/moodle-3.2.9.ebuild
index f3cbddcacb6b..f3cbddcacb6b 100644
--- a/www-apps/moodle/moodle-3.2.8.ebuild
+++ b/www-apps/moodle/moodle-3.2.9.ebuild
diff --git a/www-apps/moodle/moodle-3.3.5.ebuild b/www-apps/moodle/moodle-3.3.6.ebuild
index 2a3db73f4d01..2a3db73f4d01 100644
--- a/www-apps/moodle/moodle-3.3.5.ebuild
+++ b/www-apps/moodle/moodle-3.3.6.ebuild
diff --git a/www-apps/moodle/moodle-3.4.2.ebuild b/www-apps/moodle/moodle-3.4.3.ebuild
index 201f542fb5c2..201f542fb5c2 100644
--- a/www-apps/moodle/moodle-3.4.2.ebuild
+++ b/www-apps/moodle/moodle-3.4.3.ebuild
diff --git a/www-apps/moodle/moodle-3.5.ebuild b/www-apps/moodle/moodle-3.5.ebuild
new file mode 100644
index 000000000000..201f542fb5c2
--- /dev/null
+++ b/www-apps/moodle/moodle-3.5.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit versionator webapp
+
+AVC=( $(get_version_components) )
+MY_BRANCH="stable${AVC[0]}${AVC[1]}"
+
+DESCRIPTION="The Moodle Course Management System"
+HOMEPAGE="https://moodle.org"
+SRC_URI="https://download.moodle.org/${MY_BRANCH}/${P}.tgz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+#SLOT empty due to webapp
+
+DB_FLAGS="mysqli?,mssql?,postgres?"
+DB_TYPES=${DB_FLAGS//\?/}
+DB_TYPES=${DB_TYPES//,/ }
+
+AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
+AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
+AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
+
+PHP_REQUIRED_FLAGS="ctype,curl,iconv,json,session,simplexml,xml,zip"
+PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
+PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
+
+IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
+REQUIRED_USE="|| ( ${DB_TYPES} )"
+
+# No forced dependency on
+#  mssql? - lives on a windows server
+#  mysql? ( virtual/mysql )
+#  postgres? ( dev-db/postgresql-server-9* )
+# which may live on another server.  These USE flags affect the configuration
+# file and the dependency on php.  However other dbs are possible.  See config.php
+# and the moodle documentation for other possibilities.
+DEPEND=""
+RDEPEND="
+	>=dev-lang/php-7.0[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
+	virtual/httpd-php
+	virtual/cron"
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	# How many dbs were selected? If one and only one, which one is it?
+	MYDB=""
+	DB_COUNT=0
+	for db in ${DB_TYPES}; do
+		if use ${db}; then
+			MYDB=${db}
+			DB_COUNT=$(($DB_COUNT+1))
+		fi
+	done
+
+	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
+	#if [[ ${DB_COUNT} -eq 0 ]]; then
+	#	eerror
+	#	eerror "No database selected in your USE flags,"
+	#	eerror "You must select at least one."
+	#	eerror
+	#	die
+	#fi
+
+	if [[ ${DB_COUNT} -gt 1 ]]; then
+		MYDB=""
+		ewarn
+		ewarn "Multiple databases selected in your USE flags,"
+		ewarn "You will have to choose your database manually."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	rm COPYING.txt
+	cp "${FILESDIR}"/config-r1.php config.php
+
+	# Moodle expect pgsql, not postgres
+	MYDB=${MYDB/postgres/pgsql}
+
+	if [[ ${DB_COUNT} -eq 1 ]] ; then
+		sed -i -e "s|mydb|${MYDB}|" config.php
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
+	dodir ${MOODLEDATA}
+	webapp_serverowned -R "${MOODLEDATA}"
+
+	local MOODLEROOT="${MY_HTDOCSDIR}"
+	insinto ${MOODLEROOT}
+	doins -r *
+
+	webapp_configfile "${MOODLEROOT}"/config.php
+
+	if [[ ${DB_COUNT} -eq 1 ]]; then
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	else
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
+	fi
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	einfo
+	einfo
+	einfo "To see the post install instructions, do"
+	einfo
+	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
+	einfo
+	einfo
+}
diff --git a/www-apps/nanoblogger/Manifest b/www-apps/nanoblogger/Manifest
index 04ff757da64c..873da858f2a9 100644
--- a/www-apps/nanoblogger/Manifest
+++ b/www-apps/nanoblogger/Manifest
@@ -1,9 +1,6 @@
 AUX nb.bashcomp 1275 BLAKE2B 0e6fefe950988c1f290f442781eb284f4c762365387cc58e67502558291e0ef77557adb7af57346ee5a1a0438c0307fa2c6956fb63a621f7bdb4b1c7684800c7 SHA512 004db772c4f97870ebdbe378adc26f70ce42f8f28b68bed53fcbe2df4d95ce38e4a2608fee94ae17b1f057c28859a321cceb6cdd4f849845b5902ad048541c8e
 DIST nanoblogger-3.2.3.tar.gz 54672 BLAKE2B ab53f85d93d30e0db96d62b0dc5c0f079df1710ebe1b35be0c772d44eb01182617bbdfbbcb9e563861b9122363ee660f685683c54995ad539b8cd9803c29b6a1 SHA512 5cd771d1621a6e5fdb60cf34f294e93596584d7535d4a89a98fd8332c85b58e70715a9bf34e46839a1756a8827f37f998f105ba1e494cabefb780e81f6deb8d7
-DIST nanoblogger-3.3.tar.gz 82302 BLAKE2B 16b560de8f5a6b639ad439010aeb6335590bfe5620f29e6a8c1bdd4d96e677b707da7930407641282ecdc58ac031492699e2d211bba757808c8e4bcd7e36b5f2 SHA512 7de711a69ba0db7dd006902c335ce32773b8d02716048802487f683353702cebd164c059ce0a920856ab49a2b833d6524b6c0981d188c5874f42f6b2a6435f7d
 DIST nanoblogger-3.5-rc1.tar.gz 131833 BLAKE2B d5918e406d0b5c6d82b466b43ed84b413fc539651baa568eacbd70b47eae4b382a4f621c8195631b47ef2039d6a4e0b569596a6d601881b195b1db5f7098d90c SHA512 03a590b1bdf3adb9969e2ce6fda89ece99f33def9f46e1028d2c0724a86f47696c703a5a3bb3c4b1c34418b841702a15bae527cc94eba377ee2003203582de2f
 EBUILD nanoblogger-3.2.3.ebuild 1984 BLAKE2B 2f3e061b242e8fe93aa68e0d2dbb593a08f53033a00bf87010cc7ef6d51cc81c46ddfc2883cb6d8e4869231a17ec2db6304f72fd0d761bffe23c8ea50052a1a9 SHA512 0ee6e34be5b0b9c30779d95ccbcf37ef98be8da311de9693c5f01e164412fa7edb4bb8f497cdef7633058a533ef5737d60c9dd908671180280d9650f2b2b0a56
-EBUILD nanoblogger-3.3.ebuild 2204 BLAKE2B b7655375ceff26203a713f47a65e1d81f7d6d82c0ce57be36241a8e2e4671143e5d664a63258ab0e9a54c720a2d4e98549b2dd3de27ebb3f9f8c21598354db43 SHA512 5b197fa25dcc5579dc52ea9659327434039c9f669c8b6d984e562341dc1997de0afd64099c05fb6185e19441473ae0fbdec95cf5811968b3daa3d2ec8e4a9d46
 EBUILD nanoblogger-3.5_rc1-r1.ebuild 2222 BLAKE2B 7bdb8bf78f60cf0fc707ac947af8fbea0b47cea31a14f931baab2cb2f98349d2d20e4fa6a73352efd7bbbe3d477aa73b928373fd1e582d427aa6c44ff5c3c468 SHA512 4d4f953b77fa166b51ab55a16a3d01d0df8594aaa60ab86101d219090f8dc00eebd58e6e90d8e7ad93e1d8dafc5b3cc0d23f6e2990619f35918a7ddab80d3581
-EBUILD nanoblogger-3.5_rc1.ebuild 2217 BLAKE2B 7a66dce1b6ff8e41da7cbd969082836388bfd73f284d62752cb871cb17af3a391dbcd5ac95d1b85c52a8387043fb51cb3604ec4dc7824791e4346a93b715cfde SHA512 ccfce25bfeb31b87aea68d78f86e0a63b162e0a2ee290045181f69bf73809658b1f82a607221624a71c5d1158e6aa424bfd2708df027691e2554ca067f8aa672
 MISC metadata.xml 1158 BLAKE2B 0b261c973a5196c38ce880dd3f3ce99e368b86ca909190bf4934a50d94ebf1ccce9e01f99cd7812702dc1fcde47a5d9c91fdd5411599e46454f38cfb3831c9d6 SHA512 51fefdaaa979d1625c710655dcd2cf6bb2f1f0143f533b2b2ce1ee8022b6bfac20c9cc92dbd125aac5b19878df28e735f70653f75331c86f7152c194d37994f5
diff --git a/www-apps/nanoblogger/nanoblogger-3.3.ebuild b/www-apps/nanoblogger/nanoblogger-3.3.ebuild
deleted file mode 100644
index 66a4ec784004..000000000000
--- a/www-apps/nanoblogger/nanoblogger-3.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit bash-completion-r1
-
-DESCRIPTION="Small and simple weblog engine written in Bash for the command-line"
-HOMEPAGE="http://nanoblogger.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~x86"
-IUSE=""
-
-RDEPEND="app-shells/bash"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e 's|^\(NB_BASE_DIR=\).*$|\1"/usr/share/nanoblogger"|' \
-		-e 's|^\(NB_CFG_DIR=\).*$|\1"/etc"|' \
-		-e "s|\$NB_BASE_DIR.*\(nano.*html\)|/usr/share/doc/${PF}/html/\1|" \
-			nb || die "sed nb failed"
-}
-
-src_install() {
-	dobin nb
-	insinto /usr/share/nanoblogger
-	doins -r default moods plugins lib lang docs welcome-to-nb.txt
-	insinto /etc
-	doins nb.conf
-	dodoc ChangeLog
-	dohtml docs/nanoblogger.html
-	dobashcomp "${FILESDIR}"/nb.bashcomp || die
-}
-
-pkg_postinst() {
-	elog
-	elog "Documentation for getting started with nanoblogger may be found at"
-	elog "/usr/share/doc/${PF}/html/nanoblogger.html or by running 'nb --manual;."
-	elog
-	elog "To create and configure a new weblog, run the following as your user:"
-	elog "   nb -b /some/dir -a"
-	elog "where /some/dir is a directory that DOES NOT exist."
-	elog
-	elog "To prevent having to specify your blog directory every time you use"
-	elog "nanoblogger (with the -b switch), you can set a default value in your"
-	elog "~/.nb.conf.  For example:"
-	elog '   BLOG_DIR="$HOME/public_html/blog"'
-	elog
-	elog "If you are upgrading nanoblogger from a previous version, follow"
-	elog "these directions (as stated in the manual):"
-	elog "    1. create a new weblog directory using nanoblogger (skip configuration):"
-	elog "      nb [-b blog_dir] -a"
-	elog "    2. copy old data directry to new weblog:"
-	elog "      cp -r [old_blog_dir]/data [newblog_dir]"
-	elog "    3. edit new blog.conf to your liking and rebuild weblog:"
-	elog "      nb [-b blog_dir] --configure -u all"
-	elog
-	elog "You also should remove your [newblog_dir]/data/cat_1.db and run:"
-	elog "		nb -u all"
-	elog "after copying your old entries from [oldblog_dir]/data to"
-	elog "[newblog_dir]/data."
-	elog
-}
diff --git a/www-apps/nanoblogger/nanoblogger-3.5_rc1.ebuild b/www-apps/nanoblogger/nanoblogger-3.5_rc1.ebuild
deleted file mode 100644
index 1356e0e70101..000000000000
--- a/www-apps/nanoblogger/nanoblogger-3.5_rc1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit bash-completion-r1
-
-MY_P="${P/_/-}"
-DESCRIPTION="Small and simple weblog engine written in Bash for the command-line"
-HOMEPAGE="http://nanoblogger.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~x86"
-IUSE=""
-
-RDEPEND="app-shells/bash"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i \
-		-e 's|^\(NB_BASE_DIR=\).*$|\1"/usr/share/nanoblogger"|' \
-		-e 's|^\(NB_CFG_DIR=\).*$|\1"/etc"|' \
-		-e "s|\$NB_BASE_DIR.*\(nano.*html\)|/usr/share/doc/${PF}/html/\1|" \
-			nb || die "sed nb failed"
-}
-
-src_install() {
-	dobin nb
-	insinto /usr/share/nanoblogger
-	doins -r default moods plugins lib lang docs welcome-to-nb.txt
-	insinto /etc
-	doins nb.conf
-	dodoc ChangeLog
-	dohtml docs/nanoblogger.html
-	dobashcomp "${FILESDIR}"/nb.bashcomp
-}
-
-pkg_postinst() {
-	elog
-	elog "Documentation for getting started with nanoblogger may be found at"
-	elog "/usr/share/doc/${PF}/html/nanoblogger.html or by running 'nb --manual;."
-	elog
-	elog "To create and configure a new weblog, run the following as your user:"
-	elog "   nb -b /some/dir -a"
-	elog "where /some/dir is a directory that DOES NOT exist."
-	elog
-	elog "To prevent having to specify your blog directory every time you use"
-	elog "nanoblogger (with the -b switch), you can set a default value in your"
-	elog "~/.nb.conf.  For example:"
-	elog '   BLOG_DIR="$HOME/public_html/blog"'
-	elog
-	elog "If you are upgrading nanoblogger from a previous version, follow"
-	elog "these directions (as stated in the manual):"
-	elog "    1. create a new weblog directory using nanoblogger (skip configuration):"
-	elog "      nb [-b blog_dir] -a"
-	elog "    2. copy old data directry to new weblog:"
-	elog "      cp -r [old_blog_dir]/data [newblog_dir]"
-	elog "    3. edit new blog.conf to your liking and rebuild weblog:"
-	elog "      nb [-b blog_dir] --configure -u all"
-	elog
-	elog "You also should remove your [newblog_dir]/data/cat_1.db and run:"
-	elog "		nb -u all"
-	elog "after copying your old entries from [oldblog_dir]/data to"
-	elog "[newblog_dir]/data."
-	elog
-}
diff --git a/www-apps/otrs/Manifest b/www-apps/otrs/Manifest
index 515154c4ca6b..a4b7092a1b1a 100644
--- a/www-apps/otrs/Manifest
+++ b/www-apps/otrs/Manifest
@@ -3,8 +3,10 @@ DIST otrs-5.0.25.tar.bz2 20671315 BLAKE2B 045037411039f480434e7c36ab84b63ec0c119
 DIST otrs-6.0.3.tar.bz2 24314514 BLAKE2B 97d794d59269d354b28003879bf0d30cc9b0f7a7d375416df90d85b694ac59e84978fe61183aa058497da18631513c25ecc93e3150f662e2e2efd335014e1e75 SHA512 d7f551e2c9bbe8b303d3de1f7993d76ea22cfd876b61941cfb72a25f2ba7e0a889c275c87aa40c104c1f2e6e1923b7a530cd088bd11b7b575a608b623e2b0541
 DIST otrs-6.0.4.tar.bz2 24355298 BLAKE2B 2f27e7a34b1bad0d58193c834503f051a1a1822afb53dca185ae2f8329d048446acc4e27e823b6f27660c79179bbb48f1976c0b3a6710bc083f791c0a777152c SHA512 23e9a29a6f080c6afa92704d25363687d50073c94192ba81e69ddab55fb9f945a38a5757a4c60c2d46bfc5a0002ca13bbbce1cc0c945f40e23bb864ebc57edd1
 DIST otrs-6.0.5.tar.bz2 24368010 BLAKE2B 20511dfbca16d275a1c4f7f07f8cc9e350c182661c95932f59899400b232612aed95fecac422528e37dd01b772225e78f25464bae40490abd88b391b05ac7b15 SHA512 fe669fb83acef8252cc53b24378757e498201e916a7fc1cb5f509efe777ec2bf36925264a7080f02e50a115285c26429506927390e3b10b35622f3c65a8cd066
+DIST otrs-6.0.7.tar.bz2 24475129 BLAKE2B 595fd84251289ef120b9a35abcde927ef33557adf386dec919e6eb61a973cac3414d148531760f68549a1f0f67faaba258268e761fdfa2be5471a592e96c08b7 SHA512 bb1910a005940f17884da4e8b9b785c9a52aa8a58f434b5c3e65768912b42838d12d69ebb3f7daed2f12dc385829a5a603a1755338d44e0313c35a0a589cbb6f
 EBUILD otrs-5.0.25.ebuild 4116 BLAKE2B acd72a3d46fc25ee805a32df1e13c7a3e724f2a6c2809993aec7870fa4fdea3448375ff371a1ee229dc6f280133b68f059c8f167a2e140dbdea6fa26b6b65bfd SHA512 b388b96afdfe456c560a917b830f617dbd4939c9147a55e3bfb3fa2d487f016093274a86f0cdfcccab0f6c7c549978a58395eb3a15da5a97a15b9ed00bd158cd
 EBUILD otrs-6.0.3.ebuild 4163 BLAKE2B d77ab3f64c248feda6b18425151cb9b45cc60e2a0b240f5ae92dc31974e76fa76c6417da6651ec85a0c7b39bc83d46aac771846fbbaef5f105f7adfedb516993 SHA512 e9f98139307574c507fe267bd24f780561ce8c122b1c6f8ff23c61910c72b60d4edc10d4b4f2761344f37ab8b4b6549393f820a59e9294d9e440c9e5e36b5530
 EBUILD otrs-6.0.4.ebuild 4163 BLAKE2B d77ab3f64c248feda6b18425151cb9b45cc60e2a0b240f5ae92dc31974e76fa76c6417da6651ec85a0c7b39bc83d46aac771846fbbaef5f105f7adfedb516993 SHA512 e9f98139307574c507fe267bd24f780561ce8c122b1c6f8ff23c61910c72b60d4edc10d4b4f2761344f37ab8b4b6549393f820a59e9294d9e440c9e5e36b5530
 EBUILD otrs-6.0.5.ebuild 4163 BLAKE2B d77ab3f64c248feda6b18425151cb9b45cc60e2a0b240f5ae92dc31974e76fa76c6417da6651ec85a0c7b39bc83d46aac771846fbbaef5f105f7adfedb516993 SHA512 e9f98139307574c507fe267bd24f780561ce8c122b1c6f8ff23c61910c72b60d4edc10d4b4f2761344f37ab8b4b6549393f820a59e9294d9e440c9e5e36b5530
+EBUILD otrs-6.0.7.ebuild 4163 BLAKE2B 9b4dc98b2e68c0c08a3294f70c525d67799a4db85749adf5314b87c2a474a1490f1e3a9b8a5d15cf19d0b8bae7116ec87558517d636ce95c25f49e394df22c9a SHA512 a80c4ef113745b46a454a19431dbeb62977c09befa764e6dc86ed6ab724f1919b665a83001c23ff33830351a461d8f7e11533c3538fa605927945c843e458d7b
 MISC metadata.xml 581 BLAKE2B 14a4dfee6a80d7b1640d67ea954dd638978ebee0f6770a70a9a3e9f8a0182954d660439aa8f81cec5a85039a028f507e704109c7d946dc85b2491311f8e3f090 SHA512 8b39dcc1639161c524b1d34de6184409c72422e6442e4a61b0c47f7b1c37ef04d267936dc43c2a10f11f702c50b0b7fe04ffcf9de084f5196f1135ada3c3c802
diff --git a/www-apps/otrs/otrs-6.0.7.ebuild b/www-apps/otrs/otrs-6.0.7.ebuild
new file mode 100644
index 000000000000..b2b0f33288d3
--- /dev/null
+++ b/www-apps/otrs/otrs-6.0.7.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit systemd user
+
+DESCRIPTION="An Open source Ticket Request System"
+HOMEPAGE="https://www.otrs.com/"
+SRC_URI="https://ftp.otrs.org/pub/${PN}/${P}.tar.bz2"
+
+LICENSE="AGPL-3+"
+KEYWORDS="~amd64 ~x86"
+IUSE="apache2 fastcgi +gd ldap mod_perl +mysql pdf postgres soap"
+SLOT="0"
+
+REQUIRED_USE="|| ( mysql postgres )"
+
+DEPEND="media-libs/libpng:0"
+
+RDEPEND="dev-perl/Apache-Reload
+	dev-perl/Archive-Zip
+	dev-perl/DBI
+	dev-perl/IO-Socket-SSL
+	dev-perl/JSON-XS
+	dev-perl/LWP-UserAgent-Determined
+	dev-perl/Mail-POP3Client
+	dev-perl/Mail-IMAPClient
+	>dev-perl/Net-DNS-0.60
+	dev-perl/Template-Toolkit
+	dev-perl/Text-CSV_XS
+	dev-perl/TimeDate
+	dev-perl/DateTime
+	dev-perl/XML-LibXML-Simple
+	dev-perl/XML-Parser
+	dev-perl/YAML-LibYAML
+	apache2? (
+		mod_perl? (
+			www-servers/apache:2
+			=www-apache/libapreq2-2* www-apache/mod_perl
+		)
+		!fastcgi? ( !mod_perl? ( www-servers/apache:2[suexec] ) )
+	)
+	fastcgi? (
+		dev-perl/FCGI
+		virtual/httpd-fastcgi
+	)
+	!fastcgi? ( !apache2? ( virtual/httpd-cgi ) )
+	gd? (
+		dev-perl/GD
+		dev-perl/GDTextUtil
+		dev-perl/GDGraph
+	)
+	ldap? ( dev-perl/perl-ldap )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	pdf? (
+		>=dev-perl/PDF-API2-0.73
+		virtual/perl-Compress-Raw-Zlib
+	)
+	soap? (
+		dev-perl/SOAP-Lite
+		!=dev-perl/SOAP-Lite-0.711
+		!=dev-perl/SOAP-Lite-0.712
+	)
+	"
+
+OTRS_HOME="/var/lib/otrs"
+
+pkg_setup() {
+	# The enewuser otrs will fail if apache isn't there, but it's an optional dep
+	# so we create the apache user here just in case
+	enewgroup apache 81
+	enewuser apache 81 -1 /var/www apache
+	enewuser otrs -1 -1 "${OTRS_HOME}" apache
+}
+
+src_prepare() {
+	rm -r "${S}/scripts"/auto_* || die
+
+	pushd Kernel >/dev/null || die
+	local i
+	for i in *.dist; do
+		cp "${i}" $(basename "${i}" .dist) || die
+	done
+	popd >/dev/null || die
+
+	# Fix broken png file (and see pngfix help for exit codes)
+	pngfix -q --out=out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png"
+	if [[ $? -gt 15 ]]; then
+		die "pngfix failed"
+	fi
+	mv -f out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die
+
+	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
+		|| die "sed failed"
+
+	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
+		|| die "sed failed"
+
+	grep -lR "/opt" "${S}"/scripts | \
+		xargs sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" \
+		|| die "sed failed"
+
+	echo "CONFIG_PROTECT=\"${EPREFIX%/}${OTRS_HOME}/Kernel/Config.pm \
+		${EPREFIX%/}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
+
+	eapply_user
+}
+
+# This is too automagic, either einfo telling user or installing to /etc/cron.d/ should be preferred
+pkg_config() {
+	einfo "Installing cronjobs"
+	crontab -u otrs "${EROOT%/}"/usr/share/doc/${PF}/crontab || die
+}
+
+src_install() {
+	dodoc CHANGES.md README*
+
+	insinto "${OTRS_HOME}"
+	doins -r .fetchmailrc.dist .mailfilter.dist .procmailrc.dist RELEASE \
+		Custom Kernel bin scripts var
+
+	cat "${S}"/var/cron/*.dist > "${T}"/crontab || die
+	insinto /usr/share/doc/${PF}/
+	doins "${T}"/crontab
+
+	local a
+	for a in article log pics/images pics/stats pics sessions spool tmp tmp/CacheFileStorable
+	do
+		keepdir "${OTRS_HOME}/var/${a}"
+	done
+	doenvd "${T}/50${PN}"
+
+	systemd_dounit "${FILESDIR}/otrs.service"
+}
+
+pkg_postinst() {
+	einfo "Setting correct permissions ..."
+	/usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.SetPermissions.pl "${EROOT%/}${OTRS_HOME}" \
+		--otrs-user=otrs \
+		--web-group=apache \
+		|| die "Could not set permissions"
+
+	einfo "Installation done!"
+	elog "1) Rebuild your config now by running the following commands:"
+	elog "sudo -u otrs /usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.Console.pl Maint::Config::Rebuild"
+	elog "sudo -u otrs /usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.Console.pl Maint::Cache::Delete"
+	elog ""
+	elog "2) Enable cronjobs with the following command:"
+	elog "crontab -u otrs crontab"
+	elog ""
+	elog "3) systemd users: enable and start OTRS daemon:"
+	elog "systemctl enable otrs"
+	elog "systemctl start otrs"
+}