Version bump. Specify LICENSE more precisely. Remove old.

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

5 files changed, 39 insertions, 34 deletions

diff --git a/app-emacs/ocaml-mode/ChangeLog b/app-emacs/ocaml-mode/ChangeLog
index 044d0a6ce474..ba002520ec5d 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.60 2012/12/11 21:55:49 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ocaml-mode/ChangeLog,v 1.61 2013/02/10 16:55:14 ulm Exp $
+
+*ocaml-mode-4.00.1 (10 Feb 2013)
+
+  10 Feb 2013; Ulrich Müller <ulm@gentoo.org> -ocaml-mode-3.11.2.ebuild,
+  ocaml-mode-3.12.1.ebuild, ocaml-mode-3.12.1-r1.ebuild,
+  +ocaml-mode-4.00.1.ebuild:
+  Version bump. Specify LICENSE more precisely. Remove old.
 
 *ocaml-mode-3.12.1-r1 (11 Dec 2012)
 
diff --git a/app-emacs/ocaml-mode/Manifest b/app-emacs/ocaml-mode/Manifest
index e6b10fd9c2a9..03ed9bbd1974 100644
--- a/app-emacs/ocaml-mode/Manifest
+++ b/app-emacs/ocaml-mode/Manifest
@@ -3,27 +3,27 @@ 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 7730 SHA256 0210d7ff63732d46a814dfbbe6fc7ea8797f09e522fc9f34957dab085c596942 SHA512 40910a244c38bddf886f0b406fb5a110dff0572368e4290e3818f18545de84bbd9f8e1ccf7cd47d043961d918f03f1efc3337e2432dcd0746140fc6e8ba07720 WHIRLPOOL 1363bc2bc0f9a375821c3a89b8b95f3ce35e937bfbfdd5fd46c87f009cba5da018310a7171fce0636236f2b1196a2842e28819e0cb149b8d5da3ba279685c3df
+DIST ocaml-4.00.1.tar.bz2 2762205 SHA256 33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951 SHA512 77899430706394af558666361b152d47df3a3e21831059875f8b317d0ff9d1a010177bf1e5851e522e086c20768e92c71344aa53eda0ce003f278752870ab5da WHIRLPOOL 3fdc090e1158ae72c91685aef62c751f897f4e3efcfbdc07e00d92e83351494fd126bdaca31039c1bf5dc4107072d978bb30e02c879caafc215dbc913f2d6ed1
+EBUILD ocaml-mode-3.12.1-r1.ebuild 607 SHA256 63f439c995cf250695453faa20900d97e1eb4bfcc699eb20df22ed3a62db9317 SHA512 577787bde6e7e3c35f5b6f6e6bdc19715b72f12b3d67ba7148cd700af797f61136cbcc2f5646e6d779795ceba945a6e8cddd08232678c20cd7aa9d19da4ce4b2 WHIRLPOOL c2a90704496ac913ac36ac203cf778a52cf7cfacf8bf309eb89e9a3fbe9bb08c600cb8f1c23d1be434ef2ae1536f0c8aca293c4eaa62e541ca8fc4cbd529cdf0
+EBUILD ocaml-mode-3.12.1.ebuild 599 SHA256 253c579a5226b2447f488fea7b3007771574561dbf44273e9b42534082a93090 SHA512 6db8e7c5393566fd9725373a28d4449b4b885f04a25947d64599a786590e1a7324253b7ef197a22e7e6d3c8a122d3c22b680ffaebf7776524445178425e5a618 WHIRLPOOL 161e95d3490118260973e796538d23fa1f08e864548fd4c09ce25f77be65f0b2fd56df65889518663dd647c7134640bd15b6505318d2327dcdfb9840dfb97da2
+EBUILD ocaml-mode-4.00.1.ebuild 605 SHA256 f08e63222e650a26e4b962a479e105ad05da88cbf701bf90f855f77937adb228 SHA512 83ee9d680aef012df3462cee1b2ea03aca230c9952de28442b63b9dc85ffac19ce85e7a2648079745eee8ff462b832d1199667643c97252d6bf90d3f7ca1eb0d WHIRLPOOL 61382f27a0d1f602915096555a6abc106bc29eb79ad77e7d3143f4bb92716d199488ed7e2df51dbb741afa970c275fb5b3b83a2e60d42f923002fd43661cf586
+MISC ChangeLog 7985 SHA256 bee9c828c78f192e7d310f57a988f6231a766b0f093142ac81ad1ff84f72a00a SHA512 8be614cf97c0b274ab6eb39a7b37706158ee8f4a956a12cfdefeef6964478d736bb5ce8623c9a87a32947db322490c7d5bf38ee96325ce69b4ab500e227526af WHIRLPOOL 1eb25736d97b7cf0623a143e9fb0325bce5ee205ea73769bf3334a97e4a3554b2515f6a2def39ed617fc6e7ee5b7c4817a17acd1fefdd08a7427479b1d19b8c5
 MISC metadata.xml 178 SHA256 5d35d79a4a6edb5b03e1c36de7d1c0a97a1a2e2704b3711acaf38929def2f9f5 SHA512 5df45c3d351bc9d5ffd8ec071c23ab3c0b07dc9c63ef3ac61a62c912ca12981fd76529e8f9e63060ee55fd16f32a10d4e164fed0972b612709662431546b80de WHIRLPOOL cc20881d699ae3c9ea4252976e46c6321e8decdac595e32c81831469604570559739949f3830cd1d7142ed0d0d0d2800e47d17481088b0c92a07a131e9c6935a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-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
