Fxied to work with ocaml USE flag. #204819

(Portage version: 2.1.3.19)

2 files changed, 95 insertions, 5 deletions

diff --git a/dev-libs/gmetadom/ChangeLog b/dev-libs/gmetadom/ChangeLog
index 205714f68d5e..0d45358ad8bb 100644
--- a/dev-libs/gmetadom/ChangeLog
+++ b/dev-libs/gmetadom/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/gmetadom
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/ChangeLog,v 1.28 2008/01/17 15:08:30 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/ChangeLog,v 1.29 2008/01/18 00:32:35 matsuu Exp $
+
+  18 Jan 2008; MATSUU Takuto <matsuu@gentoo.org>
+  files/gmetadom-0.2.6-gentoo.patch:
+  Fxied to work with ocaml USE flag. #204819
 
 *gmetadom-0.2.6 (17 Jan 2008)
 
diff --git a/dev-libs/gmetadom/files/gmetadom-0.2.6-gentoo.patch b/dev-libs/gmetadom/files/gmetadom-0.2.6-gentoo.patch
index 10a7013eb5b3..70c07c6b30d6 100644
--- a/dev-libs/gmetadom/files/gmetadom-0.2.6-gentoo.patch
+++ b/dev-libs/gmetadom/files/gmetadom-0.2.6-gentoo.patch
@@ -12,16 +12,102 @@ diff -Naur gmetadom-0.2.6.orig/configure.ac gmetadom-0.2.6/configure.ac
  		OCAML_CFLAGS=-I$OCAML_LIB
 diff -Naur gmetadom-0.2.6.orig/src/gdome_caml/Makefile.am gmetadom-0.2.6/src/gdome_caml/Makefile.am
 --- gmetadom-0.2.6.orig/src/gdome_caml/Makefile.am	2006-08-06 17:33:36.000000000 +0900
-+++ gmetadom-0.2.6/src/gdome_caml/Makefile.am	2008-01-17 23:42:15.000000000 +0900
-@@ -83,7 +83,7 @@
++++ gmetadom-0.2.6/src/gdome_caml/Makefile.am	2008-01-18 08:48:01.000000000 +0900
+@@ -4,7 +4,7 @@
+ ARCHIVE = mlgdome
+ PKGNAME = gdome2
+ OCAMLBUILDDIR = $(top_builddir)/src/gdome_caml
+-OCAMLINSTALLDIR = $(DESTDIR)$(OCAML_LIB_PREFIX)/$(PKGNAME)
++OCAMLINSTALLDIR = $(DESTDIR)$(OCAML_LIB_PREFIX)/site-packages/$(PKGNAME)
+ STUBSDIR = $(DESTDIR)$(OCAML_LIB_PREFIX)/stublibs
+ OCAMLFLAGS = \
+   -I $(OCAMLBUILDDIR)/types \
+@@ -82,8 +82,8 @@
+ 	done
  	if [ "x$(OCAMLFIND)" != "x" ]; then \
  		mv $(OCAMLINSTALLDIR) $(OCAMLINSTALLDIR).saved &&	\
- 		$(mkinstalldirs) $(DESTDIR)$(OCAML_LIB_PREFIX)/ && \
+-		$(mkinstalldirs) $(DESTDIR)$(OCAML_LIB_PREFIX)/ && \
 -		$(OCAMLFIND) install -destdir $(DESTDIR)$(OCAML_LIB_PREFIX)/ $(PKGNAME) META $(DLL) && \
