Add Debian patchset from upstream, fix more compile errors, add gcc-4.6 support, patches by slepnoga

(Portage version: 2.1.10.44/cvs/Linux x86_64)

6 files changed, 144 insertions, 8 deletions

diff --git a/dev-ml/xml-light/ChangeLog b/dev-ml/xml-light/ChangeLog
index 4de964d855a3..60524cda58d9 100644
--- a/dev-ml/xml-light/ChangeLog
+++ b/dev-ml/xml-light/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-ml/xml-light
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/xml-light/ChangeLog,v 1.1 2011/12/11 18:58:07 maksbotan Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/xml-light/ChangeLog,v 1.2 2012/01/15 20:13:26 maksbotan Exp $
+
+*xml-light-2.2-r1 (15 Jan 2012)
+
+  15 Jan 2012; Maxim Koltsov <maksbotan@gentoo.org>
+  +files/01_installopt.dpatch, +files/02_cmi_depends.dpatch,
+  +files/03_cflags.dpatch, -xml-light-2.2.ebuild, +files/04_dtd_trace.dpatch,
+  +xml-light-2.2-r1.ebuild:
+  Add Debian patchset from upstream, fix more compile errors, add gcc-4.6
+  support, patches by slepnoga
 
 *xml-light-2.2 (11 Dec 2011)
 
diff --git a/dev-ml/xml-light/files/01_installopt.dpatch b/dev-ml/xml-light/files/01_installopt.dpatch
new file mode 100644
index 000000000000..1dfb50c9e271
--- /dev/null
+++ b/dev-ml/xml-light/files/01_installopt.dpatch
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_installopt.dpatch by Sylvain Le Gall <gildor@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad xml-light-2.2~/Makefile xml-light-2.2/Makefile
+--- xml-light-2.2~/Makefile	2005-10-11 23:26:41.000000000 +0200
++++ xml-light-2.2/Makefile	2005-10-11 23:28:00.000000000 +0200
+@@ -11,8 +11,11 @@
+ 

+ opt: xml-light.cmxa test_opt.exe

+ 

+-install: all opt

+-	cp xml-light.cmxa xml-light.a xml-light.cma xml.mli xmlParser.mli dtd.mli xml.cmi xmlParser.cmi dtd.cmi xml.cmx dtd.cmx xmlParser.cmx $(INSTALLDIR)

++install: all 

++	cp xml-light.cma xml.mli xmlParser.mli dtd.mli xml.cmi xmlParser.cmi dtd.cmi  $(INSTALLDIR)

++

++installopt: opt all 

++	cp xml-light.a xml-light.cmxa xml.cmx dtd.cmx xmlParser.cmx $(INSTALLDIR)

+ 

+ doc:

+ 	mkdir doc

diff --git a/dev-ml/xml-light/files/02_cmi_depends.dpatch b/dev-ml/xml-light/files/02_cmi_depends.dpatch
new file mode 100644
index 000000000000..1fcf17048407
--- /dev/null
+++ b/dev-ml/xml-light/files/02_cmi_depends.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_cmi_depends.dpatch by Sylvain Le Gall <gildor@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad xml-light-2.2~/Makefile xml-light-2.2/Makefile
+--- xml-light-2.2~/Makefile	2006-01-03 17:34:23.000000000 +0100
++++ xml-light-2.2/Makefile	2006-01-03 17:35:04.000000000 +0100
+@@ -82,6 +82,6 @@
+ .mll.ml:

+ 	ocamllex $<

+ 

+-.mly.ml:

++%.mli %.ml: %.mly

+ 	ocamlyacc $<

+ 

diff --git a/dev-ml/xml-light/files/03_cflags.dpatch b/dev-ml/xml-light/files/03_cflags.dpatch
new file mode 100644
index 000000000000..5dfbffe5da1f
--- /dev/null
+++ b/dev-ml/xml-light/files/03_cflags.dpatch
@@ -0,0 +1,51 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_cflags.dpatch by Sylvain Le Gall <gildor@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad xml-light-2.2~/Makefile xml-light-2.2/Makefile
+--- xml-light-2.2~/Makefile	2006-10-26 00:22:41.000000000 +0200
++++ xml-light-2.2/Makefile	2006-10-26 00:24:45.000000000 +0200
+@@ -3,8 +3,8 @@
+ .SUFFIXES : .ml .mli .cmo .cmx .cmi .mll .mly

+ 

+ INSTALLDIR=`ocamlc -where`

+-CFLAGS=

+-LFLAGS= -a

++XML_LIGHT_OCAML_CFLAGS= $(OCAML_CFLAGS)

++XML_LIGHT_OCAML_LFLAGS= $(OCAML_LFLAGS) -a

+ LIBS=

+ 

+ all: xml-light.cma test.exe doc

