Drop duplicate dependencies and change lua prefix check to use usex.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x4F064CA3

diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog
index 37ce238f403e1575a8ffb09c08409a1c70a5735b..04a5ef4994d5c383f4efd3a9034473a8ed62248e 100644 (file)
--- a/app-editors/vim/ChangeLog
+++ b/app-editors/vim/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/vim
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.482 2014/12/23 08:25:59 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.483 2014/12/23 17:20:55 radhermit Exp $
+
+  23 Dec 2014; Tim Harder <radhermit@gentoo.org> vim-9999.ebuild:
+  Drop duplicate dependencies and change lua prefix check to use usex.
 
   23 Dec 2014; Fabian Groffen <grobian@gentoo.org> vim-7.4.542.ebuild,
   vim-9999.ebuild:

diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index ec8d9de0cbff9b4c36b9b89f3d7ab156fb312c8b..74d263f0852200027c926c1c4049987b0d253e1a 100644 (file)
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -13,15 +13,17 @@ EBUILD vim-7.4.273.ebuild 11591 SHA256 014baae49b7e6bfafc2f55997d75738f048ee7b33
 EBUILD vim-7.4.488.ebuild 11944 SHA256 bacdd6a7ed9f18723f30ab5e0787c7ebc5866d4049b4054fcb891714b2423e05 SHA512 09c0897b2ed5785e1ce0297c98bd79e799bad7062e44f0aa210fd397a30e1f6acb754273587e488a5eed02994eda77c74a78c071d43eb644353d36fe21d4b85c WHIRLPOOL 4bdbda58d50ce9178659b601b1d132a8c1cc1b17a1a2a1ed6f8f3ad3c9fce063a698e103f06633d05d0dc1bdb66a782019ec0b868a9612a7a016b37785d51a8d
 EBUILD vim-7.4.527.ebuild 11944 SHA256 deeb77a5c2ac1eafc87a9ffc8bea469b4e87b0a1e533d0db27e6cff658e4eee1 SHA512 74f7fc2d72e016d7420a8f57a874f31119f90ef9186fdd7bb761b43e022912604dcea86b1258d13a58e075957894ba813f32fc07f6308473786793d3f1d125a8 WHIRLPOOL 2f2a907d68ffbe1ec64b0b8c9113eb7f5df0da39092d71f0e9d6ec8df847c87700b095fc8261f163b936f06c66dabb29c9fd482c1ce14b0cb5d2379c509b1c26
 EBUILD vim-7.4.542.ebuild 11998 SHA256 bbb865bb61e76172a80ff39b8e1b98caca4edaebd5b3abc3394ecb8876fd6547 SHA512 f212de529f4c45b30ed89fb198e56767996eac11cf3b884984bc6ffdd071c9e4065b817dc4bf929c1e628594e1c4261d74e0e6e1ef80e52548e5dc348652744a WHIRLPOOL 17d5024c8c04f2daf2fc0e1e7bbd4adf6094c086c1c5f8dd604059dd19442b8250c86c2d69286dd4c3ee03454fc2b8a697dd1e30f3c91d8a8c3e2d41d54869ff
-EBUILD vim-9999.ebuild 11909 SHA256 8bfae4dbe50341adbb2c67bc3e4078a8c181ff0fb3b6a69e5cce523e0761a29d SHA512 b2b50127e8e99259a1238a5b89ed75aa1f1e7eb142cbd2945e9e3915721ca7f8c9c0f476d000c70e7788b7961787404feff37fdf6f0cfe2693de0387e21302ab WHIRLPOOL 0b4b82384daa033a35a1cd7b1fad80ff08eac8d29c1b185761e79c2958b1f4d5f4a25a95ae8fc6b99ebde24e6bc626188704cb45124fdcaa4c7165ced1b9bf44
-MISC ChangeLog 65238 SHA256 1f7130a942a8c1ad4820d27cb68ba8249240f2e97ef9a750082de2ab646989f6 SHA512 936ac2c675594f64dfe84e684f6101981959843e9cc07a0cf37fe360884f63a61f562817716296b3b6141f6f0c313e57dfde31f63caf5d6be0e39a008acb09d1 WHIRLPOOL b99017d34db8439f80bb4b9d1ca1d8826a08cd005ddd9c11a4b87479f502d7fe38aa66ad05cdee0ccff4599b0216e25d4897872cb6f9f81c1a9bed66f765c69a
+EBUILD vim-9999.ebuild 11854 SHA256 9f17568a15bef70ae8e8af59e38742f26db11a502055c832fca0560ecf7e782f SHA512 b4e30fd81d14c0af288e0a43a0cf347cab69244b66477ccf62104fafc4875a6e1af1ae3c574972252996f7d261f5a55eaa0d42b628d413dc3dae26d356955b68 WHIRLPOOL 26f4a8060aa497494f8995bd4ec94af8b94e55316de319051d8e5d6f33ca02816706317fd4272dae3d0e0c195f90048a366a2c81da6a466a9cfb0cf7a4f08397
+MISC ChangeLog 65378 SHA256 c9548b0b697b47ea371d1ea76198caf1dc06f8e299b8c414252346c515fcbb99 SHA512 0317f657bebd7159d26e69706d132f5f6a2f836e7d6a246749446c3866cdc05af5118d9cdc6e935848e1e4e169ea18cc56e19743cc09c2ecb5ffd554903b5b09 WHIRLPOOL 3db29b64e1165319e2db92c94503c38e0e2c8dec9a61197476b8df51f690a29a287da265f8461ae30b4d49e3efdddb7880e017503ee0bd1bbdb93da71f0bc6b3
 MISC metadata.xml 611 SHA256 ca72f78f706a782fd43a809be03a88ae31684a281697c8668e08210084af78c0 SHA512 2566bee4ccd952830492057b31e0dd02743554748a798ef3a7df3bb44014162e5137d62fd915e28b5b4efe2c70d135baa3e0397cf60ad624ea587c3e2207bd6d WHIRLPOOL cb89aba309663ba96731451d92377a60b00347b7e8f76caac0b373459911e4b9980a015db1588750f433b5d490a0bb7f3000689ca8ea3dab5d1823d1873adec1
