Fix X and gdbm automagics

Package-Manager: portage-2.1.2.7

4 files changed, 83 insertions, 15 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index eb795026bbd9..f383a22899a2 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/ocaml
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.104 2007/05/12 21:44:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.105 2007/05/12 22:20:26 aballier Exp $
+
+  12 May 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/ocaml-3.09.3-automagic.patch, ocaml-3.09.3-r1.ebuild:
+  Fix X and gdbm automagics
 
   12 May 2007; Alexis Ballier <aballier@gentoo.org> ocaml-3.09.3-r1.ebuild:
   Add ncurses useflag (was automagic)
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index d4bd4b61d0de..348d759f7eaf 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -5,6 +5,10 @@ AUX ocaml-3.09.3-Makefile.patch 1489 RMD160 2405669fdfe7ac35191c59d51c36dcea4f43
 MD5 0d21d3b76fc3a724bd2b8d2e8d3a603f files/ocaml-3.09.3-Makefile.patch 1489
 RMD160 2405669fdfe7ac35191c59d51c36dcea4f43e2c0 files/ocaml-3.09.3-Makefile.patch 1489
 SHA256 da690e61fd4f72e28ed4f41a0b7c18a26a11f9ad42d4d8aa95301c02317336b9 files/ocaml-3.09.3-Makefile.patch 1489
+AUX ocaml-3.09.3-automagic.patch 1849 RMD160 347c4b50ae624357a4e4a118652bce8c4e71c480 SHA1 622dcd31709e95048e6430c835f98de36898c80a SHA256 910c3a2f4d2a538fd721cf0e9c9a2e714e4d67862fdecd3adc60b92a145761ec
+MD5 9f4217a60a69283ce881d43d056a651e files/ocaml-3.09.3-automagic.patch 1849
+RMD160 347c4b50ae624357a4e4a118652bce8c4e71c480 files/ocaml-3.09.3-automagic.patch 1849
+SHA256 910c3a2f4d2a538fd721cf0e9c9a2e714e4d67862fdecd3adc60b92a145761ec files/ocaml-3.09.3-automagic.patch 1849
 AUX ocaml-3.09.3-configure.patch 5206 RMD160 75f785d4950f15fea344f6a7a331ce199fb6d168 SHA1 b5df5f8d8574781738b876bde04de81f5ec945c0 SHA256 334d50f9a7a64988ef8ad6b6eedba98ec763fd4479689596f91e84f0c5a397ba
 MD5 1d3977bc99dee8b9a07876ae280a5832 files/ocaml-3.09.3-configure.patch 5206
 RMD160 75f785d4950f15fea344f6a7a331ce199fb6d168 files/ocaml-3.09.3-configure.patch 5206
@@ -32,18 +36,18 @@ EBUILD ocaml-3.09.2.ebuild 2402 RMD160 6bc854705b08c0ef5e9d05d6e6009d6c463f2d33
 MD5 8cb80568d2fffd2db8db680e611b1323 ocaml-3.09.2.ebuild 2402
 RMD160 6bc854705b08c0ef5e9d05d6e6009d6c463f2d33 ocaml-3.09.2.ebuild 2402
 SHA256 8144897559ad397542ece72e1d503d561add45cf8ac3daab8c2fd1020e38a030 ocaml-3.09.2.ebuild 2402
