12 files changed, 35 insertions, 110 deletions
diff --git a/app-portage/find_cruft/ChangeLog b/app-portage/find_cruft/ChangeLog
index b8dbc7c9..f01ac0e7 100644
--- a/app-portage/find_cruft/ChangeLog
+++ b/app-portage/find_cruft/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*find_cruft-3.0 (29 Aug 2014)
+
+  29 Aug 2014; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
 *find_cruft-2.4 (10 Feb 2014)
 
   06 Jul 2014; Martin Väth <martin@mvath.de>:
@@ -11,7 +16,7 @@
   Use optfeature
 
   01 Feb 2013; Martin Väth <martin@mvath.de>:
-  Version bump, remove old ebuild.
+  Version bump, remove old ebuild
 
 *find_cruft-2.3-r1 (17 Dec 2013)
 
@@ -21,7 +26,7 @@
 *find_cruft-2.3 (21 Nov 2013)
 
   21 Nov 2013; Martin Väth <martin@mvath.de>:
-  Version bump, remove old ebuild.
+  Version bump, remove old ebuild
 
 *find_cruft-2.2 (02 Nov 2013)
 
@@ -34,12 +39,12 @@
   Install zsh-completion unconditionally according to gentoo policy
 
   21 Aug 2013; Martin Väth <martin@mvath.de>:
-  Version bump, remove old ebuild.
+  Version bump, remove old ebuild
 
 *find_cruft-2.0 (18 May 2013)
 
   18 May 2013; Martin Väth <martin@mvath.de>:
-  Version bump, remove old ebuild. Create /etc. Warn if eix is not installed.
+  Version bump, remove old ebuild. Create /etc. Warn if eix is not installed
 
   10 Jun 2013; Martin Väth <martin@mvath.de>:
   Improve eix message
@@ -47,4 +52,4 @@
 *find_cruft-1.0 (16 May 2013)
 
   16 May 2013; Martin Väth <martin@mvath.de>:
-  New ebuild from scratch.
+  New ebuild from scratch
diff --git a/app-portage/find_cruft/Manifest b/app-portage/find_cruft/Manifest
index 3267b66c..b86093b2 100644
--- a/app-portage/find_cruft/Manifest
+++ b/app-portage/find_cruft/Manifest
@@ -1 +1 @@
-DIST find_cruft-2.4.tar.gz 9224 SHA256 b071979fd9a8481a81cf1d9ce417e1b77a57160fac603a196187fc5b5c934b31 SHA512 2babec633ff198c7075652b0629ef3af40db5c5dddedcbf5fc946eab0764d757fca75dc6ef972c6a85729530d6a1d558486149a10d22a71e22920ed1df779e04 WHIRLPOOL ad3f4fb0841bf486bf93c513804352d5e8704a33dd5f2260e70c69ea33cef06bb6a57708ae3c09a346c9955e6a465475e47ed6089b32fa50a4fef6c43ae41889
+DIST find_cruft-3.0.tar.gz 9983 SHA256 af10b309ffbe2f136a101d4096e1b2687ba10a68d92ef2cf472a71b397e22372 SHA512 c966114e4b5d1d4ee35031cb8a9ab456981cd75df66ae73153c6e170ad3641a774c031e389cf3cad0c99ef6cd5d3a86fd7f1c2e77be2ca68258df190f43dfbf9 WHIRLPOOL 146dfd82625f8587a346c5efda2161c46a14037cfa8d076d3c0282a2d9cc12d50b73cd1fe14aef668e4ff7a7f2bb4d5c7d98faf9dd023a79531ed569cb5f5073
diff --git a/app-portage/find_cruft/find_cruft-2.4.ebuild b/app-portage/find_cruft/find_cruft-3.0.ebuild
index 91604826..090ab63c 100644
--- a/app-portage/find_cruft/find_cruft-2.4.ebuild
+++ b/app-portage/find_cruft/find_cruft-3.0.ebuild
@@ -8,7 +8,7 @@ inherit eutils
 
 DESCRIPTION="find cruft files not managed by portage"
 HOMEPAGE="https://github.com/vaeth/find_cruft/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -16,6 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl
+	virtual/perl-File-Spec
 	virtual/perl-Getopt-Long"
 
 src_prepare() {
@@ -29,8 +30,7 @@ src_install() {
 	dobin bin/*
 	dodoc README
 	insinto /etc
-	doins etc/*
-	dodir /etc/find_cruft.d
+	doins -r etc/*
 	insinto /usr/share/zsh/site-functions
 	doins zsh/_*
 }
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index c5188d88..27f47ce7 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,2 +1,2 @@
-DIST zsh-5.0.5-doc.tar.bz2 2940018 SHA256 e4f22bafaa8410bbc2d83f2d748ca4764365752c46f7e1099be54f2a62c492f2 SHA512 341e4a62c7c2367d17c54c5133b7c0a74e6c0becfaddd3c1f5dbe782300bbd74b0fc2066e892776cb52ce11cd0600739bfd5a7dd067eaae8a1d11b1b2aa0c3b0 WHIRLPOOL 48e021bc2caf840d048888faf5cafea5ce698968479e1c8791f33dc36f9b0f60db16ff481e88ce8c903480d905b728eb9ff9dfc8fbcb066d3698cc0cc3a02d8a
-DIST zsh-5.0.5.tar.bz2 3104375 SHA256 6624d2fb6c8fa4e044d2b009f86ed1617fe8583c83acfceba7ec82826cfa8eaf SHA512 34d69bed190cbc476bcdaa4b703fee1caaeae7e011fe7ea595b29bbd31df57bbe4d19b5940618e0c89a0a4b6c476f9ef03ce9829b4fb3735c1aedf309b0225a5 WHIRLPOOL bf02ca194261e15e88a9e26212644aa7be1afcc8e73cd6bb18ffb8e1c1d46a8742fee109d92a3b455c418258df9ae74dece21a05ff0e54e8c370af094512af16
+DIST zsh-5.0.6-doc.tar.bz2 2999237 SHA256 b273a568682682cc1f00885aba118c7400cacfdbc0ecdf32fd5f9b820b8acfd6 SHA512 22d0b1ac03426413e8132602efc812343e77ee0fda399da2601dfde8c92aabc38eda33a9b459a7ae44542ac8ad0f6c9b3e36e2134521cc0993a84ae573500fd8 WHIRLPOOL d837cadfae5ea6818c731ddb58252f2ae1f2919dd9a1efe804b7a6d2c32d8dd0d4ade9996e83950c479a3f5a4335d56d71f81bffc4de2410406d9840089de0a0
+DIST zsh-5.0.6.tar.bz2 3174858 SHA256 84ca509b141533a3b695e314fbce1200b86ff337ab7dd9e3414da05d86378845 SHA512 bd28ebf9adb4a85e6cb9c9bc1eb7ab412a0bf467a9769021d6cd93b13b99ae961a57158374b935e615b54be92074c7adfc22434d204646110adedef4ff526c3f WHIRLPOOL a3091bd096382e615777047814b2d7a04b34d03d7111db552f749aa978f236f9fa8a1426dbbe00e1172432cce35b34374d85d5e7e543c6d1f1bf9c53832d9969
diff --git a/app-shells/zsh/zsh-5.0.5.ebuild b/app-shells/zsh/zsh-5.0.6.ebuild
index 993de82c..993de82c 120000
--- a/app-shells/zsh/zsh-5.0.5.ebuild
+++ b/app-shells/zsh/zsh-5.0.6.ebuild
diff --git a/app-shells/zsh/zsh-99999999.ebuild b/app-shells/zsh/zsh-99999999.ebuild
index 3ac7616c..9df1f948 100644
--- a/app-shells/zsh/zsh-99999999.ebuild
+++ b/app-shells/zsh/zsh-99999999.ebuild
@@ -46,17 +46,16 @@ case ${PV} in
 # Please let me know if you have an arch where "colcrt" (or at least "col")
 # is provided by a different package.
 	DEPEND="app-text/yodl
-		run-help? (
-			dev-lang/perl
-			sys-apps/man
-			sys-apps/util-linux
-		)"
+		dev-lang/perl
+		sys-apps/man
+		sys-apps/util-linux"
 	PROPERTIES="live"
 	LIVE=:;;
 *)
 	SRC_URI="${ZSH_URI}
 		doc? ( ${ZSH_DOC_URI} )"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	#KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	DEPEND=""
 	LIVE=false;;
 esac
@@ -73,9 +72,7 @@ do	case ${curr} in
 	esac
 	IUSE+=" completion_${curr}"
 done
-IUSE+=" debug doc examples gdbm maildir pcre"
-${LIVE} && IUSE+=" +run-help"
-IUSE+=" static unicode"
+IUSE+=" debug doc examples gdbm maildir pcre static unicode"
 
 RDEPEND="
 	>=sys-libs/ncurses-5.1
@@ -122,9 +119,9 @@ zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/."
 
 src_prepare() {
 	# fix zshall problem with soelim
-	ln -s Doc man1
-	mv Doc/zshall.1 Doc/zshall.1.soelim
-	soelim Doc/zshall.1.soelim > Doc/zshall.1
+	ln -s Doc man1 || die
+	mv Doc/zshall.1 Doc/zshall.1.soelim || die
+	soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
 
 	epatch "${FILESDIR}"/${PN}-init.d-gentoo-r1.diff
 
@@ -169,11 +166,6 @@ src_configure() {
 			--enable-zsh-secure-free \
 			--enable-zsh-hash-debug"
 	fi
-	if ! ${LIVE} || use run-help ; then
-		myconf+=" --enable-runhelpdir=\"${EPREFIX}/usr/share/zsh/${PVPATH}/help\""
-	else
-		myconf+=" --disable-runhelpdir"
-	fi
 
 	if [[ ${CHOST} == *-darwin* ]]; then
 		myconf+=" --enable-libs=-liconv"
@@ -284,8 +276,7 @@ src_install() {
 	if use doc ; then
 		pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
 		dohtml -r Doc/*
-		insinto /usr/share/doc/${PF}
-		doins Doc/zsh.{dvi,pdf}
+		dodoc Doc/zsh.{dvi,pdf}
 		popd >/dev/null
 	fi
 
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 1196c538..a6805501 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -115,6 +115,5 @@ sys-fs/squash_dir:overlayfs - Prefer overlayfs
 sys-fs/squash_dir:unionfs-fuse - Prefer unionfs-fuse
 sys-fs/squashfs-tools:lz4 - Enable support for LZ4 compression using app-arch/lz4
 sys-fs/squashfs-tools:xz - Enable support for XZ ("LZMA2") compression using app-arch/xz-utils
-sys-fs/squashmount:examples - Install sample config as /etc/squashmount-example.pl instead of /etc/squashmount.pl
 sys-process/systemd-cron:cron-boot - Enable systemd boot cron target
 sys-process/systemd-cron:yearly - Enable systemd yearly cron target
diff --git a/sys-fs/squashmount/ChangeLog b/sys-fs/squashmount/ChangeLog
index 963f5ba9..9055d0fe 100644
--- a/sys-fs/squashmount/ChangeLog
+++ b/sys-fs/squashmount/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*squashmount-8.7 (29 Aug 2014)
+
+  20 Aug 2014; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuilds. Remove IUSE=examples.d. Add find_cruft.d
+
 *squashmount-8.6 (23 Aug 2014)
 
   23 Aug 2014; Martin Väth <martin@mvath.de>:
diff --git a/sys-fs/squashmount/Manifest b/sys-fs/squashmount/Manifest
index 12a39c02..fef3389e 100644
--- a/sys-fs/squashmount/Manifest
+++ b/sys-fs/squashmount/Manifest
@@ -1,2 +1 @@
-DIST squashmount-6.3.tar.gz 42040 SHA256 84ddd130691f97ad7b422d8ea507ebdfa61704c8ec0e5e8348b4fa2edda9200e SHA512 f271dbc3ac0234da716aeeb523ee999f0efc0d3829188fad117c9fad5f5dd031e2a12282571ebbaeef2207a53a03572bd00be65169b02925e45ac34ea0e481bb WHIRLPOOL 3a7a63b6422b035f2b46a7e8bded94bb4e76a3125396c4d2e2bc402657b6f8ba086c0a926134695d5761aced55d2ff482aafa7c82980329a2752720cb27d0d7e
-DIST squashmount-8.6.tar.gz 51896 SHA256 1dc7c163d370a145eb5cf7214544c088cebc779886cb7c73bc55d3c213671dbe SHA512 a9ae73578e4a420ac0b0d0ad7c3a18cedd37410f37edb2dfc999f2641dea974ac38432281a8ff00a3fd7a11e031235ef426ca3de1f9c217845a3bcd697ab7891 WHIRLPOOL 89710245b8a1dd70c2d37281d6b49d7dc3f42e086c9fc9718928cb69503867375386da14fb11117da4b03bf676b9cd6abde079644c8af2e379550c8a608ee369
+DIST squashmount-8.7.tar.gz 52125 SHA256 95a804443f8de8a98c907bd62f2a124031a6eafb6a738fa860877aa13bd608ff SHA512 b5f0873201b39ff08d98f794416875eb6f4fc13f71a99c4b36aca4c54847c23f4d1d95dafdf9d807f895f9877c6a9ccae08387d3e1df6c4f0bb74c37754cf2bb WHIRLPOOL 99e99a5b0c3e99c8ae2244ad92098c60cf61bb0af361358b21501a070c6ac2d29ee1d178f58972f3463d7223f1778ed07f1cf0470113f3ccbaa019386e73bcec
diff --git a/sys-fs/squashmount/metadata.xml b/sys-fs/squashmount/metadata.xml
index c425445d..5c80606b 100644
--- a/sys-fs/squashmount/metadata.xml
+++ b/sys-fs/squashmount/metadata.xml
@@ -13,7 +13,4 @@
 		<bugs-to>mailto:martin@mvath.de</bugs-to>
 		<remote-id type="github">vaeth/squashmount</remote-id>
 	</upstream>
-	<use>
-		<flag name="examples">Install sample config as /etc/squashmount-example.pl instead of /etc/squashmount.pl</flag>
-	</use>
 </pkgmetadata>
diff --git a/sys-fs/squashmount/squashmount-6.3.ebuild b/sys-fs/squashmount/squashmount-6.3.ebuild
deleted file mode 100644
index 06a052ab..00000000
--- a/sys-fs/squashmount/squashmount-6.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-RESTRICT="mirror"
-inherit eutils readme.gentoo systemd
-
-DESCRIPTION="Keep directories compressed with squashfs. Useful for portage tree, texmf-dist"
-HOMEPAGE="http://forums.gentoo.org/viewtopic-t-465367.html"
-SRC_URI="https://github.com/vaeth/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=app-shells/runtitle-2.3
-	dev-lang/perl
-	|| ( dev-perl/File-Which sys-apps/which )
-	virtual/perl-File-Path
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp
-	virtual/perl-Getopt-Long
-	sys-fs/squashfs-tools
-	!<sys-fs/unionfs-fuse-0.25"
-DEPEND=""
-
-DISABLE_AUTOFORMATTING="true"
-DOC_CONTENTS="Please adapt /etc/squashmount.pl to your needs.
-For improved output use squasfs-tools from the mv overlay.
-It is recommended to put into your zshrc the line:
-alias squashmount='noglob squashmount'"
-
-src_prepare() {
-	use prefix || sed -i \
-		-e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \
-		-- bin/* || die
-	epatch_user
-}
-
-src_install() {
-	dobin bin/*
-	dodoc README ChangeLog compress.txt
-	doinitd openrc/init.d/*
-	systemd_dounit systemd/system/*
-	insinto /etc
-	doins etc/*
-	insinto /usr/lib/tmpfiles.d
-	doins tmpfiles.d/*
-	insinto /usr/share/zsh/site-functions
-	doins zsh/*
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	optfeature "status bar support" 'app-shells/runtitle'
-	optfeature "improved compatibility and security" 'dev-perl/File-Which'
-	optfeature "colored output" 'virtual/perl-Term-ANSIColor'
-	optfeature "using ? or ?? attributes" '>=dev-lang/perl-5.12' 'virtual/perl-IO-Compress'
-	case " ${REPLACING_VERSIONS}" in
-	' '[0-9][0-9]*|' '[3-9]*|' '2.[0-9][0-9]*|' '2.[7-9]*)
-		:;;
-	*)
-		FORCE_PRINT_ELOG="true";;
-	esac
-	readme.gentoo_pkg_postinst
-}
diff --git a/sys-fs/squashmount/squashmount-8.6.ebuild b/sys-fs/squashmount/squashmount-8.7.ebuild
index 80d22354..737a688f 100644
--- a/sys-fs/squashmount/squashmount-8.6.ebuild
+++ b/sys-fs/squashmount/squashmount-8.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples"
+IUSE=""
 
 RDEPEND=">=app-shells/runtitle-2.3
 	dev-lang/perl
@@ -42,14 +42,11 @@ src_prepare() {
 
 src_install() {
 	dobin bin/*
-	dodoc README ChangeLog compress.txt
+	dodoc README ChangeLog compress.txt etc/squashmount.pl
 	doinitd openrc/init.d/*
 	systemd_dounit systemd/system/*
 	insinto /etc
-	if use examples
-	then	newins etc/squashmount.pl /squashmount-example.pl
-	else	doins etc/squashmount.pl
-	fi
+	doins -r etc/*
 	insinto /usr/lib/tmpfiles.d
 	doins tmpfiles.d/*
 	insinto /usr/share/zsh/site-functions