version bump

Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 125 insertions, 6 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index acfe078fcb8d..43f47a04d8fd 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ocaml
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.219 2014/01/18 13:12:48 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.220 2014/11/28 15:42:01 aballier Exp $
+
+*ocaml-4.02.1 (28 Nov 2014)
+
+  28 Nov 2014; Alexis Ballier <aballier@gentoo.org> +ocaml-4.02.1.ebuild:
+  version bump
 
   18 Jan 2014; Mark Wright <gienah@gentoo.org>
   +files/ocaml-3.11.2-Fix-ocamlopt-w.r.t.-binutils-2.21.patch,
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 2beb49a80652..d259f664a19b 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -9,6 +9,7 @@ DIST ocaml-3.11.2.tar.bz2 2346284 SHA256 86f3387a0d7e7c8be2a3c53af083a5a726e3336
 DIST ocaml-3.12.1.tar.bz2 2949124 SHA256 edcf563da75e0b91f09765649caa98ab1535e0c7498f0737b5591b7de084958d SHA512 cbb050aabcbe19a4aa070d6cb74f3774cb136692dfd9433ca977f0f9520ad2f583b6cfb1a9cedfedc92e7dc794ac4a869e20aa5a67a4739002feb290435dc7e7 WHIRLPOOL b7bf4844452ab52027e6b785159df6e4defc548d2f3d31eb73dc0dc05214e7c19ed654c8b3ff234a85691599df0be568ba02fafe257856be7f603177584a7ca0
 DIST ocaml-4.00.1.tar.bz2 2762205 SHA256 33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951 SHA512 77899430706394af558666361b152d47df3a3e21831059875f8b317d0ff9d1a010177bf1e5851e522e086c20768e92c71344aa53eda0ce003f278752870ab5da WHIRLPOOL 3fdc090e1158ae72c91685aef62c751f897f4e3efcfbdc07e00d92e83351494fd126bdaca31039c1bf5dc4107072d978bb30e02c879caafc215dbc913f2d6ed1
 DIST ocaml-4.01.0.tar.bz2 3691090 SHA256 b1ca708994180236917ae79e17606da5bd334ca6acd6873a550027e1c0ec874a SHA512 b0a4efa89d0e48e5c01922156a73a8ed67c58efa07170710eaef9de1138e1d6fff8a440b2c81860fc63c604f3a4e189b795bb08a5e9d8df60778fcd468985f6e WHIRLPOOL a31cc2c46e19ca1c5ca65ffdee77ef42b7269b1584f81629e29b725b167c7e3d9eb467a3e8171aaba7d2cf1d8aea31d1822c5631fe3e209ce7731c16112a11d3
+DIST ocaml-4.02.1.tar.xz 2031244 SHA256 68c4b01be54c23bc20fc0a8beaa5c7433b8483f8950490129cfe7662e0c6f4dc SHA512 79d257210c0ddfb0367250a688ffb58f143fcc8c159f7d6e149d42b074e811eaf69449b66ad39da399e1bdcb2bab5924d195fc7c5ebc29d44cb637c093b9931d WHIRLPOOL 2c9849f73a705a63c0d0d4682d1ab1225a3150f68bda98805dc2d2b11f100ee7206200b9dc49b07d39d1b737f45671f3662a9bf2c069d6795f26e1f9b9b65ead
 DIST ocaml-patches-1.tar.bz2 3108 SHA256 ad1c252cba7cc50f70d19049fcd78aa359672e436ab9906424548229a04afa49 SHA512 36042cfec68ec06a172f07c7e8ac7904fccd0619a0d5ae2ffc6c87216be7450463fdbeeb9544e5df9d7d93ce9cd52b1502d4b74ee196a911c9f9273bc41d4396 WHIRLPOOL 2f04b3859295973b20bd83e718812f0ab1a993dc143523ebeab7b3d23cfda2bfe0f1eeb2ca1dc1393ae00192337e0cdc9d1472c5681fb719390d337a7d1ddc0e
 DIST ocaml-patches-3.tar.bz2 4101 SHA256 c4ceb604f4480c78d1cf4f848b0903c8d37798d9761f582d8d1643d4e38b8658 SHA512 8be5c44de5a6b0b7c14723e41d92fe807b881b218cc5eee38ea7519c0f971415cb7fe30035303da275089dcb8a61c4f334c4a88e0bdbced3953503794b8308a7 WHIRLPOOL f1920606785702c44dead01b1426145653bc1931acba2d614c6818baddc051e4f74ca0322cae66ade63ba0cd0df5651cfd67f511fca5f12973b67a0c50ebab6d
 DIST ocaml-patches-5.tar.bz2 2517 SHA256 a41c731da9312b29a8ff9e3b457439872ac47507b031dcb24dd4153e7cf09925 SHA512 38c0072c85d8cc3fd44e9864340385997f59afd974b60ef24fc43f50a8d33616e94310b927b9519191aebf2870a38d35a17163576352c3fd4c42a63cff936966 WHIRLPOOL 13b21e134f9887ea294fddad9ca4c18d48fcefe11b07bc7bd0dd2de232e4ff1f697db74fce62ff64e816910bbe49243ee20ac2a77f76827d28da4e0cdd221ae0
