reworked 0.7.4b ebuild to not use vim-plugin, because the eclass hardcoded vim in DEPEND. switched back to two USE flags as a result, used vim-doc eclass to auto-register vim-compatible documentation.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xEB9B4AFA

5 files changed, 105 insertions, 72 deletions

diff --git a/app-misc/vifm/ChangeLog b/app-misc/vifm/ChangeLog
index 32ce0bd91edf..09fd7d3b410f 100644
--- a/app-misc/vifm/ChangeLog
+++ b/app-misc/vifm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/vifm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/ChangeLog,v 1.27 2013/02/06 11:54:36 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/ChangeLog,v 1.28 2013/02/06 12:17:52 wired Exp $
+
+*vifm-0.7.4b-r1 (06 Feb 2013)
+
+  06 Feb 2013; Alex Alexander <wired@gentoo.org> -vifm-0.7.4b.ebuild,
+  +vifm-0.7.4b-r1.ebuild, metadata.xml:
+  reworked 0.7.4b ebuild to not use vim-plugin, because the eclass hardcoded
+  vim in DEPEND. switched back to two USE flags as a result, used vim-doc
+  eclass to auto-register vim-compatible documentation.
 
 *vifm-0.7.4b (06 Feb 2013)
 
diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index 471617a25b34..1af2c4c3bb67 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -14,23 +14,23 @@ EBUILD vifm-0.5-r1.ebuild 1162 SHA256 f006f5b8b842fc147f6c71cbc312e806c0d360d887
 EBUILD vifm-0.5.ebuild 1083 SHA256 0d5159f1ff4ff25e7de13e02301b35c3ef8b30036000b070e3f00af83f84a5c1 SHA512 96be76c4e09780ad75e86ca0ae440e4dd02f368704459d6410c4ccbe5709d360394fdc79669ce498b9d70b9df8546f34df160d706c4c80b0ed72e9d96e429fb4 WHIRLPOOL f23bc7700e7eabb3ee75198820d94da760ff333d80aadf1d5c5ca47960f90ac461ffa4811ae3fafc8111f5f11516acfea9c384ef56896ce49d045a20eef46c25
 EBUILD vifm-0.7.1.ebuild 1565 SHA256 36f1e7ad4adf35a6d97274afe35c359f5d3faad5ada449ef59bbb0be94edc6f7 SHA512 116f8b20eae7ef76d89eb85dd6ef97df4a880b0ff53aebb965a310c3270cc0b70be235912bcb8835ecc8edbd0ef939b3d3318ed3cdbb692bddde2e6a221bec3a WHIRLPOOL 88264f4cbec979b829b90b449f402c3f844b7a07e6a9919365b010601c792855754c449ef8a041cccb298e87fc0573585afa30cb23b0f21e4506c522436205ca
 EBUILD vifm-0.7.2.ebuild 1579 SHA256 7ca244723e9f132a2fcf332e6b17b9e534c88ab2785e82952e2042c118304e30 SHA512 cf334eeb61e7ca906c749ca687ec5bc19b1d6d4c5ff31e12f11f3b084b064cad92675247ec3f019dae6310691b6de5c159ef6fa4de3447a745e7e0a53fe2a033 WHIRLPOOL f7cfa968daa176048787380f60aefd78862a9b7062d28122f7205a53e9c2df64a9ee700100bc3b6a84c84859a7a9540f7a3d307d4135fbbf46f5d5e722b415e1
