gentoo resync : 25.09.2019

33 files changed, 231 insertions, 719 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index ffe2d6a4f454..aeffb0ca107f 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/cgisysinfo/Manifest b/www-apps/cgisysinfo/Manifest
index 6a19ca9d1174..d5ac4a1ba1ed 100644
--- a/www-apps/cgisysinfo/Manifest
+++ b/www-apps/cgisysinfo/Manifest
@@ -1,3 +1,3 @@
 DIST cgisysinfo-0.4.1.tar.gz 17662 BLAKE2B 63997c790d7d42d0a91f53f667a75b53b1954c1bf13f97f99918bcd926c6dcb4a7e75b1658490aab2d0d1ac666f163c910d903b26675994755c82d84bc52fa0f SHA512 a966c96345454424258b623038b555767d71e1e4258f92114081d93e8ce490b26e4c2b88f6ad527f0b55d267d008da3b13774b7e2499ad6b96e035ba3be2e912
-EBUILD cgisysinfo-0.4.1.ebuild 770 BLAKE2B 5631f168be5a8485f1c06cd48c30a2eb546b3e5cc181981a53438eca94e40bac3fda2c708e87a96bfad6b7d68615c7965ddac95bf52a1f4b31a8a074ed1ae840 SHA512 fc05ecb6836434159da552bdaa63defd34682e26e7cfffdd13acfbab0416043d20da76d05f9f44ed801d74a32c596d7186e83e9eed75a235e0f09c1c9ae1c9aa
+EBUILD cgisysinfo-0.4.1.ebuild 589 BLAKE2B 609f0743cfccc514007edc71fcc409935aef3f8d4711ab8d94f8e421548fddc95353ae9743e830ca501dbd356a519175f3ee5cff7c3e30c0e129159cf556c0d7 SHA512 b11d6b67dc941c2c01278bd7489a2892a408358b31589779919675a06691267ece842043e8256fb9942f6318411bda2c5acc63c897a37b3e47bb5ea1f95b22de
 MISC metadata.xml 647 BLAKE2B 8b9b09de4ebdac20b8799cb19c2b0d1463dc3d91ab57ae215da522adb316b1bc4b21ce61ed9a6044a6bb6c3a18cb6b6b08c6b9bf73deb9cd453aeaae5d2a65be SHA512 ebae3cddf204165d1b7b20a2223dd8922829721f11b93363fb6cefe745d2cdca1adcca769540883016f44417d92ded8cc77734f88b71d4b5deac13ad19b7f623
diff --git a/www-apps/cgisysinfo/cgisysinfo-0.4.1.ebuild b/www-apps/cgisysinfo/cgisysinfo-0.4.1.ebuild
index 0dc2dac982cd..15aea0259587 100644
--- a/www-apps/cgisysinfo/cgisysinfo-0.4.1.ebuild
+++ b/www-apps/cgisysinfo/cgisysinfo-0.4.1.ebuild
@@ -1,22 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
 inherit autotools
 
-if [[ ${PV} = *9999* ]]; then
-	WANT_AUTOMAKE="1.10"
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/rafaelmartins/${PN}"
-	KEYWORDS=""
-	DOCS=( "README.md" "AUTHORS" "NEWS" )
-else
-	SRC_URI="https://github.com/rafaelmartins/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	DOCS=( "README" "AUTHORS" "NEWS" )
-fi
-
+SRC_URI="https://github.com/rafaelmartins/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 DESCRIPTION="A small cgi utility to show basic system information"
 HOMEPAGE="https://github.com/rafaelmartins/cgisysinfo"
 
@@ -24,10 +13,14 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="fastcgi"
 
+KEYWORDS="~amd64 ~x86"
+DOCS=( "README" "AUTHORS" "NEWS" )
+
 DEPEND="fastcgi? ( dev-libs/fcgi )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	default
 	eautoreconf
 }
 
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index 9d5f573c21a4..0bcdb7a54459 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -7,6 +7,7 @@ DIST chromedriver-bin-2.40.linux64.zip 3860375 BLAKE2B b91d4cd05b390f5b0d175ab39
 DIST chromedriver-bin-2.41.linux64.zip 3944714 BLAKE2B 6f86f973c1768d549bbc57a6578459d5603424351240530a7bc3e20c201dd5a0323843e29201a6731f70cc9672c129ebcda7478539cf9875e6e9c14d7f30eca0 SHA512 328bd82d17f5d4238d3fd18b8848f4edc218014cba515972b75f1e4e866f1d729f6d56463b276f7afaf7965f0d36680c0238ae8ff8f9667bc6631e49ae9e7013
 DIST chromedriver-bin-74.0.3729.6.linux64.zip 5065988 BLAKE2B e4c6bc2530f2cf8d033677d18978d93fba9710ead098c5ed455584154b73e9d734db32d9b3fd7f5500f3f32d4403f34fa448b37d3b96d3aecfc11dd9ac7ce54a SHA512 1f61f4940b557c4d74e540ff11770b3182941a11cc34783c97beab1afb5eb53806c958721da1a8249cb6a88c6cf40e7064ac9f94e7da1970d9c23a1188873c5b
 DIST chromedriver-bin-76.0.3809.68.linux64.zip 5231218 BLAKE2B eb4bd1f6bfe8f137ba6314fdfe6c132a989266f75af1870b6dae3ed9bee70d8a8145794798d273f971fdce0b311523972eebf88cc4ddb391195fc1985abe12af SHA512 18be867e96fce752a1a2974ade8a0897b19d4a3e1b971e751193e33a01211a96e0f835785817151405e7d3d4138f86d8104544ca2b72925ba5e38a14b45c72dd
+DIST chromedriver-bin-77.0.3865.40.linux64.zip 5425800 BLAKE2B b1b0ef7e4a6822838874fe5fa4bf7e24ef01f720a8cd62b2c748af20a6fa74bc34473d3fff1ef553f21437fb2ed592c7245253b781810da8987e6d730c6c027f SHA512 6463e76f00ceee66fd8037b38e9ce5699b6ec83c8f2fa43cb0d417fb4d8d1c92cf85168beb1a23a90c20abf20dcfd66dfe235dfb690730a8fd548ca6236eb8f7
 EBUILD chromedriver-bin-2.24-r1.ebuild 644 BLAKE2B 1827f95c6dd8fe6bf87da9252d5b16a894626201a8eb2e62163970cad4abc048bac8e012043aa0e791cac28736dae680cce014b4177d85b4f6268ca4525ab8cb SHA512 5b5d5a6e5e333e8e36b8041247581aa687b756a01068f98052aa0d2898d662178530171fc58bd1e82cd32bdd742c7d8ec334f6adee2606ee156a7d22f7ef5604
 EBUILD chromedriver-bin-2.30-r1.ebuild 644 BLAKE2B 1827f95c6dd8fe6bf87da9252d5b16a894626201a8eb2e62163970cad4abc048bac8e012043aa0e791cac28736dae680cce014b4177d85b4f6268ca4525ab8cb SHA512 5b5d5a6e5e333e8e36b8041247581aa687b756a01068f98052aa0d2898d662178530171fc58bd1e82cd32bdd742c7d8ec334f6adee2606ee156a7d22f7ef5604
 EBUILD chromedriver-bin-2.35-r1.ebuild 539 BLAKE2B d41fdf3b40b52c2904abdd9f98623a248456ba07e20297ab5e367fd316e26012a76cff0745971e80fbc7f9c93565f7d89be9371177fc8e40374eb1515f7d0ec4 SHA512 f23bdc20e88e733db2006b29c533636a3a3135ee2225e39e7f5d8b718444feb6cff5351b3b46a6dcc7a4b8328a3f269c0c3a87d8e7d8abe64756436afc1b2f6a
@@ -14,4 +15,5 @@ EBUILD chromedriver-bin-2.40.ebuild 539 BLAKE2B d41fdf3b40b52c2904abdd9f98623a24
 EBUILD chromedriver-bin-2.41.ebuild 539 BLAKE2B d41fdf3b40b52c2904abdd9f98623a248456ba07e20297ab5e367fd316e26012a76cff0745971e80fbc7f9c93565f7d89be9371177fc8e40374eb1515f7d0ec4 SHA512 f23bdc20e88e733db2006b29c533636a3a3135ee2225e39e7f5d8b718444feb6cff5351b3b46a6dcc7a4b8328a3f269c0c3a87d8e7d8abe64756436afc1b2f6a
 EBUILD chromedriver-bin-74.0.3729.6.ebuild 536 BLAKE2B 33443cfcfae910fbe0fffcb92137fcc80e754883d180316acef1629b3508752dd5917e717d5fd26c94fd41591a7d817bf4ac4b99b592deb0977eb5290a921db3 SHA512 4a5ff3ae076a62a748d51f7418e1d26ee401ff2f3da81f7ec42cbb21f357269912b54fcb7276fce3556f02ac68d05b12726e0748b020de28474f585e17cfe12e
 EBUILD chromedriver-bin-76.0.3809.68.ebuild 536 BLAKE2B 33443cfcfae910fbe0fffcb92137fcc80e754883d180316acef1629b3508752dd5917e717d5fd26c94fd41591a7d817bf4ac4b99b592deb0977eb5290a921db3 SHA512 4a5ff3ae076a62a748d51f7418e1d26ee401ff2f3da81f7ec42cbb21f357269912b54fcb7276fce3556f02ac68d05b12726e0748b020de28474f585e17cfe12e
