summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-firewall/firewall-mv/ChangeLog5
-rw-r--r--net-firewall/firewall-mv/Manifest2
-rw-r--r--net-firewall/firewall-mv/firewall-mv-6.10.ebuild (renamed from net-firewall/firewall-mv/firewall-mv-6.9.ebuild)6
-rw-r--r--sys-fs/squash_dir/ChangeLog5
-rw-r--r--sys-fs/squash_dir/Manifest2
-rw-r--r--sys-fs/squash_dir/squash_dir-13.0.ebuild (renamed from sys-fs/squash_dir/squash_dir-12.10.ebuild)23
6 files changed, 35 insertions, 8 deletions
diff --git a/net-firewall/firewall-mv/ChangeLog b/net-firewall/firewall-mv/ChangeLog
index 0c8d3868..712c7dbd 100644
--- a/net-firewall/firewall-mv/ChangeLog
+++ b/net-firewall/firewall-mv/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*firewall-mv-6.10 (10 Aug 2013)
+
+ 10 Aug 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support systemd
+
*firewall-mv-6.9 (09 May 2013)
09 May 2013; Martin Väth <martin@mvath.de>:
diff --git a/net-firewall/firewall-mv/Manifest b/net-firewall/firewall-mv/Manifest
index 76a090d1..6a69d621 100644
--- a/net-firewall/firewall-mv/Manifest
+++ b/net-firewall/firewall-mv/Manifest
@@ -1 +1 @@
-DIST firewall-mv-6.9.tar.gz 11667 SHA256 044acf63f64c6e9531912b8fb82fde2d3a1448b29ddaf8fb140ca5b65ea8ea59 SHA512 a92d2b813adfc1c12b1183aed24f17c2e07e1e64e7a49205bbdf49ff1665cd8fa919d00ac66d4ed496961b66cb1f0d1cba8da2f11b2786a8a78bbf915c72170a WHIRLPOOL 5df50d614d0665c1c4b03227863d4fe147a6c9349ac11d8e0fdef6b451f18bf44489a71518573defd1f7089899f906ae3a1d19d1d3e4170d2b9e7a10638b688c
+DIST firewall-mv-6.10.tar.gz 11988 SHA256 6861bcd1d9e1436b6f7884db108a0332b8a6acf4be858d82dd333bdcdcbb685f SHA512 583b8cd7fdd43f36eb99805d59e90704cc711dbf63c2acd108e0b1a341b69ebb8973c879bd83f18598216b7524b0c9319ea22b0223c9d1834900c3b8bb1fd93e WHIRLPOOL b4ec2d1a328760e3fb08e75f0fae1c0ec2543c120c2f0978f3fedb114f4e8d307fd9dcdab6757af8bb2cc2d0948794851b4f99d9392bc6e914326d8f087f4922
diff --git a/net-firewall/firewall-mv/firewall-mv-6.9.ebuild b/net-firewall/firewall-mv/firewall-mv-6.10.ebuild
index aee8cb77..02fd2dda 100644
--- a/net-firewall/firewall-mv/firewall-mv-6.9.ebuild
+++ b/net-firewall/firewall-mv/firewall-mv-6.10.ebuild
@@ -4,7 +4,7 @@
EAPI=5
RESTRICT="mirror"
-inherit eutils vcs-snapshot
+inherit eutils systemd vcs-snapshot
DESCRIPTION="Initialize iptables and net-related sysctl variables"
HOMEPAGE="https://github.com/vaeth/firewall-mv/"
@@ -22,7 +22,8 @@ src_prepare() {
-e "s!/etc/!${EPREFIX%/}/etc/!g" \
-e "s!/usr/!${EPREFIX%/}/usr/!g" \
firewall \
- firewall.config
+ firewall.config \
+ systemd/*
epatch_user
}
@@ -34,4 +35,5 @@ src_install() {
doconfd openrc/conf.d/*
doinitd openrc/init.d/*
dodoc README
+ systemd_dounit systemd/*
}
diff --git a/sys-fs/squash_dir/ChangeLog b/sys-fs/squash_dir/ChangeLog
index 5d00de92..207b8701 100644
--- a/sys-fs/squash_dir/ChangeLog
+++ b/sys-fs/squash_dir/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*squash_dir-13.0 (13 Aug 2013)
+
+ 13 Auf 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support systemd
+
*squash_dir-12.10 (04 Aug 2013)
04 Auf 2013; Martin Väth <martin@mvath.de>:
diff --git a/sys-fs/squash_dir/Manifest b/sys-fs/squash_dir/Manifest
index 264825cf..28a8ef9a 100644
--- a/sys-fs/squash_dir/Manifest
+++ b/sys-fs/squash_dir/Manifest
@@ -1 +1 @@
-DIST squash_dir-12.10.tar.gz 29087 SHA256 20009cba5e9d6cf21acb1136273e2d05966f4234412e6e41dc00bb5bdae58f4d SHA512 7a20a8505b92d17228dd56cbdd5c49f431a577772c3a6f193408072ecea528a207e35ef7deb9a9db65706deab634f7593d4c7fed186a8f71b77aa9b5d7d41dbd WHIRLPOOL 581aa90f2d2fa508c6951aa9984e3ccab0f78506de5e5486868a73069e9efbd1e43c487c81b6fc24c4fce9ca09dbf2d7f392b5c96005bb8ee98ba2b8e770a71d
+DIST squash_dir-13.0.tar.gz 30660 SHA256 ed915083a5b50456077648adad9626a84309486f43b470f25907762f8e66fbcd SHA512 73efe1c20c9800d4c5b2bbce8e3d31ad59ecb062a1513be87bc7d9461e42ff10327e74cea3077c8696ce8c030a1fc0135cc7190d85c5b2bed59afd9f4de51e87 WHIRLPOOL e17670871737ae8141029cfb74bc7cfc6955b55056b6313081675bfe12edf50f90aedb96e65232b99ecc825144f1469be15a0bdbb42c9133b81d192294968103
diff --git a/sys-fs/squash_dir/squash_dir-12.10.ebuild b/sys-fs/squash_dir/squash_dir-13.0.ebuild
index 3547534f..23a4befb 100644
--- a/sys-fs/squash_dir/squash_dir-12.10.ebuild
+++ b/sys-fs/squash_dir/squash_dir-13.0.ebuild
@@ -5,7 +5,8 @@
EAPI=5
RESTRICT="mirror"
WANT_LIBTOOL=none
-inherit autotools eutils linux-info vcs-snapshot
+AUTOTOOLS_IN_SOURCE_BUILD=true
+inherit autotools autotools-utils eutils linux-info systemd vcs-snapshot
DESCRIPTION="Keep directories compressed with squashfs. Useful for portage tree, texmf-dist"
HOMEPAGE="http://forums.gentoo.org/viewtopic-t-465367.html"
@@ -27,7 +28,17 @@ src_prepare() {
if [ -n "${EPREFIX%/}" ]
then sed -i \
-e "s\"'[^']*/etc/conf[.]d/${PN}'\"'${EPREFIX%/}/etc/conf.d/${PN}'\"g" \
- "init.d/${PN}"
+ "init.d/${PN}" || die
+ sed -i \
+ -e "s\"=/etc/\"=${EPREFIX%/}/etc/\"" \
+ -e "s\"=/usr/\"=${EPREFIX%/}/usr/\"" \
+ "systemd/${PN}@.service" || die
+ sed -i \
+ -e "s\":/usr/sbin:/sbin'\":${EPREFIX%/}/usr/sbin:${EPREFIX%/}/sbin:/usr/sbin:/sbin'\"" \
+ "sbin/${PN}" || die
+ sed -i \
+ -e "s\"'/lib/rc/bin:\":'${EPREFIX%/}/lib/rc/bin:/lib/rc/bin:\"" \
+ "sbin/openrc-wrapper" || die
fi
epatch_user
eautoreconf
@@ -38,8 +49,12 @@ src_configure() {
use unionfs-fuse && order=unionfs-fuse
use aufs && order=aufs
use overlayfs && order=overlayfs
- econf --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- "$(use_with zsh-completion)" ${order:+"--with-first-order=${order}"}
+ local myeconfargs=(
+ "$(use_with zsh-completion)"
+ ${order:+"--with-first-order=${order}"}
+ )
+ systemd_to_myeconfargs
+ autotools-utils_src_configure
}
linux_config_missing() {