From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F1863138330 for ; Mon, 29 Aug 2016 19:32:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45E5221C043; Mon, 29 Aug 2016 19:32:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CD96521C043 for ; Mon, 29 Aug 2016 19:32:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 618BB340836 for ; Mon, 29 Aug 2016 19:32:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D209A2455 for ; Mon, 29 Aug 2016 19:32:19 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1472499107.bcbb6eeb5f4870efac32ce3d72458f276f7a4b3e.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/bopm/, net-misc/bopm/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/bopm/bopm-3.1.3-r2.ebuild net-misc/bopm/bopm-3.1.3-r3.ebuild net-misc/bopm/files/bopm-3.1.3-autotools.patch net-misc/bopm/files/bopm-3.1.3-remove-njabl.patch X-VCS-Directories: net-misc/bopm/ net-misc/bopm/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: bcbb6eeb5f4870efac32ce3d72458f276f7a4b3e X-VCS-Branch: master Date: Mon, 29 Aug 2016 19:32:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ac6cdc69-9edd-43b7-9dce-9c01722f37da X-Archives-Hash: fcf501d58979c52f65ab821680a6d031 commit: bcbb6eeb5f4870efac32ce3d72458f276f7a4b3e Author: David Seifert gentoo org> AuthorDate: Mon Aug 29 19:31:47 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Mon Aug 29 19:31:47 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcbb6eeb net-misc/bopm: Install bopm.conf.sample in docdir too Package-Manager: portage-2.3.0 net-misc/bopm/{bopm-3.1.3-r2.ebuild => bopm-3.1.3-r3.ebuild} | 11 ++++++----- net-misc/bopm/files/bopm-3.1.3-autotools.patch | 2 +- net-misc/bopm/files/bopm-3.1.3-remove-njabl.patch | 6 +++--- 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 similarity index 95% rename from net-misc/bopm/bopm-3.1.3-r2.ebuild rename to net-misc/bopm/bopm-3.1.3-r3.ebuild index 75d5f68..fda838c 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 992a1ff..e336150 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 588ccd6..318dae6 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 { # };