+EBUILD chromedriver-bin-77.0.3865.40.ebuild 536 BLAKE2B 33443cfcfae910fbe0fffcb92137fcc80e754883d180316acef1629b3508752dd5917e717d5fd26c94fd41591a7d817bf4ac4b99b592deb0977eb5290a921db3 SHA512 4a5ff3ae076a62a748d51f7418e1d26ee401ff2f3da81f7ec42cbb21f357269912b54fcb7276fce3556f02ac68d05b12726e0748b020de28474f585e17cfe12e
 MISC metadata.xml 460 BLAKE2B 6da42de60f119a13f70f0a64f61f4fde912d15a7582b240631761e852b0db50bdb2f95102be05b09b1d653907b4c0a8a9641a9952cb6a7c1bd84d8f51ae1d83b SHA512 a8dfdafe46c651f3b06e0c004750747cfbe21e0ee704e5afd6f302c2ea61e288fad3987732b0e4b6ecec4805822c347f1d43a5e09e911e7d950196207eb81f43
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-77.0.3865.40.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-77.0.3865.40.ebuild
new file mode 100644
index 000000000000..ebfd309b9915
--- /dev/null
+++ b/www-apps/chromedriver-bin/chromedriver-bin-77.0.3865.40.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="WebDriver for Chrome"
+HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
+SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="!www-client/chromium
+	www-client/google-chrome"
+
+S="${WORKDIR}"
+QA_PREBUILT="usr/bin/chromedriver"
+
+src_install()
+{
+	dobin chromedriver
+}
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 8b60aebc2618..ff0eb16339c5 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,14 +1,10 @@
 AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e871a86738f21b8b3ee68caf1e2b437343f739564dac5ef91db5dcb6b2f31b49a936f9d4e6a62cca4 SHA512 13b9868a4c0a5a7209e6f4aa1206a93a0fb33b0234c4c0a6942bdab9d1cf139049181c066e01c49f639165ea422259fa7cab9e0bdf21537b3722bd86691d9b2c
 AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743e94fc59f76ef77220610d2fd02950ad0157b9ebbfd8380a489cd0da33b5b25102fbaa936c1212e2f SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442
 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-5.4.5.tar.gz 55227168 BLAKE2B 23201dfc85a748b62f5289b53c5ea6549c7c3ddfe278b51a10c22f5be9ec85cc925f3fb4c130adacd1dc036c89f956a867f47d1d6e876fbd55c437aa740116e6 SHA512 861a6c082b006ee3a4cbafad0a65e117912d76aede2073faa264c34452dc6f93d3d0c727a66891bc1155924d1c8419232f794ca621aab1d768302668380c15e7
 DIST grafana-bin-6.3.4.tar.gz 58756149 BLAKE2B 847e88cc81aabbb208aeb4bb3e3c8c98346021e6445189d3dfbe526a007f3754ac1912fee8d8ced82cfb30555ac88d4a76bbb3bc9ee0bde604048c865850dddc SHA512 6ea604c25776420355e3d1daa0ac138884587ad16cb9b293e0f771edc57eb070a32691ab24dcf937fd4d8fb8f6562f3600c0663d17fb24c40ecffc33b0320d69
 DIST grafana-bin-6.3.5.tar.gz 58756804 BLAKE2B ffa96e5fd067dbe3590c8102c8ac93337679d968c19ec0decf44a39118d4473da82ac2f6702400cc57c22ea7703af3e7cd39aad9a1c63f41c5613b3d5bbe2bed SHA512 0298894f845fa6e322f3fa51364ba24617f3847c2f597a336ba3c1e761165a11efb9a884c3cce8856281bcb8ea3b66341c5ba301f58ce6bf2a8d0328ecd774bd
-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-5.4.5.ebuild 1944 BLAKE2B be7426448610d8b2875bd13a8f37d7c771193e236f572699224dced158835b1fb050573fc425e1d1c8ff4b216aab730ceccd666052c3467d86cca0b88a57fae2 SHA512 ae168b08b5f7c14b0f54d94be5e10fb9ef2c2c4875c8db7b2299cf087734687dc448d08b5f4fdd06ad2c219c29dd5a82802e7e2f68dd0be0daf698fdded24ccd
+DIST grafana-bin-6.3.6.tar.gz 58756037 BLAKE2B cdc7aaf9fe33ac271ca3a942e4dd9d33e8f6125db239a6b83ae33232730c44a8aa6395ebeaf60ed1d862912ba84c36347481c78d89150b32ae325926145037a5 SHA512 2c230c510a7e480aa9d972fc6648a4748fb5587830078a86b7a228f6abd1e8f4b1eb20f5ffb5d166ce07b43ac602e01af6c0574e3f8b276dde856ae6ac437067
 EBUILD grafana-bin-6.3.4.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
