3 files changed, 10 insertions, 9 deletions
diff --git a/net-misc/bopm/bopm-3.1.3-r2.ebuild b/net-misc/bopm/bopm-3.1.3-r3.ebuild
index 75d5f68e78c0..fda838c4ce07 100644
--- a/net-misc/bopm/bopm-3.1.3-r2.ebuild
+++ b/net-misc/bopm/bopm-3.1.3-r3.ebuild
@@ -28,16 +28,17 @@ pkg_setup() {
 }
 
 src_prepare() {
-	mv bopm.conf{.sample,} || die
-	mv configure.{in,ac} || die
-	mv src/libopm/configure.{in,ac} || die
-
 	sed -i \
 		-e "s!/some/path/bopm.pid!/run/${PN}/${PN}.pid!" \
 		-e "s!/some/path/scan.log!/var/log/${PN}/scan.log!" \
-		bopm.conf || die
+		bopm.conf.sample || die
+
+	mv configure.{in,ac} || die
+	mv src/libopm/configure.{in,ac} || die
 
 	default
+	cp bopm.conf{.sample,} || die
+
 	eautoreconf
 }
 
diff --git a/net-misc/bopm/files/bopm-3.1.3-autotools.patch b/net-misc/bopm/files/bopm-3.1.3-autotools.patch
index 992a1ff86eb7..e336150f430c 100644
--- a/net-misc/bopm/files/bopm-3.1.3-autotools.patch
+++ b/net-misc/bopm/files/bopm-3.1.3-autotools.patch
@@ -14,7 +14,7 @@
  SUBDIRS = src
  
 -data_DATA = bopm.conf.sample bopm.conf.blitzed
-+dist_doc_DATA = bopm.conf.blitzed
++dist_doc_DATA = bopm.conf.sample bopm.conf.blitzed
  
 -EXTRA_DIST = ChangeLog contrib INSTALL README bopm.conf.sample bopm.conf.blitzed network-bopm
 +EXTRA_DIST = ChangeLog contrib INSTALL README network-bopm
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
index 588ccd66bfa5..318dae660c51 100644
--- a/net-misc/bopm/files/bopm-3.1.3-remove-njabl.patch
+++ b/net-misc/bopm/files/bopm-3.1.3-remove-njabl.patch
@@ -3,10 +3,10 @@ Remove NJABL as an example blacklist.
 NJABL has been shut down and bopm upstream still lists it in its default
 configuration.
 ---
-diff --git a/bopm.conf b/bopm.conf
+diff --git a/bopm.conf.sample b/bopm.conf.sample
 index 74483e1..bc05bf4 100644
---- a/bopm.conf
-+++ b/bopm.conf
+--- a/bopm.conf.sample
++++ b/bopm.conf.sample
 @@ -363,18 +363,6 @@ OPM {
  #        };