Fix build with ocamlnet built without -compat-pcre.

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 57 insertions, 9 deletions

diff --git a/www-servers/ocsigenserver/ChangeLog b/www-servers/ocsigenserver/ChangeLog
index 154e7f52e819..483faf990e15 100644
--- a/www-servers/ocsigenserver/ChangeLog
+++ b/www-servers/ocsigenserver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/ocsigenserver
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigenserver/ChangeLog,v 1.3 2013/01/13 19:57:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigenserver/ChangeLog,v 1.4 2013/07/23 17:51:39 aballier Exp $
+
+  23 Jul 2013; Alexis Ballier <aballier@gentoo.org> ocsigenserver-2.2.0.ebuild,
+  +files/pcre.patch:
+  Fix build with ocamlnet built without -compat-pcre.
 
 *ocsigenserver-2.2.0 (13 Jan 2013)
 
diff --git a/www-servers/ocsigenserver/Manifest b/www-servers/ocsigenserver/Manifest
index 1946fdc2b251..da86c5b3aab8 100644
--- a/www-servers/ocsigenserver/Manifest
+++ b/www-servers/ocsigenserver/Manifest
@@ -4,16 +4,17 @@ Hash: SHA256
 AUX ocsigenserver-2.1-makefile.patch 588 SHA256 6d20af26beb7e67ced5acbe5b83e1b504278ec2853b7ef0201b537aeac64aaf1 SHA512 5ad8e96fcbc0cf9ca50133b9c38b26c5b5044a35186692a646c8542cc73026616ede5984edffc86c54f9fe7d2c735a2384ab428f6eb99cccf6fe22b0eb8fc1b3 WHIRLPOOL 57984265dc8c5168a38d15e736c440e9950a89320cb8fca9a82804ee6e11a593b9432eb524583fc8949c5183b0a4afecfdfde3f4d57f677720968c14d9cb9301
 AUX ocsigenserver.confd 432 SHA256 f128306075b9a1cc062e7b49e79806affc0b11c68f791729c861e1eff9c7bcea SHA512 d460460eef1371ef8df6e236dbb6fb46969c720ece6278983504db1cf6307b114d30353df75d172a78c041090969b30807696b34490b7ae674e5fa6acca05395 WHIRLPOOL fe5564620a04cb5b53e33865e0b71295abd99690806d9c2ee3cdad8a4aefb803e7a5fb92391f30fca8def248cdc91453b7bc06146bbb96f2ca27db454d41a548
 AUX ocsigenserver.initd 882 SHA256 7e8d232d06adce963795bf7bc58f715b5870c72a4a003d43074fee938869fd3c SHA512 89aff58a2427bb1f557796dcd30aebc88d87c604feaf9b8b9d68acb623b49cc0391889cdd468a4b443533d0fe49cd6cf5303cd38ba056e0465f913036d022c7d WHIRLPOOL 4cd19514b4565d9e701a0ff5047ee3e14df834a3064ceb2fac7dd9cf12aa87333ea808499a004dff0e81e117a29d6dbe72f5d0d4b26be6af60c3e6e9e833b1f7
