Fix bug #459512 - dev-lang/ocaml with sys-libs/ncurses[tinfo] - .../work/ocaml-4.00.1/byterun/terminfo.c:54: undefined reference to 'tgetent', thanks to Reinis Danne for reporting (patch by me). Add virtual/pkg-config to DEPEND as the ocaml configure script calls pkg-config. Apply patch from upstream for upstream bug http://caml.inria.fr/mantis/view.php?id=5237 to ocaml-3.11.2.

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

8 files changed, 132 insertions, 24 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index ea6f683a4fb8..acfe078fcb8d 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,17 @@
 # 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.218 2014/01/15 22:05:46 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.219 2014/01/18 13:12:48 gienah Exp $
+
+  18 Jan 2014; Mark Wright <gienah@gentoo.org>
+  +files/ocaml-3.11.2-Fix-ocamlopt-w.r.t.-binutils-2.21.patch,
+  +files/ocaml-4.01.0-pkg-config-ncurses.patch, ocaml-3.11.2.ebuild,
+  ocaml-3.12.1.ebuild, ocaml-4.00.1-r1.ebuild, ocaml-4.01.0.ebuild:
+  Fix bug #459512 - dev-lang/ocaml with sys-libs/ncurses[tinfo] -
+  .../work/ocaml-4.00.1/byterun/terminfo.c:54: undefined reference to 'tgetent',
+  thanks to Reinis Danne for reporting (patch by me). Add virtual/pkg-config to
+  DEPEND as the ocaml configure script calls pkg-config. Apply patch from
+  upstream for upstream bug http://caml.inria.fr/mantis/view.php?id=5237 to
+  ocaml-3.11.2.
 
   15 Jan 2014; Sébastien Fabbro <bicatali@gentoo.org> ocaml-4.01.0.ebuild:
   Prefixified and keyworded amd64-linux, x86-linux
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 6db07fda79fe..2beb49a80652 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,6 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX ocaml-3.11.2-Fix-ocamlopt-w.r.t.-binutils-2.21.patch 2223 SHA256 612a9ac108bbfce2238aa5634123da162f0315dedb219958be705e0d92dcdd8e SHA512 75d3354d8d45150b5317cedf97051353f3f035f2b5dae3b30cc69e49f07d3989df8c585f3124777bdb4578a90eb2b1a58f696c019c42e199fb9084cb82d945c6 WHIRLPOOL 4e3d5be6c84b08711e9f9a17f6de8ddcba59faf0e44622b8fb5c9ff83b887c67d7c416847cf12d43338523d4e19c6288a420174927d3fbabb17233f89afc1d64
+AUX ocaml-4.01.0-pkg-config-ncurses.patch 675 SHA256 e8885d02a1e04086c3176a1c4b5c7e68521f5b39acffadeedc9359f4e0cf972b SHA512 b2f7c2a73857f70f4e02b5d8a981e09f85288b4e3b5c2f903a4f2b72486b554ae0202e26447e353782360ae498def81456a9919f4694a96a3218644e91ce6d53 WHIRLPOOL 6e42a67a36c2bf10dc7d0ff020ba73bf0ed2adfd8a040fd37fd4cf2acd3a88e06da06315ee04ec6e527214186da29cb3143ece3913d28538d907199fd70d45ce
 AUX ocaml-rebuild.sh 1120 SHA256 893320630726c58ea3b501ef16913c150c50ea9d6cd38ecd26fa0679597d3a7c SHA512 05a3e81e95533135d9895091c21621c73ae82851abd4889d64f035979eb25f8d90b60f469d7ef5e789fd1a4adffd6bbe255e6708c14c24a04f8a423507d19a40 WHIRLPOOL 11eec7641f2bced1593f21e3b4d9bc1d6156082e8e23d4abc2cfd05294dccd13a9bf5c102b60c0dcca0b565f6edbf8e7364d3236d57db18dcdd520fe05d379a6
 AUX ocaml.conf 177 SHA256 b7f7ad0ff15bec096dcb87265d87f9b0ce8f946d4a2676dd7638ca0e14bb05c1 SHA512 4f0a48b8101b77d568d8d0a852f2a21fd46b7947c5d3f975ee4cd8a9c37c993d689cf5fb53b54a6b2740cb865051dc50c74c0c373eb697fca800ca143d401aa4 WHIRLPOOL d25c9ac2a565a5384c7f645be433faac192e4c41f55a08d74e99ec022ce06132a560070bb4771b261c6f023d3aec72fddb47279d5ab2cfe8cc93c70c97ff16d5
 DIST ocaml-3.11.2.tar.bz2 2346284 SHA256 86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143 SHA512 69888797bdab8f7baa5e398db08a723388876ed5920b62e9bf29a5214badde1c2024365f88bcbd89d43a0c8d9e4d1bd15486e4b12e8432f1c1bcedd17782faaf WHIRLPOOL d1e6d0851f8f1315f95cd0a470bb61dc1d39ec70f2ec23169ffc9aa74b2d02f5419e3474093319cb47125e7534a0d121751fd1971653e43bdca167f823d4c94a