-EBUILD grafana-bin-6.3.5.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
-MISC metadata.xml 416 BLAKE2B ff5bdf7e202aa96bbf615df2f86c6542bb7d291e6d564dfac683a2e54002380dd80ef3f1ca0b6c1f398de0115e26398903256b9d64e353127f25c3e97e5b21c8 SHA512 db2cbd25cf9b21664db93dc8f9719bf7f9a2fd632c5231d0f296bb32f3f6af3e08307c8a662081cc68f33638d70f6512094fad76073a5de4ceba02eeb3d1188b
+EBUILD grafana-bin-6.3.5.ebuild 1968 BLAKE2B fcc4feffc504f8060f41d50cf96e8080d421089e851d7e89d98cc166abce23ec21347c97ef8b693629664789584c67df82591a0d8e76acf12f86b33185ba9d32 SHA512 fc4e1c85e3346831ef9377e41ca3ab8636809a5ca4ce330fda39c739f5e184ee3c55bf0813ac60816ca980a71e093b9b78464b1c5210debac0aa76d953bdde9d
+EBUILD grafana-bin-6.3.6.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
+MISC metadata.xml 324 BLAKE2B 747dcf2b855aa56d5836860e136c1135a1940eee4cdf1c4049cc025fd36daad538e12813f0d96bef6dc5e5e4a76393d5c0e516210404f91f7cb19031c42816af SHA512 0d8b412c363e342c7971b1a95ddc52a57a6e5f9f742134682af5afeee9fef1cb7c110450891fb36b7a77cc7c19e845f24d8ad984cbbb7cc0a97adee4f9d71f24
diff --git a/www-apps/grafana-bin/grafana-bin-5.4.3-r1.ebuild b/www-apps/grafana-bin/grafana-bin-5.4.3-r1.ebuild
deleted file mode 100644
index 7e9781fe83c7..000000000000
--- a/www-apps/grafana-bin/grafana-bin-5.4.3-r1.ebuild
+++ /dev/null
@@ -1,70 +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/}
-S=${WORKDIR}/${MY_PN}-${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}-${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-5.4.5.ebuild b/www-apps/grafana-bin/grafana-bin-5.4.5.ebuild
deleted file mode 100644
index 33385776ece0..000000000000
--- a/www-apps/grafana-bin/grafana-bin-5.4.5.ebuild
+++ /dev/null
@@ -1,70 +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/}
-S=${WORKDIR}/${MY_PN}-${PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://dl.grafana.com/oss/release/grafana-${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.3.5.ebuild b/www-apps/grafana-bin/grafana-bin-6.3.5.ebuild
index ed520bacd97a..660a3ccaf0c9 100644
--- a/www-apps/grafana-bin/grafana-bin-6.3.5.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-6.3.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz ->
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND=""
 RDEPEND="${DEPEND}
diff --git a/www-apps/grafana-bin/grafana-bin-5.4.4.ebuild b/www-apps/grafana-bin/grafana-bin-6.3.6.ebuild
index 33385776ece0..ed520bacd97a 100644
--- a/www-apps/grafana-bin/grafana-bin-5.4.4.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-6.3.6.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 inherit user systemd
 
 MY_PN=${PN/-bin/}
-S=${WORKDIR}/${MY_PN}-${PV}
+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"
diff --git a/www-apps/grafana-bin/metadata.xml b/www-apps/grafana-bin/metadata.xml
index 916283cbb202..de3562b1bee5 100644
--- a/www-apps/grafana-bin/metadata.xml
+++ b/www-apps/grafana-bin/metadata.xml
@@ -2,13 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>erkiferenc@gmail.com</email>
-	</maintainer>
-	<maintainer type="person">
 		<email>patrick@gentoo.org</email>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/www-apps/groupoffice/Manifest b/www-apps/groupoffice/Manifest
deleted file mode 100644
index 64a73759ec61..000000000000
--- a/www-apps/groupoffice/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX postinstall2-en.txt 707 BLAKE2B 4c3369cd774ddbdbbc2f2979f027241899b50bd5009f68c4af937986693c6d181d577180ffa94bfbd5504ad96793890019be4ba4d64de0917db3356de67ce93f SHA512 a4b3fc6f576a80d80f86786bad1b13cc879dbe13c79c26e4141aeb160487ce2989e404f867a2e4e0dfdae8caa186f9e752baf962dcea902a090e500b9306d413
-DIST groupoffice-com-3.7.52.tar.gz 12259892 BLAKE2B 2c0e1d5320da86959c2c83bdf40a4ff97f95561cb92d89c04c1f41a3c17da9cd84f523519dfc3c43a05340ce1d8d7a603ebbe1a195fc50b3bfc32d7969471635 SHA512 f989392398d2756baf5222b0fb29add094385ea217f3065059c5eac71a82a594f820997968c07f842675d827bfcc12e3151488f57d52d4a706702f5db282d5fb
-DIST groupoffice-com-4.0.144.tar.gz 13937659 BLAKE2B 77f451f3fe0a80bc6ca43041922bc16a9389ff21d93adeb21f90a89b2e795553d92ac1298527d6ddcc7f7981beacce17c846bb48221dbdf81d2b2a3f987d16ce SHA512 a7d590eee6782ac44f9fff72e46fa646dac6e59a6c78fd551541fb539398435a4a8fc4f6068e6ead254af00d7bbe78ea8bcd0c3d0ec5ea05a9110bd1e938b27f
-DIST groupoffice-com-4.0.47.tar.gz 12354456 BLAKE2B 628b51d5052a99f55c90161e4d04ae6d2f92190e586215125d88611c86d74de7477d42e69120efc372fbb1b749eed43c110f69544bb6759b901f4f3151e2e4de SHA512 bf354e8dac5af632da6e1b3d3b4bb6010f097329540a05e55287faf775c69a8078d0742a9d4cfc30bc838e6a23bcbe694b0e75d355a018d187f8617f60ff2236
-DIST groupoffice-com-4.0.97.tar.gz 13831704 BLAKE2B bb9cc08cb8eaefd4934ea1f3bb990eaa92832733a401810b5f7aa0776c46034b27fc0df53cee6f385b3f35d9b45f2d9198295e6bd01c5ed91252e6b0f02b5a0a SHA512 0913f14ffbc4be17ac3e62e5e0a37aebddbd54d7f6dcfbead42122bb3c26e25fb32f5de13e0bd5161ee1063ab826fc7cdf427f15cf1881692a46ef81deb595fa
-DIST groupoffice-com-4.1.7.tar.gz 14894191 BLAKE2B 452496a4cdbee9169ff749be006df878bd5669ab5817b0c88ff828563ecf2ff0fee25d0cadd5b7b9153a70eb69e4e0fa80e35a8a1ca6687761fcb0c5e4ed42f0 SHA512 9863eddffd06d058336ee8bcb67efd873a6dfb4fd4ad7c41ac2f7cdef95be17cd92661ee683a7c79fce4eff002acabba50d60af86ed02310d7d7d61aa589ed8c
-EBUILD groupoffice-3.7.52.ebuild 1199 BLAKE2B 8ec9fee9e2840161670439568008f64b10b2569a80f160d517d79a79ff0418660fc9395a74198a00ecff5f299f4a957b148c15f1e82a7fc6454f593d6a1f5bc2 SHA512 cb508bf62a249138d8290cfb16762f619bb185eafc5fd5adf4b57207cf4d5c262362f17c7d2052794e39888ed835695e8f0c1c8be30b38c5410b84da0746dcd4
-EBUILD groupoffice-4.0.144.ebuild 1200 BLAKE2B d17ca2b350eb2c9c8b5afec7ee9e5bad55f5f71a97716cd9239e597bb5c9a8b88bb8da1be35c05bdc338770237dcb1cec041376eca67531007be3e0f420399cb SHA512 1b901c2a61efd18c7b6da77a8c4ccab106f5135387c7237b87dc4ce4df6550dd22973df82906d21825e8df4fb59d97864a83e6078012fee63e4636919c410bf6
-EBUILD groupoffice-4.0.47.ebuild 1200 BLAKE2B d17ca2b350eb2c9c8b5afec7ee9e5bad55f5f71a97716cd9239e597bb5c9a8b88bb8da1be35c05bdc338770237dcb1cec041376eca67531007be3e0f420399cb SHA512 1b901c2a61efd18c7b6da77a8c4ccab106f5135387c7237b87dc4ce4df6550dd22973df82906d21825e8df4fb59d97864a83e6078012fee63e4636919c410bf6
-EBUILD groupoffice-4.0.97.ebuild 1199 BLAKE2B 9d643ddc6fb76cbb296e1045eb193c59684fac0d7781158581a7b6625d60d6b0d41be6535d1afbc97b71aba14f1f88452dbd4e2ed3ec72ef212aaa26b2563f95 SHA512 63446cb0a64dbae7ffa32aa62b981eec26d97708cdeb6a96c26ec4c8c55cde69dc1e76245213eb5f727a13682fde21a792ed834299c6711267c61983658d954e
-EBUILD groupoffice-4.1.7.ebuild 1199 BLAKE2B 24e035a64b2093a722bbd2278342565b9307ff3e48e7ec03a2f835e06deb349d66930413f7d2a3ff1ed3d500935be53cae45b6346ee1598d6bf96c4bb30951e4 SHA512 fecd840969e3e4475eb9df17161d667fbef8d8437f2204b91db44b7fa0b6448d85e6f991eea7e6278a684cc614fcf3f805fae7c4f2108fbc913c5495b1298b71
-MISC metadata.xml 332 BLAKE2B 3af6031937db3653983f71dff7201650b31f04eea416a5ebf7dfe92260a7227115395f06e0c869f010bd3f0736e906cdf76d767545ce76a3d893d7dd1dfc6a14 SHA512 9ea21764f4fd8d5af004c37be6b9a3cf8c388fc4229b948336d68ce68bc0164589e1d02b95e1e4b2555a8cdde66929ebd70a979dc417bafd1b3c1da73a467756
diff --git a/www-apps/groupoffice/files/postinstall2-en.txt b/www-apps/groupoffice/files/postinstall2-en.txt
deleted file mode 100644
index 2ed6251afc8b..000000000000
--- a/www-apps/groupoffice/files/postinstall2-en.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Now browse to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}
-to complete the install.
-
-Note: User data are stored in ${VHOST_ROOT}/groupoffice-<VERSION>/userdata
-Local data are stored in ${MY_INSTALLDIR}/local
-
-When you are done with the installation,
-rm -Rf ${MY_INSTALLDIR}/install/
-or use an .htaccess file to secure the installation directory.
-
---------------------------------------------------------------
-ADDITIONAL FUNCTIONALITY:
-
-net-mail/tnef:      Install this package to decode winmail.dat
-                    attachments in the email component.
-
-dev-libs/libwbxml:  Install this package if you use the
-                    professional groupoffice version including
-                    SyncML support
diff --git a/www-apps/groupoffice/groupoffice-3.7.52.ebuild b/www-apps/groupoffice/groupoffice-3.7.52.ebuild
deleted file mode 100644
index 0aad18936b70..000000000000
--- a/www-apps/groupoffice/groupoffice-3.7.52.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit webapp
-
-MY_P="${PN}-com-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Group-Office is a powerful modular Intranet application framework"
-HOMEPAGE="http://group-office.sourceforge.net/"
-SRC_URI="mirror://sourceforge/group-office/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="app-arch/zip
-		 app-arch/unzip
-		 virtual/httpd-cgi
-		 dev-lang/php[calendar,cli,curl,gd,imap,mysqli,zlib]"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="CHANGELOG.TXT FAQ.TXT INSTALL.TXT"
-
-	dodoc ${docs} RELEASE.TXT LICENSE.TXT
-
-	cp -r . "${D}${MY_HTDOCSDIR}"
-	for doc in ${docs}; do
-		rm -f "${D}${MY_HTDOCSDIR}/${doc}"
-	done
-
-	touch "${D}${MY_HTDOCSDIR}"/config.php
-	dodir "${MY_HOSTROOTDIR}/${P}"/userdata "${MY_HTDOCSDIR}"/local
-
-	webapp_serverowned "${MY_HTDOCSDIR}"
-	webapp_serverowned -R "${MY_HOSTROOTDIR}/${P}"/userdata
-	webapp_serverowned "${MY_HTDOCSDIR}"/local
-	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
-	webapp_configfile "${MY_HTDOCSDIR}"/config.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall2-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/groupoffice/groupoffice-4.0.144.ebuild b/www-apps/groupoffice/groupoffice-4.0.144.ebuild
deleted file mode 100644
index a5590b026029..000000000000
--- a/www-apps/groupoffice/groupoffice-4.0.144.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit webapp
-
-MY_P="${PN}-com-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Group-Office is a powerful modular Intranet application framework"
-HOMEPAGE="http://group-office.sourceforge.net/"
-SRC_URI="mirror://sourceforge/group-office/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="app-arch/zip
-		 app-arch/unzip
-		 virtual/httpd-cgi
-		 dev-lang/php[calendar,cli,curl,gd,imap,mysqli,zlib]"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="CHANGELOG.TXT FAQ.TXT INSTALL.TXT"
-
-	dodoc ${docs} RELEASE.TXT LICENSE.TXT
-
-	cp -r . "${D}${MY_HTDOCSDIR}"
-	for doc in ${docs}; do
-		rm -f "${D}${MY_HTDOCSDIR}/${doc}"
-	done
-
-	touch "${D}${MY_HTDOCSDIR}"/config.php
-	dodir "${MY_HOSTROOTDIR}/${P}"/userdata "${MY_HTDOCSDIR}"/local
-
-	webapp_serverowned "${MY_HTDOCSDIR}"
-	webapp_serverowned -R "${MY_HOSTROOTDIR}/${P}"/userdata
-	webapp_serverowned "${MY_HTDOCSDIR}"/local
-	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
-	webapp_configfile "${MY_HTDOCSDIR}"/config.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall2-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/groupoffice/groupoffice-4.0.47.ebuild b/www-apps/groupoffice/groupoffice-4.0.47.ebuild
deleted file mode 100644
index a5590b026029..000000000000
--- a/www-apps/groupoffice/groupoffice-4.0.47.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit webapp
-
-MY_P="${PN}-com-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Group-Office is a powerful modular Intranet application framework"
-HOMEPAGE="http://group-office.sourceforge.net/"
-SRC_URI="mirror://sourceforge/group-office/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="app-arch/zip
-		 app-arch/unzip
-		 virtual/httpd-cgi
-		 dev-lang/php[calendar,cli,curl,gd,imap,mysqli,zlib]"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="CHANGELOG.TXT FAQ.TXT INSTALL.TXT"
-
-	dodoc ${docs} RELEASE.TXT LICENSE.TXT
-
-	cp -r . "${D}${MY_HTDOCSDIR}"
-	for doc in ${docs}; do
-		rm -f "${D}${MY_HTDOCSDIR}/${doc}"
-	done
-
-	touch "${D}${MY_HTDOCSDIR}"/config.php
-	dodir "${MY_HOSTROOTDIR}/${P}"/userdata "${MY_HTDOCSDIR}"/local
-
-	webapp_serverowned "${MY_HTDOCSDIR}"
-	webapp_serverowned -R "${MY_HOSTROOTDIR}/${P}"/userdata
-	webapp_serverowned "${MY_HTDOCSDIR}"/local
-	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
-	webapp_configfile "${MY_HTDOCSDIR}"/config.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall2-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/groupoffice/groupoffice-4.0.97.ebuild b/www-apps/groupoffice/groupoffice-4.0.97.ebuild
deleted file mode 100644
index a249c1ee716b..000000000000
--- a/www-apps/groupoffice/groupoffice-4.0.97.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit webapp
-
-MY_P="${PN}-com-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Group-Office is a powerful modular Intranet application framework"
-HOMEPAGE="http://group-office.sourceforge.net/"
-SRC_URI="mirror://sourceforge/group-office/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="app-arch/zip
-		 app-arch/unzip
-		 virtual/httpd-cgi
-		 dev-lang/php[calendar,cli,curl,gd,imap,mysqli,zlib]"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="CHANGELOG.TXT FAQ.TXT INSTALL.TXT"
-
-	dodoc ${docs} RELEASE.TXT LICENSE.TXT
-
-	cp -r . "${D}${MY_HTDOCSDIR}"
-	for doc in ${docs}; do
-		rm -f "${D}${MY_HTDOCSDIR}/${doc}"
-	done
-
-	touch "${D}${MY_HTDOCSDIR}"/config.php
-	dodir "${MY_HOSTROOTDIR}/${P}"/userdata "${MY_HTDOCSDIR}"/local
-
-	webapp_serverowned "${MY_HTDOCSDIR}"
-	webapp_serverowned -R "${MY_HOSTROOTDIR}/${P}"/userdata
-	webapp_serverowned "${MY_HTDOCSDIR}"/local
-	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
-	webapp_configfile "${MY_HTDOCSDIR}"/config.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall2-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/groupoffice/groupoffice-4.1.7.ebuild b/www-apps/groupoffice/groupoffice-4.1.7.ebuild
deleted file mode 100644
index 712f892a9147..000000000000
--- a/www-apps/groupoffice/groupoffice-4.1.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit webapp
-
-MY_P="${PN}-com-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Group-Office is a powerful modular Intranet application framework"
-HOMEPAGE="http://group-office.sourceforge.net/"
-SRC_URI="mirror://sourceforge/group-office/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="app-arch/zip
-		 app-arch/unzip
-		 virtual/httpd-cgi
-		 dev-lang/php[calendar,cli,curl,gd,imap,mysqli,zlib]"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="CHANGELOG.TXT FAQ.TXT INSTALL.TXT"
-
-	dodoc ${docs} RELEASE.TXT LICENSE.TXT
-
-	cp -r . "${D}${MY_HTDOCSDIR}"
-	for doc in ${docs}; do
-		rm -f "${D}${MY_HTDOCSDIR}/${doc}"
-	done
-
-	touch "${D}${MY_HTDOCSDIR}"/config.php
-	dodir "${MY_HOSTROOTDIR}/${P}"/userdata "${MY_HTDOCSDIR}"/local
-
-	webapp_serverowned "${MY_HTDOCSDIR}"
-	webapp_serverowned -R "${MY_HOSTROOTDIR}/${P}"/userdata
-	webapp_serverowned "${MY_HTDOCSDIR}"/local
-	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
-	webapp_configfile "${MY_HTDOCSDIR}"/config.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall2-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/groupoffice/metadata.xml b/www-apps/groupoffice/metadata.xml
deleted file mode 100644
index 1910a4d57726..000000000000
--- a/www-apps/groupoffice/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>web-apps@gentoo.org</email>
-		<name>Gentoo Webapps</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">group-office</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 16d74aa54747..3212bd23c1ef 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -1,22 +1,28 @@
 AUX kibana.confd 72 BLAKE2B 786203cfc47132fedb989fbcaebc799ed566e15f2b0ced9657980269906a0395ffd6287d8b89ce41fd437086173177a9727daa2cd03de8bda26045c013f7c6dc SHA512 7dfb5c2e99e48227a95ac405fdf9f1ffdf20f7173c5a211a1aedf73b2e2ac37b7f428e5e3c7b713b78433cc9ea7bbfac723477c4497a6cb18ed787d42d8faddd
