gentoo resync : 08.06.2019

13 files changed, 341 insertions, 78 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index a5499608721a..6c33cdf7bab3 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/cgp/Manifest b/www-apps/cgp/Manifest
index a28f61ec4243..ffcb3a1a9d67 100644
--- a/www-apps/cgp/Manifest
+++ b/www-apps/cgp/Manifest
@@ -1,3 +1,3 @@
 DIST cgp-1_p20181209.tar.gz 139556 BLAKE2B 0a79ff1974b0ae50db5582121c4fdcc2db0b89ef11ecb001dfa525dd753481f0a454e424d17f24b142fd116a9ea2eeb4ba1dade6f2ffadd63943e5c065323224 SHA512 fcbf81fca2bb14ed143ea414c2f11fe09f4594891507a1ad08482720b104ec62c9986ce25b127d45a7962a8b3db54293a6775dc2359bde41f19b5419606b51eb
-EBUILD cgp-1_p20181209.ebuild 1275 BLAKE2B 9a7cc04056e575891108cc0086519c1f42fc95bdb7d4a06cd7c68e5383f2e611be7f1b47bc214ab54b73d2b34feb0b4081956b72fed3669bb9c831906c867606 SHA512 33602a3ae8b5ad2525a631bb796c64832b0595003a1caae3f282d38c769108751aed55e99916d4e9ee232a538a5073239aae88d43cfb7049560c7b48d293ce39
+EBUILD cgp-1_p20181209.ebuild 1274 BLAKE2B 4e4f86373415213c1b88cac4828de7144732481d48d72c81d7b4156e59847af341bebd94f3f9f8e26177c324756fd99edc6973921f78e6567fbfdf01280cc69f SHA512 76a6f6b6a889d53f84b783cd67f7b60f11e472e8564c4b5caa39e14506a922a72fcce400cafd4b81b35c5508808faff5acda55041c763b2c5d0dc02a34856451
 MISC metadata.xml 677 BLAKE2B 2085e266da1c26131975e252ac7f4e9d778b8d32c708e78cecab760775af5273d1b8cfed21141159178b4a5d4d516118934b40e6ceaa67fc4b98decc643dfaf4 SHA512 a31566e2a70a4819d03b18bb7fe5a951d53db2a354430e767a26bea62666fd7c7968c423e335dd4e5d7070537e5e062bad4f5567dabcf4d900d560cc6a30bbc1
diff --git a/www-apps/cgp/cgp-1_p20181209.ebuild b/www-apps/cgp/cgp-1_p20181209.ebuild
index 6e65fd9a27e5..fa08218c3b69 100644
--- a/www-apps/cgp/cgp-1_p20181209.ebuild
+++ b/www-apps/cgp/cgp-1_p20181209.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/pommi/CGP"
 SRC_URI="https://github.com/pommi/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC-BY-2.0 GPL-2+ GPL-3 MIT"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-lang/php[json]
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index a7790b60e67e..76e673e9f970 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -2,7 +2,11 @@ AUX postinstall-en.txt 1595 BLAKE2B 9b5c237befcf415d0f769052c9634da830326ff57da1
 DIST drupal-7.67.tar.gz 3312764 BLAKE2B bb7f21e80ca192ff3e37f917c1fa43dcd8d3cd8b60ff012d1fe22e279ffd674e08be6aef6328d0c5b7c50a106592bde299300fe9ccb0c4c1ffc1aca57c3ca6ad SHA512 0e4f60010b1395183cea19424e8c2849f93fb7285a081bf7d0c774b8e82f403083533059f58c3831950cc06dfa8117d443db52b66a521301ceac10b1b333aa28
 DIST drupal-8.6.16.tar.gz 17151378 BLAKE2B 2bdd14ff7a5f898af2d322a6b2862643899dfbe2ad05c99b85f036161612cccfc2c25105c8eef37311634a2aa03ed792db8de3e625aed5adb94cd8f644557fcb SHA512 34f260d780bce286a0a61b710c340d2622cb857aa92a2bdaad63737303ef2f4f1751edc3f415daaa14b9cb483757e367e639136d03f571cba5165129bba31e12
 DIST drupal-8.7.1.tar.gz 17811529 BLAKE2B 5bdb92a8f6c5675dd311417db526be81149240a053bdb94f4294cb571193ed03f2edbc83b51cbcce9e0e322b45981d0949714659f5db2dff211815232cd447e5 SHA512 a386f7991465eade203aba4b20bb894041c76abda97e93afd772a02b215ac496d57a9aed50820a7bd78604c9e6602180fcda933c5121b8536a7d610a3bc3f2e8
