From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C493113835A for ; Tue, 16 Mar 2021 10:32:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8E1BE0825; Tue, 16 Mar 2021 10:32:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A23B1E0825 for ; Tue, 16 Mar 2021 10:32:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5F401340A6A for ; Tue, 16 Mar 2021 10:32:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DB2EA5B4 for ; Tue, 16 Mar 2021 10:32:39 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1615890441.e6a514bb9a8d07cc706d77e3eea61733d1b1a3b0.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/gmusicbrowser/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild X-VCS-Directories: media-sound/gmusicbrowser/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: e6a514bb9a8d07cc706d77e3eea61733d1b1a3b0 X-VCS-Branch: master Date: Tue, 16 Mar 2021 10:32:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ab396e72-201f-48a4-8771-5b30ae941b1c X-Archives-Hash: d01a4337fd47e7e3c1dfa445aedb9d3a commit: e6a514bb9a8d07cc706d77e3eea61733d1b1a3b0 Author: Sergiy Borodych gmail com> AuthorDate: Fri Nov 20 08:18:00 2020 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Tue Mar 16 10:27:21 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6a514bb media-sound/gmusicbrowser: bump & rework git version Remove ${PV} == "9999" condition since it may provide some issues. See 9217bbbfd685b511492a6e4e1a45bd6c930cc06c The upstream last changes are related to switching to 'Gtk3'. It doesn't work perfectly yet (some icons issues), but it generally works. Signed-off-by: Sergiy Borodych gmail.com> Signed-off-by: Miroslav Šulc gentoo.org> .../gmusicbrowser/gmusicbrowser-9999.ebuild | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild index 6813cf60326..3008348f100 100644 --- a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild +++ b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild @@ -3,28 +3,18 @@ EAPI=7 -inherit eutils gnome2-utils xdg - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/squentin/${PN}.git" - inherit git-r3 - SRC_URI="" -else - GIT_COMMIT="4538a5af5fb6c11f07bd7a9c50d6fd73b18c840d" - SRC_URI="https://github.com/squentin/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${PN}-${GIT_COMMIT}" -fi +inherit git-r3 gnome2-utils xdg DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files" HOMEPAGE="https://gmusicbrowser.org/" +EGIT_REPO_URI="https://github.com/squentin/${PN}.git" LICENSE="GPL-3" SLOT="0" IUSE="dbus doc extras gstreamer libnotify mplayer" RDEPEND="dev-lang/perl - dev-perl/Gtk2 + dev-perl/Gtk3 virtual/perl-MIME-Base64 || ( net-misc/wget dev-perl/AnyEvent-HTTP ) dbus? ( dev-perl/Net-DBus ) @@ -46,6 +36,12 @@ src_compile() { emake MARKDOWN=$(usex doc "Markdown.pl" "echo") } +src_prepare() { + default + # silence QA warnings + sed -i '/^OnlyShowIn/d' gmusicbrowser.desktop || die +} + src_install() { emake \ DESTDIR="${D}" \