From 416389103a4f6b42295b9975b6fc82278cc7b3d4 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sat, 5 Sep 2020 15:47:11 +0200
Subject: media-sound/yarock: Fix .desktop file and appdata install location

Also raising to >=media-libs/phonon-4.11.0, first version to drop Qt4.

Closes: https://bugs.gentoo.org/740524
Closes: https://bugs.gentoo.org/740506
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
 media-sound/yarock/yarock-1.4.0-r1.ebuild | 61 +++++++++++++++++++++++++++++++
 media-sound/yarock/yarock-1.4.0.ebuild    | 53 ---------------------------
 2 files changed, 61 insertions(+), 53 deletions(-)
 create mode 100644 media-sound/yarock/yarock-1.4.0-r1.ebuild
 delete mode 100644 media-sound/yarock/yarock-1.4.0.ebuild

(limited to 'media-sound')

diff --git a/media-sound/yarock/yarock-1.4.0-r1.ebuild b/media-sound/yarock/yarock-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..39414485b05d
--- /dev/null
+++ b/media-sound/yarock/yarock-1.4.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_P="Yarock_${PV}_Sources"
+DESCRIPTION="Qt-based music player"
+HOMEPAGE="https://seb-apps.github.io/yarock/"
+SRC_URI="https://launchpad.net/${PN}/1.x/${PV}/+download/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="mpv phonon vlc"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+RDEPEND="
+	dev-cpp/htmlcxx
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/taglib
+	x11-libs/libX11
+	phonon? ( >=media-libs/phonon-4.11.0 )
+	vlc? ( media-video/vlc:= )
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+	dev-qt/qtx11extras:5
+"
+
+DOCS=( CHANGES.md README.md )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e "/^install.*org.yarock.appdata.xml/s:share/appdata:share/metadata:" \
+		-i CMakeLists.txt || die
+	sed -e "/^Version/d" \
+		-i data/org.yarock.desktop || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_QT5=ON
+		-DENABLE_MPV=$(usex mpv)
+		-DENABLE_PHONON=$(usex phonon)
+		-DENABLE_VLC=$(usex vlc)
+	)
+
+	cmake_src_configure
+}
diff --git a/media-sound/yarock/yarock-1.4.0.ebuild b/media-sound/yarock/yarock-1.4.0.ebuild
deleted file mode 100644
index 27284bd85984..000000000000
--- a/media-sound/yarock/yarock-1.4.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_P="Yarock_${PV}_Sources"
-DESCRIPTION="Qt-based music player"
-HOMEPAGE="https://seb-apps.github.io/yarock/"
-SRC_URI="https://launchpad.net/${PN}/1.x/${PV}/+download/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="mpv phonon vlc"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-RDEPEND="
-	dev-cpp/htmlcxx
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/taglib
-	x11-libs/libX11
-	phonon? ( >=media-libs/phonon-4.10.1 )
-	vlc? ( media-video/vlc:= )
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5
-	dev-qt/qtx11extras:5
-"
-
-DOCS=( CHANGES.md README.md )
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_QT5=ON
-		-DENABLE_MPV=$(usex mpv)
-		-DENABLE_PHONON=$(usex phonon)
-		-DENABLE_VLC=$(usex vlc)
-	)
-
-	cmake_src_configure
-}
-- 
cgit v1.2.3-65-gdbad