-AUX kibana.initd 1015 BLAKE2B 4e8e3e22fdbc2cee3fe9b992f2118a57f82d8f099236842b787b8e66fa59a353fcc49364db31016bdec50e0c465b48c18f07236e828268e9a0b76ad3741bb3ec SHA512 cd89c1fc7846d4c553bf2abc7e3df851561a574ef70ba3c6709ee8e3016d0348093563c70e5800bf6ff2e977976835dc7bed30e5b191d60e5f3c5f17fb3adc7e
+AUX kibana.initd 1022 BLAKE2B 8eb81203f713e75d3eead4eb25a7670c7fab8af67d1fbe749856959061feedf049caa234e58c1bd39bd4127a34c9d3de0bde0a3d41bd4856aa5176e6fd442158 SHA512 e4555584ab4f3980ec703edcfb8349ec8847cae0fb25ba2243ff3404d8d7058fb317bd4b06c2df7a8b369f733648422f0e0cb8db745844ce36d4ada3385a4f90
 AUX kibana.logrotate 186 BLAKE2B e0446247e29b474dcab5756ac26f10fd8f46300e144386ff54a4e25fc1c2678ce0d21196b7365b01417cd0304a3f1edd6841800256e931bdc10f7d4e0f4ccd49 SHA512 1e0a51a83798e30b3807f496245b5733bc60a7bd1a529d2548a187ff8d3fa56d60bc23abf516d239ef76a8e9b66358ed84c687040a7b04c7818ea63417d33a1e
 AUX kibana.service 511 BLAKE2B 2b0786bfaf37c26e061973f38adea0a55ac1b8bf771395242c0ed3b53c6586099c121c286b23f0a3be67dc481a3e95c6f87486cd1601df997126d3cfd14435c1 SHA512 0b7754ebfa7e3538e64843436d8abe32a6ce38a9ab5e252e52657a99d97fa1801777db4502c1af5ec6082d83f0b3a0613e074f6ebe28624832bd0c258a478899
 DIST kibana-5.6.16-linux-x86_64.tar.gz 53468981 BLAKE2B dda2aacad7043e4ed259c194de95da143cfc8f4fef624ff783eb8323f9053afe3a9857e358df7aa0b1fa26e9b452ff5afe7480b7befb5504af95d730c1deea53 SHA512 e3b8cd5911444be3c8f39d2060216d968456cae123a3ac47805bbf1e3d5ca581ecfd061988655926a5c6243df0ea2e127e5cf6fe35d336df570cd5b82cfd338f
 DIST kibana-6.6.1-linux-x86_64.tar.gz 180675854 BLAKE2B 7c911f6715f1bb526e09a47de55b10b197dd78bcd5c9a6e710890cd333d23c8556d8efb12d34b0c0cdf1e989bb456da8f79e54b1798c02ea57658d90fbb80f83 SHA512 df4547a0056b46d6351948e7f67439b5a7fe46c27f20c9cb7783046abea04d28aa85ba74751f54c7a1524dbca55ee9c9bfaec50be903f964dedc1ceeb5d823b0
 DIST kibana-6.7.1-linux-x86_64.tar.gz 186430753 BLAKE2B 10d3b4d7996ee88ea3fc7062585dd0b00618650779e779c2fc18dcb9e0c62d964abb2806997f0712c495fb54ad2399a8b55745c67b6ff77ec1fa8e6041e7a075 SHA512 5ad5af43c18f12312d8bf5b50e8550ed8a008fb36efddb1756498c6a44cbb40cfa3ae7d307f5cb88daee0690dfd3aacfbb7bd526f098c140886a821af4b28e9d
 DIST kibana-6.8.1-linux-x86_64.tar.gz 186486884 BLAKE2B 6fc640637a2bca675726f485aef7931f475c91f92682101b987972ec9f39b57f5a7e3029dd9de102971356d17a6ce9fef197d8cd7a720e9a2511a4bb73a256b5 SHA512 31f3224bc4b571b24275dab21d3eb09fc592e7989887073985e17ccb718867d71e686f0299d28d0fb9f64388f1dfb98c82dbfaa6e7adc2d07685deffac2fed53