+DIST drupal-8.7.2.tar.gz 17824323 BLAKE2B 355a4cdbcefe98afd53235bd8546e50efe911a36536aa07e9cb8a86f00dc6b068d0c276e26aee975790ef80ca5030d7464d4b705fa4da9391ce051994a7b850d SHA512 9dc8ca6c431f1d9e50d1c9139efe537815b59bf17b433cdeeb2df5f60ae9a77812f5ca096b5a0aa67bf71344efe60728e46b209609d41fc25065ae58a6bca6af
+DIST drupal-8.7.3.tar.gz 17825116 BLAKE2B 961d92526d8d53d1823b01696bacf6bcca7c10ea0057c561a9126d43f0e18ab1b37a5e85b733927793348b8241014b78b4efdf8aaedbf9e6e82caed51df76b64 SHA512 f7b1c0360091f7b14109b6a328663d0006138d3a39855838bfa9ec70d17aa835ffe8fb393e3b54a378bdfd3011f6cfe9e2eae9be5e79c8fc2586bc48b0bd7df2
 EBUILD drupal-7.67.ebuild 1770 BLAKE2B b429cd79794eb2975636cd89c42f56926c6eb4edf86ff329bc8680ae8ee4e64f85acc2e6a668e5302b75093e59be611d459e1d23b95ded075ccb41866d912107 SHA512 1db7207e4af8c0fb2594ace139c63a14f0f01f40f26b4a785265691f57ac939c462c2b73b32ac63d735cf7b3e984a43a06e385f1c6009c1d6141bc2bbfe1b282
 EBUILD drupal-8.6.16.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
 EBUILD drupal-8.7.1.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
+EBUILD drupal-8.7.2.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
+EBUILD drupal-8.7.3.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
 MISC metadata.xml 419 BLAKE2B 3652ed012764eeebfd813e1979965e76caf500aea8a29bf8652c56f145e62e5ac8c5ae233919a0be123878cccdbab5fa52a4c02ed7367099862407487ca0b8b9 SHA512 3610c6151b6bbbb452a9c599d04d28a18c3e535c0976e425778e8b138bb03637bb28900acef2ef405ec10176390db33e997ba5d789f8a0fc49564538194fc8a1
