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 729CF138334 for ; Fri, 4 Oct 2019 19:24:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 62444E084A; Fri, 4 Oct 2019 19:23: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 4A08FE084A for ; Fri, 4 Oct 2019 19:23: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 360AE34B917 for ; Fri, 4 Oct 2019 19:23:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9B42F744 for ; Fri, 4 Oct 2019 19:23:53 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1570216863.2042baf7257140c13cd6f217ce75908e8ba1aada.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/files/, sci-geosciences/gpsd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/gpsd/files/gpsd-9999-do_not_rm_library.patch sci-geosciences/gpsd/gpsd-9999.ebuild X-VCS-Directories: sci-geosciences/gpsd/ sci-geosciences/gpsd/files/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 2042baf7257140c13cd6f217ce75908e8ba1aada X-VCS-Branch: master Date: Fri, 4 Oct 2019 19:23:53 +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: 5f0688c9-3f65-494c-adff-4531e263bb3e X-Archives-Hash: 0f65f83ab30c3dc9a5a918cd1da57241 commit: 2042baf7257140c13cd6f217ce75908e8ba1aada Author: Robin H. Johnson gentoo org> AuthorDate: Fri Oct 4 19:03:05 2019 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Fri Oct 4 19:21:03 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2042baf7 sci-geosciences/gpsd: fix DuplicateFiles Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Robin H. Johnson gentoo.org> sci-geosciences/gpsd/files/gpsd-9999-do_not_rm_library.patch | 12 ------------ sci-geosciences/gpsd/gpsd-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/sci-geosciences/gpsd/files/gpsd-9999-do_not_rm_library.patch b/sci-geosciences/gpsd/files/gpsd-9999-do_not_rm_library.patch deleted file mode 100644 index 83e2907fca5..00000000000 --- a/sci-geosciences/gpsd/files/gpsd-9999-do_not_rm_library.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/SConstruct b/SConstruct -index c0f083a..4a98580 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -1646,7 +1646,6 @@ binaryinstall.append(env.Install(installdir('sbindir'), sbin_binaries)) - binaryinstall.append(env.Install(installdir('bindir'), bin_binaries)) - binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib, libgps_version)) - # Work around a minor bug in InstallSharedLib() link handling --env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), )) - - if qt_env: - binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib, libgps_version)) diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild index 6cba45913e0..f07d1e12062 100644 --- a/sci-geosciences/gpsd/gpsd-9999.ebuild +++ b/sci-geosciences/gpsd/gpsd-9999.ebuild @@ -84,7 +84,7 @@ src_prepare() { die "please sync ebuild & source" fi - epatch "${FILESDIR}"/${P}-do_not_rm_library.patch + epatch "${FILESDIR}"/${PN}-3.19-do_not_rm_library.patch # Merged upstream #epatch "${FILESDIR}"/${P}-scons-print.patch #epatch "${FILESDIR}"/${P}-scons-py3.patch