+iQIcBAEBCAAGBQJRF9HlAAoJEDxpGckxwJCBgjAQAL/0dtTkb5RQdboDMpd3cdNd
++5BNiYh2UylDf/Q1M6gD8FFLqp0eYxaNsnAPyqBb9uL0o+we8YXgOIQsIEOnWHk6
+72/hxjhPFPSLDm+ZA5oXWQIriAUHRGODxbYnMFVFWtc4aHc3G1zql9Y2UPWP4n3l
+OwJ/66p5WWZL7b2tEEhIth3n7foTWzQf2NEa1ecsWceF5i0Fneja1Av2WdbCQZAt
+Vxb0rj/77vSYLa8d2M75sQDtu8wIGLG/hAHMVs8IEQxpE5CPi4IBs05m3BB4ZwOD
+sS4y3Tq8jEg93188RRv8mQcPHK+qXkif5/UFFkDoxZs1y45ILVvaVAmxt0W2qgZW
+CNmG7iNszsr/D0NzcTUfo5qByfT/oe8QZ/yoamz+ZBJsgiRfLqTGS9znBm6P2kXl
+4AfEEwcZOtFHX1h4VsyTk3iRjs0MNBIl/E+7nm8bVwxukUclrr9M5ZbTpOFQKB+u
+4Oyc33gfDaROdebHXdfFIuWbmnh+HxaqR51u97/DO9wmtTal5mvjoQZubJzU2SfR
+nvifRAlP7vTAMPS+1MQLMEo8pNM+wvR8Q+pi4YNd1TB+eUH9b7PVUxgyrSNob3Fb
+/KqLeihON0a1Ryd1Zgbieu+I8bsufYqM1fq6K6lOKMNynyYbm5mIKpzypUsi8zsv
+Gx2G2KjfTfVi75aSxWGd
+=w18t
 -----END PGP SIGNATURE-----
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
index 064e2a4241b2..ef3c30c6ee61 100644
--- a/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild
+++ b/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild,v 1.2 2013/02/10 16:55:14 ulm Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ 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"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 
diff --git a/app-emacs/ocaml-mode/ocaml-mode-3.12.1.ebuild b/app-emacs/ocaml-mode/ocaml-mode-3.12.1.ebuild
index 70d294a1afdf..e818b9a7a3d3 100644
--- a/app-emacs/ocaml-mode/ocaml-mode-3.12.1.ebuild
+++ b/app-emacs/ocaml-mode/ocaml-mode-3.12.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.ebuild,v 1.9 2012/05/24 10:47:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ocaml-mode/ocaml-mode-3.12.1.ebuild,v 1.10 2013/02/10 16:55:14 ulm Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ 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"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
diff --git a/app-emacs/ocaml-mode/ocaml-mode-3.11.2.ebuild b/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild
index 308c293622ed..4965ee44e4ef 100644
--- a/app-emacs/ocaml-mode/ocaml-mode-3.11.2.ebuild
+++ b/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild
@@ -1,22 +1,20 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 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.11.2.ebuild,v 1.7 2011/03/05 20:16:37 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild,v 1.1 2013/02/10 16:55:14 ulm Exp $
 
-EAPI=3
+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"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 
 S="${WORKDIR}/${MY_P}/emacs"
-SITEFILE="50${PN}-gentoo.el"
+SITEFILE="50${PN}-gentoo-3.12.1.el"
 DOCS="README README.itz"