diff --git a/www-apps/drupal/drupal-8.7.2.ebuild b/www-apps/drupal/drupal-8.7.2.ebuild
new file mode 100644
index 000000000000..a8514d07dfe0
--- /dev/null
+++ b/www-apps/drupal/drupal-8.7.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PV=${PV:0:3}.0
+MY_P=${P/_/-}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="PHP-based open-source platform and content management system"
+HOMEPAGE="https://www.drupal.org/"
+SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
+
+RDEPEND="
+	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
+	virtual/httpd-php
+	accelerator? ( ||
+		(
+			dev-php/xcache
+			(
+				>=dev-lang/php-5.5[opcache]
+				dev-php/pecl-apcu
+			)
+		)
+	)
+	uploadprogress? ( dev-php/pecl-uploadprogress )
+	mysql? (
+		|| (
+			dev-lang/php[mysql]
+			dev-lang/php[mysqli]
+		)
+	)
+	sqlite? ( dev-lang/php[sqlite] )
+"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
+		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
+
+	dodoc ${docs}
+	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
+
+	cp sites/default/{default.settings.php,settings.php} || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+
+	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	echo
+	ewarn "SECURITY NOTICE"
+	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
+	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
+	echo
+	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
+	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
+	echo
+	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
+	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
+	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
+	ewarn "reported by the setup."
+	echo
+}
diff --git a/www-apps/drupal/drupal-8.7.3.ebuild b/www-apps/drupal/drupal-8.7.3.ebuild
new file mode 100644
index 000000000000..a8514d07dfe0
--- /dev/null
+++ b/www-apps/drupal/drupal-8.7.3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PV=${PV:0:3}.0
+MY_P=${P/_/-}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="PHP-based open-source platform and content management system"
+HOMEPAGE="https://www.drupal.org/"
+SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
+
+RDEPEND="
+	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
+	virtual/httpd-php
+	accelerator? ( ||
+		(
+			dev-php/xcache
+			(
+				>=dev-lang/php-5.5[opcache]
+				dev-php/pecl-apcu
+			)
+		)
+	)
+	uploadprogress? ( dev-php/pecl-uploadprogress )
+	mysql? (
+		|| (
+			dev-lang/php[mysql]
+			dev-lang/php[mysqli]
+		)
+	)
+	sqlite? ( dev-lang/php[sqlite] )
+"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
+		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
+
+	dodoc ${docs}
+	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
+
+	cp sites/default/{default.settings.php,settings.php} || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+
+	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	echo
+	ewarn "SECURITY NOTICE"
+	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
+	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
+	echo
+	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
+	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
+	echo
+	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
+	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
+	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
+	ewarn "reported by the setup."
+	echo
+}
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index cfcc34d48698..a805e02658ed 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,7 +1,11 @@
 AUX app.ini 67 BLAKE2B 4ec7b8217486047b419202b3a8a7172ac21ae0e5ad9224cd4f010be730ac5cda9d05bf06dcba2d06f8809900094b3b007ef98dd4ea20a125fb7d3db279f53e4a SHA512 93f6f7cf49dd1ece56f7da711adbb58cc38a503527aeea140837d74456ee6f550a089e897d9cb94382e1eb3f5a5cbe4a61362534463eada08a91f314da0f2108
 AUX gitea.confd-r1 243 BLAKE2B 87caa8371f53f52b0a85f720342f9f358dedec9240ab78998655a03df6bf3f301fe077afabdca1b1895dbcab2fa05748735d6f38f9b3ad53534fe8ae6e72db49 SHA512 485dc9d0b86d0a7b3ba958aac9de1129aa0ffbb47219419d38811f2accca2539e49dd93cc4a24b21f1c3802b024aa8449f54e320e8a16197f201532edeca6836
 AUX gitea.initd-r2 736 BLAKE2B abb2733808783b3654b51493451950c07237c005897c630f8ce095f0bacb7f1e59c61f0f1663c5daddcab08121c54eaba4de953d6e03ce1c7b405d0e7de597b6 SHA512 42321bbfaa844ef246b825d36bc1b8227b34d4cb7a5c4ced706203c40dd345e4c163e18bfdaa4899154d6c405f8e42b9b7ea0657e048c496ede1976d958d2228
+AUX gitea.initd-r3 802 BLAKE2B 2e33e95f7d2762986184d45b0bbb250cc5e04fffc4e4b006233b28e5b57be69eef1d83441adebe2b94681585edaf77f9da4eb97930f91e75c1b1a5cd8d137633 SHA512 5ff2e653180a0601734fcd055dfffdfdc12363736ed2e56c8576c802398b90f4025b44002cbb9a3fd1e0c2d4c169f62d460381c6c549746d3390e55fc1c677d1
 AUX gitea.service-r1 557 BLAKE2B 0d255654da33fb9155a6bc29896ab164597667c252b680e2b945109163c09feaa88c28776277a9c7f00d6b5b66cb24bda50e99dde354a5d18ed61597fb1ce917 SHA512 cabe0a1b5a5f435f4fa5b3c20fb76ad1b248463fa681e55a4ae66b027f00574c1fcb65f1841c0bc52b7188a02c0fc05bfa9b11931d26c5efce6b988d4b7a8f57
