summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--virtual/miller-base/Manifest2
-rw-r--r--virtual/miller-base/miller-base-7-r1.ebuild5
2 files changed, 4 insertions, 3 deletions
diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest
index 6e05175..7baa5cc 100644
--- a/virtual/miller-base/Manifest
+++ b/virtual/miller-base/Manifest
@@ -44,4 +44,4 @@ AUX weekly-av-scan.cron 195 RMD160 3e80c75ccf3d09ddeb3cfc49d11ebdd369df1695 SHA1
AUX weekly-distclean-exec-eclean.cron 40 RMD160 3c0f801ebbb3e575590aa7764e5020a820e5f5fe SHA1 a077c7c5265c3d9817fa4846dbbab8bc9addfeb5 SHA256 dbb37593b994102324c5a24b5d5d21597c215924a29d065d84b8c64af3049b38
AUX weekly-distclean-exec.cron 664 RMD160 af55d070f6f442feedbfb7a324ccaa5ceff53037 SHA1 76f91d4eac90a44f3d9e636640279d1754f2739e SHA256 98808e9a3402beea0f023db32cd09df6195d608256672e01d7f05e21536af141
AUX write-new-updates 108 RMD160 1eccc342427d7c6523f23f8d7bd4bf2966638cb2 SHA1 8886bae7ac2c2f01c6cbd47ffcaa15ffcc210214 SHA256 b910f8d64a069e8038965c1c8af3bf05729f027e2da264cd6e0fa2ea627ec164
-EBUILD miller-base-7-r1.ebuild 2974 RMD160 741eb445f28c7b2225840ddf0238f7afccc43d01 SHA1 4b36a899016439a004cbe6732dfdbd722661a355 SHA256 fc9e4d8f8d9e97ba8d08fc89bcadc2ba9d737821e8bb561fc2d812886fe2f3b7
+EBUILD miller-base-7-r1.ebuild 2977 RMD160 ea51242b3b808f7ffaae50f19349d6079d473c0d SHA1 04dc63191fffa2613c220658f0b2a7812d5fa8c3 SHA256 a00d073cc1055f331eebb26b4ce96b3151c2cb1d705a34483d1ac504c2d435c9
diff --git a/virtual/miller-base/miller-base-7-r1.ebuild b/virtual/miller-base/miller-base-7-r1.ebuild
index 141d5c1..e2e1c5e 100644
--- a/virtual/miller-base/miller-base-7-r1.ebuild
+++ b/virtual/miller-base/miller-base-7-r1.ebuild
@@ -38,12 +38,13 @@ DEPEND="
!minimal? ( app-antivirus/clamav )
!hardened? ( sys-kernel/tuxonice-sources )
hardened? ( sys-kernel/hardened-sources )
- !minimal? ( app-text/unix2dos )
+ !minimal? ( ||
+ ( app-text/unix2dos app-text/dos2unix )
+ >=app-text/dos2unix-5 )
app-misc/screen
sys-boot/grub
app-vim/gentoo-syntax
sys-apps/kexec-tools
- !minimal? ( app-text/dos2unix )
sys-auth/pam_ldap
sys-auth/nss_ldap
app-editors/gvim