| 1 |
commit: 2042baf7257140c13cd6f217ce75908e8ba1aada |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 4 19:03:05 2019 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 4 19:21:03 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2042baf7 |
| 7 |
|
| 8 |
sci-geosciences/gpsd: fix DuplicateFiles |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.76, Repoman-2.3.17 |
| 11 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 12 |
|
| 13 |
sci-geosciences/gpsd/files/gpsd-9999-do_not_rm_library.patch | 12 ------------ |
| 14 |
sci-geosciences/gpsd/gpsd-9999.ebuild | 2 +- |
| 15 |
2 files changed, 1 insertion(+), 13 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
deleted file mode 100644 |
| 19 |
index 83e2907fca5..00000000000 |
| 20 |
--- a/sci-geosciences/gpsd/files/gpsd-9999-do_not_rm_library.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,12 +0,0 @@ |
| 23 |
-diff --git a/SConstruct b/SConstruct |
| 24 |
-index c0f083a..4a98580 100644 |
| 25 |
---- a/SConstruct |
| 26 |
-+++ b/SConstruct |
| 27 |
-@@ -1646,7 +1646,6 @@ binaryinstall.append(env.Install(installdir('sbindir'), sbin_binaries)) |
| 28 |
- binaryinstall.append(env.Install(installdir('bindir'), bin_binaries)) |
| 29 |
- binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib, libgps_version)) |
| 30 |
- # Work around a minor bug in InstallSharedLib() link handling |
| 31 |
--env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), )) |
| 32 |
- |
| 33 |
- if qt_env: |
| 34 |
- binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib, libgps_version)) |
| 35 |
|
| 36 |
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild |
| 37 |
index 6cba45913e0..f07d1e12062 100644 |
| 38 |
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild |
| 39 |
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild |
| 40 |
@@ -84,7 +84,7 @@ src_prepare() { |
| 41 |
die "please sync ebuild & source" |
| 42 |
fi |
| 43 |
|
| 44 |
- epatch "${FILESDIR}"/${P}-do_not_rm_library.patch |
| 45 |
+ epatch "${FILESDIR}"/${PN}-3.19-do_not_rm_library.patch |
| 46 |
# Merged upstream |
| 47 |
#epatch "${FILESDIR}"/${P}-scons-print.patch |
| 48 |
#epatch "${FILESDIR}"/${P}-scons-py3.patch |
Archives