+AUX gitea.service-r2 734 BLAKE2B 84825b8198e9495e2803ca3702e6a631fb269c5c8fb4ff4246465a5bd7f7d796b0c3eaea72d0a25cef4f5d38d27a6c99a1b6d41f489749bef322a4ac93cfdd12 SHA512 287670f196bf6353dbdeb6ac37b4ac73693e16a6a3a83f57e7179ccb64364d1d85950a2ddd0a77238a3d218afdaacc8ba849c2810a7ba1238c7277074d1ebe39
 DIST gitea-1.8.0.tar.gz 24268907 BLAKE2B b46a17733fc7bd0f228620bdfadf0d596ea56fca6e685afab7734e794c1f87c5e004529ca3d69e907d516bcb83563565b1d8c32501f1c2c0f9295ca028d96ad0 SHA512 eebbe2f77ed2e4c3562f48a6fa647e6f2a0492c5b6ea4f13542a5ef82e94a357a8d53897aa013107b5f735d2aff9d719893b5724de44831c43998c2e9c6e78d7
+DIST gitea-1.8.2.tar.gz 24321492 BLAKE2B 48a718edd1d607e4f8ee2a301bdd907f2a233be515fa327eac9cfb50cdbc024e5f90e6e86e95056c256cb35497c5a3b2ab5fa4a068a22b28c1a3d2b94780da7a SHA512 23ef63c1cea276800a19fe04b87b4baa421e1202260b4ec55614a77ee54c0bc9e5db6dad7f98791c4d902b2d4cb15f4facc4d201631cf2ef7cefd0ff996753be
 EBUILD gitea-1.8.0.ebuild 2441 BLAKE2B 017544ba40e11c49b62ac5657c59c836cacbe8c57164c0549bc34609072d3bd3aae5834c0166f600d38cfebc7805a0ad63bac57b66daa7df1dfde5c74d047f9c SHA512 32792428fe7f93f597c22134a9d946b31eed9424c065c8fc0f74896a6c6c3283df0c7d29da93e23c70f841498f6d9dc5cf1740aeae247c6c5583aedcd128150e
+EBUILD gitea-1.8.2.ebuild 3179 BLAKE2B 43582669d2e25936f7384f63834baa477ed276b21a0ec3564912ad8badd38cd916c847201855c4b78cf7961fdde9dad55278e1c3d684635b735525182d3a62fd SHA512 1c71d2564ee38ae631e98911cd548f0b72a9ab779a88d7609c48c2683ec19429ce909c224c1d4cea50798bb708eb8bfc4fbaa24cc5f0fb57a8999f2e69d60df9
 MISC metadata.xml 563 BLAKE2B 00090c9965433ee21c5ebb4cd7ff83f3c16a870acd9da92842a53349a4bf38dc1239be17ec7545e5b0a44c07e2c93d3dbff599b37fcd4366a2ff41952cb513cb SHA512 fbf0fca0af8b73494e20a965f99f101e7ed08927b8b303189f69586e59b57bdc07781353b9bbd9ba904a53efa85fa91e4a76341ca2083cf9f6769448de700222
