Version bump, thanks to Pierre Clairambault, bug #114277

Package-Manager: portage-2.1.2.2

5 files changed, 306 insertions, 9 deletions

diff --git a/dev-ml/ocamlnet/ChangeLog b/dev-ml/ocamlnet/ChangeLog
index 5cd14ea086f6..5c579903e5ae 100644
--- a/dev-ml/ocamlnet/ChangeLog
+++ b/dev-ml/ocamlnet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ml/ocamlnet
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v 1.15 2007/02/09 02:48:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v 1.16 2007/03/27 18:15:39 aballier Exp $
+
+*ocamlnet-2.2.4 (27 Mar 2007)
+
+  27 Mar 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/ocamlnet-2.2.4-configure-fix.patch, +ocamlnet-2.2.4.ebuild:
+  Version bump, thanks to Pierre Clairambault, bug #114277
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/dev-ml/ocamlnet/Manifest b/dev-ml/ocamlnet/Manifest
index 4ca0cafb36ff..bae21f1cf7f7 100644
--- a/dev-ml/ocamlnet/Manifest
+++ b/dev-ml/ocamlnet/Manifest
@@ -1,8 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX ocamlnet-2.2.4-configure-fix.patch 6060 RMD160 35633f45e37b760f0b06f58c68f592e805d823d6 SHA1 092dc628a322ccc9d39939f9a389e4289e8a1875 SHA256 2ad27672006322aded2677030a210f0d5edfa00a2a9f43414e66c28c86b613f0
+MD5 1ef04d1b60e520597f65731e2d436c69 files/ocamlnet-2.2.4-configure-fix.patch 6060
+RMD160 35633f45e37b760f0b06f58c68f592e805d823d6 files/ocamlnet-2.2.4-configure-fix.patch 6060
+SHA256 2ad27672006322aded2677030a210f0d5edfa00a2a9f43414e66c28c86b613f0 files/ocamlnet-2.2.4-configure-fix.patch 6060
 DIST ocamlnet-0.95.tar.gz 291074 RMD160 8e56842f3aa66311794e941b5b27e1d7042fd28a SHA1 ef92bea303318a4d79ab75b2753f1416dd5d8cd7 SHA256 e06c2d79fa9415d81b37ff2804a9e9be8cd6aa3eb49919fcc47fd75eab3f1361
 DIST ocamlnet-0.98.tar.gz 639820 RMD160 69609ef04ff5f954d3429613ac251d613da36fa7 SHA1 6c5165563ecc6dbbd5cd55c436ba428f3697decd SHA256 8abf1894dfa1d085cddc61546fd750bf73335b3467fc823ddde524db61ddef16
+DIST ocamlnet-2.2.4.tar.gz 1770863 RMD160 a8cf56de5e9806570689022dbe58b2d7ca003b87 SHA1 b93e6fc88b64dbc8272aa7fec715b9f6160310b2 SHA256 5d43d3c6529c99069b88708f90896cfa6682ceea25b23b948a02f38cdb31a207
 EBUILD ocamlnet-0.95.ebuild 831 RMD160 f8347dea9dfd7321fb1d29c94d959364ff9f52c4 SHA1 c44c5207b2d2c1774c3f27335a8270a7c7b0c176 SHA256 16767d404fd71d4ce910d712b2ecac8e2c5366c9209a40e286e70779d3a08212
 MD5 e03f9a8a89002763dcd26416f218a62a ocamlnet-0.95.ebuild 831
 RMD160 f8347dea9dfd7321fb1d29c94d959364ff9f52c4 ocamlnet-0.95.ebuild 831
@@ -11,10 +16,14 @@ EBUILD ocamlnet-0.98.ebuild 820 RMD160 dde0dc854cddd9998d66591681bc06d6a4880816
 MD5 e297e724044525a6ad49502b82edfead ocamlnet-0.98.ebuild 820
 RMD160 dde0dc854cddd9998d66591681bc06d6a4880816 ocamlnet-0.98.ebuild 820
 SHA256 8df8732043d34b5480358500d6a6190a41d075d74d33fb97beeb6f2eb0308860 ocamlnet-0.98.ebuild 820