@@ -17,12 +18,13 @@ EBUILD ocaml-3.11.2.ebuild 4355 SHA256 64d0669832969b53640d97711006b1e2588d806cd
 EBUILD ocaml-3.12.1.ebuild 4138 SHA256 9c0e7e46ba33952b1ba3d13a1a250993adac968dddc74b5f786054c28d2c61f6 SHA512 328c2d5eef9422a693a90910db84bcf03f771bcfc066262615e71024e3fec8d70cc985cd9840011650c55989e9f3fa6541bec7181c3b0f55bde1b92ddbfd902a WHIRLPOOL 7598bc6423ce3663ca777e05ebfcd1fd8d86dca59499d76e0c3a15b3734b2b0fbab7129ae7d3fd525f0614c9daa463bf59b581e18fbd7dff021f8de5460c6b8e
 EBUILD ocaml-4.00.1-r1.ebuild 3778 SHA256 1806ea24d8f33112fd5b141e315392e017f7d2046f4cf100d1ac922c5e0b622b SHA512 01b838ec3a75f9b00568d031c4d3d03a3daddee7ab35c978523dd80243a865045f3f9a405448dd0f6b18da4940273248ac72aaff869e4aec474837b8e0d99034 WHIRLPOOL cc8c9b0d449b648b01f381e611c25e1eb89df766fa1c52d19c83911ccb954f2af5969f542e9ec8436cc4162e625e85c01c3de899f711a7700dd710d43ee5a702
 EBUILD ocaml-4.01.0.ebuild 3860 SHA256 466f5c7bc692d21cc7bb5ac634d301f6ff083887684f62c8b9a60ff73d93f7f3 SHA512 316ead5fa078932014a3a8f2f4f3d69c737ab87fdea7becf4b174024528faf59c904c5b8dc9c0ea2158fefd46a7ff481dfbc3f0e1b04f65424577227053e9deb WHIRLPOOL df3665b5296287cac79be659421f4799af41edcee459d383a5a9fbf046cf896273032c1e00aea5e4a82cedb63a73452cccc20efb64333c2d98326d3b5bcaefb1
-MISC ChangeLog 34360 SHA256 d65795b29933620ebb04b895d3afcb2ae376e7264ea88d4986d07bbdcbfa7060 SHA512 c4ad9c0399845482ae2f626b1b80249c4f20f4f82e2fee108f877665f8c24e7c987e6fbe7aaf0fab223a633b96d331563ae42cb72ccb2fa3a20a6a733097ab27 WHIRLPOOL f5c770cead4414fbb37d7d7f910aa3cc9d2d98cc134536ecfdcc7b5f56f6ed7b05aca1bb35206552cf55229efc4010d56dfa2b769ae4c3b5beff9ee4bb95a79a
+EBUILD ocaml-4.02.1.ebuild 3313 SHA256 6497bb6f81b1b83594f5618da678b67b683be9de624a3d09ed7dcaad1c3805b5 SHA512 7871a7f0bc9868e2205f351f76597446012357b6a7d663b90106c479447b13d4823ad1eea452ca3b5ad7082201e2853c925d41fe17d706dc570febd070ccb99a WHIRLPOOL 328f6e1cf0682cd0acd92031d329c86ea360dd311464691b613e24f461b6a4295f246641a707c90422a9b35466bbe67e3b51783d4a6ddfbd055384c0df8f333b
+MISC ChangeLog 34481 SHA256 9b85573f3d7cb15caffc7e6dc9019e0696e572542647b3ac2cd70e1b7dd64688 SHA512 e10ff34c4971036090ba96cbafa9973c2184113f1993f8977ae4fb843c34d48dae6a394d95622fde37d32cf93834d077990e778ab8133813f32ea1a4c1b2a5fd WHIRLPOOL 753a757d243b2e8a55becad39cbca9fd50283ce98f3fc6920647141be0aa5ccef329add6b4029d04fab4f8cbce27423b477eac19f85c8df5d8505281721e97ea
 MISC metadata.xml 155 SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 SHA512 a525f91dd332fc144c42d1437bdae9c889cbcece6294c2d2f4baf6a532ac2e13492736e75b41c83fac31033a9ae53c37deb96286a5ab8575611136617640952c WHIRLPOOL 71a9c7aaf4e268c65c0d1e30e343911ccbcf99ef8c23773abc2b3af8d58d9f7d5c09632805d8ba9050c09eef629f2b340db9eb9ba8b9cd2e5d655fce3f91fcb6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iF4EAREIAAYFAlLafdoACgkQoBEVQmGOlx8WsAD+O8y9q4KFtrwTWVLTwq2uFn5O
