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 37130138334 for ; Tue, 28 May 2019 20:05:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 67185E0893; Tue, 28 May 2019 20:05:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 4CD0AE0893 for ; Tue, 28 May 2019 20:05:58 +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 25C6B3451F2 for ; Tue, 28 May 2019 20:05:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9D8825FA for ; Tue, 28 May 2019 20:05:54 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1559073947.fd51a6358515998e2573d7c84619d41ff4a39578.johu@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/polybar/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/polybar/polybar-9999.ebuild X-VCS-Directories: x11-misc/polybar/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: fd51a6358515998e2573d7c84619d41ff4a39578 X-VCS-Branch: master Date: Tue, 28 May 2019 20:05:54 +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: dcffd83f-60d5-48b7-b661-8194fc65a562 X-Archives-Hash: 90514d5d3c247bc757c665f13540de0a commit: fd51a6358515998e2573d7c84619d41ff4a39578 Author: Johannes Huber gentoo org> AuthorDate: Tue May 28 19:59:30 2019 +0000 Commit: Johannes Huber gentoo org> CommitDate: Tue May 28 20:05:47 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd51a635 x11-misc/polybar: Release switch Package-Manager: Portage-2.3.67, Repoman-2.3.13 Signed-off-by: Johannes Huber gentoo.org> x11-misc/polybar/polybar-9999.ebuild | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/x11-misc/polybar/polybar-9999.ebuild b/x11-misc/polybar/polybar-9999.ebuild index 1c6fc7d1218..70e8d426aaf 100644 --- a/x11-misc/polybar/polybar-9999.ebuild +++ b/x11-misc/polybar/polybar-9999.ebuild @@ -4,16 +4,26 @@ EAPI=7 PYTHON_COMPAT=( python2_7 ) -inherit cmake-utils git-r3 python-single-r1 +inherit cmake-utils python-single-r1 DESCRIPTION="A fast and easy-to-use tool for creating status bars" HOMEPAGE="https://github.com/jaagr/polybar" -EGIT_REPO_URI="https://github.com/jaagr/${PN}.git" -EGIT_CLONE_TYPE="shallow" + +if [[ ${PV} != *9999* ]]; then + XPP_VERSION="1.4.0" + I3IPCPP_VERSION="0.7.1" + SRC_URI="https://github.com/jaagr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/jaagr/xpp/archive/${XPP_VERSION}.tar.gz -> xpp-${XPP_VERSION}.tar.gz + https://github.com/jaagr/i3ipcpp/archive/v${I3IPCPP_VERSION}.tar.gz -> i3ipcpp-${I3IPCPP_VERSION}.tar.gz" + KEYWORDS="~amd64 ~x86" +else + inherit git-r3 + EGIT_REPO_URI="https://github.com/jaagr/${PN}.git" + EGIT_CLONE_TYPE="shallow" +fi LICENSE="MIT" SLOT="0" -KEYWORDS="" IUSE="alsa curl i3wm ipc mpd network pulseaudio" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -36,6 +46,20 @@ DEPEND=" RDEPEND="${DEPEND}" +src_prepare() { + cmake-utils_src_prepare + + if [[ ${PV} != *9999* ]]; then + rmdir "${S}"/lib/xpp || die + mv "${WORKDIR}"/xpp-$XPP_VERSION "${S}"/lib/xpp || die + + rmdir "${S}"/lib/i3ipcpp || die + mv "${WORKDIR}"/i3ipcpp-$I3IPCPP_VERSION "${S}"/lib/i3ipcpp || die + + sed -i "s/.*cpp_error,.*/&\n\t 'eventstruct' : lambda x, y: None,/" lib/xpp/generators/cpp_client.py || die "sed failed" + fi +} + src_configure() { local mycmakeargs=( -DENABLE_ALSA="$(usex alsa)" @@ -46,5 +70,6 @@ src_configure() { -DENABLE_NETWORK="$(usex network)" -DENABLE_PULSEAUDIO="$(usex pulseaudio)" ) + cmake-utils_src_configure }