-MISC ChangeLog 1789 RMD160 44533d27416318929f811c9402d1cb29209363ec SHA1 87b7ea0722bf32f279464e38613451062b001268 SHA256 c03cddf33d76cd68ea029e58fc8cc70e63850df4e5cf2375d3c544cd7191d470
-MD5 f1684f977519e80d1300fa771bc48f95 ChangeLog 1789
-RMD160 44533d27416318929f811c9402d1cb29209363ec ChangeLog 1789
-SHA256 c03cddf33d76cd68ea029e58fc8cc70e63850df4e5cf2375d3c544cd7191d470 ChangeLog 1789
+EBUILD ocamlnet-2.2.4.ebuild 1356 RMD160 79f75e31781308e6992535ed6eba4011bf502c8f SHA1 8914ab64b071246f791535861b178597111fc947 SHA256 e204fd85f792a891481bde0d2d62016aefe09c643f07e70608775ce075d37289
+MD5 1bad2f472885311cbf712b30b14ec891 ocamlnet-2.2.4.ebuild 1356
+RMD160 79f75e31781308e6992535ed6eba4011bf502c8f ocamlnet-2.2.4.ebuild 1356
+SHA256 e204fd85f792a891481bde0d2d62016aefe09c643f07e70608775ce075d37289 ocamlnet-2.2.4.ebuild 1356
+MISC ChangeLog 2000 RMD160 10e610d126cf0d1749693fed6e520845df6be9af SHA1 6e518a7c09568b645420489006551d9110e85299 SHA256 f5f49b543d9753c69431d30f557975519db656f182d39460bd7ede2837c53034
+MD5 047382b2b3893fb4a59b3b1be014aabd ChangeLog 2000
+RMD160 10e610d126cf0d1749693fed6e520845df6be9af ChangeLog 2000
+SHA256 f5f49b543d9753c69431d30f557975519db656f182d39460bd7ede2837c53034 ChangeLog 2000
 MISC metadata.xml 225 RMD160 138a4a018327b252bca64596a96ca8ba9889518e SHA1 1ac1e2169f829499fdbe256195de97ed63b5a7b1 SHA256 5c308b27332bed379ee06e522386288fa511e83e6449d834dea9ebcd8e827592
 MD5 845dbbef4eb685e1bfd5f9e13a03f2b8 metadata.xml 225
 RMD160 138a4a018327b252bca64596a96ca8ba9889518e metadata.xml 225
@@ -25,10 +34,13 @@ SHA256 9af8f4bb1ba2c52ad17b1e61354f0285c554904d22b85e245937b70d5481de62 files/di
 MD5 713cc1d56b8c010fc29cde35d48dfa85 files/digest-ocamlnet-0.98 241
 RMD160 51d1299b2d57d18806a0234a4ba4b4684aa86f16 files/digest-ocamlnet-0.98 241
 SHA256 beee5e2ed19c3a8d570a7aa654b501a06327c8f395af95bed361363e8c96b7fd files/digest-ocamlnet-0.98 241