-EBUILD ocaml-3.09.3-r1.ebuild 4748 RMD160 7f492a77bebb6fd1e3f0754e6207d8577c277227 SHA1 b2e948835d018978eb53006b8f3b7d24e81c767e SHA256 80601c765a0febe5f968f50f4541d4abb33e8958e4953f5624644ee961040025
-MD5 f53ad35a51c03695c6daf84e20ba0590 ocaml-3.09.3-r1.ebuild 4748
-RMD160 7f492a77bebb6fd1e3f0754e6207d8577c277227 ocaml-3.09.3-r1.ebuild 4748
-SHA256 80601c765a0febe5f968f50f4541d4abb33e8958e4953f5624644ee961040025 ocaml-3.09.3-r1.ebuild 4748
+EBUILD ocaml-3.09.3-r1.ebuild 5036 RMD160 34fe5261b1378b4fdd8e41f2929c87a074756d46 SHA1 475a3e0b665db3908a65a01f72a83a652d2724bc SHA256 e6a50ae20ab7b72b576d91609ee8fc2fb9dd11cd9079afb194476b10161a055b
+MD5 66fd7ed37ab3d8a2b9cead0d8c202950 ocaml-3.09.3-r1.ebuild 5036
+RMD160 34fe5261b1378b4fdd8e41f2929c87a074756d46 ocaml-3.09.3-r1.ebuild 5036
+SHA256 e6a50ae20ab7b72b576d91609ee8fc2fb9dd11cd9079afb194476b10161a055b ocaml-3.09.3-r1.ebuild 5036
 EBUILD ocaml-3.09.3.ebuild 2502 RMD160 2a015120aec3b6ce103ffeebdae265e1ced4aa49 SHA1 44bdb0801fe812386f53a75b3ba376ae1b54eee6 SHA256 fad524f73b1a807254283cc48dc742f18a8fec1a5b3123a86435a014cbc2125f
 MD5 e44a3de37fac8ae24a87c9f1d4019c7a ocaml-3.09.3.ebuild 2502
 RMD160 2a015120aec3b6ce103ffeebdae265e1ced4aa49 ocaml-3.09.3.ebuild 2502
 SHA256 fad524f73b1a807254283cc48dc742f18a8fec1a5b3123a86435a014cbc2125f ocaml-3.09.3.ebuild 2502
-MISC ChangeLog 16384 RMD160 afa6e3a61d694bf4f4b1d3f0c6cff594f1ad8649 SHA1 7af4f9185fb59a20cd913dd03f96fb4b8589a5f4 SHA256 085df32054549d2900b77be6a6acddae3d120055c70f3f69409f795c5f2f8cdb
-MD5 a201a75523a6ec1206680bb355e7c013 ChangeLog 16384
-RMD160 afa6e3a61d694bf4f4b1d3f0c6cff594f1ad8649 ChangeLog 16384
-SHA256 085df32054549d2900b77be6a6acddae3d120055c70f3f69409f795c5f2f8cdb ChangeLog 16384
+MISC ChangeLog 16528 RMD160 a1cc093dee98bdc2ff6e120c6486e3c71460ab90 SHA1 f9f744954f880626bb3d5c94711ba194f993abc9 SHA256 eb231321d482bf5bd2e92e95281d10439087313ae45e3b80326e00e23d947d3f
+MD5 afce4a2b134beabdd66c95e8aa602e39 ChangeLog 16528
+RMD160 a1cc093dee98bdc2ff6e120c6486e3c71460ab90 ChangeLog 16528
+SHA256 eb231321d482bf5bd2e92e95281d10439087313ae45e3b80326e00e23d947d3f ChangeLog 16528
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 RMD160 dfaa057e679b01302a807c75a32a910098b26809 metadata.xml 155
@@ -63,7 +67,7 @@ SHA256 19708f759185ed39623e03921462ba20fb6f3533268673d2bcd7dd07cef57350 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGRjTQvFcC4BYPU0oRAqC6AKCrBAH1NuJ6kfXDnJy3PDGndCJqIQCgguM4
-GC8gdd+zX76mQ2f8s+55pvk=
-=xqso
+iD8DBQFGRj0tvFcC4BYPU0oRAoQoAJ48ykyyyLmcu3yA/Vj1/q8vHiCa8wCfWjo6
+h3gWA4kNZSS7e3JyRfEPD+U=
+=pCI9
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ocaml/files/ocaml-3.09.3-automagic.patch b/dev-lang/ocaml/files/ocaml-3.09.3-automagic.patch
new file mode 100644
index 000000000000..f31318baaa3d
--- /dev/null
+++ b/dev-lang/ocaml/files/ocaml-3.09.3-automagic.patch
@@ -0,0 +1,51 @@
+Index: ocaml-3.09.3/configure
+===================================================================
+--- ocaml-3.09.3.orig/configure
++++ ocaml-3.09.3/configure
+@@ -31,6 +31,8 @@ x11_include_dir=''
+ x11_lib_dir=''
+ tk_wanted=yes
+ pthread_wanted=yes
++graph_wanted=yes
++dbm_wanted=yes
+ tk_defs=''
+ tk_libs=''
+ tk_x11=yes
+@@ -86,6 +88,10 @@ while : ; do
+         ;; # Ignored for backward compatibility
+     -no-pthread*|--no-pthread*)
+         pthread_wanted=no;;
++    -no-dbm|--no-dbm)
++        dbm_wanted=no;;
++    -no-graph|--no-graph)
++        graph_wanted=no;;
+     -no-tk|--no-tk)
+         tk_wanted=no;;
+     -tkdefs*|--tkdefs*)
+@@ -1219,7 +1225,7 @@ do
+ done
+ 
+ 
+-if test "$x11_include" = "not found" || test "$x11_link" = "not found"
++if test "$x11_include" = "not found" || test "$x11_link" = "not found" || test "$graph_wanted" = "no"
+ then
+   echo "X11 not found, the \"graph\" library will not be supported."
+   x11_include=""
+@@ -1267,7 +1273,7 @@ for dir in /usr/include /usr/include/db1
+     break
+   fi
+ done
+-if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then
++if test "$dbm_include" = "not found" || test "$dbm_link" = "not found" || test "$dbm_wanted" = "no"; then
+   echo "NDBM not found, the \"dbm\" library will not be supported."
+ else
+   echo "NDBM found (in $dbm_include)"
+@@ -1506,7 +1512,7 @@ echo "        $otherlibraries"
+ echo "Configuration for the \"num\" library:"
+ echo "        target architecture ...... $bng_arch (asm level $bng_asm_level)"
+ 
+-if test "$x11_include" != "not found" && test "$x11_lib" != "not found"; then
++if test "$x11_include" != "not found" && test "$x11_lib" != "not found" && test "$graph_wanted" != "no"; then
+ echo "Configuration for the \"graph\" library:"
+ echo "        options for compiling .... $x11_include"
+ echo "        options for linking ...... $x11_link"
diff --git a/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild b/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild
index b0b7108fa78d..9b8cbd3c432f 100644
--- a/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild
+++ b/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild,v 1.6 2007/05/12 21:44:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild,v 1.7 2007/05/12 22:20:26 aballier Exp $
 
 inherit flag-o-matic eutils multilib pax-utils versionator toolchain-funcs
 
