Fix autoloading of inferior-caml-set-font-lock. Thanks to sgbmyr@gmail.com in bug 446868.

Package-Manager: portage-2.1.11.36/cvs/Linux x86_64
Manifest-Sign-Key: 0xE7BE08CA7DC6EA25

4 files changed, 55 insertions, 16 deletions

diff --git a/app-emacs/ocaml-mode/ChangeLog b/app-emacs/ocaml-mode/ChangeLog
index dafdfb7963f1..044d0a6ce474 100644
--- a/app-emacs/ocaml-mode/ChangeLog
+++ b/app-emacs/ocaml-mode/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/ocaml-mode
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ocaml-mode/ChangeLog,v 1.59 2012/05/24 10:47:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ocaml-mode/ChangeLog,v 1.60 2012/12/11 21:55:49 ulm Exp $
+
+*ocaml-mode-3.12.1-r1 (11 Dec 2012)
+
+  11 Dec 2012; Ulrich Müller <ulm@gentoo.org> +ocaml-mode-3.12.1-r1.ebuild,
+  +files/50ocaml-mode-gentoo-3.12.1.el:
+  Fix autoloading of inferior-caml-set-font-lock. Thanks to sgbmyr@gmail.com
+  in bug 446868.
 
   24 May 2012; Alexis Ballier <aballier@gentoo.org> ocaml-mode-3.12.1.ebuild:
   keyword ~amd64-fbsd
diff --git a/app-emacs/ocaml-mode/Manifest b/app-emacs/ocaml-mode/Manifest
index 09a47bb2dc06..e6b10fd9c2a9 100644
--- a/app-emacs/ocaml-mode/Manifest
+++ b/app-emacs/ocaml-mode/Manifest
@@ -1,27 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX 50ocaml-mode-gentoo-3.12.1.el 499 SHA256 a7a7c983bbbdcbcf659d1703294e7020d850339fcf06f361a1d7ef4bc44e6d1b SHA512 0be69a30c07caeff818e4d6fb0147e18855e88a3bb6a6e876b170edddb32382c0bd19ca960836d8442eecd00e78be09cba7de08030420645c2ef1ba5d9198524 WHIRLPOOL 993027ee894b38ef47056b7ee38607b381d6cf1172bcb65c34ccdb7c0b45b9a27339cf36310c9917535f46f0f5d90c198677feff929b7cda8dc4dc6a5d95038e
 AUX 50ocaml-mode-gentoo.el 501 SHA256 35249fed8054d255c2bffe94b077e80448ae0f2c38e152f1122c200c21c1a958 SHA512 a8e665564f8b8394c677d7495ba1aac1e3f6cf1f3cd52c8ae1fdb37028fdaac8b021eeb17ce7c2e2e40dda0294888abf0e1078f821367c8a05715b5326dc73ec WHIRLPOOL 0b0c9ccec56d8eb6afcb964e2f7804e420140a6ddfd3dc9ffb519a006371fdf7452944d1b222f49b0f836b8b2b5dfb84c813f4ef2b4fd4c092d2e92decb3d846
 DIST ocaml-3.11.2.tar.bz2 2346284 SHA256 86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143 SHA512 69888797bdab8f7baa5e398db08a723388876ed5920b62e9bf29a5214badde1c2024365f88bcbd89d43a0c8d9e4d1bd15486e4b12e8432f1c1bcedd17782faaf WHIRLPOOL d1e6d0851f8f1315f95cd0a470bb61dc1d39ec70f2ec23169ffc9aa74b2d02f5419e3474093319cb47125e7534a0d121751fd1971653e43bdca167f823d4c94a
 DIST ocaml-3.12.1.tar.bz2 2949124 SHA256 edcf563da75e0b91f09765649caa98ab1535e0c7498f0737b5591b7de084958d SHA512 cbb050aabcbe19a4aa070d6cb74f3774cb136692dfd9433ca977f0f9520ad2f583b6cfb1a9cedfedc92e7dc794ac4a869e20aa5a67a4739002feb290435dc7e7 WHIRLPOOL b7bf4844452ab52027e6b785159df6e4defc548d2f3d31eb73dc0dc05214e7c19ed654c8b3ff234a85691599df0be568ba02fafe257856be7f603177584a7ca0
 EBUILD ocaml-mode-3.11.2.ebuild 588 SHA256 2eec20e44d82f499b3827336756c90aa6fd8e6d4d4d9c62e402e86686ad02532 SHA512 c3aab0ba4f12a23a1fbbb421692264d5df8950f5b89ba6e1920c762a41be4935d9d835f05bd3fd4ac46cd90ca0670c574a0f4684852d94763096b67bf9e614a0 WHIRLPOOL a601c0a389a4d4d8d328e3fb3c722f6678b55e99c41afc5a6a0868ad2d2a1fb5054abe56481be815a1aa8addd3f7e3e3c47891b563a680d2b07e58069b9e2ae8
