add openrc-wrapper. Bump squash_dir correspondingly

8 files changed, 64 insertions, 2 deletions

diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 03cad888..f6cec914 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -107,6 +107,7 @@ sys-apps/lesspipe:xlhtml - Support Excel and Powerpoint files with app-arch/xlht
 sys-fs/aufs:all-patches - Apply all patches - also those which do not start with aufs
 sys-fs/aufs:kernel-patch - Apply the aufs kernel patches instead of just copying them
 sys-fs/squash_dir:aufs - Prefer aufs
+sys-fs/squash_dir:bundled-openrc-wrapper - Install the bundled openrc-wrapper
 sys-fs/squash_dir:overlayfs - Prefer overlayfs
 sys-fs/squash_dir:unionfs-fuse - Prefer unionfs-fuse
 sys-fs/squashfs-tools:progress-redirect - Redirect printing of progress bar to stderr. This gives a nicer output if used from scripts like sys-fs/squash_dir
diff --git a/sys-apps/openrc-wrapper/ChangeLog b/sys-apps/openrc-wrapper/ChangeLog
new file mode 100644
index 00000000..79494c72
--- /dev/null
+++ b/sys-apps/openrc-wrapper/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for sys-fs/openrc-wrapper
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*openrc-wrapper-1.1 (22 Aug 2013)
+
+  22 Aug 2013; Martin Väth <martin@mvath.de>:
+  Split script from squash_dir project as it is of independent interest,
+  and the former has squashmount as a successor.
diff --git a/sys-apps/openrc-wrapper/Manifest b/sys-apps/openrc-wrapper/Manifest
new file mode 100644
index 00000000..0025a20d
--- /dev/null
+++ b/sys-apps/openrc-wrapper/Manifest
@@ -0,0 +1 @@
+DIST openrc-wrapper-1.1.tar.gz 2368 SHA256 ae7101eb56c08779c1d3e9b23989ed5832f72f21f5e6cc2376280a101905e168 SHA512 4becc07601690749b02a7a5c11307f5b3ba02124deb87469ffb5cd8f3e6ffdf25f3172e850ad667b4c99c4099b682b642723fdb84e4fdc4fadb053c34b32cc48 WHIRLPOOL ab3f61f556e27fcf9f88a20487471e6b75bb64e96088a50237bea82398077be4aa67952bf9a2589c03e0a5a90ef24c3a3dcdf4b03ec01068e6d6c935bbebcc2e
diff --git a/sys-apps/openrc-wrapper/metadata.xml b/sys-apps/openrc-wrapper/metadata.xml
new file mode 100644
index 00000000..db6be5a2
--- /dev/null
+++ b/sys-apps/openrc-wrapper/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>martin@mvath.de</email>
+		<name>Martin Väth</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>martin@mvath.de</email>
+			<name>Martin Väth</name>
+		</maintainer>
+		<bugs-to>mailto:martin@mvath.de</bugs-to>
+		<remote-id type="github">vaeth/openrc-wrapper</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-apps/openrc-wrapper/openrc-wrapper-1.1.ebuild b/sys-apps/openrc-wrapper/openrc-wrapper-1.1.ebuild
new file mode 100644
index 00000000..7ad394d2
--- /dev/null
+++ b/sys-apps/openrc-wrapper/openrc-wrapper-1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+RESTRICT="mirror"
+inherit eutils systemd vcs-snapshot
+
+DESCRIPTION="Use openrc init scripts with systemd or other init systems"
+HOMEPAGE="http://github.com/vaeth/openrc-wrapper"
+SRC_URI="http://github.com/vaeth/${PN}/tarball/release-${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=""
+IUSE="zsh-completion"
+
+src_prepare() {
+	epatch_user
+}
+
+src_install() {
+	dobin bin/*
+	systemd_dounit systemd/system/*
+	if use zsh-completion
+	then	insinto /usr/share/zsh/site-functions
+		doins zsh/*
+	fi
+}
diff --git a/sys-fs/squash_dir/Manifest b/sys-fs/squash_dir/Manifest
index 2031760a..a735307b 100644
--- a/sys-fs/squash_dir/Manifest
+++ b/sys-fs/squash_dir/Manifest
@@ -1 +1 @@
-DIST squash_dir-13.1a.tar.gz 30985 SHA256 b25b1aa68273d7ab4b8affeefa1151f604c9a904f87b30e960a00c4f26dc6f92 SHA512 a82fb5c488c8ee2fe3bc40f2d6e46dfa31a247ffc4923a6ffbf6f990deb55cf26585806e71240eb4a8a21b7cdbb0bca2683c37df8816858d9e54184a9f98e799 WHIRLPOOL 53b98b99fe202d33a7697e5b6b4bfc0ecd4f2827b40324ce4637526deffed70fe0388b9a48cb375f890f5db675044386eafced6643f1f8782b969352424869f3
+DIST squash_dir-13.2.tar.gz 31652 SHA256 8e91bb9d24b66ff67e7382f5c2869278d554cfe55d9ae2b146f2423b5eb685f2 SHA512 6e3066ff655b08bb5e6762cfe39e49cca229c87a9088c5a18c3f515af63966028e922be56541b26ceb0ae0ae3e33f5cf4c19f73779929a6af52b370d3519729b WHIRLPOOL 0b58fd4a8664638cc9e6d6d6feb34d70fc93f0f2c93cf7d82a9a90fbb50e4b4ca17fd2752ebb6bc942ccebb7ff7bd7ce49eda298ae06d30ca68931666727350a
diff --git a/sys-fs/squash_dir/metadata.xml b/sys-fs/squash_dir/metadata.xml
index 6d60656f..8bf06804 100644
--- a/sys-fs/squash_dir/metadata.xml
+++ b/sys-fs/squash_dir/metadata.xml
@@ -17,5 +17,6 @@
 		<flag name="aufs">Prefer aufs</flag>
 		<flag name="overlayfs">Prefer overlayfs</flag>
 		<flag name="unionfs-fuse">Prefer unionfs-fuse</flag>
+		<flag name="bundled-openrc-wrapper">Install the bundled openrc-wrapper</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-fs/squash_dir/squash_dir-13.1a.ebuild b/sys-fs/squash_dir/squash_dir-13.2.ebuild
index d60d39bb..d38c477a 100644
--- a/sys-fs/squash_dir/squash_dir-13.1a.ebuild
+++ b/sys-fs/squash_dir/squash_dir-13.2.ebuild
@@ -15,9 +15,10 @@ SRC_URI="http://github.com/vaeth/${PN}/tarball/release-${PV} -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="aufs overlayfs unionfs-fuse zsh-completion"
+IUSE="aufs overlayfs bundled-openrc-wrapper unionfs-fuse zsh-completion"
 
 RDEPEND="sys-fs/squashfs-tools
+	!bundled-openrc-wrapper? ( sys-apps/openrc-wrapper )
 	!<app-shells/runtitle-2.3
 	zsh-completion? ( app-shells/runtitle[zsh-completion] )
 	!<sys-fs/unionfs-fuse-0.25
@@ -51,6 +52,7 @@ src_configure() {
 	use overlayfs && order=overlayfs
 	local myeconfargs=(
 		"$(use_with zsh-completion)"
+		"$(use_enable bundled-openrc-wrapper openrc-wrapper)"
 		${order:+"--with-first-order=${order}"}
 	)
 	systemd_to_myeconfargs