Thanks to Lars Wendler again, get the ebuild syntax properly fixed.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 53 insertions, 6 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 6e9a33b0cbd2..d06a3ac2b1a3 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,8 +1,9 @@
 # ChangeLog for app-misc/mc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.152 2009/08/02 15:18:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.153 2009/08/02 15:39:41 ssuominen Exp $
 
-  02 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> files/ebuild.syntax:
+  02 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> mc-4.7.0_pre1.ebuild,
+  +files/mc-4.7.0_pre1-ebuild_syntax.patch:
   Update ebuild syntax wrt #198019, thanks to Lars Wendler for patch.
 
 *mc-4.7.0_pre1 (02 Aug 2009)
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 021a33d1fdff..3329ad5bdf78 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -9,6 +9,7 @@ AUX mc-4.6.1-invalid-mtime.patch 787 RMD160 fb02c6c2c672780551a79d942cd7b3be8eb9
 AUX mc-4.6.1-largefile.patch 6919 RMD160 f6bcb19aed609d89a0fdf36646b991d13f45f1ca SHA1 1bbe8c7d614aae3ed8225237b0ac2fdc6bc4ca64 SHA256 005bbc46f6b4ee3ff8ce29cf1b8974af69e38b4ca5676512927a3a8cd290ee57
 AUX mc-4.6.1-nonblock.patch 394 RMD160 414e6d99045ad73d3634e135892d1615cb3322fd SHA1 34b3e6d4807c9e055dbafeede0ed3aa74efe7224 SHA256 49487dbe67eef61543ca9d36f81d2d8884787d2c18dd7ca90ba032ef0ed3c10e
 AUX mc-4.6.2_pre1-null.patch 367 RMD160 5f539024b86bff08072832fef30f69f00d727858 SHA1 1d93268505de54202b1e689096ca85fcf69bf265 SHA256 e360cd5b02f330e8317cafc1035b470dfda99925ee048dfab5cd099460216878
+AUX mc-4.7.0_pre1-ebuild_syntax.patch 1352 RMD160 603d62336c00e85712bfbef03218340f27b00074 SHA1 777a58895a67c6c11b6530129eb13ea5a9647eb0 SHA256 0cdc301345fb324df90827fb0c3e32f144a5babb19cd8b1d5ac673d47b0b8e10
 AUX mc.gentoo 322 RMD160 957d5127be68de3eca20ac3121607faa1370d997 SHA1 c13e3625613764aa7c06aaba4519efa30c5722c1 SHA256 6dff61a04bf35cbc5c9570e3ad194a8d8ffd255096c977997d11aa59cd0f24c9
 AUX mc.ini 43 RMD160 2254610744c484553cd3332a4f45e439b13cceed SHA1 dde4fa7bc44867f9e1b34e170aec07484e8497dc SHA256 ed0921487e74b913fa34f4d672584b64da6cf5d592b17c65328621934a4d46f1
 DIST mc-4.6.1-utf8-r2.patch.bz2 30449 RMD160 ffe89eb0cef217ba87398c93b65ebc0e5fefac5d SHA1 f0994ddc412b4f86a7dab83686e846156fc36de2 SHA256 f58de9e412694958c00c7ef831995f2b56b7add7ea1e26567281516db02f483e
@@ -19,6 +20,6 @@ DIST mc-4.7.0-pre1.tar.bz2 2783935 RMD160 0f63d2a3b30af097697ae5fb715bb04249877e
 DIST u7z-4.29.tar.bz2 2951 RMD160 1ab0cfea1563e81bdde9c0552d37efe710ea14bf SHA1 1a8c65dcb58a8f1be9d7fa8a3b91b1819fbb3360 SHA256 0d046e76fade7c7e31be01626bb3fcb0afcb5f62809733d0c70e0e12c655348d
 EBUILD mc-4.6.1-r4.ebuild 4435 RMD160 3fb4884c84cea9ebc1d25712c5cfd82f4cd32a83 SHA1 8299104edf60b0b62ba8b565a88c003029f0c6b2 SHA256 92a93a2dbf14c086a9a0684f813a7d7b05e58835ba1969bae4b7f8f94aa3f315
 EBUILD mc-4.6.2_pre1.ebuild 3143 RMD160 8f87353820e31e6be30022b43af1cd8c13cfb9e0 SHA1 89f2115b3407186ffb6d821b15d8441c689dfc22 SHA256 7c8ceb783746c9ad3a4f5098c3ddcdddcaabb1b787dfb686c1027931587922e4