-+		$(OCAMLFIND) install -destdir $(DESTDIR)$(OCAML_LIB_PREFIX)/site-packages $(PKGNAME) META $(DLL) && \
++		$(mkinstalldirs) $(DESTDIR)$(OCAML_LIB_PREFIX)/site-packages/ && \
++		$(OCAMLFIND) install -ldconf ignore -destdir $(DESTDIR)$(OCAML_LIB_PREFIX)/site-packages/ $(PKGNAME) META $(DLL) && \
  		$(INSTALL_DATA) $(OCAMLINSTALLDIR).saved/* $(OCAMLINSTALLDIR)/ &&	\
  		rm -rf $(OCAMLINSTALLDIR).saved/;	\
  	else	\
+@@ -92,7 +92,7 @@
+ 
+ uninstall-local:
+ 	if [ "x$(OCAMLFIND)" != "x" ]; then	\
+-	  $(OCAMLFIND) remove -destdir $(DESTDIR)$(OCAML_LIB_PREFIX)/ $(PKGNAME);	\
++	  $(OCAMLFIND) remove -destdir $(DESTDIR)$(OCAML_LIB_PREFIX)/site-packages/ $(PKGNAME);	\
+ 	else	\
+ 		rm -rf $(OCAMLINSTALLDIR);	\
+ 		rm $(STUBSDIR)/$(DLL);	\
+diff -Naur gmetadom-0.2.6.orig/src/gdome_caml/basic/Makefile.am gmetadom-0.2.6/src/gdome_caml/basic/Makefile.am
+--- gmetadom-0.2.6.orig/src/gdome_caml/basic/Makefile.am	2003-09-13 23:14:42.000000000 +0900
++++ gmetadom-0.2.6/src/gdome_caml/basic/Makefile.am	2008-01-18 08:57:33.000000000 +0900
+@@ -1,6 +1,6 @@
+ 
+ OCAMLBUILDDIR = $(top_builddir)/src/gdome_caml
+-OCAMLINSTALLDIR = $(DESTDIR)$(OCAML_LIB_PREFIX)/gdome2
++OCAMLINSTALLDIR = $(DESTDIR)$(OCAML_LIB_PREFIX)/site-packages/gdome2
+ OCAMLFLAGS = -I $(OCAMLBUILDDIR) -I $(OCAMLBUILDDIR)/core \
+              -I $(OCAMLBUILDDIR)/types
+ OCAMLC = @OCAMLC@ ${OCAMLFLAGS}
+diff -Naur gmetadom-0.2.6.orig/src/gdome_caml/core/Makefile.am gmetadom-0.2.6/src/gdome_caml/core/Makefile.am
+--- gmetadom-0.2.6.orig/src/gdome_caml/core/Makefile.am	2007-10-12 23:12:51.000000000 +0900
++++ gmetadom-0.2.6/src/gdome_caml/core/Makefile.am	2008-01-18 08:57:33.000000000 +0900
+@@ -1,6 +1,6 @@
+ 
+ OCAMLBUILDDIR = $(top_builddir)/src/gdome_caml
+-OCAMLINSTALLDIR = $(DESTDIR)$(OCAML_LIB_PREFIX)/gdome2
++OCAMLINSTALLDIR = $(DESTDIR)$(OCAML_LIB_PREFIX)/site-packages/gdome2
+ OCAMLFLAGS = -I $(OCAMLBUILDDIR)/types -I $(OCAMLBUILDDIR)/basic
+ OCAMLC = @OCAMLC@ ${OCAMLFLAGS}
+ OCAMLOPT = @OCAMLOPT@ ${OCAMLFLAGS}
+diff -Naur gmetadom-0.2.6.orig/src/gdome_caml/events/Makefile.am gmetadom-0.2.6/src/gdome_caml/events/Makefile.am
+--- gmetadom-0.2.6.orig/src/gdome_caml/events/Makefile.am	2007-10-12 23:12:51.000000000 +0900
++++ gmetadom-0.2.6/src/gdome_caml/events/Makefile.am	2008-01-18 08:57:33.000000000 +0900
+@@ -1,6 +1,6 @@
+ 
+ OCAMLBUILDDIR = $(top_builddir)/src/gdome_caml
+-OCAMLINSTALLDIR = $(DESTDIR)$(OCAML_LIB_PREFIX)/gdome2
++OCAMLINSTALLDIR = $(DESTDIR)$(OCAML_LIB_PREFIX)/site-packages/gdome2
+ OCAMLFLAGS = -I $(OCAMLBUILDDIR)/types -I $(OCAMLBUILDDIR)/basic
+ OCAMLC = @OCAMLC@ ${OCAMLFLAGS}
+ OCAMLOPT = @OCAMLOPT@ ${OCAMLFLAGS}
+diff -Naur gmetadom-0.2.6.orig/src/gdome_caml/include/Makefile.am gmetadom-0.2.6/src/gdome_caml/include/Makefile.am
+--- gmetadom-0.2.6.orig/src/gdome_caml/include/Makefile.am	2002-08-31 03:03:36.000000000 +0900
++++ gmetadom-0.2.6/src/gdome_caml/include/Makefile.am	2008-01-18 08:57:33.000000000 +0900
+@@ -1,5 +1,5 @@
+ 
+-OCAMLINSTALLDIR = $(DESTDIR)$(OCAML_LIB_PREFIX)/gdome2
++OCAMLINSTALLDIR = $(DESTDIR)$(OCAML_LIB_PREFIX)/site-packages/gdome2
+ EXTRA_DIST = mlgdomevalue.h
+ 
+ install-data-local: mlgdomevalue.h
+diff -Naur gmetadom-0.2.6.orig/src/gdome_caml/ocaml/Makefile.am gmetadom-0.2.6/src/gdome_caml/ocaml/Makefile.am
+--- gmetadom-0.2.6.orig/src/gdome_caml/ocaml/Makefile.am	2007-10-12 23:12:51.000000000 +0900
++++ gmetadom-0.2.6/src/gdome_caml/ocaml/Makefile.am	2008-01-18 08:57:33.000000000 +0900
+@@ -1,6 +1,6 @@
+ 
+ OCAMLBUILDDIR = $(top_builddir)/src/gdome_caml
+-OCAMLINSTALLDIR = $(DESTDIR)$(OCAML_LIB_PREFIX)/gdome2
++OCAMLINSTALLDIR = $(DESTDIR)$(OCAML_LIB_PREFIX)/site-packages/gdome2
+ 
+ OCAMLFLAGS = \
+   -I $(OCAMLBUILDDIR) \
+diff -Naur gmetadom-0.2.6.orig/src/gdome_caml/types/Makefile.am gmetadom-0.2.6/src/gdome_caml/types/Makefile.am
+--- gmetadom-0.2.6.orig/src/gdome_caml/types/Makefile.am	2007-10-12 23:12:51.000000000 +0900
++++ gmetadom-0.2.6/src/gdome_caml/types/Makefile.am	2008-01-18 08:57:33.000000000 +0900
+@@ -1,7 +1,7 @@
+ 
+ OCAMLC = @OCAMLC@
+ OCAMLDEP = @OCAMLDEP@
+-OCAMLINSTALLDIR = $(DESTDIR)$(OCAML_LIB_PREFIX)/gdome2
++OCAMLINSTALLDIR = $(DESTDIR)$(OCAML_LIB_PREFIX)/site-packages/gdome2
+ 
+ T_AUTO_MLI = \
+   tNode.mli \
 diff -Naur gmetadom-0.2.6.orig/src/gdome_cpp_smart/test/Makefile.am gmetadom-0.2.6/src/gdome_cpp_smart/test/Makefile.am
 --- gmetadom-0.2.6.orig/src/gdome_cpp_smart/test/Makefile.am	2007-05-09 00:26:18.000000000 +0900
 +++ gmetadom-0.2.6/src/gdome_cpp_smart/test/Makefile.am	2008-01-17 23:41:17.000000000 +0900