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 BD1E5138790 for ; Sat, 22 Oct 2016 12:01:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1EE21E07F7; Sat, 22 Oct 2016 12:01:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C017CE07DD for ; Sat, 22 Oct 2016 12:01:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B3913341688 for ; Sat, 22 Oct 2016 12:01:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 40846248D for ; Sat, 22 Oct 2016 12:01:22 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1477137652.b4c71ee959016d82fed9c3b3d423180dbf137c57.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/gmusicbrowser/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r1.ebuild media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild X-VCS-Directories: media-sound/gmusicbrowser/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: b4c71ee959016d82fed9c3b3d423180dbf137c57 X-VCS-Branch: master Date: Sat, 22 Oct 2016 12:01:22 +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-Archives-Salt: aeaec254-5ee5-4781-a48f-3b8e2e613eb7 X-Archives-Hash: c3b92902b860c19f420ff9c3628a66d3 commit: b4c71ee959016d82fed9c3b3d423180dbf137c57 Author: Sergiy Borodych gmail com> AuthorDate: Wed Oct 5 11:49:34 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Oct 22 12:00:52 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4c71ee9 media-sound/gmusicbrowser: fix install of icons due to changes in the last version (1.1.15) Closes: https://github.com/gentoo/gentoo/pull/2478 Signed-off-by: David Seifert gentoo.org> ...-9999.ebuild => gmusicbrowser-1.1.15-r1.ebuild} | 23 ++++++++-------------- .../gmusicbrowser/gmusicbrowser-9999.ebuild | 6 ++---- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r1.ebuild similarity index 77% copy from media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild copy to media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r1.ebuild index 3fb3a81..482cabe 100644 --- a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild +++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r1.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -inherit eutils fdo-mime git-2 gnome2-utils +inherit fdo-mime gnome2-utils DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files" HOMEPAGE="http://gmusicbrowser.org/" -EGIT_REPO_URI="git://github.com/squentin/${PN}.git" +SRC_URI="http://${PN}.org/download/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="" -IUSE="doc" +KEYWORDS="~amd64 ~x86" +IUSE="" GSTREAMER_DEPEND=" dev-perl/GStreamer @@ -37,23 +37,16 @@ RDEPEND="dev-lang/perl ( ${MPV_DEPEND} ) ( ${OTHER_DEPEND} ) )" -DEPEND="sys-devel/gettext - doc? ( dev-perl/Text-Markdown )" - -src_compile() { - emake MARKDOWN=$(usex doc "Markdown.pl" "echo") -} +DEPEND="sys-devel/gettext" src_install() { emake \ DOCS="AUTHORS NEWS README" \ DESTDIR="${D}" \ - iconsdir="${D}/usr/share/icons/hicolor/32x32/apps" \ - liconsdir="${D}/usr/share/icons/hicolor/48x48/apps" \ - miconsdir="${D}/usr/share/pixmaps" \ + iconsdir="${D}/usr/share/icons/hicolor" \ install - use doc && dohtml layout_doc.html + dohtml layout_doc.html } pkg_preinst() { diff --git a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild index 3fb3a81..3ac52e6 100644 --- a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild +++ b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -48,9 +48,7 @@ src_install() { emake \ DOCS="AUTHORS NEWS README" \ DESTDIR="${D}" \ - iconsdir="${D}/usr/share/icons/hicolor/32x32/apps" \ - liconsdir="${D}/usr/share/icons/hicolor/48x48/apps" \ - miconsdir="${D}/usr/share/pixmaps" \ + iconsdir="${D}/usr/share/icons/hicolor" \ install use doc && dohtml layout_doc.html