diff --git a/www-apps/gitea/files/gitea.initd-r3 b/www-apps/gitea/files/gitea.initd-r3
new file mode 100644
index 000000000000..680ae834e230
--- /dev/null
+++ b/www-apps/gitea/files/gitea.initd-r3
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 2016-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Gitea, a self-hosted Git service"
+
+: ${GITEA_CONF:=/etc/gitea/app.ini}
+: ${GITEA_USER:=git}
+: ${GITEA_GROUP:=git}
+: ${GITEA_WORK_DIR:=/var/lib/gitea}
+: ${GITEA_CUSTOM:=${GITEA_WORK_DIR}/custom}
+
+command="/usr/bin/gitea web"
+command_args="--config ${GITEA_CONF}"
+command_background="true"
+command_user="${GITEA_USER}:${GITEA_GROUP}"
+error_log="/var/log/${RC_SVCNAME}/${RC_SVCNAME}.err"
+pidfile="/run/${RC_SVCNAME}.pid"
+required_files="${GITEA_CONF}"
+start_stop_daemon_args="-d ${GITEA_WORK_DIR}"
+start_stop_daemon_args="${start_stop_daemon_args} -e GITEA_WORK_DIR=${GITEA_WORK_DIR}"
+start_stop_daemon_args="${start_stop_daemon_args} -e GITEA_CUSTOM=${GITEA_CUSTOM}"
diff --git a/www-apps/gitea/files/gitea.service-r2 b/www-apps/gitea/files/gitea.service-r2
new file mode 100644
index 000000000000..1931b46c73c4
--- /dev/null
+++ b/www-apps/gitea/files/gitea.service-r2
@@ -0,0 +1,34 @@
+[Unit]
+Description=Gitea service
+Documentation=https://docs.gitea.io/
+
+AssertPathIsDirectory=/var/lib/gitea
+AssertPathIsReadWrite=/var/lib/gitea
+
+After=network.target
+Requires=network.target
+After=mysqld.service
+After=postgresql-9.3.service
+After=postgresql-9.4.service
+After=postgresql-9.5.service
+After=postgresql-9.6.service
+After=postgresql-10.service
+After=postgresql-11.service
+After=postgresql-12.service
+After=memcached.service
+After=redis.service
+
+[Service]
+User=git
+Group=git
+
+Environment="GITEA_WORK_DIR=/var/lib/gitea" "GITEA_CUSTOM=/var/lib/gitea/custom"
+WorkingDirectory=/var/lib/gitea
+ExecStart=/usr/bin/gitea web --config /etc/gitea/app.ini
+
+Restart=always
+PrivateTmp=true
+Nice=5
+
+[Install]
+WantedBy=multi-user.target
diff --git a/www-apps/gitea/gitea-1.8.2.ebuild b/www-apps/gitea/gitea-1.8.2.ebuild
new file mode 100644
index 000000000000..bdefa9b63520
--- /dev/null
+++ b/www-apps/gitea/gitea-1.8.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit golang-vcs-snapshot systemd user
+
+EGO_PN="code.gitea.io/gitea"
+
+DESCRIPTION="A painless self-hosted Git service"
+HOMEPAGE="https://gitea.io"
+SRC_URI="https://github.com/go-gitea/gitea/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="pam sqlite"
+
+COMMON_DEPEND="pam? ( sys-libs/pam )"
+DEPEND="${COMMON_DEPEND}
+	dev-go/go-bindata"
+RDEPEND="${COMMON_DEPEND}
+	dev-vcs/git"
+
+DOCS=( custom/conf/app.ini.sample CONTRIBUTING.md README.md )
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/bash /var/lib/gitea git
+}
+
+gitea_make() {
+	local my_tags=(
+		bindata
+		$(usev pam)
+		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
+	)
+	local my_makeopt=(
+		DRONE_TAG=${PV}
+		TAGS="${my_tags[@]}"
+	)
+	GOPATH=${WORKDIR}/${P}:$(get_golibdir_gopath) emake "${my_makeopt[@]}" "$@"
+}
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s#^RUN_MODE = dev#RUN_MODE = prod#"                                     \
+		-e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"          \
+		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"                   \
+		-e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#" \
+		-e "s#^HTTP_ADDR = 0.0.0.0#HTTP_ADDR = 127.0.0.1#"                          \
+		-e "s#^MODE = console#MODE = file#"                                         \
+		-e "s#^LEVEL = Trace#LEVEL = Info#"                                         \
+		-e "s#^LOG_SQL = true#LOG_SQL = false#"                                     \
+		-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"               \
+		-e "s#^APP_ID =#;APP_ID =#"                                                 \
+		-e "s#^TRUSTED_FACETS =#;TRUSTED_FACETS =#"                                 \
+		custom/conf/app.ini.sample || die
+	if use sqlite ; then
+		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.ini.sample || die
+	fi
+
+	gitea_make generate
+}
+
+src_compile() {
+	gitea_make build
+}
+
+src_test() {
+	gitea_make test
+}
+
+src_install() {
+	dobin gitea
+
+	einstalldocs
+
+	newconfd "${FILESDIR}"/gitea.confd-r1 gitea
+	newinitd "${FILESDIR}"/gitea.initd-r3 gitea
+	systemd_newunit "${FILESDIR}"/gitea.service-r2 gitea.service
+
+	insinto /etc/gitea
+	newins custom/conf/app.ini.sample app.ini
+	fowners root:git /etc/gitea/{,app.ini}
+	fperms g+w,o-rwx /etc/gitea/{,app.ini}
+
+	diropts -m0750 -o git -g git
+	keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
+	keepdir /var/log/gitea
+}
+
+pkg_postinst() {
+	if [[ -e "${EROOT}/var/lib/gitea/conf/app.ini" ]]; then
+		ewarn "The configuration path has been changed to ${EROOT}/etc/gitea/app.ini."
+		ewarn "Please move your configuration from ${EROOT}/var/lib/gitea/conf/app.ini"
+		ewarn "and adapt the gitea-repositories hooks and ssh authorized_keys."
+		ewarn "Depending on your configuration you should run something like:"
+		ewarn "sed -i -e 's#${EROOT}/var/lib/gitea/conf/app.ini#${EROOT}/etc/gitea/app.ini#' \\"
+		ewarn "  /var/lib/gitea/gitea-repositories/*/*/hooks/*/* \\"
+		ewarn "  /var/lib/gitea/.ssh/authorized_keys"
+	fi
+}
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 48a8362d58d6..cbd51550b61b 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -3,14 +3,12 @@ AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
 DIST grafana-bin-5.4.3.tar.gz 55228439 BLAKE2B 63ee14b1ab074f453c8f1b870b8c0c51365106cb2af59fa20f56805f7add7fec29bc5ecd7e2ffc1f3f6811049e839893433e14b1871cb2aea359f58537b9e0dc SHA512 781466c7477ecb4fbca59006600adc3569d0ee2158da3b75831b1934fd39456030471d4508fbf2d3296d3660dcc8b92782295d7afe458229bad1d64de88ad33b
 DIST grafana-bin-5.4.4.tar.gz 55227302 BLAKE2B f80fcf4447de6eb2f8a450650eb054da6a426e61142c2882cb5faef91b1d9779b77016b822d2f9082c81fe7b6ec14f23996132d880067bd956ac6260b171388e SHA512 c95a3e9b40fdd8fff88c01a66efdda1fc64c258a768bdf65f738562b0c039020de1aa2500cbaa93dff4220715c57ce803ca0ff01344d63a9b8548e4d27dc1af1