+EBUILD ocaml-mode-3.12.1-r1.ebuild 606 SHA256 820627016d2254ceec84d6ea49158c0aa95696df63f4bb2311d41ffe9eeb7b92 SHA512 acd6e4f9f62041252cd3651b9603b4c21a8bf3ed209e5c07790bd34cf6ae158c844b56af76200c0b21f9f658c0c49fe538af65657053e18ba384cbc2f695160b WHIRLPOOL 47e7d8666b1da3ceacfa524cdc00099dbaebe2a33bf22c0f3fcd4e5215c15d079763c85e1af0a0338a60b990fa2570fdcfbca0d4c72b7da6743c7305ecef546b
 EBUILD ocaml-mode-3.12.1.ebuild 602 SHA256 80c79e2d48f66fc51ae1af88b2d54dcde70a687f51fa9d98a857b2a1e3f6125b SHA512 d11aaa62e77d2f561ee6ae84f3a8859c619decf2447555a7fd4c74a9ec16db91b49f2432cacef79fe2c6db525feec1c8cb724aadb4ef8761c564123f9efe5b95 WHIRLPOOL d1203a8563c3188d77e2a931d42a090045149bf5cf87c0313fc18a5e07efc833f26010830b18d09405f9dc52fa48ae7e3eb56f9ec8c34f211a59a45c6aa20def
-MISC ChangeLog 7486 SHA256 245c87c1e1029431c7f73d28e3c7534aaff50fe9ae8f0c3807ef2d0e9cc2763b SHA512 8ba64949675ab2b4c62b07d1eb448a880a8d97f9522d9297637e17a1f04ada34129a065892734c2505ed60167d2551d30590c071c255c1e6728486a3ad084d26 WHIRLPOOL 1038ba8f7f49d862626704e0acebb83b43331de93aedb4c800ab5fc7d6f16ed7ad3f93d918086e3e20d789ddc4298eebb4028c0a5e69126ff4effb26e0c6a4e0
+MISC ChangeLog 7730 SHA256 0210d7ff63732d46a814dfbbe6fc7ea8797f09e522fc9f34957dab085c596942 SHA512 40910a244c38bddf886f0b406fb5a110dff0572368e4290e3818f18545de84bbd9f8e1ccf7cd47d043961d918f03f1efc3337e2432dcd0746140fc6e8ba07720 WHIRLPOOL 1363bc2bc0f9a375821c3a89b8b95f3ce35e937bfbfdd5fd46c87f009cba5da018310a7171fce0636236f2b1196a2842e28819e0cb149b8d5da3ba279685c3df
 MISC metadata.xml 178 SHA256 5d35d79a4a6edb5b03e1c36de7d1c0a97a1a2e2704b3711acaf38929def2f9f5 SHA512 5df45c3d351bc9d5ffd8ec071c23ab3c0b07dc9c63ef3ac61a62c912ca12981fd76529e8f9e63060ee55fd16f32a10d4e164fed0972b612709662431546b80de WHIRLPOOL cc20881d699ae3c9ea4252976e46c6321e8decdac595e32c81831469604570559739949f3830cd1d7142ed0d0d0d2800e47d17481088b0c92a07a131e9c6935a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP9fJPAAoJEDxpGckxwJCB39kP/RslqLD/vjLy6LbeEG6KNrP5
