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 B4182138334 for ; Wed, 13 Mar 2019 15:33:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6D96E087B; Wed, 13 Mar 2019 15:33:03 +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 ABA71E087D for ; Wed, 13 Mar 2019 15:33:03 +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 10142335D02 for ; Wed, 13 Mar 2019 15:33:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E6D5454B for ; Wed, 13 Mar 2019 15:32:59 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1552491172.60c80e4147c2ef2eab1d872de022103ba4a0304e.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/mumble/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/mumble/mumble-9999.ebuild X-VCS-Directories: media-sound/mumble/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 60c80e4147c2ef2eab1d872de022103ba4a0304e X-VCS-Branch: master Date: Wed, 13 Mar 2019 15:32:59 +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: 7991680f-da75-443b-a0bd-2f1bbcbbff40 X-Archives-Hash: bb08a7206a2c44fffe9092d231982d2d commit: 60c80e4147c2ef2eab1d872de022103ba4a0304e Author: Lars Wendler gentoo org> AuthorDate: Wed Mar 13 15:12:06 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Mar 13 15:32:52 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60c80e41 media-sound/mumble: Bumped live ebuild to EAPI-7 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> media-sound/mumble/mumble-9999.ebuild | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild index e75beaeaaec..1b3d0c7ac3a 100644 --- a/media-sound/mumble/mumble-9999.ebuild +++ b/media-sound/mumble/mumble-9999.ebuild @@ -1,21 +1,25 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit desktop gnome2-utils qmake-utils xdg-utils +inherit desktop qmake-utils xdg DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software" HOMEPAGE="https://wiki.mumble.info" -if [[ "${PV}" = 9999 ]] ; then +if [[ "${PV}" == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git" EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src ) else - MY_P="${PN}-${PV/_/~}" - SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz" + if [[ "${PV}" == *_pre* ]] ; then + SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz" + else + MY_P="${PN}-${PV/_/~}" + SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz" + S="${WORKDIR}/${MY_P}" + fi KEYWORDS="~amd64 ~arm64 ~x86" - S="${WORKDIR}/${MY_P}" fi LICENSE="BSD MIT" @@ -51,9 +55,11 @@ RDEPEND=" " DEPEND="${RDEPEND} >=dev-libs/boost-1.41.0 + x11-base/xorg-proto +" +BDEPEND=" dev-qt/linguist-tools:5 virtual/pkgconfig - x11-base/xorg-proto " src_configure() { @@ -115,9 +121,12 @@ src_install() { dolib.so "${dir}"/libmumble.so* "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so* } +pkg_preinst() { + xdg_pkg_preinst +} + pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update + xdg_pkg_postinst echo elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions." elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)." @@ -125,6 +134,5 @@ pkg_postinst() { } pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update + xdg_pkg_postrm }