+AUX pcre.patch 1533 SHA256 4c73846375ccfe3b113e649ccbd15239b0967d5ddb3d124cbec27c030f15ff03 SHA512 b9bb25da58dcf4548d2991a3ed446f5b21d2aee84d7829c632900bdb7dbfc65533568ecf2b38f745841c2b3069eee9c6848a6a74dc12a794cda4c5e36d562480 WHIRLPOOL b99b1bd469fc2c340d0cbd92e9fd5901c36eafeb22f4fca17b2be2b1876fe21b21021018d1333b8b4e41c54991d0a13d418796cb7b26e8633826cb4e1fc8bf21
 DIST ocsigenserver-2.1.tar.gz 1254537 SHA256 433bf98754c198b1752a8893f52dcb69352e7265dd3634c45eacfdf9702d0cbd SHA512 18ad75da9bbf4375bd57e38a6360ee2cee50719900e05ee3857f7878f25f7ae907b9087ca8906087a6373c26e646d431a6cd961ad87d4202a050a27127e763e3 WHIRLPOOL dbe9288c5d520a9288597f03abd783ce9750bbec2620a9a399adda2a3ef0d9e57eabd6051e5b6599d23e69cd2e3ccd81d0867da0d44964c45bea7982778fa593
 DIST ocsigenserver-2.2.0.tar.gz 1259122 SHA256 21d4d08dd00550647fc08cef214c0a651574671ee3542b7445f76b8234de1f68 SHA512 f1f98df2a00dcbdf9b9dcc5fb4213eb27cf68c66242bea85330d6f2bf772b958bbfed0b48630af6e12972638bf7bcf3e68c45aa4e3979cd1348e34d4da6c93f5 WHIRLPOOL b6c1f7daf676834793719e2222d528e0403bf25f6581ea6966beabeee4472641e32721aa626b9d67fbbc5c207096e3a1ee5e413763c0ff0b098cf7de8ad5505e
 EBUILD ocsigenserver-2.1.ebuild 1944 SHA256 77cf6a80c9f3db196535068c722b00c760d1df425b916168b8af70bf5701b22d SHA512 f0ad3b8c3be711f76a2340215e198c78fe9b19dca2a4eaff3e65ce8e17027ad3c81b7abf2c0bcd98636c9effab1f476c4cd5ca23d9da38cacdbda3c19d5efff9 WHIRLPOOL a257574f032827a81e63ff3829a63477a89443f060d412d709c1e448732bfc71b89edceb0512b2f71b0e87e72ed3c1f61b8b719dee8c6f04854e2ed445868c7e
-EBUILD ocsigenserver-2.2.0.ebuild 1885 SHA256 516d8519ce3ac5666b7f6ec250353958bee710624d26454aef87ea10be12f725 SHA512 84c96c058107a34e25b3dc397315b68c39592df8a70bf0906c3b9e73da21adcafefff6124b31302d98b4a4ba700ea58edc4785be49f33bd81e9150e91118d010 WHIRLPOOL fabffd370275bc9e0f85c5a262569a1fbda2d6d7136f2273bb2a6fe7e67dfa9212d9f3852198e4fef7a4599c735236ec96aa9ad3d29d2ecdb4c4947a55f1df1d
-MISC ChangeLog 889 SHA256 7e63c7bb82db683d241a27397636927b25436543c88e74c47551558f41bc2bcc SHA512 35abcecddcf2d5964350c7157511e34804f5841965857d94df7ab1a735e6af7431e4fc1507e32d8aa5b2834538e1853499213317da3c2a3dd5084c31a71305d6 WHIRLPOOL 58b15b81feadfd7056c407a2e2130a77819c22d6e2bcdccd7a064d7d33c8595fdac8d77bb50e787d3bf6c1e979443398ca6e72c2a92cc119bb9384428b359fd2
+EBUILD ocsigenserver-2.2.0.ebuild 1941 SHA256 c86f4bf2a77942345ea871c72d846e150b1d33e18bfb32a9fba05a99e7f06bd5 SHA512 278c24b95540692e3bbacf6f475d4e68a8b4bfd6894fdd387537872edcef6e091cccfec6a01e8760722356f3abb676ad9a418b52f776b0ee83335fd1870217a8 WHIRLPOOL 5b9380d054ad0895ad6251b9390a0440ad95e84e13923a3bc05bf68fac9e386ab6b19a5ae68cd03dab3a3da2dbb900c83902c679a260a38a4d2429359acd22f0
+MISC ChangeLog 1045 SHA256 a816319c231becccd91cc2ddf135f26867545c8a3140a709be75172bf695ae5a SHA512 ec69ca7eec1a905c14156ae9eeaaa55ddc55dd882077585f46b1419b9f37270c2745c6100515ad1ed9f114a90df8575eb187fb05a7bc065d3e9356769469f72f WHIRLPOOL 1051f9b450d9428bfe8c7607b7e3b769f819ba2e49dae9e5340537665157f4607fab9f2e6c44a6c81cace5ad6c91446b58389f003368d339ee0ae219ff92e473
 MISC metadata.xml 155 SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 SHA512 a525f91dd332fc144c42d1437bdae9c889cbcece6294c2d2f4baf6a532ac2e13492736e75b41c83fac31033a9ae53c37deb96286a5ab8575611136617640952c WHIRLPOOL 71a9c7aaf4e268c65c0d1e30e343911ccbcf99ef8c23773abc2b3af8d58d9f7d5c09632805d8ba9050c09eef629f2b340db9eb9ba8b9cd2e5d655fce3f91fcb6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlDzEbIACgkQvFcC4BYPU0qCBwCfXtxEUIKPfFB3bwd5w4sDCQ68