-EBUILD vifm-0.7.4b.ebuild 1040 SHA256 264b9a77e289161096273ab0fff785ec010c6a75c6296552c0d95d0c13db1caf SHA512 1a4467f755c11d498d7fe280753cad7980644408003128f29dfe06606a3bd50e1cd3ac631bbb426bd6d129d4ac71fd6431586d53f8b1577a7c3ae8e69ca28f86 WHIRLPOOL 52463bd6ef793229d9e3ceef81f0bcf0ca0f28c1d70ed97499f2f22a900f37f6d2ed6b3e36561ded592365e0587dc58446ccaa43f55f494a611ec9f30380332b
-MISC ChangeLog 3280 SHA256 29ba34d6fd246af43833ef26841e62b6551c1abdac55e79e0f5c40619fe2621a SHA512 697a351b3445f37d9ac274c2278f1f0701fb37711b582a16a3380f7d276bb6976f2a8937748a0eea66a201a52ac91727909428ce95351ec096c613a1151d6f64 WHIRLPOOL e2b0e524091244670819efa48b6799ec5cae11fe7300e7c916c33698962524f78f8c422e1ea224d7d1c9adebde773cd6cf34a2526f3b7f717577a8b9d0727da5
-MISC metadata.xml 896 SHA256 7f61cfbc2917ac7200b7757bc29ca52ada80f67ba708ab6f8d815ea311dd6bbe SHA512 d29f8c1b248f4b290e43a69ebcee17c9ff017a1861f8d9adff419bdca850c785aee6f55128827f0ecd53745bc5a2de0abed73262626360675590b09ebf96df7b WHIRLPOOL 75a0d8c4cbf19e9ae747509de58b82836d22f9670aa4faff247316c204420a85498498da45a51550f7a190192b44da3a37dacfe070c353b40e0a33c8aac59626
+EBUILD vifm-0.7.4b-r1.ebuild 1816 SHA256 414e2968299f36c5e7d862ec71ff0da01df18b16e0895ff9f67ef0801349dc63 SHA512 e14a9b85dc4bf8e0cbc5261fe53bd5ec3447af027af1999c2bbd586b45c34cf46727fcba97b78fa8cc0426c0423ad70a826c31c665701217d949b8ded2e32748 WHIRLPOOL 10f6d83393b7d0ec9b0fb3d5d8e421a9b77724e3f6e3a8478e5f11081c9300753afb8f275e962fed4de39293f14a29cef8b38639284e8f7b14f8ef9353b3c5b7
+MISC ChangeLog 3629 SHA256 57b05fe624fdc46acf377b43b569fff0c29081e9370ae963b223d75e21f0fa16 SHA512 4566ceb0350d7c17fe2dbff8ea59233e5efb9db0546b676f3118f9276b9e71719258d9dbbb8398900380be36682e26dda8311625fbe38cc76e22fc9bd4ac4296 WHIRLPOOL 5757b4a544b1a1809ecd1c82a7174d50de1e56b6bccde8ba938437f576f980fa5e33beadef4cae487794247895c02bb3172109354ee6b64344879339c72efd37
+MISC metadata.xml 903 SHA256 215864127e3b59fc370cfef2d81eca2d09b6fedf196098d1302b9729a7f113b8 SHA512 7bf9e7646edda66f7be452f0a69f8ff1b0753dadb23be07bc6b888bad1afc2fed565814b3f8e029312035c0074e692c182ff90d58a14c678736b96ae13ee64b8 WHIRLPOOL 8f4966d9cf6b6006673c985dd55aa3d126001076fa2f37aa5f4695e2884de472c5ce4ef13d4478d9fea31503d8050536a3f2cc9713c69361c6c086682d29cba7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJREkTOAAoJEDZF8K7rm0r6ZOkP/jP9glQrKQDB2lSpEEAr4vxG
-PdSueRC/ucCRo1QyGarUjD/FXeCXpKrVwdg6xcnJrYrMI5KdTOlQ8qcVo8fsLKs6
-gU2FoZEBg7vY5vFgv/n1DXBlFD8WhXnGIDpFyBxFxE5JCxR4nrH1kV3YPaPlmjVH
-NoCnbqh7O0bPLBdiUQPgS+SLGYDGP18wXd3Tnlk+JkfHNFKH94UpDvsg3a0RPZGj
-pdhEJrYSvb8lFAolaiPIeYfn18l/nFry8b7yUnMByn901dir8u7mmHBsYjSDw8QU
-F3sQd508HzmWgy+9QA5sNIS3JT44PE5Q5KB9q4GEqMlTABgsGDqPv3TeQz4Y92MY
-MwLGYlr4FVyKaYMJfXckL4hALek6v05ThfTZ2Bg9ZPgRwaMx5atwTvrObYVz9H01
-UbvNCyyLORqvrYbuiE15/nPHOajQdzsw5Q1eVAVbdlEWN6H8gK7Js6xt31lyEdiq
-7TBxRjOTOADaQ416jzF0z/GLK1IA6Q3FVFJXTaxnHD2GojUuWkMtk+4V3WW/3/ro
-+bBZSwzHsEokfbn9S8xVVRDe8Puufy2p6DOv3/xVPinIAKsizxNyad2M4PZhVlUu
-yuxG5MJIcoAd9alSPey/OcHPpmCXwBP8Eshz1y2wyEVmyvlFtDbD4Pn7CPZXGQeZ
-VDVogPTJvo4q1LZbWorC
-=Sk0n
+iQIcBAEBCAAGBQJREko7AAoJEDZF8K7rm0r6LbIP/ivSM7KlRTHfutjwqezL9RMe
+XTorBPm8iSxZItVBq4I8cAWWgimurLQD4Pod9La9cfMbwNCOXwiQUZm0bREg/xSH
+MKN7E8fI4qHVL5WgD1GB/g5O0o/Xsnz9vTKk5mu8MjburEbqaHTAE0EOuVEDOJTO
+jqCwjBHMleJniWv/Yun7etJyh8Al6K4QLUF0IMeLlPBImyg0PeFj5E8U8WXEQzck
+687Zg0qe+iAxz9gj+wqO5ut09ywPx+R3NnZ+XWdJJLmPbZY8DuEYqgDhXnwiNbwY
+g3Ln7pPUztsXcTyDp/iMyUdWX2U9x2lr8aDCYmwdf3f8S/hNsrUeKMYG9gFR361R
+gMEnNFAphQh09b2+ShaprsBZXSSOBJd741CQT2SPsGs9hCBEjytDLuD0LMe7Yykr
+KRXJqTooZlsQyUWBD6Grqi8a6sXHI/Cw50WBPHfnUjFBUxRzTGYZ/k6HCvRGVuWx
+O5N1GKtszaNOlgoWx7TqiBO9sd/+PwwWI9Mr3MtuoobmBnPtzIclZ6pE3sWl2IAV
+V4l8KrcX+dxZBcrpxG0faXafL5ei3yvEPwIZg/0T3MVaVbS7NF6FxwzuxbBkfL6W
+vazcUyUHOgf9keu78Tyn7t+xMdJRbuJ4vwytwqwX3AckzkbGnmI6Q+HEnGJoqS34
+nIwlp/Mzvbe/wXYz9AAK
+=suFL
 -----END PGP SIGNATURE-----