-DIST grafana-bin-6.1.4.tar.gz 56564647 BLAKE2B 277a51f056faee911adb46f80673bde05dd872cc2d1387e67066806c8b749e434cb0bf2cd0e55338081814c19edf025927dd2379064aca2acb1e718dc89140af SHA512 7d27dfcc689c4e96f4ea9276c75581ac0762556759c8a70a5f87199a9cdd49493b40b7e44bbcf069b0cb2b4ca60d4b8157c7d977673253db9a80c9c785b4b344
 DIST grafana-bin-6.1.6.tar.gz 56569580 BLAKE2B b8122e5ec6104ba211d7d331fd99e3caaea6b4bc2cdeae3315ea84abc6634723d106fb19b27f68ad5f5f0ff84648f8ea84254a3b0c96519702349acfeb6bd753 SHA512 b8851df5a00b752777c168446326603c5e00ed66e7217551c75a976961c9de1f5a5bf0d262068866ecd0dae685a09ac8829db2bb5201c32e1ecaed6bafc149e4
-DIST grafana-bin-6.2.0.tar.gz 58485103 BLAKE2B 8613821d8dc03518585def91119d3f3b53f1c65a3d31930d4bc3261dfad09d3f30a4de8826fff6057827de5099f9d6945573ffa2aa4908c243b5b82efb531266 SHA512 2f722823577adc7dcf85e1340cef111a09686c9e2a3064b81f53d28fc5a3339f542506bf1fa87b6c242678242683e670f949ab3aaa06d9e542fb6c22e107479c
 DIST grafana-bin-6.2.1.tar.gz 58508207 BLAKE2B 5f543b105768f5151fe868b43927984a9dac4a0987192c2d7d6b2b1b0a1d636fbc4beb898d55a707f5d220785a7c56b0163f834e27293f67b55acaf7c54811a0 SHA512 9a35e953686f8ad0d75d3e2fdfb713fe6cac95ffc56ec4ee78bbbc6d753611675b5bf48e45652cc8a76af38e2358754a415a5b09f660e3a5508a2434b882ec91
