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

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

7 files changed, 164 insertions, 10 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/Manifest b/dev-ml/xml-light/Manifest
index d9e72d3dd250..8255749ac984 100644
--- a/dev-ml/xml-light/Manifest
+++ b/dev-ml/xml-light/Manifest
@@ -1,4 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 01_installopt.dpatch 861 RMD160 827f9d68eb5e89b33affc5d3dfadaae6602d4936 SHA1 3461151efa22c25753cb31c181d1bbd89a1e6e93 SHA256 aad4700cca888ffb6d159ee442af4be4114ddac7e706aa0c9c9f6d4bef11eb2c
+AUX 02_cmi_depends.dpatch 492 RMD160 ab3c6e8cacb5547eb22b02555f7a354a9b24c4a7 SHA1 265122342911ebb7ffae10b3df675fbaf8821c6d SHA256 3497b14c89eac4810637607fe10b20ac7645469ec02a391b36fe29726da8db39
+AUX 03_cflags.dpatch 1681 RMD160 1106b1e462533eea2adac485ab5a86b9e1a8a0d3 SHA1 5a0236d22d7ba67ba2839f970f9ca7c6169beb43 SHA256 3f4127cc44d5cb82e9e91830ac3e5a49f559d31a4d0363a54ed8fd7cde758668
+AUX 04_dtd_trace.dpatch 780 RMD160 a428fce68d5fcb8eb6afe9417f294a053de53f88 SHA1 64d5434ebb421dbb9e9a75d04cc047c2cc818da8 SHA256 86d2652afd61fa75dadd54c15ccd430df84c5d67fe7386ebe2de614013833014
 DIST xml-light-2.2.zip 22130 RMD160 5a6158698110f706ecfeca0d5799eea2c155f974 SHA1 e524aa20c34bf45a839363b61bb2cbbf8fcdc6bc SHA256 fdb205e8b3a25922e46fca52aea449b9a2de4000c5442487e7e74d79f1e2274a
-EBUILD xml-light-2.2.ebuild 789 RMD160 302ee5be4a58da39b0e069e98322a05f11f6dbd2 SHA1 4e0148991c66edcd4831377a08ce9d0cc40863b0 SHA256 3d275cdb7e162d7dddb4096fe48433c3000fb9cdef4e73a28c5ba63ca27c702b
-MISC ChangeLog 386 RMD160 4fa836475056f08ff700206beed4ec1169a1e317 SHA1 887fd0a25b830768d8db6a24e2b0644194ae09d9 SHA256 22dfbbf6d9fbb63b611a24770e2a67a71978cab8dd75bf2022c4c257dbb0b52d
+EBUILD xml-light-2.2-r1.ebuild 906 RMD160 c23090cb15e5d9a4db5c5a7446c142c3710983de SHA1 f083bf0038698bafab3f83aafdbfa0f3b6154633 SHA256 eca40166a43eaeab96a38c3029a5aa3f224ab55c6e05894a59eb43e89d88b34b
+MISC ChangeLog 744 RMD160 6f4beb82814a73f728d97a1bdc10dc3909b91497 SHA1 01985310bb20122f907d90998c0843293cda7e84 SHA256 08f85e344609592f21f366a22e8632467d5c97df093a6fcdd136ea80096c3ceb
 MISC metadata.xml 327 RMD160 4d929f82166d31d5710f17e78f8c66f8fecef407 SHA1 cde31cdfff5ff2543719f2d83cf074261e06910a SHA256 ad8f529f9a202f44af4371b094874e9cd0857e8325396676a189b91e5dd544fc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPEzPTAAoJEAmJmMX429reSLgH/RVn4KiqMVSSHmtv79pwHGqO
+Z/0yvYqJAqA4yfg542ibUvmw8tp5g3V6E0RZc9Umh5qvBFvBrq47CoYhRWUE3UHR
+omiqL5Z+UXJQx8sXDmWCLpnCDaLDHruprZb1FdmYiaN4Cl6+qoHZp0ki415JqEm8
+Hk0sheyzK3dQWkZa5LKIgugnfDSIHGaxJ8p38w/cncbUTnzuhy0a2sqnXSF4tiZm
+o02q3+IKsr7MIBo2OnKjq3D25FM/58tqeNjPy9NEJDuKga/MmhaAnj17KSUYIY8a
+Z+vUMGpMTDsZI/6zjFTod8xKLij6N3j3EqD6s8UgJi/Q0RHuVx+o7O2upXrtdzQ=
+=yX4V
+-----END PGP SIGNATURE-----
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/*