Fixed ocaml bindings problem. Bug 56682

5 files changed, 108 insertions, 2 deletions

diff --git a/dev-libs/gmetadom/ChangeLog b/dev-libs/gmetadom/ChangeLog
index 436a21f3cfbf..4a697ffd53b3 100644
--- a/dev-libs/gmetadom/ChangeLog
+++ b/dev-libs/gmetadom/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/gmetadom
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/ChangeLog,v 1.6 2004/06/24 23:11:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/ChangeLog,v 1.7 2004/07/29 21:57:47 matsuu Exp $
+
+*gmetadom-0.2.1-r1 (30 Jul 2004)
+
+  30 Jul 2004; MATSUU Takuto <matsuu@gentoo.org> +gmetadom-0.2.1-r1.ebuild:
+  Fixed ocaml bindings problem. Bug#56682.
 
 *gmetadom-0.2.1 (21 Jan 2004)
 
diff --git a/dev-libs/gmetadom/Manifest b/dev-libs/gmetadom/Manifest
index f440049d612e..d7e8514c488d 100644
--- a/dev-libs/gmetadom/Manifest
+++ b/dev-libs/gmetadom/Manifest
@@ -2,10 +2,13 @@ MD5 47dd4a6a91133344e4588beb75080d49 gmetadom-0.0.3-r3.ebuild 1471
 MD5 0d85948245811ee6e2829f30eb86ea18 gmetadom-0.1.8.ebuild 734
 MD5 e781dbc70b628b213c55c56dfdd8bfa3 gmetadom-0.2.1.ebuild 750
 MD5 4b01e7566ffd7faffa34e61e84b90467 gmetadom-0.2.0.ebuild 734
-MD5 40d0de572293f147813a00b5f81aaf5d ChangeLog 1068
+MD5 69f516cf446c187f9319fb746cf3bdab ChangeLog 1220
 MD5 e10a0da4fac2882942ffa8360ccdd921 metadata.xml 201
+MD5 0341f1b2048b67e5dee486eacf83157a gmetadom-0.2.1-r1.ebuild 1158
 MD5 61a42bb68511dea925d7f7860eb7027c files/digest-gmetadom-0.1.8 66
 MD5 350b9753c53fe68919fe89a53c77736a files/digest-gmetadom-0.2.0 66
 MD5 51735b8a4a855394319affc43667b6de files/digest-gmetadom-0.2.1 66
+MD5 326c113f108983dcacee65c42b42b766 files/gmetadom-0.2.1-gentoo.patch 2344
 MD5 7192830dc2daf239e593ee9d302af67e files/digest-gmetadom-0.0.3-r3 66
+MD5 51735b8a4a855394319affc43667b6de files/digest-gmetadom-0.2.1-r1 66
 MD5 07657f960b260c0ab18b3022b6c115a4 files/gmetadom-0.0.3-gcc3.diff 863
