From e95fca37fe7f9aa3824002d4fb365f2099fd6966 Mon Sep 17 00:00:00 2001 From: Martin Väth Date: Tue, 1 Jan 2013 12:30:06 +0100 Subject: Bump squash_dir, supporting new /etc/conf.d/squash_dir --- sys-fs/squash_dir/ChangeLog | 7 ++- sys-fs/squash_dir/Manifest | 2 +- sys-fs/squash_dir/squash_dir-12.6.ebuild | 66 -------------------------- sys-fs/squash_dir/squash_dir-12.7.ebuild | 79 ++++++++++++++++++++++++++++++++ 4 files changed, 86 insertions(+), 68 deletions(-) delete mode 100644 sys-fs/squash_dir/squash_dir-12.6.ebuild create mode 100644 sys-fs/squash_dir/squash_dir-12.7.ebuild 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 + 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 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.6.ebuild deleted file mode 100644 index a357a94c..00000000 --- a/sys-fs/squash_dir/squash_dir-12.6.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -RESTRICT="mirror" -WANT_LIBTOOL=none -inherit autotools eutils linux-info vcs-snapshot - -DESCRIPTION="Keep directories compressed with squashfs. Useful for portage tree, texmf-dist" -HOMEPAGE="http://forums.gentoo.org/viewtopic-t-465367.html" -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 +title unionfs-fuse zsh-completion" - -RDEPEND="sys-fs/squashfs-tools - !=app-shells/runtitle-2.3[zsh-completion?] ) - unionfs-fuse? ( sys-fs/unionfs-fuse )" -DEPEND=">=sys-devel/autoconf-2.65" - -src_prepare() { - epatch_user - eautoreconf -} - -src_configure() { - local order= - 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}"} -} - -linux_config_missing() { - ! linux_config_exists || ! linux_chkconfig_present "${1}" -} - -pkg_postinst() { - local fs=aufs - use unionfs-fuse && fs=unionfs-fuse - use aufs && fs=aufs - use overlayfs && fs=overlayfs - CONFIG_CHECK="~SQUASHFS" - case ${fs} in - overlayfs) - if linux_config_missing 'OVERLAYFS_FS' - then ewarn "To use ${PN} activate overlayfs in your kernel." - ewarn "Unless you use a patched kernel, apply e.g. top patches from some head of" - ewarn "http://git.kernel.org/?p=linux/kernel/git/mszeredi/vfs.git;a=summary" - fi;; - aufs) - if ! has_version sys-fs/aufs3 && ! has_version sys-fs/aufs2 && linux_config_missing 'AUFS_FS' - then ewarn "To use ${PN} activate aufs in your kernel. Use e.g. sys-fs/aufs*" - fi;; - esac - if ! has_version sys-fs/squashfs-tools[progress-redirect] - then ${sep} - 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 -} diff --git a/sys-fs/squash_dir/squash_dir-12.7.ebuild b/sys-fs/squash_dir/squash_dir-12.7.ebuild new file mode 100644 index 00000000..8b871f44 --- /dev/null +++ b/sys-fs/squash_dir/squash_dir-12.7.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 +RESTRICT="mirror" +WANT_LIBTOOL=none +inherit autotools eutils linux-info vcs-snapshot + +DESCRIPTION="Keep directories compressed with squashfs. Useful for portage tree, texmf-dist" +HOMEPAGE="http://forums.gentoo.org/viewtopic-t-465367.html" +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 +title unionfs-fuse zsh-completion" + +RDEPEND="sys-fs/squashfs-tools + !=app-shells/runtitle-2.3[zsh-completion?] ) + unionfs-fuse? ( sys-fs/unionfs-fuse )" +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 +} + +src_configure() { + local order= + 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}"} +} + +linux_config_missing() { + ! linux_config_exists || ! linux_chkconfig_present "${1}" +} + +pkg_postinst() { + local fs=aufs + use unionfs-fuse && fs=unionfs-fuse + use aufs && fs=aufs + use overlayfs && fs=overlayfs + CONFIG_CHECK="~SQUASHFS" + case ${fs} in + overlayfs) + if linux_config_missing 'OVERLAYFS_FS' + then ewarn "To use ${PN} activate overlayfs in your kernel." + ewarn "Unless you use a patched kernel, apply e.g. top patches from some head of" + ewarn "http://git.kernel.org/?p=linux/kernel/git/mszeredi/vfs.git;a=summary" + fi;; + aufs) + if ! has_version sys-fs/aufs3 && ! has_version sys-fs/aufs2 && linux_config_missing 'AUFS_FS' + 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 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 +} -- cgit v1.2.3-65-gdbad