diff --git a/app-misc/vifm/metadata.xml b/app-misc/vifm/metadata.xml
index 5d50cb372497..acba9d310918 100644
--- a/app-misc/vifm/metadata.xml
+++ b/app-misc/vifm/metadata.xml
@@ -10,7 +10,7 @@
 		<flag name="extended-keys">Support for extended keys (arrows, home etc)</flag>
 		<flag name="gtk">Use gtk+ to determine mimetypes</flag>
 		<flag name="magic">Use libmagic to determine mimetypes</flag>
-		<flag name="vim">Install the vifm vim plugin, documentation and syntax</flag>
+		<flag name="vim">Install the vifm vim plugin and vim-compatible documentation</flag>
 		<flag name="vim-plugin">Install the vifm vim plugin</flag>
 	</use>
 	<longdescription>
diff --git a/app-misc/vifm/vifm-0.7.4b-r1.ebuild b/app-misc/vifm/vifm-0.7.4b-r1.ebuild
new file mode 100644
index 000000000000..81c4176ebabb
--- /dev/null
+++ b/app-misc/vifm/vifm-0.7.4b-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/vifm-0.7.4b-r1.ebuild,v 1.1 2013/02/06 12:17:52 wired Exp $
+
+EAPI=5
+inherit base vim-doc
+
+DESCRIPTION="Console file manager with vi(m)-like keybindings"
+HOMEPAGE="http://vifm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/vifm/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~s390 ~x86"
+IUSE="X +extended-keys gtk +magic vim vim-syntax"
+
+DEPEND="
+	>=sys-libs/ncurses-5.7-r7
+	magic? ( sys-apps/file )
+	gtk? ( x11-libs/gtk+:2 )
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="
+	${DEPEND}
+	vim? ( || ( app-editors/vim app-editors/gvim ) )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+DOCS=( AUTHORS TODO README )
+
+src_configure() {
+	econf \
+		$(use_enable extended-keys) \
+		$(use_with magic libmagic) \
+		$(use_with gtk) \
+		$(use_with X X11)
+}
+
+src_install() {
+	base_src_install
+
+	if use vim; then
+		local t
+		for t in doc plugin; do
+			insinto /usr/share/vim/vimfiles/"${t}"
+			doins "${S}"/data/vim/"${t}"/"${PN}".*
+		done
+	fi
+
+	if use vim-syntax; then
+		local t
+		for t in ftdetect ftplugin syntax; do
+			insinto /usr/share/vim/vimfiles/"${t}"
+			doins "${S}"/data/vim/"${t}"/"${PN}".vim
+		done
+	fi
+}
+
+pkg_postinst() {
+	if use vim; then
+		update_vim_helptags
+
+		if [[ -n ${REPLACING_VERSIONS} ]]; then
+			elog
+			elog "You don't need to copy or link any files for"
+			elog "  the vim plugin and documentation to work anymore."
+			elog "If you copied any vifm files to ~/.vim/ manually"
+			elog "  in earlier vifm versions, please delete them."
+		fi
+		elog
+		elog "To use vim in vifm to view the documentation"
+		elog "  edit ~/.vifm/vifmrc and set vimhelp instead of novimhelp"
+		elog
+	fi
+}
+
+pkg_postrm() {
+	use vim && update_vim_helptags
+}
diff --git a/app-misc/vifm/vifm-0.7.4b.ebuild b/app-misc/vifm/vifm-0.7.4b.ebuild
deleted file mode 100644
index 6db53d1ca50b..000000000000
--- a/app-misc/vifm/vifm-0.7.4b.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/vifm-0.7.4b.ebuild,v 1.1 2013/02/06 11:54:36 wired Exp $
-
-EAPI=5
-inherit base vim-plugin
-
-DESCRIPTION="Console file manager with vi(m)-like keybindings"
-HOMEPAGE="http://vifm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/vifm/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~s390 ~x86"
-IUSE="X +extended-keys gtk +magic vim"
-
-DEPEND="
-	>=sys-libs/ncurses-5.7-r7
-	magic? ( sys-apps/file )
-	gtk? ( x11-libs/gtk+:2 )
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="
-	${DEPEND}
-"
-
-DOCS=( AUTHORS TODO README )
-
-src_configure() {
-	econf \
-		$(use_enable extended-keys) \
-		$(use_with magic libmagic) \
-		$(use_with gtk) \
-		$(use_with X X11)
-}
-
-src_install() {
-	base_src_install
-
-	if use vim; then
-		local s="${S}"
-		S="${S}"/data/vim/
-		vim-plugin_src_install
-		S="${s}"
-	fi
-}
-
-pkg_postinst() {
-	use vim && vim-plugin_pkg_postinst
-}
-
-pkg_postrm() {
-	use vim && vim-plugin_pkg_postrm
-}