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 93A751382C5 for ; Fri, 16 Feb 2018 11:59:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A1EAE0A7C; Fri, 16 Feb 2018 11:59:06 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 58482E0A76 for ; Fri, 16 Feb 2018 11:59:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 0B40E335C83 for ; Fri, 16 Feb 2018 11:59:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 608151C9 for ; Fri, 16 Feb 2018 11:59:01 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1518782129.130fcc9f7be9fea0b9e72f551510be27b3232d32.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/clementine/clementine-9999.ebuild X-VCS-Directories: media-sound/clementine/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 130fcc9f7be9fea0b9e72f551510be27b3232d32 X-VCS-Branch: master Date: Fri, 16 Feb 2018 11:59:01 +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: b8c17cdb-693a-49de-b9ad-f71407c1deab X-Archives-Hash: 2df96361dd2a8466b59b59b07d8daa65 commit: 130fcc9f7be9fea0b9e72f551510be27b3232d32 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Feb 16 11:26:17 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Feb 16 11:55:29 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=130fcc9f media-sound/clementine: Consolidate 9999-specifics Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-sound/clementine/clementine-9999.ebuild | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild index c80ccee1bf4..caae648812d 100644 --- a/media-sound/clementine/clementine-9999.ebuild +++ b/media-sound/clementine/clementine-9999.ebuild @@ -3,23 +3,26 @@ EAPI=6 -EGIT_BRANCH="qt5" -EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git" - PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW" -inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils -[[ ${PV} == *9999* ]] && inherit git-r3 +MY_P="${P/_}" +if [[ ${PV} == *9999* ]]; then + EGIT_BRANCH="qt5" + EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git" + GIT_ECLASS="git-r3" +else + SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${MY_P^}" +fi +inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS} +unset GIT_ECLASS DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt" HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine" -[[ ${PV} == *9999* ]] || \ -SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -[[ ${PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~x86" IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote" REQUIRED_USE=" @@ -99,10 +102,6 @@ DEPEND="${COMMON_DEPEND} DOCS=( Changelog README.md ) -MY_P="${P/_}" -[[ ${PV} == *9999* ]] || \ -S="${WORKDIR}/${MY_P^}" - PATCHES=( "${FILESDIR}"/${PN}-fts3-tokenizer.patch ) src_prepare() {