gentoo resync : 07.07.2018

7 files changed, 52 insertions, 36 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 60fbd1c2eae7..8b3d059deb4d 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/ampache/Manifest b/www-apps/ampache/Manifest
index 50f3ed6fb9bb..a785ceb8659d 100644
--- a/www-apps/ampache/Manifest
+++ b/www-apps/ampache/Manifest
@@ -1,4 +1,6 @@
 AUX installdoc.txt 223 BLAKE2B 08e17cb76e549112b488a666257454c41f6397e2ba7d7065a73b90787f976a494d3efbca375297573641da4b6744a541bef4c5386df3f6b2f469b660c0452903 SHA512 07636e6b53e9f259e1195795d15e6dc88e3e5401a700553df55cf7c0a39997c8bdfc3f5a83b0bac2a2ef474bea11d71e442ce6e45ef88b0fac0cf9c3307732d2
 DIST ampache-3.8.3.tar.gz 8444610 BLAKE2B a08f49ee043ea8dbf89d7ac8a3bed892be389605f6d23aa1454166d7058ae227ec6f24cf397e4d7e9d93c9441a43df54824ece768980cbf7e98bd5a098648a5d SHA512 35deb6bde949641bf39f58e033953bc0d79f1f56033d496e5a3d302d16c998da3468d1d82ac49e0702fada34a6dafb22ffa5bc931fe886e35c81ba2a5cf1233e
+DIST ampache-3.8.8.tar.gz 8453616 BLAKE2B 4cfd19e90dda22012b6dd73d4540bb5252e514682b0e51be35456e7179f86123b6e8a7af8e3d936e53e0889da8927a9975ef07761415d019dc9668fc91461615 SHA512 4aa010b6bb42a192d6e2408265a78e738a356c08bfb43464fbc6e6375d8cdc9e4701280db0b21f73a1302b2792f9474c6dc5c7808c977a29aab2047a80caebfc
 EBUILD ampache-3.8.3.ebuild 1235 BLAKE2B c0a36f4d78018c02165f0c121d29a02ee833becf26c56ddc71bf7f2a4e3e215f876468420b0f08b011a49600e9a021a5051126c6290a63b3b3fb9d4c09035c95 SHA512 3a8bbfe71415fe4f466ef9fc7c4b2769e61a4e9df7d260e98784cf0c8427ab4227c032d0dff62a54bd5af31bedae92355044370d8064e4eefa75c019bfc3aa4b
+EBUILD ampache-3.8.8.ebuild 1237 BLAKE2B 7d45aafdb4f05b6524b9e08cbc7ed731eb6f7e683f1f7946fc4a5c2ed9494608f7e6a223ee8aed2a59f4aa5e726f53d47db34f480ad7c43b74d9757bd1c62946 SHA512 c2725065b12585544fb62372b03c817ba18f968b2600be96a09cc7406e27c3e8c36afe0fa5c03b8a590e0d3158ea2719b30ceedad6ea10472712b47cbee01662
 MISC metadata.xml 432 BLAKE2B 2dc5db83850f35f36e81f9d050d63cfae5028858683769301d8525a37131ebf47207a4febcd280264ed75837f90b465afb0bccc0708962a52cb8b523a19261a8 SHA512 a10625a3ee73dbea032a0e6389a140a32441ac32bb11adbb9c01dc122da44a625604854bce9d34bbeed4969b3fdbe2bd5cf10678e1d2c362a3db55351eccf2de