-IEvuMF3+AkStJA1li+WZ/c1ge1zVJtJDCRwy4GtIepQ81T1R2QnoLQgDQEnHZV2r
-WTqpjWpOjRDpxH8/pdAoRDfrkm8cMQaXfjZwYSWd2RFmnHRjxaIruBFFkWFYx2of
-cGVgM/JMWX4PHWAdHVhcbmq+l9joxcXESGVkQNQ6kIBmzoBRngfpOaTbuOIVoyiO
-NvyOFbwR6GILlEqTIcUFxIkWvnXWSHwOsXUnDyaYakAJDu0bHUhHmXP+YZHwWCAh
-q37fkLSleCctSRWHnxsNqk0Hp/oBQ137Jn4jYD1uzrxt2oT3GUS2a7AooW5Yr44q
-Ip+XT7f0y9TsbRABgEG/GMn5VCJ4hnS4Lwh2EijAHUJXonTFQvEpM/3qlLKwUP5G
-vXwNHojJRVmEl0kM4SwoxZ2DUXMd9VcxRqEA1ei/qEFh0Z4N6cViXBnSfPXl1UEc
-YE/TMDV3KMR8AMuXH+bGReyDs30xEitYDJhSHx78Gn7osPDo3iReFM7vRLRlXICb
-/9wk08V/aWzcRpYovn70sBr2Wga6fdxflg94wKmMeFvRbZ04rgoJTvlPw2Ysd49q
-8oTyXPWF+mLS50tRxc/dZNifgo7obRoJyFw242sluOZt2x9yFv8IbUEOq2LDb/+2
-0s72Hn6zZAes/fRI5lnc
-=2u04
+iQIcBAEBCAAGBQJQx6xIAAoJEDxpGckxwJCBoZAQAKNreJqn65h4sQIVXR3tow8Y
+1fQD9falYKgbrb7lnDDguiXJu32pH9UN6ObC3JCrmG5+RSnDZWpoPSG3sVRAyT5n
+dE4nGINJOkYN6qHFMn/5xwHvBbZHjUnG7f6VPpTBIMXNkIG3L3f576OyNGmkDtcE
+1PejXlBJbE7XmOA80PlbFXB/+0uOXxdZzWHECghxRvrmG0/NHv29oeNKzcIPEEa6
+K0RfWp5WQ5qmeeCReio0qXmHX6THLkZHjeX/Vk6g9BuUoQ5sdLME6ZvduqRz4W9L
+tCxrmAvXukODNzzUjw4ql28Jw0crQ8RtqvAX98227X4V7gQbYT3QunDXrQiQn8wz
+Y7CFth75lEt1qFZXP8I02+Z3dN8MSvz1szgJwJKz/R3zYOxep1CsX/6YIlICcJ2F
+HjzJtXV4HzLE3eE5cPa33wU9tHjg9kaBDPV2jtrvd6f1E2i86feq52idQsj+xqGp
+JdkgTF8ia9gg7wQOYriBSJmuPngLwNwZic47/BVsZsbt8zjxsXFoKdHQhZCZ2iu6
+3keA+iIPqPWQuVMue5ZxJNVn/Ef+tj8a2VTjtwQTgLIIEFO+f07Fy9UYh7qKDsuc
+nueRr7B9WU99Tc+AxltTaSpR2FYTUIPWYx/Xydu+Nkr4FVMlyIgVwjM5VYEokyJw
+x+VhQcvV3AJP1N6nuXGF
+=SNvB
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo-3.12.1.el b/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo-3.12.1.el
new file mode 100644
index 000000000000..bea123308024
--- /dev/null
+++ b/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo-3.12.1.el
@@ -0,0 +1,10 @@
+(add-to-list 'load-path "@SITELISP@")
+(add-to-list 'auto-mode-alist '("\\.ml[iylp]?\\'" . caml-mode))
+(autoload 'caml-mode "caml" "Major mode for editing Caml code." t)
+(autoload 'run-caml "inf-caml" "Run an inferior Caml process." t)
+(autoload 'camldebug "camldebug"
+  "Run camldebug on program FILE in buffer *camldebug-FILE*." t)
+(autoload 'inferior-caml-set-font-lock "caml-font")
+
+(eval-after-load "caml" '(require 'caml-font))
+(add-hook 'inferior-caml-mode-hooks 'inferior-caml-set-font-lock)
diff --git a/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild b/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild
new file mode 100644
index 000000000000..064e2a4241b2
--- /dev/null
+++ b/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild,v 1.1 2012/12/11 21:55:49 ulm Exp $
+
+EAPI=5
+
+inherit elisp
+
+MY_P=${P/-mode/}
+DESCRIPTION="Emacs mode for OCaml"
+HOMEPAGE="http://www.ocaml.org/"
+SRC_URI="http://caml.inria.fr/distrib/${MY_P%.*}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+
+S="${WORKDIR}/${MY_P}/emacs"
+SITEFILE="50${PN}-gentoo-${PV}.el"
+DOCS="README README.itz"