+DIST kibana-6.8.3-linux-x86_64.tar.gz 186404046 BLAKE2B aa4220fe060dce823c22a1b366dbe941e5f0930cde290b7272fade5e330a8f4f4dbe8fb4215d55b88edef3c8e65418e8f3659b7658355197f38b20316e0c3dff SHA512 54c3b9ad197bb8f100905c8b933b94a2dccd38ae3c4482d9b798fc3bd86e53a1e8d60d30554223da537012da47f9aefdbd0d41b9fc01bf01f7bcb45ffe60ebbc
 DIST kibana-7.0.0-linux-x86_64.tar.gz 167679944 BLAKE2B 55e1e36134861a063e6a2e844e717fc1e90130403d1f08be87c27582b822e866d8703b7a16a9cf1371ec65e0ff1a314bf6e838ce4b1b5905911325a1a4850b5a SHA512 647dd3900d70dfcf7c8f97d8a020f204b4e2f11c2fc23b4733618ad931f7876b37bfd885809632bbd05fdac75fbc0e233d48367ddb34801e1450b452af8e3f4a
 DIST kibana-7.2.0-linux-x86_64.tar.gz 213198521 BLAKE2B 64ce95baa14107c3789d4aff748310cacd41cdabe227cb3fedab4bdd5d65d86d4bc8883dd7f8fbced3fda2ed25ed294ce49a8f28311fcbcfcae3c7bdc960c4ac SHA512 78368be3c55ef09cfed6903cc6556edb1a77f9e548614535b261d13c3190052ee9571cbb686470662f5563c564f1256e3a31ca233a26e8b734f3df44ab5a97f0
+DIST kibana-7.3.2-linux-x86_64.tar.gz 236654252 BLAKE2B 0e851e372e628d72670f161569ac6dea09ee34dfe07dcb0c383709534f1495bb35c1853c1e3610c92aa320d62e784537597af7d8dba210f9e9eaf153de6568bc SHA512 23a496cf55cebeebdc67577c966f9f19de36fd7fe2d05597687047b0e7f6b52a41395a0e750e245b04f9881ea99381ff3104fd18bc19593a2db520100874bf0e
 DIST kibana-oss-6.6.1-linux-x86_64.tar.gz 59466869 BLAKE2B 593563976b4d1c89b6042dbd1a945c6fc7ae2a8c3ea18d142d9e7e5f8307d72e7b358059316130880c64c6879e5df41d80005a1dad82d8a5ae223bf292bdf392 SHA512 1131ce7cab882166478be89426a8885fb53e2b1154100b6fa5dd0a431b1d9aa20df73c687159c18e1b9703e42f953fb10b3ab7fbfe634ed253331238249bf574
 DIST kibana-oss-6.7.1-linux-x86_64.tar.gz 62807564 BLAKE2B 8fec550769f4a2a88a4fab72b0ecb49d81d25d2f13d365cfefce2f70ed5c088a72f750a0b5807d729621a78c7fe393a5f9875012b6559aa82bb049083eaff5bf SHA512 309c25a16d535b1c5f0853ea89b7b69b61e3472afdabdd6f60a86fabba4c76c034b620cbe3d7f988cc78d21e5ed058b4f97e4995d868876a55fcc30769822882
 DIST kibana-oss-6.8.1-linux-x86_64.tar.gz 62862417 BLAKE2B ac421af54dff10dec2cd414f3a2101df6fa7691092865d53a35a80cd015679d3d749ef8b37bd67bf6a709741f310fc1ebfeb54ee705f2e81c044ae714e90c932 SHA512 853d920253e1c55ad284d713065174696d228634a90bfef20d7ada1f76a8db94b1d61b62c5e715356381780dcb28f87ae71c2d509282e97c524a8cb313a79e66
+DIST kibana-oss-6.8.3-linux-x86_64.tar.gz 62872100 BLAKE2B e47755708b7fa1a7a2b8d74b4fde352b554b350f31541eb98467f66e599ba1075c5833e1926e1f2cf6ec7accfc302bfd271dbba2ef6a9526683950d67442be0f SHA512 baa8ad7bb9388d6f969509ff1c8fe6273d8ec0b377aa15942a41a8f3934a670bf84fd84b96b76dbfb8fc4c053084b38dc26a6d2ce02efcb2ddf7b4530dfdeae4
 DIST kibana-oss-7.0.0-linux-x86_64.tar.gz 70548795 BLAKE2B b41f6073548f1cf09fd1e49504775f4802a1e86ed561870b60507054583f73bc0c531fadb831c7145d5234832eabf94a1b7e23ba78c88481be154d4b24ee07c4 SHA512 091ab4fbf0aec782307b7313dec82e6437be4cb76efac49eed6434c393e9adda3f925d6a75be4b78c9768c943168881dc38aa7b1b23462af80d5d158b3806136
 DIST kibana-oss-7.2.0-linux-x86_64.tar.gz 82672623 BLAKE2B 770e35f8025fb65513e51cb6a582dfe456e348efc7493c3710f2fa8ee49207392494aa437d7fe2d7115e5f607926e185264b6f92dacdc202331aab3d8ab10254 SHA512 ea735ecd18fc4441f29adcd7fd5a08a61e8bf1e82170219f598edf4a7726a11166e16b36f125edbfecafb6ed2c7cf003880d428960765861868e22cf55542e6b
+DIST kibana-oss-7.3.2-linux-x86_64.tar.gz 87456219 BLAKE2B acfc04f9b4afc582d7959ba394487747b0e82f9e12c3b783add91b36155fe74620c067cad1a85898e74ba22b0ba7d66c124f1f8a1e29ae7291de74c048a8d8ef SHA512 a54d0ad3dafd69661762ee8d59021d955253389fb0d228f61f58b522d0644684f57ff96a4bda84d51cf39ecded4ade6c21923bc8e20d6ec9e61305fb6c0b2e32
 EBUILD kibana-bin-5.6.16.ebuild 1684 BLAKE2B 7f2226c849036d14b3d9226902237a456251b1ed7d765394e4dc9cb969d98b9d12abb5a065858e46b074c588242e8612e5ed81b3e40e0fe92007b6106029d772 SHA512 35b7685abc2aac386fcfbad7f7685534967bc2d34c4aab7b39dbe0642428bf61ea3c5dd9aa49f82f6393f786b7389a60b7ddf4c543c5cfdd9689b15dced7cf04
 EBUILD kibana-bin-6.6.1.ebuild 1983 BLAKE2B bcb04b1069e796f06affb4b020ac3659d5ade023d947222db02423c1d222fa2f92f0e269e2bc430fb1b2b63901cee84bedd84c82a16d17c0d3780e6c505d5196 SHA512 5d59d675f38a990fba0c1c76e155a7a0f19444563e511dbdba425a639c59e9b9f4d7d3bc2c1ce0fe18775929d88682dc66b30a03211d4721794eb7e7aed922b8
 EBUILD kibana-bin-6.7.1.ebuild 2508 BLAKE2B f3fb5262c8c37518909ed910b33ac5407d2314b54ebe1411d47924571994e0488767781fa52e826680276c56217b2f641a7b7c948ccfc78ac703277e3cf7288b SHA512 4454a2cca319cd23a6ee6b5cbf2e9019163c61fc30df07eee83e98a0f02420e548a398e6dd624a3fbd2c51bb8c22898bd3f0eed47e5a9be94f6ceedf6130cdcb
 EBUILD kibana-bin-6.8.1.ebuild 2508 BLAKE2B f3fb5262c8c37518909ed910b33ac5407d2314b54ebe1411d47924571994e0488767781fa52e826680276c56217b2f641a7b7c948ccfc78ac703277e3cf7288b SHA512 4454a2cca319cd23a6ee6b5cbf2e9019163c61fc30df07eee83e98a0f02420e548a398e6dd624a3fbd2c51bb8c22898bd3f0eed47e5a9be94f6ceedf6130cdcb
+EBUILD kibana-bin-6.8.3.ebuild 2503 BLAKE2B 8c91e450ba90a593e1f6f13b9a628d16f4735dfb0a301bd11a6bdc8006ffd7cb6783f02f6babd6c85c027379ca279d4a36241d9112b38239aae238a138a1cdbc SHA512 9f21a0332a7a7d4515d96480045d6ead3977ae80f01fbce2fb584ddb4f9fd54fc1d70c772aa5d5a2dd4ba811340d7e21f19787f2bd80bedba557d0fa211447fc
 EBUILD kibana-bin-7.0.0.ebuild 2575 BLAKE2B a5adfc1d6e352420452ec8aa16cb72b5189aebf640c20be06fcb9e5f64b54ec81ed601cfaa6b5121695e65ea282bbd030ec231d567aae346c6683123c18c6919 SHA512 c51939d86d84c6df489c8c9dfa5827dd64b3a484bdb71a0e6c996387cc0274e58f3701618f3c6c2e68f8f2fbc2141024315345d2040eba312bb71f82ee354aca
 EBUILD kibana-bin-7.2.0.ebuild 2575 BLAKE2B a5adfc1d6e352420452ec8aa16cb72b5189aebf640c20be06fcb9e5f64b54ec81ed601cfaa6b5121695e65ea282bbd030ec231d567aae346c6683123c18c6919 SHA512 c51939d86d84c6df489c8c9dfa5827dd64b3a484bdb71a0e6c996387cc0274e58f3701618f3c6c2e68f8f2fbc2141024315345d2040eba312bb71f82ee354aca
+EBUILD kibana-bin-7.3.2.ebuild 2570 BLAKE2B 8d83a83d8f9c05a87540de774d2699b019e6cc40051fc8daca9e787a6479864314d1044ce5d146948a75e0c5eeea287f49024028b76c53c68fff44a8263f42b4 SHA512 8ab38932951a799d4635219e9f64fd6227b271e2ac07303ab7a3b0fc5cdb5337e3c238399fbbd2bc3135dfdd4e3863bdc5989db777b820ede2d26901e92cc01f
 MISC metadata.xml 538 BLAKE2B 649a05badea8d1116854565d09820a8ce623c733d9d0d1cbded145fdc0dfcac2478273d99f686119adab16126149ad4da8f6feb0c7be9499f5721f31a259ec34 SHA512 f0e65883a644eeb57f2d11d0871631142665e74bf8820431ac8333a1cf3e40a0b517b5cca747adba173c7eab20b70311b7bd8de6c4fb5cee4982e044189e5256
diff --git a/www-apps/kibana-bin/files/kibana.initd b/www-apps/kibana-bin/files/kibana.initd
index 84f38e9aeefa..80623fe54b37 100644
--- a/www-apps/kibana-bin/files/kibana.initd
+++ b/www-apps/kibana-bin/files/kibana.initd
@@ -12,7 +12,7 @@ KIBANA_LOG_DIR="${KIBANA_LOG_DIR:-/var/log/kibana}"
 command="/opt/kibana/bin/kibana"
 command_args="--elasticsearch ${ES_INSTANCE} --config ${KIBANA_CONFIG} --path.data=${KIBANA_DATA_DIR}"
 
-pidfile="/run/kibana.pid"
+pidfile="/run/${RC_SVCNAME}.pid"
 command_background="true"
 start_stop_daemon_args="--user=\"${KIBANA_USER}\" --stdout ${KIBANA_LOG_DIR}/kibana.log --stderr ${KIBANA_LOG_DIR}/kibana.err --env BABEL_CACHE_PATH=${KIBANA_BABEL_CACHE_PATH}"
 
diff --git a/www-apps/kibana-bin/kibana-bin-6.8.3.ebuild b/www-apps/kibana-bin/kibana-bin-6.8.3.ebuild
new file mode 100644
index 000000000000..2cc05a870273
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-6.8.3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+MY_PN="${PN%-bin}"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Analytics and search dashboard for Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/kibana"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RDEPEND="
+	acct-group/kibana
+	acct-user/kibana
+	>=net-libs/nodejs-10.15.2
+	x-pack? (
+		dev-libs/expat
+		dev-libs/nss
+	)"
+
+S="${WORKDIR}/${MY_P}-linux-x86_64"
+
+src_prepare() {
+	default
+
+	# remove empty unused directory
+	rmdir data || die
+
+	# remove bundled nodejs
+	rm -r node || die
+
+	# move optimize/plugins to /var/lib/kibana
+	rm -r optimize plugins || die
+
+	# handle node.js version with RDEPEND
+	sed -i /node_version_validator/d src/setup_node_env/index.js || die
+}
+
+src_install() {
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	rm -r config || die
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
+
+	newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
+	newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
+
+	insinto /opt/${MY_PN}
+	doins -r .
+
+	fperms -R +x /opt/${MY_PN}/bin
+
+	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
+	keepdir /var/lib/${MY_PN}/optimize
+	keepdir /var/lib/${MY_PN}/plugins
+	keepdir /var/log/${MY_PN}
+
+	dosym ../../var/lib/kibana/optimize /opt/kibana/optimize # Bug 667214
+	dosym ../../var/lib/kibana/plugins /opt/kibana/plugins
+}
+
+pkg_postinst() {
+	ewarn "Kibana optimize/plugins directories were moved to /var/lib/kibana."
+	ewarn "In case of startup failures (FATAL Error: Cannot find module...),"
+	ewarn "please remove the optimize directory content:"
+	ewarn "rm -r /var/lib/kibana/optimize/*"
+	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
+	elog "Node.js 10. Some plugins may fail with other versions of Node.js (Bug #656008)."
+	elog
+	elog "To set a customized Elasticsearch instance:"
+	elog "  OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}"
+	elog "  systemd: set elasticsearch.url in /etc/${MY_PN}/kibana.yml"
+	elog
+	elog "Elasticsearch can run local or remote."
+}
diff --git a/www-apps/kibana-bin/kibana-bin-7.3.2.ebuild b/www-apps/kibana-bin/kibana-bin-7.3.2.ebuild
new file mode 100644
index 000000000000..17b609c079cd
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-7.3.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+MY_PN="${PN%-bin}"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Analytics and search dashboard for Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/kibana"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RDEPEND="
+	acct-group/kibana
+	acct-user/kibana
+	>=net-libs/nodejs-10.15.2
+	x-pack? (
+		dev-libs/expat
+		dev-libs/nss
+	)"
+
+S="${WORKDIR}/${MY_P}-linux-x86_64"
+
+src_prepare() {
+	default
+
+	# remove empty unused directory
+	rmdir data || die
+
+	# remove bundled nodejs
+	rm -r node || die
+	sed -i 's@\(^NODE="\).*@\1/usr/bin/node"@g' \
+		bin/kibana || die
+
+	# move optimize/plugins to /var/lib/kibana
+	rm -r optimize plugins || die
+
+	# handle node.js version with RDEPEND
+	sed -i /node_version_validator/d src/setup_node_env/index.js || die
+}
+
+src_install() {
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	rm -r config || die
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
+
+	newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
+	newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
+
+	insinto /opt/${MY_PN}
+	doins -r .
+
+	fperms -R +x /opt/${MY_PN}/bin
+
+	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
+	keepdir /var/lib/${MY_PN}/optimize
+	keepdir /var/lib/${MY_PN}/plugins
+	keepdir /var/log/${MY_PN}
+
+	dosym ../../var/lib/kibana/optimize /opt/kibana/optimize # Bug 667214
+	dosym ../../var/lib/kibana/plugins /opt/kibana/plugins
+}
+
+pkg_postinst() {
+	ewarn "Kibana optimize/plugins directories were moved to /var/lib/kibana."
+	ewarn "In case of startup failures (FATAL Error: Cannot find module...),"
+	ewarn "please remove the optimize directory content:"
+	ewarn "rm -r /var/lib/kibana/optimize/*"
+	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
+	elog "Node.js 10. Some plugins may fail with other versions of Node.js (Bug #656008)."
+	elog
+	elog "To set a customized Elasticsearch instance:"
+	elog "  OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}"
+	elog "  systemd: set elasticsearch.url in /etc/${MY_PN}/kibana.yml"
+	elog
+	elog "Elasticsearch can run local or remote."
+}
diff --git a/www-apps/phpBB/files/permissions b/www-apps/phpBB/files/permissions
index b5c21c879eb1..b5c21c879eb1 100755..100644
--- a/www-apps/phpBB/files/permissions
+++ b/www-apps/phpBB/files/permissions
diff --git a/www-apps/phpwebsite/Manifest b/www-apps/phpwebsite/Manifest
deleted file mode 100644
index d5dbd6a25d11..000000000000
--- a/www-apps/phpwebsite/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX postinstall-en.txt 4642 BLAKE2B d00a3c06c548ab1b424a988b064d23023ce10c5ba62058bfee5c5d81f4edcc5cf2871365672ea048c8f4a2d73cb0073867db8ed2274589bf233927caf6f8b5c6 SHA512 18698195eabc6f0b032c679f6f8bb4e6f5c09c1063155feb98ea366ac204e3577b7fbc5a0b49a1f6d5b00f0354c0e5b2bab52f99e4996f81e1511657e7529aa0
-DIST phpwebsite_1_7_2.tar.gz 14531036 BLAKE2B 4681cad72ebc9ae3e1838b0db15022a8681560dae27bd9cc4be9e1b4b1d479e218e43781e2c5024924c762cbc85eacfa31ab975ab81587e42356bbb0b7936c9f SHA512 cf3f503794bb12d24ea003b0caf3e98148be43e0acd38e4d15be559cdf643266270800450309337d6540eaa069022730cef64bf315bd0fb3853a344a63c78ae5
-EBUILD phpwebsite-1.7.2.ebuild 1076 BLAKE2B 6178ce16315beb0d3d8ed0346c90734c12f973e6b59b55b4a331857ada2484a5d84bb6d0d6291032a978c34f937a60a6010df8894fb37ac2610a0644ef09c209 SHA512 f71f17722a93f01f61db60b703ed382a433bfecfde4cc3e238b01b4859d68641559ee73b82c24ae6b888475f4db5f7e007149e367fd83ca6793ef4175580f213
-MISC metadata.xml 530 BLAKE2B 7da060cdaf07251ff2d82470470c761f08d2d9c4ce8bbc3be8bd12cf31431f7404ec0dee4860bc63ece36e10cb4025b7c18381d57035dc747efb7453d619422b SHA512 ae99108e95329aacd90e09478fa476ddde8c30de43db1c2f09b7083d034d0190114922ae70715414ad32456884b9be9e99fadc6ace9374336dc8eb35aa089c90
diff --git a/www-apps/phpwebsite/files/postinstall-en.txt b/www-apps/phpwebsite/files/postinstall-en.txt
deleted file mode 100644
index 7bca5583dafb..000000000000
--- a/www-apps/phpwebsite/files/postinstall-en.txt
+++ /dev/null
@@ -1,130 +0,0 @@
-phpWebSite is installed.
-
-Installation Instructions
-=========================
-
-You will need to create a database for phpWebSite
-on your own before starting setup.
-
-Then change permissions for set with this script:
-
-cd ${MY_INSTALLDIR}/setup
-./secure_phpws.sh setup
-
-Once you have a database ready proceed to
-http://${VHOST_HOSTNAME}/${VHOST_APPDIR} to continue installation.
-
-Once you are done with installation you need to run:
-
-cd ${MY_INSTALLDIR}/setup
-./secure_phpws.sh run apache users
-
-Upgrade Instructions
-====================
-
-Preparing to Upgrade
---------------------
- - Dump/backup your hub and branch databases.
- - Backup your hub and branch directories/files.
- - Create an index.php file that warns users of the upgrade.
-
-<?php
-echo "<div align=\"center\"><h1>Please be patient while we upgrade the site.</h1>
-We'll be back in a jiffy!</div>";
-?>
-
- - Close and restart your browser.  If you have a session live while updating
-   your site, it MIGHT interfere with the upgrade process.  If you are using
-   Boost to upgrade, you can skip this step.
-
-If you are upgrading to 0.9.3 or greater, you should make the images/
-directory and subdirectories writable by the web server.
-
-Prepare your branches if you are running any off of your hub site.  Depending
-on the owner of these directories will affect the commands to run.  The base
-directory of each branch will need to be writable.
-
-If the owner is the webserver and you have root access:
-chmod o+rwx branch1/
-chmod o+rwx branch2/
-etc...
-
-otherwise:
-chmod 0777 branch1/
-chmod 0777 branch2/
-etc...
-
-The images and themes directories will also need to be writable for the
-upgrade:
-
-chmod -R o+rwx branch1/{images,themes}
-chmod -R o+rwx branch2/{images,themes}
-
--or-
-
-chmod -R 0777 branch1/{images,themes}
-chmod -R 0777 branch2/{images,themes}
-
-If the webserver is not given the proper permissions then the branch upgrade
-will not be successfull.
-
-
-Once you have you have finished these steps (and ONLY after) should you
-continue.
-
-Running the Upgrade
---------------------------------------
-Now you can untar the new files into your installation. If you go to
-your site's index.php file, you will see a few error messages. The
-aforementioned index.php prevents most people from seeing these messages.
-Point your browser to 'http://www.myWebSitesName.com/setup/' where 
-'www.myWebSitesName.com' is the address for your web site.
-
-The first thing the upgrader will do is upgrade your core modules. It
-will also check to see if you are running any branch sites and automatically
-upgrade them as well.
-
-You should receive a 'Core Updated!' message. Underneath these messages
-will be a list of modules that appear to need upgrading as well. Click
-the checkboxes of the modules you want updated (or click the 'Check All' button
-to check all of them) and click the 'Update Modules' button. Your site and
-all your branch sites should now be updated.
-
-If you made a warning index.php file, dump it and put the real file back.
-You should now be able to use your site as normal.
-
-Should something go wrong
---------------------------------------
-If you go to your site and receive errors the FIRST thing you should try
-is closing your browser, reopening it, and trying to use your site again.
-Sometimes old sessions will conflict with the upgraded information.
-
-If you get an error message or your sites still don't function, restore your
-backed up databases and files and try again. If it STILL doesn't work, contact
-us via Sourceforge, we want to know what went wrong.
-
-Please include your OS, web server, PHP, and phpWebSite version information.
-Also include any error messages that were displayed. The more data you supply
-us, the better chance you will receive help.
-
-You may also try using the repair.php file. It contains answers to a few
-commonly experienced problems.
-
-Returning to update.php
----------------------------------------
-Most of the time, Boost will handle your upgrade needs. However, should 
-an upgraded module cause problems before you can get to the Boost module,
-you can always return to update.php to upgrade the offending module.
-
-Securing your Site
----------------------------------------
-Although setup.php, update.php, and repair.php require passwords to enter,
-you may want to prevent malicious users (read: jerks) from even accessing
-these files. One way would be to limit read access on that directory after
-you are finished using it. Another measure would be to alter your 
-allow_setup.php file. Open this file in an editor and change the 'TRUE'
-to 'FALSE' like so:
-
-$_SESSION['allow_setup'] = FALSE;
-
-Change this back to TRUE when you need to update again.
diff --git a/www-apps/phpwebsite/metadata.xml b/www-apps/phpwebsite/metadata.xml
deleted file mode 100644
index cce709fb534c..000000000000
--- a/www-apps/phpwebsite/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>web-apps@gentoo.org</email>
-		<name>Gentoo Webapps</name>
-	</maintainer>
-	<longdescription>phpWebSite provides a complete web site content management system. Web-based administration allows for easy maintenance of interactive, community-driven web sites.</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">phpwebsite</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/www-apps/phpwebsite/phpwebsite-1.7.2.ebuild b/www-apps/phpwebsite/phpwebsite-1.7.2.ebuild
deleted file mode 100644
index e2b172dd995d..000000000000
--- a/www-apps/phpwebsite/phpwebsite-1.7.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit webapp
-
-MY_PV=${PV//./_}
-DESCRIPTION="phpWebSite Content Management System"
-HOMEPAGE="http://phpwebsite.appstate.edu"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${MY_PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ppc ~ppc64 x86"
-IUSE="+mysql postgres"
-REQUIRED_USE="|| ( mysql postgres )"
-
-S="${WORKDIR}"/${PN}_${MY_PV}
-
-RDEPEND="virtual/httpd-php
-	dev-lang/php[gd,mysql?,postgres?]"
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README docs/*
-
-	cp -r * "${D}/${MY_HTDOCSDIR}"
-
-	# Files that need to be owned by webserver
-	webapp_serverowned ${MY_HTDOCSDIR}/config
-	webapp_serverowned ${MY_HTDOCSDIR}/config/core
-	webapp_serverowned ${MY_HTDOCSDIR}/files
-	webapp_serverowned ${MY_HTDOCSDIR}/images
-	webapp_serverowned ${MY_HTDOCSDIR}/mod
-	webapp_serverowned ${MY_HTDOCSDIR}/logs
-	webapp_serverowned ${MY_HTDOCSDIR}/templates
-	webapp_serverowned ${MY_HTDOCSDIR}/javascript
-
-#	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/sitebar/Manifest b/www-apps/sitebar/Manifest
deleted file mode 100644
index 8034aaa761f1..000000000000
--- a/www-apps/sitebar/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX inc_writer.inc.php.diff 329 BLAKE2B 7a8c82a8891493cc22f3fb4624e056a47a2a715c14946a055c68f8a0e5d764cb323c7a396b84969f585507b24ec48f10c0ab3740c60a621df124c062b7b2108b SHA512 128a6afcca78fbbe9ceb242a956fc77edc958247e2981b486e3a6a57754f9c4dcdaa6c9ecd589d3ac22e1defc4e25911471f5cda1903c9e85ecd66fc8f304d96
-AUX postinstall-en.txt 93 BLAKE2B 721bb76c62412b79dd9c42cb0cd36a8ade45a570b9612f34c1156528d11c38d049fc70d7a02abbdbdc3f26cdae87e662892f448a7130a2e00744e6a2ce616f87 SHA512 15d3c1a7acc7882c8971c6ada33a48605b63045902dd43d0bd30902c62360f30918686f73c2620a09e849559dcb6a0e6426327678cc76671518b0f07afab414f
-DIST SiteBar-3.3.9.tar.bz2 526092 BLAKE2B c219d71bb74ba0014c19e84e2543e6468cd3959305770f1a63b69f2c203d7c801699ce9b63d87e5f3bc21c275b3359255cd3bcca661ba574f63cd384936e47b3 SHA512 bcca2e654f86bac0e82f69932b8d1a7f3caaf5054731af70451f7423fd7d616c58663e7ff08e05183e37d0fa71880dbed16b8469b9759901aaa90cac998e2014
-DIST SiteBarPluginIMAP_3.3.7_1.1.zip 9575 BLAKE2B 8651717a274feb54ff6dd106c0efc543a6b9839c177800b1d146117e9a46b877214898ff7a96f2884a45be2af7c7bea050f221fb4564d77c260abe5a6dc07342 SHA512 27554658610f3ced7d3068d67eeabbc8c5eca3bfc15d858203f2a9ae6652f1be595ffe0b7b5ecc61026bf67301a50437dc20aef95c3e23cc266f08379432b995
-DIST SiteBarPluginLDAP_3.3.7_1.1.zip 10036 BLAKE2B d4c93d9070c642a3ef042f5c485389536ad6f2eda41db147bdeeef4308a2092c694c9a6a7fefeccfe71b7c3415092964506a00f081962cac0f6d5a431c54b0d7 SHA512 99eb6749707125e62e5f4feb2ec6f8f0b6bc3ea39ffcc03182dbeb3dfbec7f151968f9c2559489ab34b0a16de0cac6333963f265ac1192fe72c605c6a6c71dcf
-DIST SiteBarPluginMailGate_3.3.7_1.0.4.zip 15685 BLAKE2B b0b0ab6697382742435b0f9b613d2ed447dc3489ae466a7720ae264b74d5331f7d1810cdc7d466fa0b6ae517edb3bd832b416b62e585c4e9edbc5bf0d5adc264 SHA512 3e27d31c62bd7cadd734740247a8e94066d3787f7a19208f1630bc85720ddf9bcada5392aa654103c756780c92178d3df0d2ea0d3dd8ba63ccb77410a507e5c7
-DIST SiteBarPluginMessenger_3.3.7_1.2.zip 19406 BLAKE2B 465718b08d653d8a96d5564bfbfc8a44d1211eb7e5c75abbbe678a1e2e72e9334a1b5bfd29f1cec68bc82d367787fa77f2816ecc01474fa919f22cb872579d70 SHA512 eee9c2be52472972e454de49210f884a6436ccdaaf1ecedc59b25aa83a40ffa695ece645db65a5bcf246621de54d2f510a8e6a5e9f3b059ee0aa0c677a9b739c
-DIST SiteBarPluginXBELSync_3.3.7_1.1.zip 16487 BLAKE2B c818f6783573f2ead2715e3f7d0b8dca2abe2e88fde44710233bed70a79d2d55a301d4067ce05c9e6d74776da9192a546aa2e3d4aeae4c48b8a984b32e988c33 SHA512 9ad4924912befec47851aba3ad3f9c13ef94db6de09b56c6c75c10e76ac44e54b7d07303936aef70bd720a15e8a3569af49bec92aa68eedf05d49389c4c0cbf5
-EBUILD sitebar-3.3.9-r2.ebuild 1284 BLAKE2B 173b5552f6e1319e9d81b04707a2ddf88c81cb3700d16bff360e911dc0a9fe985de18795dc9c6f3d904a4b752d14b791c85b39d8dd1073333e19f304812425e7 SHA512 59e83208fb66244ae580934dde47a98e0821325b7b0ab547223dba019b1534720d74e6eb9481b1901f4cfe211fcfcc0d301b30e5a81e0f8928320a428fb690f5
-MISC metadata.xml 397 BLAKE2B 3d3c552dc80d9f027cd4a86270d164cd40512a1632d17b9b0b1deb0e862e06f117574a98ff111281ff8e05dd54c7bdc81314b17f7c6aa94feea16a7faab86f19 SHA512 e7eaac481d5b669270adda58bff95be6428c3b7eb6c8a2d6da48d60c1b2a59f0dda5ad51a82367c148b5cb8470ef4e4dae378826228d46dc365582e6d834f06f
diff --git a/www-apps/sitebar/files/inc_writer.inc.php.diff b/www-apps/sitebar/files/inc_writer.inc.php.diff
deleted file mode 100644
index 65b6e82b148a..000000000000
--- a/www-apps/sitebar/files/inc_writer.inc.php.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- inc/writer.inc.php.orig	2010-03-07 19:20:51.000000000 +0100
-+++ inc/writer.inc.php	2011-10-07 15:30:29.000000000 +0200
-@@ -624,7 +624,7 @@
- 
- class SB_WriterInterfaceXML extends SB_WriterInterface
- {
--    function SB_WriterInterface()
-+    function SB_WriterInterfaceXML()
-     {
-         $this->SB_WriterInterface();
-     }
diff --git a/www-apps/sitebar/files/postinstall-en.txt b/www-apps/sitebar/files/postinstall-en.txt
deleted file mode 100644
index 2e7b45dd6e3b..000000000000
--- a/www-apps/sitebar/files/postinstall-en.txt
+++ /dev/null
@@ -1 +0,0 @@
-Now go to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/sitebar.php to complete the installation.
diff --git a/www-apps/sitebar/metadata.xml b/www-apps/sitebar/metadata.xml
deleted file mode 100644
index bc8f9fcabf1a..000000000000
--- a/www-apps/sitebar/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>web-apps@gentoo.org</email>
-		<name>Gentoo Webapps</name>
-	</maintainer>
-	<use>
-		<flag name="plugins">Install optional plugins</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">sitebar</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/www-apps/sitebar/sitebar-3.3.9-r2.ebuild b/www-apps/sitebar/sitebar-3.3.9-r2.ebuild
deleted file mode 100644
index f5a808632f8b..000000000000
--- a/www-apps/sitebar/sitebar-3.3.9-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit base webapp
-
-MY_P="SiteBar-${PV}"
-
-DESCRIPTION="The Bookmark Server for Personal and Team Use"
-HOMEPAGE="http://sitebar.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-	plugins? (
-		mirror://sourceforge/${PN}/SiteBarPluginIMAP_3.3.7_1.1.zip
-		mirror://sourceforge/${PN}/SiteBarPluginLDAP_3.3.7_1.1.zip
-		mirror://sourceforge/${PN}/SiteBarPluginMailGate_3.3.7_1.0.4.zip
-		mirror://sourceforge/${PN}/SiteBarPluginMessenger_3.3.7_1.2.zip
-		mirror://sourceforge/${PN}/SiteBarPluginXBELSync_3.3.7_1.1.zip
-	)"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-IUSE="plugins"
-
-DEPEND="virtual/httpd-php"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/inc_writer.inc.php.diff" )  # PHP 5.3 patch
-DOCS=( readme.txt doc/history.txt doc/install.txt doc/troubleshooting.txt )
-
-src_install() {
-	webapp_src_preinst
-	base_src_install_docs
-	cp -R . "${D}/${MY_HTDOCSDIR}"
-	use plugins && cp -R "${WORKDIR}/plugins/." "${D}/${MY_HTDOCSDIR}/plugins/."
-	rm -rf "${D}/${MY_HTDOCSDIR}/doc" "${D}/${MY_HTDOCSDIR}/readme.txt"
-
-	webapp_serverowned "${MY_HTDOCSDIR}/inc"
-	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
-
-	webapp_src_install
-}