@@ -11,16 +13,16 @@ DIST ocaml-patches-1.tar.bz2 3108 SHA256 ad1c252cba7cc50f70d19049fcd78aa359672e4
 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
 DIST ocaml-patches-6.tar.bz2 2197 SHA256 7acfa3d056c2b3f7dfc3b1f96a2557d81802c837c2ba0abc1487de10627e5e07 SHA512 88afa904044192b945b537cbfc3c17308e333ed1d241332212b9500d01c14bb306905b03f2b48ec64dd2f428df1f7179772d742b77b4402da108ba7790239bf6 WHIRLPOOL d2001a8a3e799080c3981be87bcef62635c11cab037d6d92da186643614c6e2a568543f82f3566bfb099c063ad344cab2238edf863a9fb02081f4e20f442d9f8
-EBUILD ocaml-3.11.2.ebuild 4127 SHA256 89abc74d30c03d2755623f3b9eadcb1a4b975fb9b668616f380640b6af76aeea SHA512 ac4a51bdf2e199635a2ab8fa18cab1907ef5f4357bc9695d23462d4cda4e836867a6de6c9d07f93522094ce764331d47528a6a46182fd3342a382dbae363da0c WHIRLPOOL 8b0d3bd3a359443dad4f4611af785cf857a2d3cbb8736f41fff28b7e86519036e7810fa3dbcba60fb07a4e79bb8148400b256b36a3390491151883ebb2c15132
-EBUILD ocaml-3.12.1.ebuild 4045 SHA256 924440c4a1a73ea30cd8833d85cde70f9ad95eb9ce5e13326f9b288569dd52e9 SHA512 3f6c6430eaac2020759134ea26012e2c657dd49f42fc54bbc6fff133639bdd78bfbe381d44b53281c9dd51d8a86eeaa25729b9766a12f45c2fd31a757df9ef94 WHIRLPOOL 1355f4ae0c98153efdfc95cd74a67383176d2141c5bef77cf41fd44b22901c3b5446d4aa0d7c83c7bd4d4a3fac564328a7a434051b523b64e827bd81db20d0d9
-EBUILD ocaml-4.00.1-r1.ebuild 3685 SHA256 47bb6f84d590209bfb35b91e8b34f8c82d34138b89829fa3a7e7b648178994d5 SHA512 477398d24c1e219e1de27cd5894925b89613048c714e68e6335dcc06b5c767bae07f53752dc1be0b054b2aa6666b64cb2356948a99e14627d12e47cbdfb03f43 WHIRLPOOL ffd0761225d487f64587d8ee581ad2b961f7cc933e1ddac92ea2604c72d7732164365503ba59dab21173b8a43052432df8e8136cac1d4482c12fb85fd2ac966d
-EBUILD ocaml-4.01.0.ebuild 3767 SHA256 0ff742fad12f542d8cfeb5c80b56101a80b137d00569a445a99cf51822f86c68 SHA512 c2cb0db8532a94300dcc977df4f2063c56304f961d1fb93959929f8746ec96b168b23157ce94b7172e5bdbe44999ca00769067fd593bcff13ba0172ac032c405 WHIRLPOOL 8a54ec43b7aaaa816abf5c2b308edb4b9a98ab660e77a0c1267ffcc81fe61b8c3880ed2107797e00f680d5a969ab0837d4d106a813b4c3fdf4293f21657f8df7
-MISC ChangeLog 33721 SHA256 0c2e2ae84701b7e27940eb90150729bbbbd6e46bf5a9b7cc1d08fd96b5018364 SHA512 d803a77cbb08b3bebcc877d3d8d303acf9ca7968a9b734edf1e3f9708b2f17d926ba47965a275590edef2f0e2f1ea942577e112d828d1f04f70d46c8df344a3b WHIRLPOOL e3765ba0036ef0dfcc30c4b5966ede828787f1c4b1af27f85b9d27c38861b92a39e718a5395bb7aed79e1c049b9a94f19f36aa3f74dcf6d21a1f894012b46d4f
+EBUILD ocaml-3.11.2.ebuild 4355 SHA256 64d0669832969b53640d97711006b1e2588d806cd73224dd6ff4764a886c7df3 SHA512 455c07ab33faf9e2f799eb049b42e08d6432b83e196cd451b426eb259b017e9448f45ac6d7558661b472af856b17bdc60f82b9408ae8c6545f459c4f723c5083 WHIRLPOOL 783ef6567feaca8839330dab8878903cf5a5b89a1cf611fb3b80431e4b0488271c01ee2a053eb51a37735e11a1e72ec1e02aea3ab9b03cb9f24599fb0e91ad90
+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
 MISC metadata.xml 155 SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 SHA512 a525f91dd332fc144c42d1437bdae9c889cbcece6294c2d2f4baf6a532ac2e13492736e75b41c83fac31033a9ae53c37deb96286a5ab8575611136617640952c WHIRLPOOL 71a9c7aaf4e268c65c0d1e30e343911ccbcf99ef8c23773abc2b3af8d58d9f7d5c09632805d8ba9050c09eef629f2b340db9eb9ba8b9cd2e5d655fce3f91fcb6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLXBkIACgkQ1ycZbhPLE2D9wACeNSx+5V+cwoBkOJ8aEs/XxDjm
