diff options
| author |   Ciaran McCreesh <ciaranm@gentoo.org> | 2005-10-09 18:08:50 +0000 |
|---|---|---|
| committer | Ciaran McCreesh <ciaranm@gentoo.org> | 2005-10-09 18:08:50 +0000 |
| commit | 41c33a7791215d919124a5ab82762ced0f28dd10 (patch) | |
| tree | f1ebd957d6c4ecc99798c3538c0b485ab1f0492c | |
| parent | Added ~x86 keyword. (diff) | |
| download | gentoo-2-41c33a7791215d919124a5ab82762ced0f28dd10.tar.gz gentoo-2-41c33a7791215d919124a5ab82762ced0f28dd10.tar.bz2 gentoo-2-41c33a7791215d919124a5ab82762ced0f28dd10.zip | |
updates for vim 6.4 beta: drop selinux
| -rw-r--r-- | eclass/vim.eclass | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/eclass/vim.eclass b/eclass/vim.eclass index 7b9636a205fd..695d69fc103a 100644 --- a/eclass/vim.eclass +++ b/eclass/vim.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.123 2005/09/28 19:35:57 ciaranm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.124 2005/10/09 18:08:50 ciaranm Exp $ # Authors: # Ryan Phillips <rphillips@gentoo.org> @@ -43,7 +43,11 @@ fi EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install src_test pkg_postinst pkg_postrm -IUSE="selinux nls acl" +if version_is_at_least "6.4_beta" ; then + IUSE="nls acl" +else + IUSE="selinux nls acl" +fi if version_is_at_least "6.3.086" ; then # DEPEND="${DEPEND} nls? ( elibc_uclib? ( dev-libs/libiconv ) )" @@ -64,7 +68,6 @@ else gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) python? ( dev-lang/python ) - selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl ) ruby? ( virtual/ruby )" RDEPEND="${RDEPEND} @@ -72,10 +75,14 @@ else gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) python? ( dev-lang/python ) - selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl ) ruby? ( virtual/ruby )" + if ! version_is_at_least "6.4_beta" ; then + DEPEND="${DEPEND} selinux? ( sys-libs/libselinux )" + RDEPEND="${RDEPEND} selinux? ( sys-libs/libselinux )" + fi + if [[ "${MY_PN}" == "vim" ]] ; then IUSE="${IUSE} vim-with-x minimal" DEPEND="${DEPEND} vim-with-x? ( virtual/x11 )" @@ -469,8 +476,12 @@ vim_src_compile() { || myconf="${myconf} --with-tlib=termcap" fi - use selinux \ - || myconf="${myconf} --disable-selinux" + if version_is_at_least "6.4_beta" ; then + myconf="${myconf} --disable-selinux" + else + use selinux \ + || myconf="${myconf} --disable-selinux" + fi econf ${myconf} || die "vim configure failed" |