+DIST grafana-bin-6.2.2.tar.gz 58512782 BLAKE2B 3c837f1477890995e93d15d86c744e1158b6167b8cde7b101ee579befb0c8577a70fd0fb722999ef30e823f21d89ee525eb20d147327bbc4bbbffc774b67157f SHA512 24a1f685a76b8bdf4876f498daf43ae316a8e6fc89dcc9d3aed67cfd360baff1cb48c1118753afcb845ddebbbebfa195d369036786e09b8ca00d78cb1f60e6f2
 EBUILD grafana-bin-5.4.3-r1.ebuild 1969 BLAKE2B f90d9c8c479edfd60eff8a4c6823fad5ba9683411a6e9b4e137a77990f528d6184ecf0f917520209dd4497e1cfef9198fe305bb76a9c6c4911cd09204481a69a SHA512 d674745ae0614747c945e96990c17c89c1c7e027e909c92a8e08a898d9567d531900e56ea5f2714128549b2094fdc568da3949b6578fd9bb84f3d78c4b339a10
 EBUILD grafana-bin-5.4.4.ebuild 1944 BLAKE2B be7426448610d8b2875bd13a8f37d7c771193e236f572699224dced158835b1fb050573fc425e1d1c8ff4b216aab730ceccd666052c3467d86cca0b88a57fae2 SHA512 ae168b08b5f7c14b0f54d94be5e10fb9ef2c2c4875c8db7b2299cf087734687dc448d08b5f4fdd06ad2c219c29dd5a82802e7e2f68dd0be0daf698fdded24ccd
-EBUILD grafana-bin-6.1.4.ebuild 2000 BLAKE2B a2aded1295055013836375d7dcc73efa0c198030ec7653e07d3288792e284bba24db7e01b575c89421bd21155529c8f6e99add702929bbb45a5ff7ba16254161 SHA512 1790f63faba64a441f2527f1cbdab6ed3685b23f0b5032f3d3208851d491e077dc01edff00dc60ce81e25ce7b0b59b3e70ab480b065295fc6c05c4d0710216e4
 EBUILD grafana-bin-6.1.6.ebuild 1971 BLAKE2B f8d887e76e958c29296e441bb7165590d910ec9e43c717244e264bd266abdf4874c5ac63c789a61afdf81c5602ac2411cf992507d03b3a941a28a870a3f00051 SHA512 cad905e8e9aa9a8f02431b6fe3c0f780cba7c2ddf3db9477a48bbc0fae8f3b800407e95a926b203b34414be2386bcc21c6b590d9657266f709be95a5e6ed1305