-dkQAoJlIFw4DbvjKJGiozRdFUnjdqpCr
-=y1sa
+iEYEAREIAAYFAlHuwq0ACgkQvFcC4BYPU0pypQCfVUel1cfLaQXcFDpz4+ZgEtrB
+q2QAnRS3kOVE5YNfK4dx0ad3ITBTChbR
+=thTf
 -----END PGP SIGNATURE-----
diff --git a/www-servers/ocsigenserver/files/pcre.patch b/www-servers/ocsigenserver/files/pcre.patch
new file mode 100644
index 000000000000..187b2b9c5994
--- /dev/null
+++ b/www-servers/ocsigenserver/files/pcre.patch
@@ -0,0 +1,39 @@
+Fix build with ocamlnet built without -compat-pcre.
+
+Index: ocsigenserver-2.2.0/src/extensions/Makefile
+===================================================================
+--- ocsigenserver-2.2.0.orig/src/extensions/Makefile
++++ ocsigenserver-2.2.0/src/extensions/Makefile
+@@ -4,6 +4,7 @@ PACKAGE  := lwt.unix     \
+ 	    lwt.ssl      \
+ 	    lwt.react    \
+             netstring    \
++	    netstring-pcre \
+ 	    tyxml.parser \
+ 
+ LIBS     := -I ../baselib -I ../http -I ../server ${addprefix -package ,${PACKAGE}}
+Index: ocsigenserver-2.2.0/configure
+===================================================================
+--- ocsigenserver-2.2.0.orig/configure
++++ ocsigenserver-2.2.0/configure
+@@ -414,6 +414,8 @@ check_library lwt.ssl   "Missing support
+ 
+ check_library netstring \
+     "See ocamlnet: http://projects.camlcity.org/projects/ocamlnet.html"
++check_library netstring-pcre \
++    "See ocamlnet: http://projects.camlcity.org/projects/ocamlnet.html"
+ check_library netsys \
+     "See ocamlnet: http://projects.camlcity.org/projects/ocamlnet.html"
+ 
+Index: ocsigenserver-2.2.0/Makefile.options
+===================================================================
+--- ocsigenserver-2.2.0.orig/Makefile.options
++++ ocsigenserver-2.2.0/Makefile.options
+@@ -34,6 +34,7 @@ BASE_PACKAGE := lwt
+ SERVER_PACKAGE := lwt.ssl           \
+ 	          ${LWT_EXTRA_PACKAGE} \
+ 	          netstring         \
++	          netstring-pcre    \
+                   findlib           \
+ 	          cryptokit         \
+ 		  tyxml             \
diff --git a/www-servers/ocsigenserver/ocsigenserver-2.2.0.ebuild b/www-servers/ocsigenserver/ocsigenserver-2.2.0.ebuild
index 1488920fd5fc..b7c70e435d7b 100644
--- a/www-servers/ocsigenserver/ocsigenserver-2.2.0.ebuild
+++ b/www-servers/ocsigenserver/ocsigenserver-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigenserver/ocsigenserver-2.2.0.ebuild,v 1.1 2013/01/13 19:57:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigenserver/ocsigenserver-2.2.0.ebuild,v 1.2 2013/07/23 17:51:39 aballier Exp $
 
 EAPI=4
 
@@ -20,7 +20,7 @@ RESTRICT="strip installsources"
 DEPEND=">=dev-ml/lwt-2.3.0[react,ssl]
 		zlib? ( >=dev-ml/camlzip-1.03-r1 )
 		dev-ml/cryptokit
-		>=dev-ml/ocamlnet-2.2.9
+		>=dev-ml/ocamlnet-3.6[pcre]
 		>=dev-ml/pcre-ocaml-6.0.1
 		>=dev-ml/tyxml-2.1
 		>=dev-lang/ocaml-3.12[ocamlopt?]
@@ -33,6 +33,10 @@ pkg_setup() {
 	enewuser ocsigenserver -1 -1 /var/www ocsigenserver
 }
 
+src_prepare() {
+	epatch "${FILESDIR}/pcre.patch"
+}
+
 src_configure() {
 	sh configure \
 		--prefix /usr \