diff options
author | Martin Väth <martin@mvath.de> | 2017-07-10 08:11:05 +0200 |
---|---|---|
committer | Martin Väth <martin@mvath.de> | 2017-07-10 08:11:05 +0200 |
commit | 076140811b2689a0e559485b345aa991a8337ad7 (patch) | |
tree | 3bf68b863ceb20246266e87aa44e78f6edaf0152 /sys-fs | |
parent | www-plugins/classic-theme-restorer: Version bump (diff) | |
download | mv-076140811b2689a0e559485b345aa991a8337ad7.tar.gz mv-076140811b2689a0e559485b345aa991a8337ad7.tar.bz2 mv-076140811b2689a0e559485b345aa991a8337ad7.zip |
Make nonexpensive deps non-optional. Remove corresponding set data
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/emount/emount-3.0.4.ebuild | 12 | ||||
-rw-r--r-- | sys-fs/squashmount/squashmount-15.4.3.ebuild | 12 |
2 files changed, 14 insertions, 10 deletions
diff --git a/sys-fs/emount/emount-3.0.4.ebuild b/sys-fs/emount/emount-3.0.4.ebuild index a9e70f73..f5e243f8 100644 --- a/sys-fs/emount/emount-3.0.4.ebuild +++ b/sys-fs/emount/emount-3.0.4.ebuild @@ -3,7 +3,6 @@ EAPI=6 RESTRICT="mirror" -inherit eutils DESCRIPTION="mount/unmount create/remove dm-crypt filesystems according to your /etc/fstab" HOMEPAGE="https://github.com/vaeth/emount/" @@ -14,8 +13,13 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" +# This should really depend on a USE-flag but must not by policy. +# Waiting for https://bugs.gentoo.org/show_bug.cgi?id=424283 +OPTIONAL_RDEPEND="dev-perl/String-ShellQuote" + RDEPEND=">=dev-lang/perl-5.6.1 - sys-fs/cryptsetup" + sys-fs/cryptsetup + ${OPTIONAL_RDEPEND}" # || ( >=dev-lang/perl-5.6.1 >=virtual/perl-Getopt-Long-2.24 ) # || ( >=dev-lang/perl-5.4.5 virtual/perl-File-Spec ) @@ -38,7 +42,3 @@ src_install() { insinto /usr/share/zsh/site-functions doins zsh/* } - -pkg_postinst() { - optfeature "improved output" 'dev-perl/String-ShellQuote' -} diff --git a/sys-fs/squashmount/squashmount-15.4.3.ebuild b/sys-fs/squashmount/squashmount-15.4.3.ebuild index 6e2b25c1..042ab6c4 100644 --- a/sys-fs/squashmount/squashmount-15.4.3.ebuild +++ b/sys-fs/squashmount/squashmount-15.4.3.ebuild @@ -15,11 +15,18 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" IUSE="" +# These should really depend on USE-flags but must not by policy. +# Waiting for https://bugs.gentoo.org/show_bug.cgi?id=424283 +OPTIONAL_RDEPEND="app-shells/runtitle +dev-perl/File-Which +dev-perl/String-ShellQuote" + RDEPEND="!<sys-apps/openrc-0.13 >=dev-lang/perl-5.22 || ( dev-perl/File-Which sys-apps/which ) sys-fs/squashfs-tools - !<sys-fs/unionfs-fuse-0.25" + !<sys-fs/unionfs-fuse-0.25 + ${OPTIONAL_RDEPEND}" # >=dev-lang/perl-5.12 # || ( >=dev-lang/perl-5.10.1 >=virtual/perl-File-Path-2.6.5 ) # || ( >=dev-lang/perl-5.4.5 virtual/perl-File-Spec ) @@ -63,9 +70,6 @@ src_install() { } pkg_postinst() { - optfeature "status bar support" 'app-shells/runtitle' - optfeature "improved compatibility and security" 'dev-perl/File-Which' - optfeature "improved output" 'dev-perl/String-ShellQuote' optfeature "user mounting" \ '>=sys-fs/squashfuse-0.1.100 >=sys-fs/unionfs-fuse-0.25' \ '>=sys-fs/squashfuse-0.1.100 sys-fs/funionfs' |