diff --git a/dev-libs/gmetadom/files/digest-gmetadom-0.2.1-r1 b/dev-libs/gmetadom/files/digest-gmetadom-0.2.1-r1
new file mode 100644
index 000000000000..8a061964eb93
--- /dev/null
+++ b/dev-libs/gmetadom/files/digest-gmetadom-0.2.1-r1
@@ -0,0 +1 @@
+MD5 d49465d563d83e99ea1c4f7816d1ac9a gmetadom-0.2.1.tar.gz 476454
diff --git a/dev-libs/gmetadom/files/gmetadom-0.2.1-gentoo.patch b/dev-libs/gmetadom/files/gmetadom-0.2.1-gentoo.patch
new file mode 100644
index 000000000000..1693b603ec5a
--- /dev/null
+++ b/dev-libs/gmetadom/files/gmetadom-0.2.1-gentoo.patch
@@ -0,0 +1,48 @@
+diff -Naur gmetadom-0.2.1.orig/configure gmetadom-0.2.1/configure
+--- gmetadom-0.2.1.orig/configure	2003-10-08 06:50:30.000000000 +0900
++++ gmetadom-0.2.1/configure	2004-07-14 08:37:13.000000000 +0900
+@@ -21780,7 +21780,7 @@
+ 	HAVE_OCAMLC=no
+ else
+ 	HAVE_OCAMLC=yes
+-	OCAML_LIB=`$OCAMLC -v | tail -1 | cut -d ':' -f2 | tr -d ' '`
++	OCAML_LIB=`$OCAMLC -v | tail -n 1 | cut -d ':' -f2 | tr -d ' '`
+ 
+ 	if test $OCAML_INCLUDE_PREFIX = no; then
+ 		OCAML_CFLAGS=-I$OCAML_LIB
+diff -Naur gmetadom-0.2.1.orig/configure.ac gmetadom-0.2.1/configure.ac
+--- gmetadom-0.2.1.orig/configure.ac	2003-10-08 06:49:32.000000000 +0900
++++ gmetadom-0.2.1/configure.ac	2004-07-14 08:37:25.000000000 +0900
+@@ -312,7 +312,7 @@
+ 	HAVE_OCAMLC=no
+ else
+ 	HAVE_OCAMLC=yes
+-	OCAML_LIB=`$OCAMLC -v | tail -1 | cut -d ':' -f2 | tr -d ' '`
++	OCAML_LIB=`$OCAMLC -v | tail -n 1 | cut -d ':' -f2 | tr -d ' '`
+ 
+ 	if test $OCAML_INCLUDE_PREFIX = no; then
+ 		OCAML_CFLAGS=-I$OCAML_LIB
+diff -Naur gmetadom-0.2.1.orig/src/gdome_caml/Makefile.am gmetadom-0.2.1/src/gdome_caml/Makefile.am
+--- gmetadom-0.2.1.orig/src/gdome_caml/Makefile.am	2003-10-08 15:00:50.000000000 +0900
++++ gmetadom-0.2.1/src/gdome_caml/Makefile.am	2004-07-14 09:09:26.028761996 +0900
+@@ -81,7 +81,7 @@
+ 	done
+ 	if [ "x$(OCAMLFIND)" != "x" ]; then \
+ 		mv $(OCAMLINSTALLDIR) $(OCAMLINSTALLDIR).saved;	\
+-		$(OCAMLFIND) install -destdir $(DESTDIR)$(OCAML_LIB_PREFIX)/ $(PKGNAME) META $(DLL); \
++		$(OCAMLFIND) install -destdir $(DESTDIR)$(OCAML_LIB_PREFIX)/site-packages $(PKGNAME) META $(DLL); \
+ 		$(INSTALL_DATA) $(OCAMLINSTALLDIR).saved/* $(OCAMLINSTALLDIR)/;	\
+ 		rm -rf $(OCAMLINSTALLDIR).saved/;	\
+ 	else	\
+diff -Naur gmetadom-0.2.1.orig/src/gdome_caml/Makefile.in gmetadom-0.2.1/src/gdome_caml/Makefile.in
+--- gmetadom-0.2.1.orig/src/gdome_caml/Makefile.in	2003-10-08 15:00:55.000000000 +0900
++++ gmetadom-0.2.1/src/gdome_caml/Makefile.in	2004-07-14 09:09:58.739215644 +0900
+@@ -630,7 +630,7 @@
+ 	done
+ 	if [ "x$(OCAMLFIND)" != "x" ]; then \
+ 		mv $(OCAMLINSTALLDIR) $(OCAMLINSTALLDIR).saved;	\
+-		$(OCAMLFIND) install -destdir $(DESTDIR)$(OCAML_LIB_PREFIX)/ $(PKGNAME) META $(DLL); \
++		$(OCAMLFIND) install -destdir $(DESTDIR)$(OCAML_LIB_PREFIX)/site-packages $(PKGNAME) META $(DLL); \
+ 		$(INSTALL_DATA) $(OCAMLINSTALLDIR).saved/* $(OCAMLINSTALLDIR)/;	\
+ 		rm -rf $(OCAMLINSTALLDIR).saved/;	\
+ 	else	\
diff --git a/dev-libs/gmetadom/gmetadom-0.2.1-r1.ebuild b/dev-libs/gmetadom/gmetadom-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..f54b5dca5dbc
--- /dev/null
+++ b/dev-libs/gmetadom/gmetadom-0.2.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/gmetadom-0.2.1-r1.ebuild,v 1.1 2004/07/29 21:57:47 matsuu Exp $
+
+inherit 64-bit flag-o-matic eutils
+
+DESCRIPTION="A library providing bindings for multiple languages of multiple C DOM implementations"
+HOMEPAGE="http://gmetadom.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gmetadom/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="ocaml"
+
+RDEPEND=">=dev-libs/gdome2-0.8.0"
+DEPEND="${RDEPEND}
+	>=dev-libs/libxslt-1.0.0
+	ocaml? ( >=dev-lang/ocaml-3.05
+		>=dev-ml/findlib-0.8 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch
+}
+
+src_compile() {
+	local mymod="gdome_cpp_smart"
+
+	64-bit && append-flags -fPIC
+	use ocaml && mymod="${mymod} gdome_caml"
+
+	econf --with-modules="${mymod}" || die
+	#emake || die
+	make || die
+}
+
+src_install() {
+	local destdir=`ocamlfind printconf destdir`
+
+	make \
+		DESTDIR=${D} \
+		OCAMLINSTALLDIR=${D}${destdir}/gdome2 \
+		OCAMLFIND_LDCONF=dummy \
+		install || die
+
+	dodoc AUTHORS BUGS ChangeLog HISTORY LICENSE NEWS README
+}