-FkQAn0ldEA7KbjZlH/2m2V4yFOx8sv5s
-=Prbo
+iF4EAREIAAYFAlLafdoACgkQoBEVQmGOlx8WsAD+O8y9q4KFtrwTWVLTwq2uFn5O
+a5W5Ge96uuceaYbAlUkBALArSvnIU3ffxOJbOYlRCx+FFcD2sh0Q7I8IJRspNmus
+=o7oI
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ocaml/files/ocaml-3.11.2-Fix-ocamlopt-w.r.t.-binutils-2.21.patch b/dev-lang/ocaml/files/ocaml-3.11.2-Fix-ocamlopt-w.r.t.-binutils-2.21.patch
new file mode 100644
index 000000000000..fa7664cecc98
--- /dev/null
+++ b/dev-lang/ocaml/files/ocaml-3.11.2-Fix-ocamlopt-w.r.t.-binutils-2.21.patch
@@ -0,0 +1,66 @@
+From: Stephane Glondu <steph@glondu.net>
+Date: Tue, 8 Mar 2011 21:17:40 +0100
+Subject: [PATCH] Fix ocamlopt w.r.t. binutils 2.21
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Bug: http://caml.inria.fr/mantis/view.php?id=5237
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617404
+Authors: Eric Cooper, spiralvoice
+Reviewed-by: Stéphane Glondu <steph@glondu.net>
+---
+ asmcomp/amd64/emit.mlp |   13 +++++++------
+ asmcomp/i386/emit.mlp  |    6 +++---
+ 2 files changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp
+index 4a3f844..525c6e6 100644
+--- a/asmcomp/amd64/emit.mlp
++++ b/asmcomp/amd64/emit.mlp
+@@ -679,17 +679,18 @@ let fundecl fundecl =
+   emit_all true fundecl.fun_body;
+   List.iter emit_call_gc !call_gc_sites;
+   emit_call_bound_errors ();
++  begin match Config.system with
++    "linux" | "gnu" ->
++      `	.type	{emit_symbol fundecl.fun_name},@function\n`;
++      `	.size	{emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n`
++    | _ -> ()
++  end;
+   if !float_constants <> [] then begin
+     if macosx
+     then `	.literal8\n`
+     else `	.section	.rodata.cst8,\"a\",@progbits\n`;
+     List.iter emit_float_constant !float_constants
+-  end;
+-  match Config.system with
+-    "linux" | "gnu" ->
+-      `	.type	{emit_symbol fundecl.fun_name},@function\n`;
+-      `	.size	{emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n`
+-  | _ -> ()
++  end
+ 
+ (* Emission of data *)
+ 
+diff --git a/asmcomp/i386/emit.mlp b/asmcomp/i386/emit.mlp
+index 2992f29..0b1252c 100644
+--- a/asmcomp/i386/emit.mlp
++++ b/asmcomp/i386/emit.mlp
+@@ -905,12 +905,12 @@ let fundecl fundecl =
+   emit_all true fundecl.fun_body;
+   List.iter emit_call_gc !call_gc_sites;
+   emit_call_bound_errors ();
+-  List.iter emit_float_constant !float_constants;
+-  match Config.system with
++  begin match Config.system with
+     "linux_elf" | "bsd_elf" | "gnu" ->
+       `	.type	{emit_symbol fundecl.fun_name},@function\n`;
+       `	.size	{emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n`
+-  | _ -> ()
++  | _ -> () end;
++  List.iter emit_float_constant !float_constants
+ 
+ 
+ (* Emission of data *)
+-- 
diff --git a/dev-lang/ocaml/files/ocaml-4.01.0-pkg-config-ncurses.patch b/dev-lang/ocaml/files/ocaml-4.01.0-pkg-config-ncurses.patch
new file mode 100644
index 000000000000..b9fa750ff07d
--- /dev/null
+++ b/dev-lang/ocaml/files/ocaml-4.01.0-pkg-config-ncurses.patch
@@ -0,0 +1,15 @@
+--- ocaml-4.01.0-orig/configure	2013-08-23 16:22:36.000000000 +1000
++++ ocaml-4.01.0/configure	2014-01-18 20:06:50.669644267 +1100
+@@ -892,7 +892,11 @@
+ # For the terminfo module
+ 
+ if test "$withcurses" = "yes"; then
+-  for libs in "" "-lcurses" "-ltermcap" "-lcurses -ltermcap" "-lncurses"; do
++  ncurseslibs=""
++  if pkg-config --exists ncurses 2>/dev/null; then
++    ncurseslibs=`pkg-config --libs ncurses`
++  fi
++  for libs in "${ncurseslibs}" "-lcurses" "-ltermcap" "-lcurses -ltermcap" "-lncurses"; do
+     if sh ./hasgot $libs tgetent tgetstr tgetnum tputs; then
+       echo "termcap functions found (with libraries '$libs')"
+       echo "#define HAS_TERMCAP" >> s.h
diff --git a/dev-lang/ocaml/ocaml-3.11.2.ebuild b/dev-lang/ocaml/ocaml-3.11.2.ebuild
index 856a34d4b388..be4f08812d90 100644
--- a/dev-lang/ocaml/ocaml-3.11.2.ebuild
+++ b/dev-lang/ocaml/ocaml-3.11.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-3.11.2.ebuild,v 1.8 2011/01/22 22:58:12 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.2.ebuild,v 1.9 2014/01/18 13:12:48 gienah Exp $
 
 EAPI="1"
 