-MISC vim-9999.ebuild.orig 11856 SHA256 5d81136f52fe6466958fa96e43fd0b814023b987d210920f859e7a586ec3b0b4 SHA512 d0a2085b8a88c93305b247482682eb3c514f516bc58335da022acd3ba52a7b61e826a917aaca0eccbf978e37fbfe8fd0dabf01a6fcfaf268db1b74691c139100 WHIRLPOOL 42ac82234f318e958c15fa4111b1d13bf5f89bbfc409f2064ef2b41c24da3d4f6d73e9d2b3650bcba7be80abd1675db2d41cd39fdad3817012edc85e5c220bf2
-MISC vim-9999.ebuild.rej 434 SHA256 7c9b4d646c3bff24309acba4ebc9e56dd85592893cdc39e1d54c41be868d216d SHA512 15e66d91fef52a2e25d8093b63d9d89756efb1d0fb4dd6782f7dbd23dfe8c5e904cd949e09b0415cda5ebad7af5b26ea52c2726552bed6b383969e92501bb8bb WHIRLPOOL 64d98f3ff9287c84536c1bf060b0c85c4868f25b25823fd96ab8b184c32d6173b97bdcbb4b485ed7df88c12341965aa250984870233392c6f9bab5297d9f8854
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSZJxkACgkQX3X2B8XHToliTQCgmziIzPcE2L0jZVa6raw/aR/b
-PQ8AoKVCjOwkQrpAcO/lXtVB3e/9HYb2
-=Ax6B
+iQEcBAEBCAAGBQJUmaSsAAoJEEqz6FtPBkyjz9UIAKl/sItT4FCqF/XemVVaRMxb
+KNiU6j4ZKcA78kwAXXM/LLz18lzNaV+NxagOUWlSQGZ1fvwFYHMFMqdpASK3Hp6f
+hCpYrkeROGNlwnPdx0LLfqOoVxK+nS9OWkfvjbZhqk9Do27+NhjQX6NhCcL5Qat2
+ZNscNZRyNBKwX9KvWjxGDzgTkXFVOYThyXJ9k8LpsQwZ7A5ubh+q9Rgt4atFJDzN
+Ks/TrhGd5JhXpAbi3xbpnGpulNnAd2eEJUQMBieWDhcjeX7Be2caWUHL1JBHpGIa
+7nsEy2PeGdpJg+mQYTJLHrDlcBqh0aN+JYeEtSgQ2Ru65lH+vmVYYaRC9Hnx3RM=
+=wEMT
 -----END PGP SIGNATURE-----

diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index caeb6ff497ad9341645b768756f158cfb26b983d..bc06fe5304fb15eb1c69b5e4f970bbc91628744f 100644 (file)
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v 1.20 2014/12/23 08:25:59 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v 1.21 2014/12/23 17:20:55 radhermit Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -55,9 +55,7 @@ RDEPEND="
        X? ( x11-libs/libXt )
 "
 DEPEND="${RDEPEND}
-       >=app-admin/eselect-vi-1.1
        sys-devel/autoconf
-       >=sys-libs/ncurses-5.2-r2
        nls? ( sys-devel/gettext )
 "
 
@@ -205,7 +203,7 @@ src_configure() {
                        $(use_enable cscope)
                        $(use_enable gpm)
                        $(use_enable lua luainterp)
-                       $(use lua && echo --with-lua-prefix=${EPREFIX}/usr)
+                       $(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
                        $(use_with luajit)
                        $(use_enable nls)
                        $(use_enable perl perlinterp)