gentoo resync : 21.12.2017

4 files changed, 56 insertions, 50 deletions

diff --git a/media-sound/frescobaldi/Manifest b/media-sound/frescobaldi/Manifest
index af688e8b48b4..80a4c1d05a83 100644
--- a/media-sound/frescobaldi/Manifest
+++ b/media-sound/frescobaldi/Manifest
@@ -1,3 +1,3 @@
-DIST frescobaldi-2.20.0.tar.gz 4478977 BLAKE2B bac6e455656064fc64120a4e30690b55159254562f1b4fb6515fccb74cc113354ac337c68fe91942c42b4aeff14db18f5024dd6b47fb913dafe7bcf95efaf019 SHA512 a875e8d574e77db5e87555aa091b4b0966e4b8df16dc1f7fbcfe100f67d9ccafdd9a26c8f4b8cea13410faaa298185c1ec0e9b5e722b3d37c32d0b573511a3e3
-EBUILD frescobaldi-2.20.0.ebuild 855 BLAKE2B 2157ee4fd660676ee6bbdda7316693318fecb0c662f8d92b71dc5260cdc1a11074ea22dd57060c19f40c46cd2fa20235119e393231b8834990f3ef6511258ac5 SHA512 bc829bdbb726b0f1e2c5c35342e830f81e23867191cc37ed43ef06228d1a4f0a25043561af6ecd978a4e5b97c3bfc88e5bacb25de84a66f2154ce1a4ad05cf5d
-MISC metadata.xml 442 BLAKE2B 71b3500edaf46be59e6f9125c45a8aa9e30a5fd3187b0b58e834991b473650600aa9a53a30abac3b423f32aa37a9df4032c37a6b50888a0fae44fb0dead4b5c0 SHA512 cf86623fdde3cd003175081ac264d109511036d6c0e09a80e7f88dde98ed52568a8412f4b32dadb75c6986dd1d59e7e83c95546aefb17ffc9e349386a94e54ef
+DIST frescobaldi-3.0.0.tar.gz 4895317 BLAKE2B 6a9a2b92d075742f54b3148761f1946c4dd73616482aec9278c0326d5597773ce6eb714f8d31d49f79051294d23d4e43552ce29bde0f464d1a677900b8a276f6 SHA512 e33cbcb70bec74239cd84691725e9978b6c6fee391848c7de8ea32dd5459d953ddda120eeea25a602154d94a84947b6c151237b859450162db0822ef58fd7787
+EBUILD frescobaldi-3.0.0.ebuild 1001 BLAKE2B 58a4456955b5ac9a5e5809f03e2733812ed2d73732b3b9fb184a875b60ed66931a64778cc67571bc5bf2a1e6007f3a5926231c281ff501bd14d80325c5949f04 SHA512 4ee2b26a52f464e1c9e564004b149dbf1de0b5aa9274bd3ca7fa8bcc526afb90be891ad0875b82a6ceede42c86fed0f81712eded7414a8731b471153684a620c
+MISC metadata.xml 437 BLAKE2B 5df0dcf6f211964427c34070f126b8a7b65f4341d5ca0edc899e413d112eb3920197086981537847506148b11b58cfcba80213839e5171baf8c16f05781765f6 SHA512 fee7fc00ca40615d9470bcf15ac3df4541864f825f55021c4b8d59891ea1fbec88f4e5133cceef05791cee1d95be320c7405cdfa67446863bdd2b23e86ca2940
diff --git a/media-sound/frescobaldi/frescobaldi-2.20.0.ebuild b/media-sound/frescobaldi/frescobaldi-2.20.0.ebuild
deleted file mode 100644
index 4b205dbb61d3..000000000000
--- a/media-sound/frescobaldi/frescobaldi-2.20.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="A LilyPond sheet music text editor"
-HOMEPAGE="http://www.frescobaldi.org/"
-SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 public-domain" # public-domain is for bundled Tango icons
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="portmidi"
-
-RDEPEND="
-	dev-python/PyQt4[svg,X,${PYTHON_USEDEP}]
-	dev-python/python-poppler-qt4[${PYTHON_USEDEP}]
-	>=dev-python/python-ly-0.9.4[${PYTHON_USEDEP}]
-	>=media-sound/lilypond-2.14.2
-	portmidi? ( media-libs/portmidi[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/frescobaldi/frescobaldi-3.0.0.ebuild b/media-sound/frescobaldi/frescobaldi-3.0.0.ebuild
new file mode 100644
index 000000000000..d6cb86b3d468
--- /dev/null
+++ b/media-sound/frescobaldi/frescobaldi-3.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit distutils-r1 gnome2-utils xdg-utils
+
+DESCRIPTION="A LilyPond sheet music text editor"
+HOMEPAGE="http://www.frescobaldi.org/"
+SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# 	portmidi? ( media-libs/portmidi[${PYTHON_USEDEP}] ) # bug 550820
+DEPEND="
+	dev-python/PyQt5[svg,${PYTHON_USEDEP}]
+	>=dev-python/python-ly-0.9.4[${PYTHON_USEDEP}]
+	dev-python/python-poppler-qt5[${PYTHON_USEDEP}]
+	>=media-sound/lilypond-2.14.2"
+RDEPEND="${DEPEND}
+	x11-themes/tango-icon-theme
+"
+
+python_prepare_all() {
+	rm -r frescobaldi_app/icons/Tango || die "failed to remove tango icon theme"
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/frescobaldi/metadata.xml b/media-sound/frescobaldi/metadata.xml
index bb0cc4ccb3ce..468c931f9c42 100644
--- a/media-sound/frescobaldi/metadata.xml
+++ b/media-sound/frescobaldi/metadata.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sound@gentoo.org</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
-  <use>
-    <flag name="portmidi">Enable <pkg>media-libs/portmidi</pkg> support</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">wbsoft/frescobaldi</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+<!--
+	<use>
+		<flag name="portmidi">Enable <pkg>media-libs/portmidi</pkg> support</flag>
+	</use>
+-->
+	<upstream>
+		<remote-id type="github">wbsoft/frescobaldi</remote-id>
+	</upstream>
 </pkgmetadata>