@@ -11,10 +11,12 @@ SRC_URI="http://caml.inria.fr/distrib/ocaml-$( get_version_component_range 1-2 )
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="ncurses tk latex"
+IUSE="gdbm ncurses tk latex X"
 
 DEPEND="tk? ( >=dev-lang/tk-3.3.3 )
-	ncurses? ( sys-libs/ncurses )"
+	ncurses? ( sys-libs/ncurses )
+	X? ( x11-libs/libX11 x11-proto/xproto )
+	gdbm? ( sys-libs/gdbm )"
 
 # ocaml deletes the *.opt files when running make bootstrap
 
@@ -49,6 +51,11 @@ src_unpack() {
 	# in driver/ocamlcomp.sh.in. Reported upstream as issue 0004268.
 	epatch "${FILESDIR}"/${P}-Makefile.patch
 
+
+	# ocaml has automagics on libX11 and gdbm
+	# http://caml.inria.fr/mantis/view.php?id=4278
+	epatch "${FILESDIR}/${P}-automagic.patch"
+
 	# Change the configure script to add the CFLAGS to bytecccompopts, LDFLAGS
 	# to bytecclinkopts.
 	sed -i -e "s,bytecccompopts=\"\",bytecccompopts=\"\${CFLAGS}\"," \
@@ -65,6 +72,8 @@ src_compile() {
 
 	use tk || myconf="${myconf} -no-tk"
 	use ncurses || myconf="${myconf} -no-curses"
+	use X || myconf="${myconf} -no-graph"
+	use gdbm || myconf="${myconf} -no-dbm"
 
 	# ocaml uses a home-brewn configure script, preventing it to use econf.
 	./configure -prefix /usr \