summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-fs/squash_dir/ChangeLog7
-rw-r--r--sys-fs/squash_dir/Manifest2
-rw-r--r--sys-fs/squash_dir/squash_dir-12.7.ebuild (renamed from sys-fs/squash_dir/squash_dir-12.6.ebuild)19
3 files changed, 23 insertions, 5 deletions
diff --git a/sys-fs/squash_dir/ChangeLog b/sys-fs/squash_dir/ChangeLog
index f17324bf..108147a4 100644
--- a/sys-fs/squash_dir/ChangeLog
+++ b/sys-fs/squash_dir/ChangeLog
@@ -1,7 +1,12 @@
# ChangeLog for sys-fs/squash_dir
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*squash_dir-12.7 (01 Jan 2013)
+
+ 01 Jan 2013; Martin Väth <martin@mvath.de>
+ Version bump, remove old ebuild. Support new /etc/conf.d/squash_dir
+
*squash_dir-12.6 (19 Dec 2012)
19 Dec 2012; Martin Väth <martin@mvath.de>
diff --git a/sys-fs/squash_dir/Manifest b/sys-fs/squash_dir/Manifest
index 5db52e11..65b7c7e1 100644
--- a/sys-fs/squash_dir/Manifest
+++ b/sys-fs/squash_dir/Manifest
@@ -1 +1 @@
-DIST squash_dir-12.6.tar.gz 28155 SHA256 9f62b96608b80cda2dec6ad9c5e09009bf68226e80cb4e402b616d8bb5011d80 SHA512 06908a60735aad93883050d06b8b2b2e9b0e1e43da2ab139b6664392f31da3318d48553e663245966d3bb0549153dbcd3ee51d03bcee132db99df19a22701330 WHIRLPOOL 102e678e5343bf71931cac3dd1bfcadaf904ff05c11bc032d59d1d9a179cf5ea53c10c5c7440c1bf9e428262aee42165a29ace0644ddeebdc1523fe86127dc8d
+DIST squash_dir-12.7.tar.gz 28635 SHA256 e474280ff869df25937b570d15e12eec9e741d4fd544c931fc8575d2c40d9f87 SHA512 24d37539fee58c3d60b247ebbbf80fd252c8de81922f4da72f752d9c6cb7f53cffa192a02a7e9bd4ab7477a5de58a717e92ba6fef298e51a39b25b0a25ac0e08 WHIRLPOOL 52f87bec562d16698571879c9c3fb9bd9c80793068cdce81237784d02c7328bb8a597f7507aff29dc6740a8dbe4251bea9cf7059c2a93395ad577f8a8ef7f1fe
diff --git a/sys-fs/squash_dir/squash_dir-12.6.ebuild b/sys-fs/squash_dir/squash_dir-12.7.ebuild
index a357a94c..8b871f44 100644
--- a/sys-fs/squash_dir/squash_dir-12.6.ebuild
+++ b/sys-fs/squash_dir/squash_dir-12.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -23,6 +23,11 @@ RDEPEND="sys-fs/squashfs-tools
DEPEND=">=sys-devel/autoconf-2.65"
src_prepare() {
+ if [ -n "${EPREFIX%/}" ]
+ then sed -i \
+ -e "s\"'[^']*/etc/conf[.]d/${PN}'\"'${EPREFIX%/}/etc/conf.d/${PN}'\"g" \
+ "init.d/${PN}"
+ fi
epatch_user
eautoreconf
}
@@ -58,9 +63,17 @@ pkg_postinst() {
then ewarn "To use ${PN} activate aufs in your kernel. Use e.g. sys-fs/aufs*"
fi;;
esac
+ local i ok=false
+ for i in ${REPLACING_VERSIONS[*]}
+ do case ${i} in
+ [0-9].*|1[01].*|12.[0-6]) continue;;
+ esac
+ ok=:
+ break
+ done
+ ${ok} || elog "Please adopt ${EPREFIX}/etc/conf.d/${PN} to your needs"
if ! has_version sys-fs/squashfs-tools[progress-redirect]
- then ${sep}
- elog "For better output of ${PN}, it is recommended to install"
+ then elog "For better output of ${PN}, it is recommended to install"
elog "sys-fs/squashfs-tools from the mv overlay with USE=progress-redirect"
fi
}