| 1 |
commit: bcbb6eeb5f4870efac32ce3d72458f276f7a4b3e |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 29 19:31:47 2016 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 29 19:31:47 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcbb6eeb |
| 7 |
|
| 8 |
net-misc/bopm: Install bopm.conf.sample in docdir too |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
net-misc/bopm/{bopm-3.1.3-r2.ebuild => bopm-3.1.3-r3.ebuild} | 11 ++++++----- |
| 13 |
net-misc/bopm/files/bopm-3.1.3-autotools.patch | 2 +- |
| 14 |
net-misc/bopm/files/bopm-3.1.3-remove-njabl.patch | 6 +++--- |
| 15 |
3 files changed, 10 insertions(+), 9 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-misc/bopm/bopm-3.1.3-r2.ebuild b/net-misc/bopm/bopm-3.1.3-r3.ebuild |
| 18 |
similarity index 95% |
| 19 |
rename from net-misc/bopm/bopm-3.1.3-r2.ebuild |
| 20 |
rename to net-misc/bopm/bopm-3.1.3-r3.ebuild |
| 21 |
index 75d5f68..fda838c 100644 |
| 22 |
--- a/net-misc/bopm/bopm-3.1.3-r2.ebuild |
| 23 |
+++ b/net-misc/bopm/bopm-3.1.3-r3.ebuild |
| 24 |
@@ -28,16 +28,17 @@ pkg_setup() { |
| 25 |
} |
| 26 |
|
| 27 |
src_prepare() { |
| 28 |
- mv bopm.conf{.sample,} || die |
| 29 |
- mv configure.{in,ac} || die |
| 30 |
- mv src/libopm/configure.{in,ac} || die |
| 31 |
- |
| 32 |
sed -i \ |
| 33 |
-e "s!/some/path/bopm.pid!/run/${PN}/${PN}.pid!" \ |
| 34 |
-e "s!/some/path/scan.log!/var/log/${PN}/scan.log!" \ |
| 35 |
- bopm.conf || die |
| 36 |
+ bopm.conf.sample || die |
| 37 |
+ |
| 38 |
+ mv configure.{in,ac} || die |
| 39 |
+ mv src/libopm/configure.{in,ac} || die |
| 40 |
|
| 41 |
default |
| 42 |
+ cp bopm.conf{.sample,} || die |
| 43 |
+ |
| 44 |
eautoreconf |
| 45 |
} |
| 46 |
|
| 47 |
|
| 48 |
diff --git a/net-misc/bopm/files/bopm-3.1.3-autotools.patch b/net-misc/bopm/files/bopm-3.1.3-autotools.patch |
| 49 |
index 992a1ff..e336150 100644 |
| 50 |
--- a/net-misc/bopm/files/bopm-3.1.3-autotools.patch |
| 51 |
+++ b/net-misc/bopm/files/bopm-3.1.3-autotools.patch |
| 52 |
@@ -14,7 +14,7 @@ |
| 53 |
SUBDIRS = src |
| 54 |
|
| 55 |
-data_DATA = bopm.conf.sample bopm.conf.blitzed |
| 56 |
-+dist_doc_DATA = bopm.conf.blitzed |
| 57 |
++dist_doc_DATA = bopm.conf.sample bopm.conf.blitzed |
| 58 |
|
| 59 |
-EXTRA_DIST = ChangeLog contrib INSTALL README bopm.conf.sample bopm.conf.blitzed network-bopm |
| 60 |
+EXTRA_DIST = ChangeLog contrib INSTALL README network-bopm |
| 61 |
|
| 62 |
diff --git a/net-misc/bopm/files/bopm-3.1.3-remove-njabl.patch b/net-misc/bopm/files/bopm-3.1.3-remove-njabl.patch |
| 63 |
index 588ccd6..318dae6 100644 |
| 64 |
--- a/net-misc/bopm/files/bopm-3.1.3-remove-njabl.patch |
| 65 |
+++ b/net-misc/bopm/files/bopm-3.1.3-remove-njabl.patch |
| 66 |
@@ -3,10 +3,10 @@ Remove NJABL as an example blacklist. |
| 67 |
NJABL has been shut down and bopm upstream still lists it in its default |
| 68 |
configuration. |
| 69 |
--- |
| 70 |
-diff --git a/bopm.conf b/bopm.conf |
| 71 |
+diff --git a/bopm.conf.sample b/bopm.conf.sample |
| 72 |
index 74483e1..bc05bf4 100644 |
| 73 |
---- a/bopm.conf |
| 74 |
-+++ b/bopm.conf |
| 75 |
+--- a/bopm.conf.sample |
| 76 |
++++ b/bopm.conf.sample |
| 77 |
@@ -363,18 +363,6 @@ OPM { |
| 78 |
# }; |
Archives