diff --git a/www-apps/ampache/ampache-3.8.8.ebuild b/www-apps/ampache/ampache-3.8.8.ebuild
new file mode 100644
index 000000000000..448fc8754f3e
--- /dev/null
+++ b/www-apps/ampache/ampache-3.8.8.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+DESCRIPTION="PHP-based tool for managing,updating and playing audio files via a web interface"
+HOMEPAGE="http://www.ampache.org/"
+SRC_URI="https://github.com/ampache/ampache/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="aac flac mp3 ogg transcode"
+
+RDEPEND="dev-lang/php[gd,hash,iconv,mysql,pdo,session,unicode,xml,zlib]
+	transcode? ( media-sound/lame
+		aac? ( || ( media-libs/faad2 media-sound/alac_decoder ) )
+		flac? ( media-libs/flac )
+		mp3? ( media-sound/mp3splt )
+		ogg? ( media-sound/mp3splt media-sound/vorbis-tools )
+	)"
+DEPEND=""
+
+need_httpd_cgi
+
+src_install() {
+	webapp_src_preinst
+
+	doman docs/man/man1/ampache.1
+	rm -rf docs/man || die "Unable to remove local man dir"
+
+	dodoc docs/*
+	rm -rf docs/ || die "Unable to remove local docs dir"
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_postinst_txt en "${FILESDIR}"/installdoc.txt
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "Install and upgrade instructions can be found here:"
+	elog "  /usr/share/doc/${P}/INSTALL.bz2"
+	elog "  /usr/share/doc/${P}/MIGRATION.bz2"
+	webapp_pkg_postinst
+}
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 3e911112c39b..20fb7136ed66 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -2,7 +2,7 @@ AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e87
 AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743e94fc59f76ef77220610d2fd02950ad0157b9ebbfd8380a489cd0da33b5b25102fbaa936c1212e2f SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
 DIST grafana-bin-5.1.3.tar.gz 52436314 BLAKE2B e5ff613a6d65018b6c205a88a520b5f07ea32955cb8f4b75d1eef05946d93c50272edecf80c8a4a6b8b4a70fbae7c90c71f1b833a31ff56ed71c59dda3007b4c SHA512 3d0fcc2015d95a5334d571f4ea61fa1bb7ead1b4131342e3bf167c832c0f951ae6669049da73a8d954117d54b5422be9203505db19b370ec337c481900d7fea5
-DIST grafana-bin-5.2.0.tar.gz 54295475 BLAKE2B 30d17fa3bf1c5f802fdbc6e0fc651afe793f30e81fce137baac3ab1d979cb9d656e97a49636b4a59b4388534115680b16d7c0979ceca59f1c61891c9a512ad4d SHA512 d87bb727f3e90aa89ba46d50ab1a9293292270fc5633caa2932418ca8fe28355863e71f5550e279be4a916a4d0d22c34e39bdab1cce4908d968de859952cd9fa
+DIST grafana-bin-5.2.1.tar.gz 54294991 BLAKE2B ca60a8e90f5333482c2f364193a431c58bee89db6bbc08424a49c4b444e5655d1d3a21fc9cc177ed73847eb3240c0429a7891c7dafe34b8b8764155a17d20860 SHA512 5f97b2dde1625c51743aeb52b2f323d578401c42379791b49978224e98b5f9de542ff8b10698aa84c04f4de1c08458ad6b0dad8dcd2258dee1b14b55e7ae2952
 EBUILD grafana-bin-5.1.3.ebuild 1744 BLAKE2B bc770fec942dd9cb491ebe4a6fea5dd1b344a24ba70c36c8180c419720b0c749c4cefd43d408d7b0d0cfc64fe835af5e7a443ce3f20dcb185cc937fec063d6d7 SHA512 2b2958db3539457935e235f4271aff86100868203cf840512d2d9916067fbb899f95765bbda14f9fca60063d618e09de4c1c96de3045e864090a676715a5231a
-EBUILD grafana-bin-5.2.0.ebuild 1746 BLAKE2B 913e4249c53721a7a5ac44f2047fa815b4a8900c67811b2b46677dd9afdea6ec5d352150acef9fd2d7459fb659a23afa455b836a1db68c55501cc1d7494eb5d8 SHA512 e3e61b3821699073253cc6cb6f6b910792e6e6e9bf8f256c6d1447dc689d47dc8e7c0ab098cebdf4af399cae1111b17fa82c439ca69952a65d52f6103229eaf3
+EBUILD grafana-bin-5.2.1.ebuild 1746 BLAKE2B 913e4249c53721a7a5ac44f2047fa815b4a8900c67811b2b46677dd9afdea6ec5d352150acef9fd2d7459fb659a23afa455b836a1db68c55501cc1d7494eb5d8 SHA512 e3e61b3821699073253cc6cb6f6b910792e6e6e9bf8f256c6d1447dc689d47dc8e7c0ab098cebdf4af399cae1111b17fa82c439ca69952a65d52f6103229eaf3
 MISC metadata.xml 416 BLAKE2B ff5bdf7e202aa96bbf615df2f86c6542bb7d291e6d564dfac683a2e54002380dd80ef3f1ca0b6c1f398de0115e26398903256b9d64e353127f25c3e97e5b21c8 SHA512 db2cbd25cf9b21664db93dc8f9719bf7f9a2fd632c5231d0f296bb32f3f6af3e08307c8a662081cc68f33638d70f6512094fad76073a5de4ceba02eeb3d1188b
diff --git a/www-apps/grafana-bin/grafana-bin-5.2.0.ebuild b/www-apps/grafana-bin/grafana-bin-5.2.1.ebuild
index c398e8e88585..c398e8e88585 100644
--- a/www-apps/grafana-bin/grafana-bin-5.2.0.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-5.2.1.ebuild
diff --git a/www-apps/jekyll-coffeescript/Manifest b/www-apps/jekyll-coffeescript/Manifest
index bebe0705890d..ee9a0401f220 100644
--- a/www-apps/jekyll-coffeescript/Manifest
+++ b/www-apps/jekyll-coffeescript/Manifest
@@ -1,5 +1,3 @@
-DIST jekyll-coffeescript-1.0.2.tar.gz 5042 BLAKE2B 1a08099b940118e15f5f2310671efe1cc61fc496242c94a3351654870518095d62f576922f1bbf882a64f7bbca6b9b00e1f692f00684f0a5c60005a5fb86c69b SHA512 cc8e3fc21d9ff0b4c0fb00652e8a8011fbb535f6c1b51c0c380637cb124524282f6ef5272e82976f964c5eae66a8340bd11f516f6625732d9ee51ef6c58b3a8f
 DIST jekyll-coffeescript-1.1.1.tar.gz 5350 BLAKE2B cbcb98f831b937458938e541e3b4d79bbdc1bf12444c5fbccf9f295744ca34fda019956ca5b7d011c8b88582d043157f7abf584af447e061f973b39da82227aa SHA512 6b748fb521a33be6dcf944bba35db2f2924d8ee403ba035f4e0e1411d91f1a7eb527af42237994c4f9839a3e6babfbd8b5441ecd5ef5c42db7afbdf4bfc643d2
-EBUILD jekyll-coffeescript-1.0.2-r1.ebuild 855 BLAKE2B a5b431c54dc590e943f785d902d71e72427defe36d4b204abf98b16e07e3150d3799d1d14839c931cba007b58fad2cd5286046a87e99a8d8634178abbb109bda SHA512 deee794f3b9b5c09e93243959976c5bc637be2b4753b44a5690594c37c5d07fdc473ea65316fcf1374cb45234d6c75e959d77cb1a2ab16ee744e2c1fa3bc0c6a
 EBUILD jekyll-coffeescript-1.1.1.ebuild 848 BLAKE2B defd171fe2a7aaa5459e04c997cd7af9eb99567d536796d9f5782dfdf31ae4dd34d968ed267273d56ef608570e5ad2c00b469e16a2b37cf2eb2981c60ce07afa SHA512 da3438228d8b05e9f977bc9fdefc6848383706c1d3127d81753c0f75e789c4cde091687a174491e05de826db3b44fc60aa682200e1429f3087211bd5c010903e
 MISC metadata.xml 338 BLAKE2B 224b7454b4b3fb88128aafe4b0980619f366f5c5151d14f801bda08f2457c9a9bcac20767070cc4240ffcaed43b62382a14bc886d17a4259a9c7b9ecb0b6cb0b SHA512 01c630c47335166243996a64160cce9820e4b46086ccfba65c9ea6455c69ff94c3a0ab8760993b49e80f0f36d8375af02bc1774fba9fa020cdf7dc87c23bfded
diff --git a/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.0.2-r1.ebuild b/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.0.2-r1.ebuild
deleted file mode 100644
index 0aa60a1e7a7e..000000000000
--- a/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/jekyll/jekyll-coffeescript/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="A CoffeeScript Converter for Jekyll"
-HOMEPAGE="https://github.com/jekyll/jekyll-coffeescript"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' Rakefile || die
-	sed -i -e "/^RSpec/i \
-		require 'jekyll'"\
-		-e "/^RSpec/i \
-		require 'jekyll-coffeescript'" spec/spec_helper.rb || die
-}
-
-ruby_add_rdepend ">=dev-ruby/coffee-script-2.2
-	>=dev-ruby/coffee-script-source-1.11.1"
-ruby_add_bdepend "test? ( www-apps/jekyll )"