sci-geosciences/gpsd: fix DuplicateFiles

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

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 (file)
index 83e2907..0000000
--- 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 6cba45913e0f864391271161744d769da27150dc..f07d1e12062a9a3c936e58e812e9d094e3beaeba 100644 (file)
--- 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