Bump squash_dir. Log instead of depend where reasonable. Update checksums

20 files changed, 116 insertions, 114 deletions

diff --git a/app-portage/logclean/ChangeLog b/app-portage/logclean/ChangeLog
index 724469ce..74b0e39e 100644
--- a/app-portage/logclean/ChangeLog
+++ b/app-portage/logclean/ChangeLog
@@ -4,6 +4,9 @@
 
 *logclean-8.2 (11 Nov 2012)
 
+  01 Dev 2012; Martin Väth <martin@mvath.de>
+  Remove USE=eix; only log recommendation if appropriate
+
   11 Nov 2012; Martin Väth <martin@mvath.de>
   Version bump, remove old ebuild.
 
diff --git a/app-portage/logclean/logclean-8.2.ebuild b/app-portage/logclean/logclean-8.2.ebuild
index 9d84ff05..759e23d9 100644
--- a/app-portage/logclean/logclean-8.2.ebuild
+++ b/app-portage/logclean/logclean-8.2.ebuild
@@ -13,11 +13,10 @@ SRC_URI="http://github.com/vaeth/${PN}/tarball/release-${PV} -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+eix zsh-completion"
+IUSE="zsh-completion"
 
 RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long
-	eix? ( app-portage/eix )"
+	virtual/perl-Getopt-Long"
 
 src_prepare() {
 	epatch_user
@@ -32,3 +31,8 @@ src_install() {
 			doins "_${PN}"
 	fi
 }
+
+pkg_postinst() {
+	has_version app-portage/eix || \
+		elog "Installing app-portage/eix will speed up execution time"
+}
diff --git a/app-portage/logclean/metadata.xml b/app-portage/logclean/metadata.xml
index 02b42a05..7d030fd7 100644
--- a/app-portage/logclean/metadata.xml
+++ b/app-portage/logclean/metadata.xml
@@ -13,7 +13,4 @@
 		<bugs-to>mailto:martin@mvath.de</bugs-to>
 		<remote-id type="github">vaeth/logclean</remote-id>
 	</upstream>
-	<use>
-		<flag name="eix">Pull in eix for quicker execution</flag>
-	</use>
 </pkgmetadata>
diff --git a/app-portage/portage-bashrc-mv/ChangeLog b/app-portage/portage-bashrc-mv/ChangeLog
index 54608ea4..656a8c1f 100644
--- a/app-portage/portage-bashrc-mv/ChangeLog
+++ b/app-portage/portage-bashrc-mv/ChangeLog
@@ -4,6 +4,9 @@
 
 *portage-bashrc-mv-12.0 (04 Nov 2012)
 
+  01 Dev 2012; Martin Väth <martin@mvath.de>
+  Remove USE=eix; only log recommendation if appropriate
+
   04 Nov 2012; Martin Väth <martin@mvath.de>
   Version bump, remove old ebuild. Globally rename GPO->PGO, gpo->pgo
 
diff --git a/app-portage/portage-bashrc-mv/metadata.xml b/app-portage/portage-bashrc-mv/metadata.xml
index d8165f2c..cb260f08 100644
--- a/app-portage/portage-bashrc-mv/metadata.xml
+++ b/app-portage/portage-bashrc-mv/metadata.xml
@@ -13,7 +13,4 @@
 		<bugs-to>mailto:martin@mvath.de</bugs-to>
 		<remote-id type="github">vaeth/portage-bashrc-mv</remote-id>
 	</upstream>
-	<use>
-		<flag name="eix">Pull in >=app-portage/eix-0.25.6 for proper mask handling</flag>
-	</use>
 </pkgmetadata>
diff --git a/app-portage/portage-bashrc-mv/portage-bashrc-mv-12.0.ebuild b/app-portage/portage-bashrc-mv/portage-bashrc-mv-12.0.ebuild
index 59565b56..ca4183fc 100644
--- a/app-portage/portage-bashrc-mv/portage-bashrc-mv-12.0.ebuild
+++ b/app-portage/portage-bashrc-mv/portage-bashrc-mv-12.0.ebuild
@@ -13,9 +13,7 @@ SRC_URI="http://github.com/vaeth/${PN}/tarball/release-${PV} -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+eix"
-
-RDEPEND="eix? ( >=app-portage/eix-0.25.6 )"
+IUSE=""
 
 src_prepare() {
 	epatch_user
@@ -28,6 +26,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	has_version app-portage/eix || \
+		elog "Installing app-portage/eix will improve mask handling"
 	! test -d /var/cache/gpo || \
 		ewarn 'Obsolete /var/cache/gpo found. Please remove'
 }
diff --git a/app-portage/trickyfetch/ChangeLog b/app-portage/trickyfetch/ChangeLog
index c3c3ce9c..49909971 100644
--- a/app-portage/trickyfetch/ChangeLog
+++ b/app-portage/trickyfetch/ChangeLog
@@ -4,6 +4,9 @@
 
 *trickyfetch-7.3 (25 Nov 2012)
 
+  01 Dev 2012; Martin Väth <martin@mvath.de>
+  Remove USE=eix; only log recommendation if appropriate
+
   25 Nov 2012; Martin Väth <martin@mvath.de>
   Version bump, remove old ebuild. Make getdelta support optional
 
diff --git a/app-portage/trickyfetch/metadata.xml b/app-portage/trickyfetch/metadata.xml
index a332b7a7..6a18283d 100644
--- a/app-portage/trickyfetch/metadata.xml
+++ b/app-portage/trickyfetch/metadata.xml
@@ -14,7 +14,6 @@
 		<remote-id type="github">vaeth/trickyfetch</remote-id>
 	</upstream>
 	<use>
-		<flag name="eix">Pull in eix for quicker execution</flag>
 		<flag name="getdelta">Support getdelta</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-portage/trickyfetch/trickyfetch-7.3.ebuild b/app-portage/trickyfetch/trickyfetch-7.3.ebuild
index 9c8a1947..e8ce80c4 100644
--- a/app-portage/trickyfetch/trickyfetch-7.3.ebuild
+++ b/app-portage/trickyfetch/trickyfetch-7.3.ebuild
@@ -13,10 +13,9 @@ SRC_URI="http://github.com/vaeth/${PN}/tarball/release-${PV} -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+eix getdelta zsh-completion"
+IUSE="getdelta zsh-completion"
 
-RDEPEND="eix? ( app-portage/eix )
-getdelta? ( app-portage/getdelta )"
+RDEPEND="getdelta? ( app-portage/getdelta )"
 
 src_prepare() {
 	local use_getdelta=false
@@ -35,3 +34,8 @@ src_install() {
 	fi
 	dodoc README
 }
+
+pkg_postinst() {
+	has_version app-portage/eix || \
+		elog "Installing app-portage/eix will speed up execution time"
+}
diff --git a/app-portage/useflags/ChangeLog b/app-portage/useflags/ChangeLog
index d79ff500..fca43edd 100644
--- a/app-portage/useflags/ChangeLog
+++ b/app-portage/useflags/ChangeLog
@@ -4,6 +4,9 @@
 
 *useflags-2.9 (11 Nov 2012)
 
+  01 Dev 2012; Martin Väth <martin@mvath.de>
+  Remove USE=eix; only log recommendation if appropriate
+
   11 Nov 2012; Martin Väth <martin@mvath.de>
   Version bump, remove old ebuild.
 
diff --git a/app-portage/useflags/metadata.xml b/app-portage/useflags/metadata.xml
index a7cb2a45..4e3965d1 100644
--- a/app-portage/useflags/metadata.xml
+++ b/app-portage/useflags/metadata.xml
@@ -13,7 +13,4 @@
 		<bugs-to>mailto:martin@mvath.de</bugs-to>
 		<remote-id type="github">vaeth/useflags</remote-id>
 	</upstream>
-	<use>
-		<flag name="eix">Pull in eix for quicker execution</flag>
-	</use>
 </pkgmetadata>
diff --git a/app-portage/useflags/useflags-2.8.ebuild b/app-portage/useflags/useflags-2.8.ebuild
index a022afa5..8167038a 100644
--- a/app-portage/useflags/useflags-2.8.ebuild
+++ b/app-portage/useflags/useflags-2.8.ebuild
@@ -13,11 +13,10 @@ SRC_URI="http://github.com/vaeth/${PN}/tarball/release-${PV} -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+eix zsh-completion"
+IUSE="zsh-completion"
 
 RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long
-	eix? ( app-portage/eix )"
+	virtual/perl-Getopt-Long"
 
 src_prepare() {
 	epatch_user
@@ -30,3 +29,8 @@ src_install() {
 			doins "_${PN}"
 	fi
 }
+
+pkg_postinst() {
+	has_version app-portage/eix || \
+		elog "Installing app-portage/eix will speed up execution time"
+}
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index d16c7a4f..d7c43ce0 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -12,11 +12,7 @@ app-portage/eix:security - This adds some checks which can prevent certain explo
 app-portage/eix:sqlite - Compile in support for portage's sqlite backend; to actually use it you need additional configuration of portage and eix
 app-portage/eix:strong-optimization - Adds several more agressive CXXFLAGS/LDFLAGS for optimization like graphite (if available). May cause trouble with some buggy compiler versions. Absense of this USE flag does not strip user's *FLAGS
 app-portage/eix:tools - Create separate binary for script helper tools; useful if they are called extremely often
-app-portage/logclean:eix - Pull in eix for quicker execution
-app-portage/portage-bashrc-mv:eix - Pull in >=app-portage/eix-0.25.6 for proper mask handling
-app-portage/trickyfetch:eix - Pull in eix for quicker execution
 app-portage/trickyfetch:getdelta - Support getdelta
-app-portage/useflags:eix - Pull in eix for quicker execution
 app-shells/auto-fu-zsh:compile - Byte-compile to speed up
 app-shells/auto-fu-zsh:kill-line - Make Ctrl-D work correctly and in case of nonempty buffer work as kill-line resp. kill-whole-line
 app-shells/zsh:completion_AIX - install completions for AIX
@@ -92,5 +88,4 @@ sys-fs/squash_dir:title - Support for statusline changes (requires app-shells/ru
 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
 sys-kernel/kernel:title - Support for statusline changes (requires app-shells/runtitle)
diff --git a/sys-fs/squash_dir/ChangeLog b/sys-fs/squash_dir/ChangeLog
index ae90b58d..d480b7ee 100644
--- a/sys-fs/squash_dir/ChangeLog
+++ b/sys-fs/squash_dir/ChangeLog
@@ -4,6 +4,10 @@
 
 *squash_dir-12.3 (23 Nov 2012)
 
+  01 Dec 2012; Martin Väth <martin@mvath.de>
+  Version bump, remove old ebuild. Provide USE for ORDER default
+  Print logs instead of making hard dependencies
+
   23 Nov 2012; Martin Väth <martin@mvath.de>
   Version bump, remove old ebuild. Provide USE for ORDER default
 
diff --git a/sys-fs/squash_dir/Manifest b/sys-fs/squash_dir/Manifest
index 0fa71e89..01169a0d 100644
--- a/sys-fs/squash_dir/Manifest
+++ b/sys-fs/squash_dir/Manifest
@@ -1 +1 @@
-DIST squash_dir-12.3.tar.gz 28133 SHA256 7c775fcd39cee2f8f99de8777127ba6b1817103685147b6a5daa75ec39ed6e5e SHA512 ba6accca6103aad64e975161df53446c1c7ba720db17326549672cfa020d0e58fd1f3507689cfa8f1e7e42ffeafcc221a2f5b7c1e5b211ed1d0aad559e2e65ad WHIRLPOOL ed3c209bef234828cfa1444501b0592cd84ef2b66a42f4ad985a5874e0029a18f89f5d754384098d244e607a999697a9195a8f3c8eaa5d73a66ba110b6d5eb53
+DIST squash_dir-12.4.tar.gz 27588 SHA256 604729ec6cd79dde501ef40cd5ed7f7d65ca446066a212467c0ad5b1b9cc573e SHA512 5df3b92910350e1f1602944f8ce030f17f38b4c25880895405bff1f18cd89241fddcca4550ab45fea8e85fbb003e863238713e9b233c5ae18d7e89f79dd53c57 WHIRLPOOL 3e4c2d395311b5fc4f874874f64f67de0bf152ee034849af97873921e66861587c30f7bcbdc1936491815f97b2e8af608c78cf47828a3fbb7ee80a3bf2ec8e44
diff --git a/sys-fs/squash_dir/squash_dir-12.3.ebuild b/sys-fs/squash_dir/squash_dir-12.3.ebuild
deleted file mode 100644
index f7642292..00000000
--- a/sys-fs/squash_dir/squash_dir-12.3.ebuild
+++ /dev/null
@@ -1,82 +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="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 "<sys-fs/unionfs-fuse-0.25_alpha"
-	then	ewarn "It is recommended to use >=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.4.ebuild b/sys-fs/squash_dir/squash_dir-12.4.ebuild
new file mode 100644
index 00000000..0e511922
--- /dev/null
+++ b/sys-fs/squash_dir/squash_dir-12.4.ebuild
@@ -0,0 +1,65 @@
+# 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
+	!<sys-fs/unionfs-fuse-0.25
+	title? ( >=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}"}
+}
+
+pkg_postinst() {
+	local CONFIG_CHECK fs=overlayfs sep=:
+	use unionfs-fuse && fs=unionfs-fuse
+	use aufs && fs=aufs
+	use overlayfs && fs=overlayfs
+	CONFIG_CHECK="~SQUASHFS"
+	case ${fs} in
+	overlayfs)
+		CONFIG_CHECK="${CONFIG_CHECK} ~OVERLAYFS_FS"
+		elog "To use ${PN} activate overlayfs in your kernel."
+		elog "Unless you use a patched kernel, apply e.g. top patches from some head of"
+		elog "http://git.kernel.org/?p=linux/kernel/git/mszeredi/vfs.git;a=summary"
+		sep=elog;;
+	aufs)
+		if ! has_version sys-fs/aufs3 && ! has_version sys-fs/aufs2
+		then	CONFIG_CHECK="${CONFIG_CHECK} ~AUFS_FS"
+			elog "To use ${PN} activate aufs in your kernel. Use e.g. sys-fs/aufs*"
+			sep=elog
+		fi;;
+	esac
+	check_extra_config
+	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-kernel/kernel/ChangeLog b/sys-kernel/kernel/ChangeLog
index b58c1d11..a37800d6 100644
--- a/sys-kernel/kernel/ChangeLog
+++ b/sys-kernel/kernel/ChangeLog
@@ -4,7 +4,10 @@
 
 *kernel-1.26 (17 Nov 2012)
 
-  17 Oct 2012; Martin Väth <martin@mvath.de>
+  01 Dev 2012; Martin Väth <martin@mvath.de>
+  Remove USE=eix; only log recommendation if appropriate
+
+  17 Nov 2012; Martin Väth <martin@mvath.de>
   Version bump, remove old ebuild. Improve zsh-completion
 
 *kernel-1.25 (21 Oct 2012)
diff --git a/sys-kernel/kernel/kernel-1.26.ebuild b/sys-kernel/kernel/kernel-1.26.ebuild
index f8b098dd..61abfad8 100644
--- a/sys-kernel/kernel/kernel-1.26.ebuild
+++ b/sys-kernel/kernel/kernel-1.26.ebuild
@@ -13,11 +13,10 @@ SRC_URI="http://github.com/vaeth/${PN}/tarball/release-${PV} -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+eix +title zsh-completion"
+IUSE="+title zsh-completion"
 RDEPEND="app-admin/sudo
 	app-admin/sudox
 	app-shells/push
-	eix? ( app-portage/eix )
 	title? ( >=app-shells/runtitle-2.3[zsh-completion?] )"
 DEPEND=""
 
@@ -32,3 +31,8 @@ src_install() {
 			doins _*
 	fi
 }
+
+pkg_postinst() {
+	has_version app-portage/eix || \
+		elog "Installing app-portage/eix will speed up execution time"
+}
diff --git a/sys-kernel/kernel/metadata.xml b/sys-kernel/kernel/metadata.xml
index 9d1ceb54..f1c5f9d4 100644
--- a/sys-kernel/kernel/metadata.xml
+++ b/sys-kernel/kernel/metadata.xml
@@ -14,7 +14,6 @@
 		<remote-id type="github">vaeth/kernel</remote-id>
 	</upstream>
 	<use>
-		<flag name="eix">Pull in eix for quicker execution</flag>
 		<flag name="title">Support for statusline changes (requires app-shells/runtitle)</flag>
 	</use>
 </pkgmetadata>