-EBUILD grafana-bin-6.2.0.ebuild 1971 BLAKE2B f8d887e76e958c29296e441bb7165590d910ec9e43c717244e264bd266abdf4874c5ac63c789a61afdf81c5602ac2411cf992507d03b3a941a28a870a3f00051 SHA512 cad905e8e9aa9a8f02431b6fe3c0f780cba7c2ddf3db9477a48bbc0fae8f3b800407e95a926b203b34414be2386bcc21c6b590d9657266f709be95a5e6ed1305
 EBUILD grafana-bin-6.2.1.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
+EBUILD grafana-bin-6.2.2.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
 MISC metadata.xml 416 BLAKE2B ff5bdf7e202aa96bbf615df2f86c6542bb7d291e6d564dfac683a2e54002380dd80ef3f1ca0b6c1f398de0115e26398903256b9d64e353127f25c3e97e5b21c8 SHA512 db2cbd25cf9b21664db93dc8f9719bf7f9a2fd632c5231d0f296bb32f3f6af3e08307c8a662081cc68f33638d70f6512094fad76073a5de4ceba02eeb3d1188b
diff --git a/www-apps/grafana-bin/grafana-bin-6.1.4.ebuild b/www-apps/grafana-bin/grafana-bin-6.1.4.ebuild
deleted file mode 100644
index f5baddc3529b..000000000000
--- a/www-apps/grafana-bin/grafana-bin-6.1.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit user systemd
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_beta/-beta}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${MY_PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	media-libs/fontconfig"
-
-QA_EXECSTACK="usr/share/grafana/tools/phantomjs/phantomjs"
-QA_PREBUILT="usr/bin/grafana-* ${QA_EXECSTACK}"
-QA_PRESTRIPPED=${QA_PREBUILT}
-
-pkg_setup() {
-	enewgroup grafana
-	enewuser grafana -1 -1 /usr/share/grafana grafana
-}
-
-src_install() {
-	keepdir /etc/grafana
-	insinto /etc/grafana
-	newins "${S}"/conf/sample.ini grafana.ini
-	rm "${S}"/conf/sample.ini || die
-
-	# Frontend assets
-	insinto /usr/share/${MY_PN}
-	doins -r public conf
-
-	dobin bin/grafana-cli
-	dobin bin/grafana-server
-
-	exeinto /usr/share/grafana/tools/phantomjs
-	doexe tools/phantomjs/phantomjs
-
-	insinto /usr/share/grafana/tools/phantomjs
-	doins tools/phantomjs/render.js
-
-	newconfd "${FILESDIR}"/grafana.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd.3 grafana
-	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
-
-	keepdir /var/{lib,log}/grafana
-	keepdir /var/lib/grafana/{dashboards,plugins}
-	fowners grafana:grafana /var/{lib,log}/grafana
-	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
-	fperms 0750 /var/{lib,log}/grafana
-	fperms 0750 /var/lib/grafana/{dashboards,plugins}
-}
-
-postinst() {
-	elog "${PN} has built-in log rotation. Please see [log.file] section of"
-	elog "/etc/grafana/grafana.ini for related settings."
-	elog
-	elog "You may add your own custom configuration for app-admin/logrotate if you"
-	elog "wish to use external rotation of logs. In this case, you also need to make"
-	elog "sure the built-in rotation is turned off."
-}
diff --git a/www-apps/grafana-bin/grafana-bin-6.2.0.ebuild b/www-apps/grafana-bin/grafana-bin-6.2.2.ebuild
index 7760f27c61fd..ed520bacd97a 100644
--- a/www-apps/grafana-bin/grafana-bin-6.2.0.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-6.2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 inherit user systemd