+@@ -28,10 +28,10 @@
+ 	ocamlopt xml-light.cmxa test.ml -o test_opt.exe

+ 

+ xml-light.cma: xml_parser.cmo xml_lexer.cmo dtd.cmo xmlParser.cmo xml.cmo 

+-	ocamlc -o xml-light.cma $(LFLAGS) $(LIBS) xml_parser.cmo xml_lexer.cmo dtd.cmo xmlParser.cmo xml.cmo

++	ocamlc -o xml-light.cma $(XML_LIGHT_OCAML_LFLAGS) $(LIBS) xml_parser.cmo xml_lexer.cmo dtd.cmo xmlParser.cmo xml.cmo

+ 

+ xml-light.cmxa: xml_parser.cmx xml_lexer.cmx dtd.cmx xmlParser.cmx xml.cmx 

+-	ocamlopt -o xml-light.cmxa $(LFLAGS) $(LIBS) xml_parser.cmx xml_lexer.cmx dtd.cmx xmlParser.cmx xml.cmx

++	ocamlopt -o xml-light.cmxa $(XML_LIGHT_OCAML_LFLAGS) $(LIBS) xml_parser.cmx xml_lexer.cmx dtd.cmx xmlParser.cmx xml.cmx

+ 

+ dtd.cmo: xml.cmi xml_lexer.cmi dtd.cmi

+ 

+@@ -71,13 +71,13 @@
+ 

+ # SUFFIXES

+ .ml.cmo:

+-	ocamlc $(CFLAGS) -c $<

++	ocamlc $(XML_LIGHT_OCAML_CFLAGS) -c $<

+ 

+ .ml.cmx:

+-	ocamlopt $(CFLAGS) -c $<

++	ocamlopt $(XML_LIGHT_OCAML_CFLAGS) -c $<

+ 

+ .mli.cmi:

+-	ocamlc $(CFLAGS) $<

++	ocamlc $(XML_LIGHT_OCAML_CFLAGS) $<

+ 

+ .mll.ml:

+ 	ocamllex $<

diff --git a/dev-ml/xml-light/files/04_dtd_trace.dpatch b/dev-ml/xml-light/files/04_dtd_trace.dpatch
new file mode 100644
index 000000000000..9dbea4bdf0c8
--- /dev/null
+++ b/dev-ml/xml-light/files/04_dtd_trace.dpatch
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_dtd_trace.dpatch by Sylvain Le Gall <gildor@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad xml-light-2.2~/dtd.ml xml-light-2.2/dtd.ml
+--- xml-light-2.2~/dtd.ml	2005-02-18 10:01:54.000000000 +0100
++++ xml-light-2.2/dtd.ml	2006-10-26 23:22:25.000000000 +0200
+@@ -267,7 +267,7 @@
+ exception TmpResult of dtd_result

+ 

+ let prove_child dtd tag = 

+-	trace dtd tag;

++	(*trace dtd tag;*)

+ 	match dtd.current with

+ 	| DTDEmpty -> raise (Prove_error EmptyExpected)

+ 	| DTDAny -> ()

+@@ -505,4 +505,4 @@
+ 		sprintf "<!ELEMENT %s %s>" tag (etype_to_string etype)

+ 

+ ;;

+-to_string_ref := to_string
+\ No newline at end of file
++to_string_ref := to_string

diff --git a/dev-ml/xml-light/xml-light-2.2.ebuild b/dev-ml/xml-light/xml-light-2.2-r1.ebuild
index ec4f22d852fa..dbedf30b7eff 100644
--- a/dev-ml/xml-light/xml-light-2.2.ebuild
+++ b/dev-ml/xml-light/xml-light-2.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/xml-light/xml-light-2.2.ebuild,v 1.1 2011/12/11 18:58:07 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/xml-light/xml-light-2.2-r1.ebuild,v 1.1 2012/01/15 20:13:26 maksbotan Exp $
 
-EAPI=3
+EAPI=4
 
 inherit eutils multilib
 
@@ -21,14 +21,22 @@ RDEPEND="dev-lang/ocaml"
 
 S="${WORKDIR}/${PN}"
 
+src_prepare() {
+	EPATCH_FORCE=yes EPATCH_SUFFIX=dpatch EPATCH_SOURCE="${FILESDIR}" \
+	epatch
+}
+
 src_compile() {
-	emake || die
+	emake
+	if use doc;then
+		emake doc
+	fi
 }
 
 src_install() {
 	dodir /usr/$(get_libdir)/ocaml
-	emake INSTALLDIR="${D}"/usr/$(get_libdir)/ocaml install || die
-	dodoc  README
+	emake INSTALLDIR="${D}"/usr/$(get_libdir)/ocaml install
+	dodoc README
 	if use doc; then
 		emake doc
 		dohtml doc/*