Bump find_cruft, squashmount, zsh

5 files changed, 9 insertions, 79 deletions

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