Version bump.

6 files changed, 69 insertions, 46 deletions

diff --git a/dev-ml/ocamlsdl/ChangeLog b/dev-ml/ocamlsdl/ChangeLog
index f67efb9b91ea..f5f9a33b661a 100644
--- a/dev-ml/ocamlsdl/ChangeLog
+++ b/dev-ml/ocamlsdl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ml/ocamlsdl
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ChangeLog,v 1.7 2005/03/15 12:42:33 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ChangeLog,v 1.8 2005/03/18 16:47:50 mattam Exp $
+
+*ocamlsdl-0.7.2 (18 Mar 2005)
+
+  18 Mar 2005; Matthieu Sozeau <mattam@gentoo.org> -ocamlsdl-0.6.3.ebuild,
+  +ocamlsdl-0.7.2.ebuild:
+  Version bump, remove older one.
 
   15 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> ocamlsdl-0.7.1.ebuild:
   Stable on sparc
diff --git a/dev-ml/ocamlsdl/Manifest b/dev-ml/ocamlsdl/Manifest
index ff4d9a43b61d..ad401864cb3f 100644
--- a/dev-ml/ocamlsdl/Manifest
+++ b/dev-ml/ocamlsdl/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
-MD5 639b23db4e1514b4e55313be5605079e ChangeLog 1113
-MD5 9a69df0d5855ac0004faea1dc80514c7 ocamlsdl-0.6.3.ebuild 690
+MD5 3586b71fca00be394d5f813c95544a8e ocamlsdl-0.7.2.ebuild 1335
 MD5 982d0909f2774907a3fdac66390ffd44 ocamlsdl-0.7.1.ebuild 1341
+MD5 630e9a8f40e1d2bdfa167b870d0cd848 ChangeLog 1278
+MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 MD5 dc12fdb347282470f8819d9ef5db7fcf files/digest-ocamlsdl-0.7.1 66
-MD5 21cf2a31ec5ac945f54f9c9df0ff5603 files/digest-ocamlsdl-0.6.3 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCNthVKRy60XGEcJIRAgmEAKCstUFRrcMJrsmd+9s413QLIYiVXwCgkv+H
-Ry8hrIzzc+e9qURYP8aZprg=
-=AXGw
------END PGP SIGNATURE-----
+MD5 377a8ee5b8eaa8477e7750741d3d3c3b files/digest-ocamlsdl-0.7.2 66
diff --git a/dev-ml/ocamlsdl/files/digest-ocamlsdl-0.6.3 b/dev-ml/ocamlsdl/files/digest-ocamlsdl-0.6.3
deleted file mode 100644
index 73075a7a2c36..000000000000
--- a/dev-ml/ocamlsdl/files/digest-ocamlsdl-0.6.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9e99ba5675b2d113ce2e3e139c2c8dc3 ocamlsdl-0.6.3.tar.bz2 335489
diff --git a/dev-ml/ocamlsdl/files/digest-ocamlsdl-0.7.2 b/dev-ml/ocamlsdl/files/digest-ocamlsdl-0.7.2
new file mode 100644
index 000000000000..84375d299aad
--- /dev/null
+++ b/dev-ml/ocamlsdl/files/digest-ocamlsdl-0.7.2
@@ -0,0 +1 @@
+MD5 0707a9cf80bd9cfe18ad660dc077bad6 ocamlsdl-0.7.2.tar.gz 215193
diff --git a/dev-ml/ocamlsdl/ocamlsdl-0.6.3.ebuild b/dev-ml/ocamlsdl/ocamlsdl-0.6.3.ebuild
deleted file mode 100644
index bae8ffeeeb36..000000000000
--- a/dev-ml/ocamlsdl/ocamlsdl-0.6.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ocamlsdl-0.6.3.ebuild,v 1.5 2005/02/17 20:15:56 mattam Exp $
-
-DESCRIPTION="OCaml SDL Bindings"
-
-HOMEPAGE="http://ocamlsdl.sourceforge.net"
-SRC_URI="mirror://sourceforge/ocamlsdl/${P}.tar.bz2"
-LICENSE="LGPL-2"
-
-SLOT="0"
-KEYWORDS="x86 sparc ppc"
-IUSE=""
-
-DEPEND=">=dev-lang/ocaml-3.04
->=media-libs/libsdl-1.2
->=dev-ml/lablgl-0.98
->=media-libs/sdl-mixer-1.2
->=media-libs/sdl-image-1.2
->=media-libs/sdl-ttf-2.0"
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} all install || die
-	doinfo doc/*.info*
-}
diff --git a/dev-ml/ocamlsdl/ocamlsdl-0.7.2.ebuild b/dev-ml/ocamlsdl/ocamlsdl-0.7.2.ebuild
new file mode 100644
index 000000000000..7cab15b4850a
--- /dev/null
+++ b/dev-ml/ocamlsdl/ocamlsdl-0.7.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ocamlsdl-0.7.2.ebuild,v 1.1 2005/03/18 16:47:50 mattam Exp $
+
+inherit findlib
+
+DESCRIPTION="OCaml SDL Bindings"
+
+HOMEPAGE="http://ocamlsdl.sourceforge.net"
+SRC_URI="mirror://sourceforge/ocamlsdl/${P}.tar.gz"
+LICENSE="LGPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="doc opengl truetype" #noimage nomixer
+
+DEPEND=">=dev-lang/ocaml-3.04
+>=media-libs/libsdl-1.2
+opengl? ( >=dev-ml/lablgl-0.98 )
+>=media-libs/sdl-mixer-1.2
+>=media-libs/sdl-image-1.2
+truetype? ( >=media-libs/sdl-ttf-2.0 )"
+
+src_compile() {
+	myconf=""
+	if use opengl; then
+		destdir=`ocamlfind printconf destdir`
+		lablgldir=`find ${destdir} -name "lablgl" -or -name "lablGL"`
+		if [ -z "${lablgldir}" ]; then
+			destdir=`ocamlc -where`
+			lablgldir=`find ${destdir} -name "lablgl" -or -name "lablGL"`
+		fi
+
+		if [ ! -z "${lablgldir}" ]; then
+			myconf="--with-lablgldir=${lablgldir}"
+		fi
+	fi
+
+	#use noimage && myconf="${myconf} --without-sdl-image"
+	#use nomixer && myconf="${myconf} --without-sdl-mixer"
+
+	econf $myconf \
+		`use_enable truetype sdl-ttf` \
+		|| die
+	emake all || die
+}
+
+src_install() {
+	findlib_src_install
+
+	dodoc AUTHORS NEWS README
+	doinfo doc/*.info*
+
+	if use doc; then
+		dohtml doc/html/*
+	fi
+}