-a5W5Ge96uuceaYbAlUkBALArSvnIU3ffxOJbOYlRCx+FFcD2sh0Q7I8IJRspNmus
-=o7oI
+iEYEAREIAAYFAlR4l8oACgkQvFcC4BYPU0oqHQCgzEaCjcfoIWU63swB4fu89utQ
+1YoAn0sqU5WQnkQLritlMKFUT4rnQbzu
+=SXIh
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ocaml/ocaml-4.02.1.ebuild b/dev-lang/ocaml/ocaml-4.02.1.ebuild
new file mode 100644
index 000000000000..92b8b7964acc
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-4.02.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-4.02.1.ebuild,v 1.1 2014/11/28 15:42:01 aballier Exp $
+
+EAPI="5"
+
+inherit flag-o-matic eutils multilib versionator toolchain-funcs
+
+PATCHLEVEL="6"
+MY_P="${P/_/+}"
+DESCRIPTION="Fast modern type-inferring functional programming language descended from the ML family"
+HOMEPAGE="http://www.ocaml.org/"
+SRC_URI="http://caml.inria.fr/pub/distrib/ocaml-$(get_version_component_range 1-2)/${MY_P}.tar.xz
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="QPL-1.0 LGPL-2"
+# Everytime ocaml is updated to a new version, everything ocaml must be rebuilt,
+# so here we go with the subslot.
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux"
+IUSE="emacs latex ncurses +ocamlopt X xemacs"
+
+RDEPEND="
+	ncurses? ( sys-libs/ncurses )
+	X? ( x11-libs/libX11 x11-proto/xproto )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PDEPEND="emacs? ( app-emacs/ocaml-mode )
+	xemacs? ( app-xemacs/ocaml )"
+
+S="${WORKDIR}/${MY_P}"
+pkg_setup() {
+	# dev-lang/ocaml creates its own objects but calls gcc for linking, which will
+	# results in relocations if gcc wants to create a PIE executable
+	if gcc-specs-pie ; then
+		append-ldflags -nopie
+		ewarn "Ocaml generates its own native asm, you're using a PIE compiler"
+		ewarn "We have appended -nopie to ocaml build options"
+		ewarn "because linking an executable with pie while the objects are not pic will not work"
+	fi
+}
+
+src_prepare() {
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+}
+
+src_configure() {
+	export LC_ALL=C
+	local myconf=""
+
+	# Causes build failures because it builds some programs with -pg,
+	# bug #270920
+	filter-flags -fomit-frame-pointer
+	# Bug #285993
+	filter-mfpmath sse
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	use ncurses || myconf="${myconf} -no-curses"
+	use X || myconf="${myconf} -no-graph"
+
+	# ocaml uses a home-brewn configure script, preventing it to use econf.
+	RAW_LDFLAGS="$(raw-ldflags)" ./configure -prefix "${EPREFIX}"/usr \
+		--bindir "${EPREFIX}"/usr/bin \
+		--libdir "${EPREFIX}"/usr/$(get_libdir)/ocaml \
+		--mandir "${EPREFIX}"/usr/share/man \
+		-host "${CHOST}" \
+		-cc "$(tc-getCC)" \
+		-as "$(tc-getAS)" \
+		-aspp "$(tc-getCC) -c" \
+		-partialld "$(tc-getLD) -r" \
+		--with-pthread ${myconf} || die "configure failed!"
+
+	# http://caml.inria.fr/mantis/view.php?id=4698
+	export CCLINKFLAGS="${LDFLAGS}"
+}
+
+src_compile() {
+	emake world
+
+	# Native code generation can be disabled now
+	if use ocamlopt ; then
+		# bug #279968
+		emake opt
+		emake opt.opt
+	fi
+}
+
+src_install() {
+	emake BINDIR="${ED}"/usr/bin \
+		LIBDIR="${ED}"/usr/$(get_libdir)/ocaml \
+		MANDIR="${ED}"/usr/share/man \
+		install
+
+	# Symlink the headers to the right place
+	dodir /usr/include
+	dosym /usr/$(get_libdir)/ocaml/caml /usr/include/caml
+
+	dodoc Changes INSTALL README
+
+	# Create and envd entry for latex input files
+	if use latex ; then
+		echo "TEXINPUTS=${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamldoc
+		doenvd "${T}"/99ocamldoc
+	fi
+
+	# Install ocaml-rebuild portage set
+	insinto /usr/share/portage/config/sets
+	doins "${FILESDIR}/ocaml.conf"
+}