| 1 |
commit: 7a72f005ce01318e2ed7a51936782ddcbf71f8f6 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 4 09:05:40 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 4 09:05:40 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a72f005 |
| 7 |
|
| 8 |
net-firewall/shorewall: fix missing slashes |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.75, Repoman-2.3.17 |
| 11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 12 |
|
| 13 |
net-firewall/shorewall/shorewall-5.2.3.4.ebuild | 28 ++++++++++++------------- |
| 14 |
1 file changed, 14 insertions(+), 14 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-firewall/shorewall/shorewall-5.2.3.4.ebuild b/net-firewall/shorewall/shorewall-5.2.3.4.ebuild |
| 17 |
index e377930a382..6effdd7a417 100644 |
| 18 |
--- a/net-firewall/shorewall/shorewall-5.2.3.4.ebuild |
| 19 |
+++ b/net-firewall/shorewall/shorewall-5.2.3.4.ebuild |
| 20 |
@@ -272,13 +272,13 @@ src_compile() { |
| 21 |
src_install() { |
| 22 |
# shorewall-core |
| 23 |
einfo "Installing ${MY_P_CORE} ..." |
| 24 |
- DESTDIR="${D%/}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed" |
| 25 |
+ DESTDIR="${ED}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed" |
| 26 |
dodoc "${S}"/${MY_PN_CORE}/changelog.txt "${S}"/${MY_PN_CORE}/releasenotes.txt |
| 27 |
|
| 28 |
# shorewall |
| 29 |
if use ipv4; then |
| 30 |
einfo "Installing ${MY_P_IPV4} ..." |
| 31 |
- DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed" |
| 32 |
+ DESTDIR="${ED}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed" |
| 33 |
keepdir /var/lib/shorewall |
| 34 |
|
| 35 |
if use doc; then |
| 36 |
@@ -289,7 +289,7 @@ src_install() { |
| 37 |
# shorewall6 |
| 38 |
if use ipv6; then |
| 39 |
einfo "Installing ${MY_P_IPV6} ..." |
| 40 |
- DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed" |
| 41 |
+ DESTDIR="${ED}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed" |
| 42 |
keepdir /var/lib/shorewall6 |
| 43 |
|
| 44 |
if use doc; then |
| 45 |
@@ -300,40 +300,40 @@ src_install() { |
| 46 |
# shorewall-lite |
| 47 |
if use lite4; then |
| 48 |
einfo "Installing ${MY_P_LITE4} ..." |
| 49 |
- DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed" |
| 50 |
+ DESTDIR="${ED}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed" |
| 51 |
keepdir /var/lib/shorewall-lite |
| 52 |
fi |
| 53 |
|
| 54 |
# shorewall6-lite |
| 55 |
if use lite6; then |
| 56 |
einfo "Installing ${MY_P_LITE6} ..." |
| 57 |
- DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed" |
| 58 |
+ DESTDIR="${ED}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed" |
| 59 |
keepdir /var/lib/shorewall6-lite |
| 60 |
fi |
| 61 |
|
| 62 |
# shorewall-init |
| 63 |
if use init; then |
| 64 |
einfo "Installing ${MY_P_INIT} ..." |
| 65 |
- DESTDIR="${D%/}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed" |
| 66 |
+ DESTDIR="${ED}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed" |
| 67 |
dodoc "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt |
| 68 |
|
| 69 |
- if [[ -f "${D}etc/logrotate.d/shorewall-init" ]]; then |
| 70 |
+ if [[ -f "${ED}/etc/logrotate.d/shorewall-init" ]]; then |
| 71 |
# On Gentoo, shorewall-init will not create shorewall-ifupdown.log, |
| 72 |
# so we don't need a logrotate configuration file for shorewall-init |
| 73 |
- einfo "Removing unused \"${D}etc/logrotate.d/shorewall-init\" ..." |
| 74 |
- rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed" |
| 75 |
+ einfo "Removing unused \"${ED}/etc/logrotate.d/shorewall-init\" ..." |
| 76 |
+ rm -rf "${ED}"/etc/logrotate.d/shorewall-init || die "Removing \"${ED}/etc/logrotate.d/shorewall-init\" failed" |
| 77 |
fi |
| 78 |
|
| 79 |
- if [[ -d "${D}etc/NetworkManager" ]]; then |
| 80 |
+ if [[ -d "${ED}/etc/NetworkManager" ]]; then |
| 81 |
# On Gentoo, we don't support NetworkManager |
| 82 |
# so we don't need this folder at all |
| 83 |
- einfo "Removing unused \"${D}etc/NetworkManager\" ..." |
| 84 |
- rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed" |
| 85 |
+ einfo "Removing unused \"${ED}/etc/NetworkManager\" ..." |
| 86 |
+ rm -rf "${ED}"/etc/NetworkManager || die "Removing \"${ED}/etc/NetworkManager\" failed" |
| 87 |
fi |
| 88 |
|
| 89 |
- if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then |
| 90 |
+ if [[ -f "${ED}/usr/share/shorewall-init/ifupdown" ]]; then |
| 91 |
# This script isn't supported on Gentoo |
| 92 |
- rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed" |
| 93 |
+ rm -rf "${ED}"/usr/share/shorewall-init/ifupdown || die "Removing \"${ED}/usr/share/shorewall-init/ifupdown\" failed" |
| 94 |
fi |
| 95 |
fi |
Archives