[gentoo-commits] repo/gentoo:master commit in: sys-power/nut/files/nut-2.7.2/, sys-power/nut/, sys-power/nut/files/

[gentoo-commits] repo/gentoo:master commit in: sys-power/nut/files/nut-2.7.2/, sys-power/nut/, sys-power/nut/files/

[Andreas Sturmlechner]

commit:     16891f0aedd7b75eb7e172d805aa6c636243d93a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 27 18:09:33 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 27 19:02:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16891f0a

sys-power/nut: Drop superfluous FILESDIR subdir

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 sys-power/nut/files/{nut-2.7.2 => }/nut-2.7.2-no-libdummy.patch | 0
 sys-power/nut/nut-2.7.2-r2.ebuild                               | 4 ++--
 sys-power/nut/nut-2.7.3.ebuild                                  | 4 ++--
 sys-power/nut/nut-2.7.4-r1.ebuild                               | 4 ++--
 sys-power/nut/nut-2.7.4-r2.ebuild                               | 2 +-
 sys-power/nut/nut-2.7.4.ebuild                                  | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sys-power/nut/files/nut-2.7.2/nut-2.7.2-no-libdummy.patch b/sys-power/nut/files/nut-2.7.2-no-libdummy.patch
similarity index 100%
rename from sys-power/nut/files/nut-2.7.2/nut-2.7.2-no-libdummy.patch
rename to sys-power/nut/files/nut-2.7.2-no-libdummy.patch

diff --git a/sys-power/nut/nut-2.7.2-r2.ebuild b/sys-power/nut/nut-2.7.2-r2.ebuild
index 8f9e94b92e4..f787827f293 100644
--- a/sys-power/nut/nut-2.7.2-r2.ebuild
+++ b/sys-power/nut/nut-2.7.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -86,7 +86,7 @@ pkg_setup() {
 src_prepare() {
 	#ht_fix_file configure.in
 
-	epatch "${FILESDIR}/nut-2.7.2/nut-2.7.2-no-libdummy.patch"
+	epatch "${FILESDIR}"/nut-2.7.2-no-libdummy.patch
 	epatch "${FILESDIR}"/${PN}-2.6.2-lowspeed-buffer-size.patch
 	#epatch "${FILESDIR}"/${PN}-2.6.3-CVE-2012-2944.patch
 	#epatch "${FILESDIR}"/${PN}-2.6.5-freeipmi_fru.patch

diff --git a/sys-power/nut/nut-2.7.3.ebuild b/sys-power/nut/nut-2.7.3.ebuild
index 55dd831f344..efe9d9f33f9 100644
--- a/sys-power/nut/nut-2.7.3.ebuild
+++ b/sys-power/nut/nut-2.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -87,7 +87,7 @@ pkg_setup() {
 src_prepare() {
 	#ht_fix_file configure.in
 
-	epatch "${FILESDIR}/nut-2.7.2/nut-2.7.2-no-libdummy.patch"
+	epatch "${FILESDIR}"/nut-2.7.2-no-libdummy.patch
 	epatch "${FILESDIR}"/${PN}-2.6.2-lowspeed-buffer-size.patch
 	#epatch "${FILESDIR}"/${PN}-2.6.3-CVE-2012-2944.patch
 	#epatch "${FILESDIR}"/${PN}-2.6.5-freeipmi_fru.patch

diff --git a/sys-power/nut/nut-2.7.4-r1.ebuild b/sys-power/nut/nut-2.7.4-r1.ebuild
index ddbe49986a3..3d3d49eec6f 100644
--- a/sys-power/nut/nut-2.7.4-r1.ebuild
+++ b/sys-power/nut/nut-2.7.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -88,7 +88,7 @@ pkg_setup() {
 src_prepare() {
 	#ht_fix_file configure.in
 
-	epatch "${FILESDIR}/nut-2.7.2/nut-2.7.2-no-libdummy.patch"
+	epatch "${FILESDIR}"/nut-2.7.2-no-libdummy.patch
 	epatch "${FILESDIR}"/${PN}-2.6.2-lowspeed-buffer-size.patch
 	#epatch "${FILESDIR}"/${PN}-2.6.3-CVE-2012-2944.patch
 	#epatch "${FILESDIR}"/${PN}-2.6.5-freeipmi_fru.patch

diff --git a/sys-power/nut/nut-2.7.4-r2.ebuild b/sys-power/nut/nut-2.7.4-r2.ebuild
index 2c212243bab..f33d974e494 100644
--- a/sys-power/nut/nut-2.7.4-r2.ebuild
+++ b/sys-power/nut/nut-2.7.4-r2.ebuild
@@ -78,7 +78,7 @@ NUT_PRIVATE_FILES="/etc/nut/{upsd.conf,upsd.users,upsmon.conf}"
 NUT_CGI_FILES="/etc/nut/{{hosts,upsset}.conf,upsstats{,-single}.html}"
 
 PATCHES=(
-	"${FILESDIR}/nut-2.7.2/${PN}-2.7.2-no-libdummy.patch"
+	"${FILESDIR}/${PN}-2.7.2-no-libdummy.patch"
 	"${FILESDIR}/${PN}-2.7.1-snmpusb-order.patch"
 	"${FILESDIR}/${PN}-2.6.2-lowspeed-buffer-size.patch"
 )

diff --git a/sys-power/nut/nut-2.7.4.ebuild b/sys-power/nut/nut-2.7.4.ebuild
index a767415e64b..236c60cfcba 100644
--- a/sys-power/nut/nut-2.7.4.ebuild
+++ b/sys-power/nut/nut-2.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -87,7 +87,7 @@ pkg_setup() {
 src_prepare() {
 	#ht_fix_file configure.in
 
-	epatch "${FILESDIR}/nut-2.7.2/nut-2.7.2-no-libdummy.patch"
+	epatch "${FILESDIR}"/nut-2.7.2-no-libdummy.patch
 	epatch "${FILESDIR}"/${PN}-2.6.2-lowspeed-buffer-size.patch
 	#epatch "${FILESDIR}"/${PN}-2.6.3-CVE-2012-2944.patch
 	#epatch "${FILESDIR}"/${PN}-2.6.5-freeipmi_fru.patch