commit: 2042baf7257140c13cd6f217ce75908e8ba1aada
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 4 19:03:05 2019 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> 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 <robbat2 <AT> 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
