From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1223039-garchives=archives.gentoo.org@lists.gentoo.org> 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 64D1C138359 for <garchives@archives.gentoo.org>; Mon, 16 Nov 2020 23:48:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AD88BE0982; Mon, 16 Nov 2020 23:48:07 +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 350C0E0982 for <gentoo-commits@lists.gentoo.org>; Mon, 16 Nov 2020 23:48:07 +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 2A1AE34119E for <gentoo-commits@lists.gentoo.org>; Mon, 16 Nov 2020 23:48:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A068642F for <gentoo-commits@lists.gentoo.org>; Mon, 16 Nov 2020 23:48:04 +0000 (UTC) From: "Lars Wendler" <polynomial-c@gentoo.org> 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" <polynomial-c@gentoo.org> Message-ID: <1605570480.3629693f926f2a47c4adc08e28987bb265a7aa4a.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: 3629693f926f2a47c4adc08e28987bb265a7aa4a X-VCS-Branch: master Date: Mon, 16 Nov 2020 23:48:04 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 013c4b80-1089-4e7e-9eca-84f0ef5845bc X-Archives-Hash: 27c3d4c763a4f41512d4f9092c5a7e09 commit: 3629693f926f2a47c4adc08e28987bb265a7aa4a Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Mon Nov 16 23:47:10 2020 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Mon Nov 16 23:48:00 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3629693f media-sound/mumble: Fix remaining (style) issues from previous commit Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> media-sound/mumble/mumble-9999.ebuild | 43 ++++++++++++++++------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild index 48fccfb70b6..1109a96055d 100644 --- a/media-sound/mumble/mumble-9999.ebuild +++ b/media-sound/mumble/mumble-9999.ebuild @@ -73,23 +73,23 @@ src_prepare() { src_configure() { local mycmakeargs=( - "-Dalsa=$(usex alsa)" - "-DBUILD_TESTING=$(usex test)" - "-Dbundled-celt=ON" - "-Dbundled-opus=OFF" - "-Dbundled-speex=OFF" - "-Ddbus=$(usex dbus)" - "-Dg15=$(usex g15)" - "-Djackaudio=$(usex jack)" - "-Doverlay=ON" - "-Dportaudio=$(usex portaudio)" - "-Dpulseaudio=$(usex pulseaudio)" - "-Drnnoise=$(usex rnnoise)" - "-Dserver=OFF" - "-Dspeechd=$(usex speech)" - "-Dtranslations=$(usex nls)" - "-Dupdate=OFF" - "-Dzeroconf=$(usex zeroconf)" + -Dalsa="$(usex alsa)" + -DBUILD_TESTING="$(usex test)" + -Dbundled-celt="ON" + -Dbundled-opus="OFF" + -Dbundled-speex="OFF" + -Ddbus="$(usex dbus)" + -Dg15="$(usex g15)" + -Djackaudio="$(usex jack)" + -Doverlay="ON" + -Dportaudio="$(usex portaudio)" + -Dpulseaudio="$(usex pulseaudio)" + -Drnnoise="$(usex rnnoise)" + -Dserver="OFF" + -Dspeechd="$(usex speech)" + -Dtranslations="$(usex nls)" + -Dupdate="OFF" + -Dzeroconf="$(usex zeroconf)" ) cmake_src_configure @@ -103,8 +103,9 @@ src_install() { # Install it into the correct 32bit lib dir. local libdir_64="/usr/$(get_libdir)/mumble" local libdir_32="/usr/$(get_abi_var LIBDIR x86)/mumble" - mkdir -p ${D}/{$libdir_32} || die - mv ${D}/${libdir_64}/libmumbleoverlay.x86.so* ${D}/${libdir_32}/ || die + dodir ${libdir_32} + mv "${ED}"/${libdir_64}/libmumbleoverlay.x86.so* \ + "${ED}"/${libdir_32}/ || die fi } @@ -115,7 +116,3 @@ pkg_postinst() { elog "Run 'mumble-overlay <program>' to start the OpenGL overlay (after starting mumble)." echo } - -pkg_postrm() { - xdg_pkg_postrm -}