@@ -18,11 +18,12 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="emacs gdbm latex ncurses +ocamlopt tk X xemacs"
 
-DEPEND="tk? ( >=dev-lang/tk-3.3.3 )
+RDEPEND="tk? ( >=dev-lang/tk-3.3.3 )
 	ncurses? ( sys-libs/ncurses )
 	X? ( x11-libs/libX11 x11-proto/xproto )
 	gdbm? ( sys-libs/gdbm )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 PDEPEND="emacs? ( app-emacs/ocaml-mode )
 	xemacs? ( app-xemacs/ocaml )"
@@ -43,6 +44,10 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	# Bug #459512
+	epatch "${FILESDIR}/${PN}-4.01.0-pkg-config-ncurses.patch"
+	# Upstream bug: http://caml.inria.fr/mantis/view.php?id=5237
+	epatch "${FILESDIR}/${PN}-3.11.2-Fix-ocamlopt-w.r.t.-binutils-2.21.patch"
 }
 
 src_compile() {
diff --git a/dev-lang/ocaml/ocaml-3.12.1.ebuild b/dev-lang/ocaml/ocaml-3.12.1.ebuild
index e85ed46aafef..88f14d8112b9 100644
--- a/dev-lang/ocaml/ocaml-3.12.1.ebuild
+++ b/dev-lang/ocaml/ocaml-3.12.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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-3.12.1.ebuild,v 1.11 2012/05/24 10:47:13 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.12.1.ebuild,v 1.12 2014/01/18 13:12:48 gienah Exp $
 
 EAPI="1"
 
@@ -18,11 +18,12 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="emacs gdbm latex ncurses +ocamlopt tk X xemacs"
 
-DEPEND="tk? ( >=dev-lang/tk-3.3.3 )
+RDEPEND="tk? ( >=dev-lang/tk-3.3.3 )
 	ncurses? ( sys-libs/ncurses )
 	X? ( x11-libs/libX11 x11-proto/xproto )
 	gdbm? ( sys-libs/gdbm )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 PDEPEND="emacs? ( app-emacs/ocaml-mode )
 	xemacs? ( app-xemacs/ocaml )"
@@ -43,6 +44,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	# Bug #459512
+	epatch "${FILESDIR}/${PN}-4.01.0-pkg-config-ncurses.patch"
 }
 
 src_compile() {
diff --git a/dev-lang/ocaml/ocaml-4.00.1-r1.ebuild b/dev-lang/ocaml/ocaml-4.00.1-r1.ebuild
index 24fd69cf4484..88e738b8ed86 100644
--- a/dev-lang/ocaml/ocaml-4.00.1-r1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.00.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.00.1-r1.ebuild,v 1.2 2013/06/19 03:19:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-4.00.1-r1.ebuild,v 1.3 2014/01/18 13:12:48 gienah Exp $
 
 EAPI="5"
 
@@ -20,10 +20,11 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="emacs latex ncurses +ocamlopt tk X xemacs"
 
-DEPEND="tk? ( >=dev-lang/tk-3.3.3 )
+RDEPEND="tk? ( >=dev-lang/tk-3.3.3 )
 	ncurses? ( sys-libs/ncurses )
 	X? ( x11-libs/libX11 x11-proto/xproto )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 PDEPEND="emacs? ( app-emacs/ocaml-mode )
 	xemacs? ( app-xemacs/ocaml )"
@@ -42,6 +43,8 @@ pkg_setup() {
 
 src_prepare() {
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	# Bug #459512
+	epatch "${FILESDIR}/${PN}-4.01.0-pkg-config-ncurses.patch"
 }
 
 src_configure() {
diff --git a/dev-lang/ocaml/ocaml-4.01.0.ebuild b/dev-lang/ocaml/ocaml-4.01.0.ebuild
index 078dd4744ec0..d6276db555ae 100644
--- a/dev-lang/ocaml/ocaml-4.01.0.ebuild
+++ b/dev-lang/ocaml/ocaml-4.01.0.ebuild
@@ -1,6 +1,6 @@
 # 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.01.0.ebuild,v 1.2 2014/01/15 22:05:46 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-4.01.0.ebuild,v 1.3 2014/01/18 13:12:48 gienah Exp $
 
 EAPI="5"
 
@@ -20,10 +20,11 @@ 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 tk X xemacs"
 
-DEPEND="tk? ( >=dev-lang/tk-3.3.3 )
+RDEPEND="tk? ( >=dev-lang/tk-3.3.3 )
 	ncurses? ( sys-libs/ncurses )
 	X? ( x11-libs/libX11 x11-proto/xproto )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 PDEPEND="emacs? ( app-emacs/ocaml-mode )
 	xemacs? ( app-xemacs/ocaml )"
@@ -42,6 +43,8 @@ pkg_setup() {
 
 src_prepare() {
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	# Bug #459512
+	epatch "${FILESDIR}/${PN}-4.01.0-pkg-config-ncurses.patch"
 }
 
 src_configure() {