-EBUILD mc-4.7.0_pre1.ebuild 1352 RMD160 d5fd5757ec64c5d2a5d66bc10ad0f283acc8be93 SHA1 ba10abde01658d98023544c83d0bf3236e468996 SHA256 e6fd7d3bff5f97e995c5d089c12bf044eb8fe12f264fe77b94025bc254949d2d
-MISC ChangeLog 21615 RMD160 2770bf985d3430caf35a6b0f1626a3f014a188cb SHA1 a4c70ea197af4c8e9d6801ccafa43633f4824f04 SHA256 1fbaef8bbb4f98e1c4612309b1b772d68ae656fc68dc96dd19edd1acde11e5a5
+EBUILD mc-4.7.0_pre1.ebuild 1439 RMD160 b03a46c611b827bc57315cf0cb6fa85e66828e87 SHA1 38849aec5667e8c08137bd71f376dd1950593dce SHA256 0f7ab833bec83d3bddeeb26310ac3a54c5e8a0a09e074c30ab5647f68f844758
+MISC ChangeLog 21660 RMD160 5e841978d4fa9545921f36a7f531d0f75ab54e95 SHA1 067c5c354ad4134af6caf2375200bb12126ea59b SHA256 4e865970293ebf37ba3bee3dfc7d68aab09ed0f07e05459422b136424b5d556b
 MISC metadata.xml 300 RMD160 9f102fd6d3f520bc53b394229456e9b70e91807f SHA1 020bf4ff7b164e352b8340434ed3762430db87bc SHA256 f1f97640f02ba1eca452c927887656187f24f40a0f8ba97223dcbedb21497ef5
diff --git a/app-misc/mc/files/mc-4.7.0_pre1-ebuild_syntax.patch b/app-misc/mc/files/mc-4.7.0_pre1-ebuild_syntax.patch
new file mode 100644
index 000000000000..2453115b13a2
--- /dev/null
+++ b/app-misc/mc/files/mc-4.7.0_pre1-ebuild_syntax.patch
@@ -0,0 +1,40 @@
+diff -ur mc-4.7.0-pre1.orig/syntax/ebuild.syntax mc-4.7.0-pre1/syntax/ebuild.syntax
+--- mc-4.7.0-pre1.orig/syntax/ebuild.syntax	2009-06-23 21:55:12.000000000 +0300
++++ mc-4.7.0-pre1/syntax/ebuild.syntax	2009-08-02 18:37:56.000000000 +0300
+@@ -38,9 +38,9 @@
+     keyword LINGUAS brightcyan
+ 
+     keyword whole _elibtoolize yellow
+-    keyword whole check_KV yellow
+     keyword whole best_version yellow
+     keyword whole built_with_use yellow
++    keyword whole check_KV yellow
+     keyword whole die yellow
+     keyword whole diropts yellow
+     keyword whole dobin yellow
+@@ -64,6 +64,7 @@
+     keyword whole dosbin yellow
+     keyword whole dosed yellow
+     keyword whole dosym yellow
++    keyword whole eaclocal yellow
+     keyword whole eautoconf yellow
+     keyword whole eautoreconf yellow
+     keyword whole eautomake yellow
+@@ -110,6 +111,8 @@
+     keyword whole use yellow
+     keyword whole use_enable yellow
+     keyword whole use_with yellow
++    #cvs
++    keyword whole cvs_src_unpack yellow
+     #flag-o-matic
+     keyword whole append-flags yellow
+     keyword whole replace-flags yellow
+@@ -118,6 +121,8 @@
+     keyword whole git_src_unpack yellow
+     #java-ant-2
+     keyword whole EANT_BUILD_TARGET yellow
++    #mercurial
++    keyword whole mercurial_src_unpack yellow
+     #svn
+     keyword whole subversion_src_unpack yellow
+ 
diff --git a/app-misc/mc/mc-4.7.0_pre1.ebuild b/app-misc/mc/mc-4.7.0_pre1.ebuild
index 76a9369135b0..8c8f1f2369f5 100644
--- a/app-misc/mc/mc-4.7.0_pre1.ebuild
+++ b/app-misc/mc/mc-4.7.0_pre1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.7.0_pre1.ebuild,v 1.4 2009/08/02 15:20:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.7.0_pre1.ebuild,v 1.5 2009/08/02 15:39:41 ssuominen Exp $
 
 EAPI=2
+inherit eutils
 
 MY_P=${P/_/-}
 
@@ -13,7 +14,7 @@ SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~arm ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="gpm nls +slang X"
+IUSE="gpm nls samba +slang X"
 
 RDEPEND=">=dev-libs/glib-2.6:2
 	gpm? ( sys-libs/gpm )
@@ -31,6 +32,10 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ebuild_syntax.patch
+}
+
 src_configure() {
 	local myscreen=ncurses