sys-power/nut: Drop superfluous FILESDIR subdir

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

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 8f9e94b92e467774b4caad9b830e3823a5404c6e..f787827f2931a2ad0f385b4ae9fe8dbda3fa56d5 100644 (file)
--- 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 55dd831f344fc25ccdf510d5b203e149aa838159..efe9d9f33f9dbabc6e9db807020cc562c97e7de5 100644 (file)
--- 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 ddbe49986a35d0ddf140200c652a3a5299826474..3d3d49eec6ffae86f12eb108ee00e8dac45091d2 100644 (file)
--- 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 2c212243babf2a86bc69189af5317fb133a24c19..f33d974e494943d31419184c2f3040637272d9e0 100644 (file)
--- 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 a767415e64b7a05684a030f2c8228509e63a6ec3..236c60cfcbab0e700a0c62b04887366ae5776582 100644 (file)
--- 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