From: "Matsuu Takuto (matsuu)" <matsuu@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/gmetadom/files: gmetadom-0.2.6-gentoo.patch
Date: Fri, 18 Jan 2008 00:32:36 +0000 [thread overview]
Message-ID: <E1JFf9w-0003ov-SG@stork.gentoo.org> (raw)
matsuu 08/01/18 00:32:36
Modified: gmetadom-0.2.6-gentoo.patch
Log:
Fxied to work with ocaml USE flag. #204819
(Portage version: 2.1.3.19)
Revision Changes Path
1.2 dev-libs/gmetadom/files/gmetadom-0.2.6-gentoo.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/gmetadom/files/gmetadom-0.2.6-gentoo.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/gmetadom/files/gmetadom-0.2.6-gentoo.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/gmetadom/files/gmetadom-0.2.6-gentoo.patch?r1=1.1&r2=1.2
Index: gmetadom-0.2.6-gentoo.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/files/gmetadom-0.2.6-gentoo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gmetadom-0.2.6-gentoo.patch 17 Jan 2008 15:08:30 -0000 1.1
+++ gmetadom-0.2.6-gentoo.patch 18 Jan 2008 00:32:36 -0000 1.2
@@ -12,16 +12,102 @@
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
--
gentoo-commits@lists.gentoo.org mailing list
next reply other threads:[~2008-01-18 0:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-18 0:32 Matsuu Takuto (matsuu) [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-07-09 16:49 [gentoo-commits] gentoo-x86 commit in dev-libs/gmetadom/files: gmetadom-0.2.6-gentoo.patch Michael Palimaka (kensington)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1JFf9w-0003ov-SG@stork.gentoo.org \
--to=matsuu@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox