gentoo resync : 08.05.2018

6 files changed, 18 insertions, 13 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 0cb4ffa81966..0960d0bb0096 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/cgisysinfo/Manifest b/www-apps/cgisysinfo/Manifest
index f732b9520e36..6a19ca9d1174 100644
--- a/www-apps/cgisysinfo/Manifest
+++ b/www-apps/cgisysinfo/Manifest
@@ -1,3 +1,3 @@
-DIST cgisysinfo-0.4.1.tar.bz2 262016 BLAKE2B f5595474591e55fb38b51a9235ad1d18b08e11694e79bcfb15234aed4e267f4c7f83202117c38df34d4e6045725f6d4ce8c2745a6e31b50c86a0b2db311b2a87 SHA512 fd14339ea346f70c9b5632ae861ba006b70c5ff5849ebbd3b32bcedaf0a5865d411d6d0f251362baea515f0d64639d544779c3569574a710ed4967c9fa770909
-EBUILD cgisysinfo-0.4.1.ebuild 730 BLAKE2B a62a116205a7ea79dca50d5e70ee2d2232ac6a858bd0c0ec35fcad305df2e18106d750499ae0877c4a6f3d300447be802e8b71a348c5f5a3355cbb9dd9ba208c SHA512 ea8f6fc3ba22f2f648a33cb1c0108e598eaf3667f236db2718a95493510b31d8cd8743a23b49612d9a1d5a94c8ddaec0de71bb8a67d843e162831d7c924f9103
-MISC metadata.xml 558 BLAKE2B 9002044a1cdfd00fde8063e8332a5b38b4a7e9af9d8ffb8bb0e861e52cdfa18f8648f6b57ab2ff2a6cd0bef113d58cd4e19a7bb1b6130dac7bdff18c3c33ecb5 SHA512 05876a1092544d7cc74fa2ae7df5764959819114919ee495ca3eb8744229f64f66290831b5f552818fc9b85fee50aa17457555f747b4fcba01d4b024a483e615
+DIST cgisysinfo-0.4.1.tar.gz 17662 BLAKE2B 63997c790d7d42d0a91f53f667a75b53b1954c1bf13f97f99918bcd926c6dcb4a7e75b1658490aab2d0d1ac666f163c910d903b26675994755c82d84bc52fa0f SHA512 a966c96345454424258b623038b555767d71e1e4258f92114081d93e8ce490b26e4c2b88f6ad527f0b55d267d008da3b13774b7e2499ad6b96e035ba3be2e912
+EBUILD cgisysinfo-0.4.1.ebuild 770 BLAKE2B 5631f168be5a8485f1c06cd48c30a2eb546b3e5cc181981a53438eca94e40bac3fda2c708e87a96bfad6b7d68615c7965ddac95bf52a1f4b31a8a074ed1ae840 SHA512 fc05ecb6836434159da552bdaa63defd34682e26e7cfffdd13acfbab0416043d20da76d05f9f44ed801d74a32c596d7186e83e9eed75a235e0f09c1c9ae1c9aa
+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 392f1647e1c7..0dc2dac982cd 100644
--- a/www-apps/cgisysinfo/cgisysinfo-0.4.1.ebuild
+++ b/www-apps/cgisysinfo/cgisysinfo-0.4.1.ebuild
@@ -3,18 +3,22 @@
 
 EAPI="5"
 
+inherit autotools
+
 if [[ ${PV} = *9999* ]]; then
 	WANT_AUTOMAKE="1.10"
-	inherit autotools mercurial
-	EHG_REPO_URI="http://hg.rafaelmartins.eng.br/cgisysinfo/"
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rafaelmartins/${PN}"
 	KEYWORDS=""
+	DOCS=( "README.md" "AUTHORS" "NEWS" )
 else
-	SRC_URI="http://distfiles.rafaelmartins.eng.br/${PN}/${P}.tar.bz2"
+	SRC_URI="https://github.com/rafaelmartins/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
+	DOCS=( "README" "AUTHORS" "NEWS" )
 fi
 
 DESCRIPTION="A small cgi utility to show basic system information"
-HOMEPAGE="http://projects.rafaelmartins.eng.br/cgisysinfo"
+HOMEPAGE="https://github.com/rafaelmartins/cgisysinfo"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,10 +27,8 @@ IUSE="fastcgi"
 DEPEND="fastcgi? ( dev-libs/fcgi )"
 RDEPEND="${DEPEND}"
 
-DOCS="README AUTHORS NEWS"
-
 src_prepare() {
-	[[ ${PV} = *9999* ]] && eautoreconf
+	eautoreconf
 }
 
 src_configure() {
diff --git a/www-apps/cgisysinfo/metadata.xml b/www-apps/cgisysinfo/metadata.xml
index 94d26d8201c4..44c61e61b12e 100644
--- a/www-apps/cgisysinfo/metadata.xml
+++ b/www-apps/cgisysinfo/metadata.xml
@@ -13,4 +13,7 @@
 		tested with nginx + fcgiwrap. It should works with any CGI-capable web
 		server.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">rafaelmartins/cgisysinfo</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 7e7774804345..c407ffbd9159 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,8 +1,8 @@
 AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e871a86738f21b8b3ee68caf1e2b437343f739564dac5ef91db5dcb6b2f31b49a936f9d4e6a62cca4 SHA512 13b9868a4c0a5a7209e6f4aa1206a93a0fb33b0234c4c0a6942bdab9d1cf139049181c066e01c49f639165ea422259fa7cab9e0bdf21537b3722bd86691d9b2c
 AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743e94fc59f76ef77220610d2fd02950ad0157b9ebbfd8380a489cd0da33b5b25102fbaa936c1212e2f SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442
 AUX grafana.service 651 BLAKE2B dcf0ddfcd2cbbc457f0dc7142a64c403c7657c30a7f85ab103828758c16fce8c6fc2e80a4f2f943393f3c226f873a2bce4b6df999fa4b178b3e95bf213688d86 SHA512 7bda41f0c6ee9ec0947ef6b8d4591453f797ac0256f9b67800249a6edf699e55855a9bd6f46501a86ffec5b5d2e1d8ac735657a0c63600683f61044e0bbc35d4
-DIST grafana-bin-4.6.3.tar.gz 47187988 BLAKE2B 8d09f6569c8cc7b880fe852e0696b5d8b811d91a8aed360dffb40dc033e8ca756f7b37c6f2fd16d9925c33f2b7fcc4d279e31611fdb5aa7e4b24eee88cea0d38 SHA512 dad2c26b998910519cc462aa3dc91bd6d7ab6b7fdea9e1aa3c54ed5eb86830e9b8484434a5fd307f7ff490549509df97486249b301ccd84a7bd5b2de11ffe929
 DIST grafana-bin-5.0.4.tar.gz 51600575 BLAKE2B 13fc3943fc55424674ae173c9c16ae3f1de0d1c331dbee807e69cef9d9743c83d348185edc33af541ae77766849e74a5cb0c742a316677ac9582db40ae051d08 SHA512 c0a05e6661af615676f3bee99c7865bda599a47de464d4bb322232224305191879cdb6ac4149a8963b2a7102d6a34349059cdb3b0e069cf830d341889df1c745
-EBUILD grafana-bin-4.6.3.ebuild 1751 BLAKE2B 445adcc18c56cb84461b430b2566ecd662ececf846c5bdbb9522ef012147ab182e3fe2c00791e56a89e8706699720f9c656e5917d1a5e989e4df45e338b9f67e SHA512 30f855e6fd3eb2729ed159dd84d8c8c55c88139217ab268d98c63adb056cabdef0187435f11f4b15f9b619e6f1cc826b285e0ceb6dd70d7cc7976a5989a187ff
+DIST grafana-bin-5.1.1.tar.gz 52436085 BLAKE2B c1bdbd6adcfecefe0aa0ead2d11b80045dcda62010744972e0824e2dc14c10c3c17440f68e4986b1b824254b918543d9650e83503d136986e0cc9a7d28c18d3a SHA512 9a2ce531712e5003fdd8a708cbd59d01b4b7dbbc2f1db132a90ddfb701d702415c29bae8943f36a0ad802f9daee635792df3f26a13ba0e176f79d90b35e5461e
 EBUILD grafana-bin-5.0.4.ebuild 1744 BLAKE2B 44baac3eb8ab856235c2eadc43c415e0973722024c3dca157b0aa7c11d9967c30b6f5d55f8d2a534b99c2cc9ddc3e1c1c381aa2c50543042ffa8b134264f6e90 SHA512 6eed7ec805a005b2f7cf7fb959b77c2d8169f1812cc0cee829112cf4e97c2d8f38af07a5c32712f878926fec735034378b18f4ed650ce21fbf0ef81e088824c4
+EBUILD grafana-bin-5.1.1.ebuild 1744 BLAKE2B 44baac3eb8ab856235c2eadc43c415e0973722024c3dca157b0aa7c11d9967c30b6f5d55f8d2a534b99c2cc9ddc3e1c1c381aa2c50543042ffa8b134264f6e90 SHA512 6eed7ec805a005b2f7cf7fb959b77c2d8169f1812cc0cee829112cf4e97c2d8f38af07a5c32712f878926fec735034378b18f4ed650ce21fbf0ef81e088824c4
 MISC metadata.xml 299 BLAKE2B f907a1d524382aed556259ab450e2e6b9c927b7b07a975d468867855e3dc184d7d296a4f6f098a65598b377b2c46cab1c90dced667c7b0cdad16e156949807b1 SHA512 3c543eb4a0465af174a2a80650a542daead9f89685993575eef9ab826b98c84585184152f8ebc5e81fdafd9bbe24d63f467b251a4c9aeaaeef52408a1a3812df
diff --git a/www-apps/grafana-bin/grafana-bin-4.6.3.ebuild b/www-apps/grafana-bin/grafana-bin-5.1.1.ebuild
index f2175c44021f..a2e20a0a3685 100644
--- a/www-apps/grafana-bin/grafana-bin-4.6.3.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-5.1.1.ebuild
@@ -35,7 +35,7 @@ src_install() {
 
 	# Frontend assets
 	insinto /usr/share/${MY_PN}
-	doins -r public conf vendor
+	doins -r public conf
 
 	dobin bin/grafana-cli
 	dobin bin/grafana-server