+MD5 2efaa5471a97b64a9b8d6a4b9001da59 files/digest-ocamlnet-2.2.4 247
+RMD160 fd14e60b5c9fe3f726fd6b4b2ba20ba9ebbee058 files/digest-ocamlnet-2.2.4 247
+SHA256 fdbf7812de970c6c93439616f1fc8b523d14ad6367ac2cdd1592ccc6c55c5a92 files/digest-ocamlnet-2.2.4 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFy+EVAiZjviIA2XgRAq6CAJ4gJSbWde+OcvCkS+0M7WUxUHwZEwCfTzT5
-6YqjV/jo51yig4M2Zu48vm8=
-=+pUu
+iD8DBQFGCV8tvFcC4BYPU0oRAqHJAJ0Zo4WE0aCgyKhkaTOrCX1P89jP2QCbBjl1
+HoV/fyEfbkM7wUkNUmdMmRY=
+=8PvY
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/ocamlnet/files/digest-ocamlnet-2.2.4 b/dev-ml/ocamlnet/files/digest-ocamlnet-2.2.4
new file mode 100644
index 000000000000..374d0b57a445
--- /dev/null
+++ b/dev-ml/ocamlnet/files/digest-ocamlnet-2.2.4
@@ -0,0 +1,3 @@
+MD5 5805641c5d4f4e6da1b4fc1008c41f0e ocamlnet-2.2.4.tar.gz 1770863
+RMD160 a8cf56de5e9806570689022dbe58b2d7ca003b87 ocamlnet-2.2.4.tar.gz 1770863
+SHA256 5d43d3c6529c99069b88708f90896cfa6682ceea25b23b948a02f38cdb31a207 ocamlnet-2.2.4.tar.gz 1770863
diff --git a/dev-ml/ocamlnet/files/ocamlnet-2.2.4-configure-fix.patch b/dev-ml/ocamlnet/files/ocamlnet-2.2.4-configure-fix.patch
new file mode 100644
index 000000000000..112db811c0e6
--- /dev/null
+++ b/dev-ml/ocamlnet/files/ocamlnet-2.2.4-configure-fix.patch
@@ -0,0 +1,222 @@
+--- ocamlnet-2.2.4.orig/configure	2007-01-12 14:58:03.000000000 +0100
++++ ocamlnet-2.2.4/configure	2007-01-12 15:03:56.000000000 +0100
+@@ -114,9 +114,9 @@
+ 		eval "$e"
+ 		uopt=`echo $opt | sed -e 's/_/-/g'`
+ 		if [ $o -gt 0 ]; then
+-			echo "    -enable-$uopt"
++			echo "    --enable-$uopt"
+ 		else
+-			echo "    -disable-$uopt"
++			echo "    --disable-$uopt"
+ 		fi
+ 	done
+ 	for opt in $woptions; do
+@@ -124,30 +124,30 @@
+ 		eval "$e"
+ 		uopt=`echo $opt | sed -e 's/_/-/g'`
+ 		if [ $o -gt 0 ]; then
+-			echo "    -with-$uopt"
++			echo "    --with-$uopt"
+ 		else
+-			echo "    -without-$uopt"
++			echo "    --without-$uopt"
+ 		fi
+ 	done
+-	echo "    -bindir $bindir"
+-	echo "    -datadir $net_db_dir"
++	echo "    --bindir $bindir"
++	echo "    --datadir $net_db_dir"
+ 	if [ $enable_tcl -gt 0 ]; then
+-            echo "    -equeue-tcl-defs \"$tcl_defs\""
+-            echo "    -equeue-tcl-libs \"$tcl_libs\""
++            echo "    --equeue-tcl-defs \"$tcl_defs\""
++            echo "    --equeue-tcl-libs \"$tcl_libs\""
+ 	fi
+ 	if [ $with_rpc_auth_dh -gt 0 ]; then
+ 	    if [ -n "$adh_style" ]; then
+-		echo "    -auth-dh-style $adh_style"
++		echo "    --auth-dh-style $adh_style"
+ 	    fi
+ 	fi
+ 	if [ -n "$apxs" ]; then
+-	    echo "    -apxs $apxs"
++	    echo "    --apxs $apxs"
+ 	fi
+ 	if [ -n "$apache" ]; then
+-	    echo "    -apache $apache"
++	    echo "    --apache $apache"
+ 	fi
+ 	if [ $prefer_netcgi2 -gt 0 ]; then
+-	    echo "    -prefer-netcgi2"
++	    echo "    --prefer-netcgi2"
+ 	fi
+ }
+ 
+@@ -162,41 +162,41 @@
+ 		e="help=\$ehelp_$opt"
+ 		eval "$e"
+ 		uopt=`echo $opt | sed -e 's/_/-/g'`
+-		echo "-enable-$uopt:" >&2
+-		echo "-disable-$uopt:" >&2
++		echo "--enable-$uopt:" >&2
++		echo "--disable-$uopt:" >&2
+ 		echo "        $help" >&2
+ 	done
+ 	for opt in $woptions; do
+ 		e="help=\$whelp_$opt"
+ 		eval "$e"
+ 		uopt=`echo $opt | sed -e 's/_/-/g'`
+-		echo "-with-$uopt:" >&2
+-		echo "-without-$uopt:" >&2
++		echo "--with-$uopt:" >&2
++		echo "--without-$uopt:" >&2
+ 		echo "        $help" >&2
+ 	done
+ 	cat <<_EOF_ >&2
+--bindir dir
++--bindir dir
+         Install binaries into this directory
+ 
+--datadir dir
++--datadir dir
+         Install the run-time data file into this directory
+ 
+--equeue-tcl-defs <opts>
+-        Set C compiler options to find tcl.h (for -enable-tcl)
++--equeue-tcl-defs <opts>
++        Set C compiler options to find tcl.h (for --enable-tcl)
+ 
+--equeue-tcl-libs <opts>
+-        Set C compiler options to link against libtcl (for -enable-tcl)
++--equeue-tcl-libs <opts>
++        Set C compiler options to link against libtcl (for --enable-tcl)
+ 
+--auth-dh-style (keyenvoy|unixdomain|tirpc)
++--auth-dh-style (keyenvoy|unixdomain|tirpc)
+         Set style of keyserv connector (see README.authdh)
+ 
+--apxs /path/to/apxs
+-        Set which apxs to use for -enable-modcaml
++--apxs /path/to/apxs
++        Set which apxs to use for --enable-modcaml
+ 
+--apache /path/to/apache
+-        Set which apache executable to use for -enable-modcaml
++--apache /path/to/apache
++        Set which apache executable to use for --enable-modcaml
+ 
+--prefer-netcgi2
++--prefer-netcgi2
+         Use netcgi2 as default CGI implementation instead of netcgi1.
+         This affects nethttpd.
+ 
+@@ -234,74 +234,74 @@
+ 
+ while [ "$#" -gt 0 ]; do
+ 	case "$1" in
+-		-enable-*)
+-			opt=`echo "$1" | sed -e 's/-enable-//' -e 's/-/_/g'`
++		--enable-*)
++			opt=`echo "$1" | sed -e 's/--enable-//' -e 's/-/_/g'`
+ 			check_eopt "$opt"
+ 			eval "enable_$opt=2"
+ 			shift
+ 			;;
+-	        -disable-core)
++	        --disable-core)
+ 		        # Intentionally undocumented.
+ 		        disable_core=1
+ 			shift
+ 			;;
+-		-disable-*)
+-			opt=`echo "$1" | sed -e 's/-disable-//' -e 's/-/_/g'`
++		--disable-*)
++			opt=`echo "$1" | sed -e 's/--disable-//' -e 's/-/_/g'`
+ 			check_eopt "$opt"
+ 			eval "enable_$opt=-1"
+ 			shift
+ 			;;
+-		-with-*)
+-			opt=`echo "$1" | sed -e 's/-with-//' -e 's/-/_/g'`
++		--with-*)
++			opt=`echo "$1" | sed -e 's/--with-//' -e 's/-/_/g'`
+ 			check_wopt "$opt"
+ 			eval "with_$opt=2"
+ 			shift
+ 			;;
+-		-without-*)
+-			opt=`echo "$1" | sed -e 's/-without-//' -e 's/-/_/g'`
++		--without-*)
++			opt=`echo "$1" | sed -e 's/--without-//' -e 's/-/_/g'`
+ 			check_wopt "$opt"
+ 			eval "with_$opt=-1"
+ 			shift
+ 			;;
+-                -bindir)
++                --bindir)
+                         bindir="$2"
+                         shift
+                         shift
+                         ;;
+-	        -datadir)
++	        --datadir)
+ 		        net_db_dir="$2"
+ 			net_db_dir_set=1
+ 			shift; shift
+ 			;;
+-                -equeue-tcl-defs)
++                --equeue-tcl-defs)
+                         tcl_defs="$tcl_defs $2"
+                         shift
+                         shift
+                         ;;
+-                -equeue-tcl-libs)
++                --equeue-tcl-libs)
+                         tcl_libs="$tcl_libs $2"
+                         shift
+                         shift
+                         ;;
+-                -auth-dh-style)
++                --auth-dh-style)
+                         adh_style="$2"
+                         shift
+                         shift
+                         ;;
+-                -apxs)
++                --apxs)
+                         apxs="$2"
+                         shift
+                         shift
+                         ;;
+-                -apache)
++                --apache)
+                         apache="$2"
+                         shift
+                         shift
+                         ;;
+-	        -prefer-netcgi2)
++	        --prefer-netcgi2)
+ 		        prefer_netcgi2=1
+ 			shift ;;
+-		-version)
++		--version)
+ 			echo "$version"
+ 			exit 0
+ 			;;
+@@ -482,13 +482,13 @@
+         else
+             echo "not ok (check ldd output of tmp/t)"
+             echo
+-            echo "Please check -equeue-tcl-libs!"
++            echo "Please check --equeue-tcl-libs!"
+             exit 1
+         fi
+     else
+         echo "not ok"
+         echo
+-        echo "Please check -equeue-tcl-libs!"
++        echo "Please check --equeue-tcl-libs!"
+         exit 1
+     fi
+ 
diff --git a/dev-ml/ocamlnet/ocamlnet-2.2.4.ebuild b/dev-ml/ocamlnet/ocamlnet-2.2.4.ebuild
new file mode 100644
index 000000000000..8b7d719c97bd
--- /dev/null
+++ b/dev-ml/ocamlnet/ocamlnet-2.2.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-2.2.4.ebuild,v 1.1 2007/03/27 18:15:39 aballier Exp $
+
+inherit eutils findlib
+
+DESCRIPTION="Modules for OCaml application-level Internet protocols"
+HOMEPAGE="http://ocamlnet.sourceforge.net"
+SRC_URI="mirror://sourceforge/ocamlnet/${P}.tar.gz"
+
+LICENSE="as-is GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk ssl tk httpd"
+
+# the auth-dh compile flag has been disabled as well, since it depends on
+# ocaml-cryptgps, which is not available. 
+
+DEPEND="!dev-ml/equeue
+		!dev-ml/rpc
+		!dev-ml/netclient
+		>=dev-ml/findlib-1.0
+		>=dev-ml/pcre-ocaml-5
+		gtk? ( >=dev-ml/lablgtk-2 )
+		ssl? ( dev-ml/ocaml-ssl )"
+
+src_unpack() {
+	cd "${S}"
+	unpack ${A}
+	epatch "${FILESDIR}/ocamlnet-2.2.4-configure-fix.patch"
+}
+
+pkg_setup() {
+	if use tk && ! built_with_use 'dev-lang/ocaml' tk ;
+		 then die "If you want to enable tcl/tk, you need to rebuild dev-lang/ocaml with the 'tk' USE flag";
+	fi
+}
+
+src_compile() {
+	./configure \
+	    --bindir /usr/bin \
+		--datadir /usr/share/${PN} \
+		$(use_enable gtk gtk2) \
+		$(use_enable ssl) \
+		$(use_enable tk tcl) \
+		$(use_with httpd nethttpd) \
+		|| die "Error : econf failed!"
+
+	emake -j1 all opt || die "make failed"
+}
+
+src_install() {
+	findlib_src_install
+}