From 3c099c76e1b067bb2cfb53d7c331eb9334b91009 Mon Sep 17 00:00:00 2001 From: Martin Väth Date: Fri, 23 Nov 2012 21:09:10 +0100 Subject: Bump squash_dir, providing USE to change ORDER default --- profiles/use.local.desc | 4 +- sys-fs/squash_dir/ChangeLog | 5 ++ sys-fs/squash_dir/Manifest | 2 +- sys-fs/squash_dir/metadata.xml | 4 +- sys-fs/squash_dir/squash_dir-12.2.ebuild | 78 ------------------------------ sys-fs/squash_dir/squash_dir-12.3.ebuild | 82 ++++++++++++++++++++++++++++++++ 6 files changed, 94 insertions(+), 81 deletions(-) delete mode 100644 sys-fs/squash_dir/squash_dir-12.2.ebuild create mode 100644 sys-fs/squash_dir/squash_dir-12.3.ebuild diff --git a/profiles/use.local.desc b/profiles/use.local.desc index e82f6908..9d7a49c7 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -85,8 +85,10 @@ sys-apps/lesspipe:xlhtml - Support Excel and Powerpoint files with app-arch/xlht sys-apps/starter:title - Support for statusline changes (requires app-shells/runtitle) 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:readonly - Do not depend on any of aufs|aufs2|aufs3|unionfs|unionfs-fuse|funionfs. At least one of these must be installed and active to make the squash_dir-mounted filesystems writable. +sys-fs/squash_dir:aufs - Prefer aufs +sys-fs/squash_dir:overlayfs - Prefer overlayfs sys-fs/squash_dir:title - Support for statusline changes (requires app-shells/runtitle) +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 sys-fs/squashfs-tools:xz - Enable support for XZ ("LZMA2") compression using app-arch/xz-utils sys-kernel/kernel:eix - Pull in eix for quicker execution diff --git a/sys-fs/squash_dir/ChangeLog b/sys-fs/squash_dir/ChangeLog index e631801d..ae90b58d 100644 --- a/sys-fs/squash_dir/ChangeLog +++ b/sys-fs/squash_dir/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*squash_dir-12.3 (23 Nov 2012) + + 23 Nov 2012; Martin Väth + Version bump, remove old ebuild. Provide USE for ORDER default + *squash_dir-12.2 (17 Nov 2012) 17 Nov 2012; Martin Väth diff --git a/sys-fs/squash_dir/Manifest b/sys-fs/squash_dir/Manifest index c878a315..0fa71e89 100644 --- a/sys-fs/squash_dir/Manifest +++ b/sys-fs/squash_dir/Manifest @@ -1 +1 @@ -DIST squash_dir-12.2.tar.gz 27713 SHA256 6009ecedb0f41a36cc02614eedd41bbb39caaa1a265723b41f6228077178fee6 SHA512 57d1243f0ec06c6129f32c326877d7003df8d0eab5c6f7adf9e317aaa642d642843e0698982b06467122d1518d6a8531f3d950a23e8442a53a08c86019a9b7aa WHIRLPOOL f127cc2a4a0d2fabcc467dce50db11cc082a34ebce655298a7f4f410496d8404e32e8f354b07e7bc05d2ee5423a5ef160f620c2b562b565e2e81be8d6103d84d +DIST squash_dir-12.3.tar.gz 28133 SHA256 7c775fcd39cee2f8f99de8777127ba6b1817103685147b6a5daa75ec39ed6e5e SHA512 ba6accca6103aad64e975161df53446c1c7ba720db17326549672cfa020d0e58fd1f3507689cfa8f1e7e42ffeafcc221a2f5b7c1e5b211ed1d0aad559e2e65ad WHIRLPOOL ed3c209bef234828cfa1444501b0592cd84ef2b66a42f4ad985a5874e0029a18f89f5d754384098d244e607a999697a9195a8f3c8eaa5d73a66ba110b6d5eb53 diff --git a/sys-fs/squash_dir/metadata.xml b/sys-fs/squash_dir/metadata.xml index 43c15e8f..3bf27287 100644 --- a/sys-fs/squash_dir/metadata.xml +++ b/sys-fs/squash_dir/metadata.xml @@ -14,7 +14,9 @@ vaeth/squash_dir - Do not depend on any of aufs|aufs2|aufs3|unionfs|unionfs-fuse|funionfs. At least one of these must be installed and active to make the squash_dir-mounted filesystems writable. + Prefer aufs + Prefer overlayfs Support for statusline changes (requires app-shells/runtitle) + Prefer unionfs-fuse diff --git a/sys-fs/squash_dir/squash_dir-12.2.ebuild b/sys-fs/squash_dir/squash_dir-12.2.ebuild deleted file mode 100644 index 273c1169..00000000 --- a/sys-fs/squash_dir/squash_dir-12.2.ebuild +++ /dev/null @@ -1,78 +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 eutils autotools 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="readonly +title zsh-completion" - -RDEPEND="sys-fs/squashfs-tools - title? ( >=app-shells/runtitle-2.3[zsh-completion?] ) - !readonly? ( || ( - sys-fs/aufs - sys-fs/aufs3 - sys-fs/aufs2 - sys-fs/unionfs-fuse - sys-fs/funionfs - sys-fs/unionfs - ) )" -DEPEND=">=sys-devel/autoconf-2.65" - -src_prepare() { - epatch_user - eautoreconf -} - -src_configure() { - econf --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - "$(use_with zsh-completion)" -} - -check_for_obsolete() { - local a - a="/etc/mtab.lock" - if test -p '/etc/mtab' && test -e "${a}" - then ewarn - ewarn "${a} is probably left from a previous install and now obsolete." - ewarn "You probably want to remove it." - ewarn - fi - a="${EPREFIX}/etc/portage/env/sys-fs/squashfs-tools" - test -e "${a}" && grep -q "squash_dir's hack" "${a}" || return 0 - ewarn "You probably had installed ${PN} with USE=hack-squash-utils" - ewarn "${a} is left from this." - ewarn "This file is now obsolete." - ewarn "It is recommended to remove it and to install instead" - ewarn "sys-fs/squashfs-tools from the mv overlay with USE=progress-redirect" - return 1 -} - -pkg_postinst() { - if check_for_obsolete && \ - ! has_version sys-fs/squashfs-tools[progress-redirect] - then ewarn "For better output of ${PN}, it is recommended to install" - ewarn "sys-fs/squashfs-tools from the mv overlay with USE=progress-redirect" - fi - if has_version "=unionfs-fuse-0.25_alpha" - ewarn "Otherwise, if you use squash_dir with unionfs-fuse for the portage tree, put" - ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"\${PORTAGE_RSYNC_EXTRA_OPTS} --exclude=/.unionfs\"" - ewarn "into your /etc/make.conf" - fi - : -} - -pkg_postrm() { - check_for_obsolete - : -} diff --git a/sys-fs/squash_dir/squash_dir-12.3.ebuild b/sys-fs/squash_dir/squash_dir-12.3.ebuild new file mode 100644 index 00000000..f7642292 --- /dev/null +++ b/sys-fs/squash_dir/squash_dir-12.3.ebuild @@ -0,0 +1,82 @@ +# 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 eutils autotools 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 + title? ( >=app-shells/runtitle-2.3[zsh-completion?] ) + aufs? ( + || ( + sys-fs/aufs + sys-fs/aufs2 + sys-fs/aufs3 + ) + ) + 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}"} +} + +check_for_obsolete() { + local a + a="/etc/mtab.lock" + if test -p '/etc/mtab' && test -e "${a}" + then ewarn + ewarn "${a} is probably left from a previous install and now obsolete." + ewarn "You probably want to remove it." + ewarn + fi + a="${EPREFIX}/etc/portage/env/sys-fs/squashfs-tools" + test -e "${a}" && grep -q "squash_dir's hack" "${a}" || return 0 + ewarn "You probably had installed ${PN} with USE=hack-squash-utils" + ewarn "${a} is left from this." + ewarn "This file is now obsolete." + ewarn "It is recommended to remove it and to install instead" + ewarn "sys-fs/squashfs-tools from the mv overlay with USE=progress-redirect" + return 1 +} + +pkg_postinst() { + if check_for_obsolete && \ + ! has_version sys-fs/squashfs-tools[progress-redirect] + then ewarn "For better output of ${PN}, it is recommended to install" + ewarn "sys-fs/squashfs-tools from the mv overlay with USE=progress-redirect" + fi + if has_version "=unionfs-fuse-0.25_alpha" + ewarn "Otherwise, if you use squash_dir with unionfs-fuse for the portage tree, put" + ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"\${PORTAGE_RSYNC_EXTRA_OPTS} --exclude=/.unionfs\"" + ewarn "into your /etc/make.conf" + fi + : +} + +pkg_postrm() { + check_for_obsolete + : +} -- cgit v1.2.3-65-gdbad