version bump, remove unused version

(Portage version: 2.1.3.6)

5 files changed, 34 insertions, 239 deletions

diff --git a/dev-ml/ocamlnet/ChangeLog b/dev-ml/ocamlnet/ChangeLog
index 4cd4f68b49a5..1602fb9b4373 100644
--- a/dev-ml/ocamlnet/ChangeLog
+++ b/dev-ml/ocamlnet/ChangeLog
@@ -1,6 +1,13 @@
 # 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.17 2007/05/12 09:07:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v 1.18 2007/08/23 09:02:23 aballier Exp $
+
+*ocamlnet-2.2.8.1 (23 Aug 2007)
+
+  23 Aug 2007; Alexis Ballier <aballier@gentoo.org>
+  -files/ocamlnet-2.2.4-configure-fix.patch, -ocamlnet-2.2.4.ebuild,
+  +ocamlnet-2.2.8.1.ebuild:
+  version bump, remove unused version
 
 *ocamlnet-2.2.7 (12 May 2007)
 
diff --git a/dev-ml/ocamlnet/files/digest-ocamlnet-2.2.4 b/dev-ml/ocamlnet/files/digest-ocamlnet-2.2.4
deleted file mode 100644
index 374d0b57a445..000000000000
--- a/dev-ml/ocamlnet/files/digest-ocamlnet-2.2.4
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-ocamlnet-2.2.8.1 b/dev-ml/ocamlnet/files/digest-ocamlnet-2.2.8.1
new file mode 100644
index 000000000000..ea6594d46c13
--- /dev/null
+++ b/dev-ml/ocamlnet/files/digest-ocamlnet-2.2.8.1
@@ -0,0 +1,3 @@
+MD5 68699aec5238690216597ae452212c53 ocamlnet-2.2.8.1.tar.gz 1877285
+RMD160 988bffbbb34d74d4a6fffb645094dff1a4ab4b70 ocamlnet-2.2.8.1.tar.gz 1877285
+SHA256 3d88a365c4d01d88ebc9b683fda3179da4d1b7675500907e9fc37fc81a63b8e2 ocamlnet-2.2.8.1.tar.gz 1877285
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
deleted file mode 100644
index 112db811c0e6..000000000000
--- a/dev-ml/ocamlnet/files/ocamlnet-2.2.4-configure-fix.patch
+++ /dev/null
@@ -1,222 +0,0 @@
---- 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.8.1.ebuild
index 21d875108c21..2e09595c078c 100644
--- a/dev-ml/ocamlnet/ocamlnet-2.2.4.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-2.2.8.1.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-ml/ocamlnet/ocamlnet-2.2.4.ebuild,v 1.3 2007/06/26 01:56:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-2.2.8.1.ebuild,v 1.1 2007/08/23 09:02:23 aballier Exp $
 
 inherit eutils findlib
 
@@ -24,26 +24,36 @@ DEPEND="!dev-ml/equeue
 		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
 }
 
+ocamlnet_use_with() {
+	if use $1; then
+		echo "-with-$2"
+	else
+		echo "-without-$2"
+	fi
+}
+
+ocamlnet_use_enable() {
+	if use $1; then
+		echo "-enable-$2"
+	else
+		echo "-disable-$2"
+	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) \
+	    -bindir /usr/bin \
+		-datadir /usr/share/${PN} \
+		$(ocamlnet_use_enable gtk gtk2) \
+		$(ocamlnet_use_enable ssl ssl) \
+		$(ocamlnet_use_enable tk tcl) \
+		$(ocamlnet_use_with httpd nethttpd) \
 		|| die "Error : econf failed!"
 
 	emake -j1 all opt || die "make failed"