version bump

Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

7 files changed, 140 insertions, 13 deletions

diff --git a/dev-ml/dose3/ChangeLog b/dev-ml/dose3/ChangeLog
index ae26a8c0299a..13d19c18b23d 100644
--- a/dev-ml/dose3/ChangeLog
+++ b/dev-ml/dose3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ml/dose3
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/dose3/ChangeLog,v 1.5 2014/11/28 17:55:09 aballier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/dose3/ChangeLog,v 1.6 2015/01/26 13:51:24 aballier Exp $
+
+*dose3-3.3 (26 Jan 2015)
+
+  26 Jan 2015; Alexis Ballier <aballier@gentoo.org> +dose3-3.3.ebuild:
+  version bump
 
   28 Nov 2014; Alexis Ballier <aballier@gentoo.org> dose3-3.3_beta2-r2.ebuild:
   update deps for ocaml 4.02
diff --git a/dev-ml/dose3/Manifest b/dev-ml/dose3/Manifest
index ba589102388b..cc2678dafb35 100644
--- a/dev-ml/dose3/Manifest
+++ b/dev-ml/dose3/Manifest
@@ -2,13 +2,15 @@
 Hash: SHA256
 
 DIST dose3-3.3-beta2.tar.gz 257564 SHA256 ec73f6ad8da999a90b4c20633c55dac78755018c0128592501f3931396d85abf SHA512 7540b2390f8ef49acdf4ac5c7598e25137b380f4d0b862d75a144a2e12d3f7e24633e8f0e3597f74cd48491f9fa7559dc1664692eb3a840eca26e0f077550db8 WHIRLPOOL 6ad1e502ac85c9e873703f5f11f8291fe24a2bd79f6c659ff7f22d001f37114e8568db915ef6e2b2dd245eaceb3eaa00797d47626577cf33df057762eb727af2
+DIST dose3-3.3.tar.gz 257658 SHA256 8dc4dae9b1a81bb3a42abb283df785ba3eb00ade29b13875821c69f03e00680e SHA512 0decf753f6f4a9fc73ac2cf8eb4b6b464f16cba2fa7f97d8e7c6f37cb63749ee171c3273019a9a9a42141fdb7843a730e5a5dfc0ebba68d4a8d50261165d71be WHIRLPOOL bd2f863a7ffa9fc34c1f4595950441d05984b9d26c3b54067ed24ca4e1e05795f7b1f1c213e8c20a089360c8a50c324f9472f22cb9cbfe4f59fe8e919f370de9
+EBUILD dose3-3.3.ebuild 1536 SHA256 24512443791e6c9419919ced954a15405d4312be45caa42a07d68b9c0befec82 SHA512 c0d5ab7943e3ac4b0c40d44144c80217ef42c9c631a53fc093dd74846285095cf0d195775108318ad8dd335211107157216feff933212b5eee1794e25248f26e WHIRLPOOL 2d0f8c764971bc002a2d3b1c9244aaa40b9d9d3ad4cdc4a3221ca3fd1cdceb7dc58874b4161f97958be095b463924b614edc036e78899b3cc7205974c275b107
 EBUILD dose3-3.3_beta2-r2.ebuild 1466 SHA256 a07fe7d281bdeca18d6df74f48e03530bce7dbfcefeca8f1026719caf6e0a5e5 SHA512 3e16ba60384f311744d12b26ec91f2c56f496e19fb32f802934f705b404cc34ebb57f76e00c64032d6635007b50ac9b231eed7f69132e57ff3af15526962739c WHIRLPOOL 34483ff1258a393a930582288185bf4aa7645a0aa705de6ee0c02166451b6919a8bec5105dc65c7f575a8dcc2deb9233f1d8a91e577c3be87f99e3a32b0e56ae
-MISC ChangeLog 925 SHA256 d18db797a616011a9368877578b0408075e7a85568bd52ed3bc6c78bb999f641 SHA512 5f52c5c0d120609abcbfeda6b8c29176fd96a85b99127897d2205203e020c3cb698c931905d93d0e7f497cea7f74e5c5769805b9f14c6606da6012ccc0e3658f WHIRLPOOL 67f5f2a123eed7af3cd010ca11ac58b1ec7769e536ef86de270accd3914510005bf580621e64b29942c3c91d82e581a4bdb322f9fac41062a43ec0de96b3f9da
+MISC ChangeLog 1038 SHA256 71a32bd38c089d33c049681041abd060a934cad5465a83eabc7b288c177d22ab SHA512 7d2420d6a998d53de570dc0d74fdab7b2b89c46ac03a870065d26f6858376dbe892a74d758497157981718a48e5635e1c3757cbf986971a03838f1dbbd1b4f96 WHIRLPOOL 5a9c3908725be47ae8ff2b53b79971ce807f3be6b6b5e6dcb67aed92ecd15cceb01c5901a5f9a199f64de76be5c039a5849fa52d8094c026ac401e34f4261ffd
 MISC metadata.xml 387 SHA256 64a8cc049d08b5cb65af57b322ae2e8f6f11e5a594a3b9c7902ee424740c3832 SHA512 f5209cffc24f5de30d278732c111cc9ba5d36f2200e7cde2613e959b252cc5d75388a794bc16d5474149e30b6120a0ee5485b7f96d17c8e4e094ba11f51e338e WHIRLPOOL 8368331c44df52863d2c71fc79d168d0a16afe9c4f9ba12a311b114ba46683be42b64854a57e4a355daf72fe153c51f6e5b3c8f995b4067a52dbbfca83ae6569
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlR4tv4ACgkQvFcC4BYPU0p7lACfY1iqY7rhV5YqKH0aus7desA1
-6rIAnip2H/ScDWRehjafTblR4qOMtNkN
-=KpLE
+iEYEAREIAAYFAlTGRl0ACgkQvFcC4BYPU0rokACghAZkixOsXnsp+DDItonb1rrH
+wwAAn3Zs15hl/aQaQkuar/oa2+FNtKc+
+=YnEf
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/dose3/dose3-3.3.ebuild b/dev-ml/dose3/dose3-3.3.ebuild
new file mode 100644
index 000000000000..aad1ebc6a12a
--- /dev/null
+++ b/dev-ml/dose3/dose3-3.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/dose3/dose3-3.3.ebuild,v 1.1 2015/01/26 13:51:24 aballier Exp $
+
+EAPI=5
+
+MY_P="${P/_beta/-beta}"
+DESCRIPTION="Library and a collection of tools to perform la large spectrum of analysis on package repositories"
+HOMEPAGE="http://dose.gforge.inria.fr/public_html/"
+SRC_URI="https://gforge.inria.fr/frs/download.php/file/34277/${MY_P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt +parmap zip bzip2 xml curl rpm4 test"
+
+RDEPEND="
+	>=dev-lang/ocaml-3.12:=[ocamlopt?]
+	dev-ml/cudf:=
+	dev-ml/extlib:=
+	dev-ml/ocaml-re:=
+	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )
+	parmap? ( dev-ml/parmap:= )
+	zip? ( dev-ml/camlzip:= )
+	bzip2? ( dev-ml/camlbz2:= )
+	>=dev-ml/ocamlgraph-1.8.5:=
+	xml? ( dev-ml/ocaml-expat:= dev-ml/xml-light:= )
+	curl? ( dev-ml/ocurl:= )
+	rpm4? ( app-arch/rpm )
+"
+DEPEND="${RDEPEND}
+	dev-ml/findlib
+	test? ( dev-python/pyyaml[libyaml] )
+"
+# missing test data
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -e 's/INSTALLOPTS=-s/INSTALLOPTS=/' -i Makefile.config.in || die
+}
+
+src_configure() {
+	econf \
+		$(use ocamlopt || echo "--with-bytecodeonly") \
+		$(use parmap && echo "--with-parmap") \
+		$(use zip && echo "--with-zip") \
+		$(use bzip2 && echo "--with-bz2") \
+		--with-ocamlgraph \
+		$(use xml && echo "--with-xml") \
+		$(use curl && echo "--with-curl") \
+		$(use rpm4 && echo "--with-rpm4")
+}
+
+src_compile() {
+	emake -j1
+}
diff --git a/dev-ml/uutf/ChangeLog b/dev-ml/uutf/ChangeLog
index 834761a3e277..8791a9cec926 100644
--- a/dev-ml/uutf/ChangeLog
+++ b/dev-ml/uutf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ml/uutf
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/uutf/ChangeLog,v 1.1 2014/10/29 08:41:19 aballier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/uutf/ChangeLog,v 1.2 2015/01/26 13:54:58 aballier Exp $
+
+*uutf-0.9.4 (26 Jan 2015)
+
+  26 Jan 2015; Alexis Ballier <aballier@gentoo.org> +uutf-0.9.4.ebuild,
+  metadata.xml:
+  version bump
 
 *uutf-0.9.3 (29 Oct 2014)
 
diff --git a/dev-ml/uutf/Manifest b/dev-ml/uutf/Manifest
index 905714190b4b..33b96dc40612 100644
--- a/dev-ml/uutf/Manifest
+++ b/dev-ml/uutf/Manifest
@@ -2,13 +2,15 @@
 Hash: SHA256
 
 DIST uutf-0.9.3.tbz 31734 SHA256 1f364f89b1179e5182a4d3ad8975f57389d45548735d19054845e06a27107877 SHA512 6fa3592bcb401eb96ffe7d4112ae89a72f0088a3909e087ba04d22544bab0521fadee536b4c01efac040435ffc5f2681567d2291beb90db5c2e56deb4b22c2d6 WHIRLPOOL fbb3500f8a58d6a5f4f8b43e6545b53317995b6de2aee51f688fd6d42b5eaab0d56426e567024a625ec2774603559182e7e54bbd6f1da5c2a69f80cf8f2a5f7e
+DIST uutf-0.9.4.tbz 36987 SHA256 13706722a0037b167eef359bac68d5426d05f64aa308f44c1784aace9577e1b8 SHA512 95203b06e7506f33822f10607315920b849efde3ed2e032bf8dd805f99ce4851b375bc92a1f95403673c97c6176c5a6974af2be611f530db0a7f36296948edf4 WHIRLPOOL a3446da14f665c06dbc9b245baf530c4650fb657baec02de7773cbb5addb2fdb5ddf9a98822a3af3b72b4800affcf2af39e44a6f37f17d221c55bd02b39c4cce
 EBUILD uutf-0.9.3.ebuild 1219 SHA256 4ca958ec4a7193984666dcae58e10927e8d56e28cab4495391457d9a75934483 SHA512 8eb9bb258129f27e5f0757614422f0564594f1364fb331ad4ea9ac069ec6f27a49fd38485f98f85d83ea291c3e103da60406b0769b051f7ac011cf336bd69b85 WHIRLPOOL bc6a9c387fca61ba67140c8cea707c7d734c12bb79cf63ede8216686bfc57caecbb75cf79fa98e597cb7ed2ad488784562a19547b907555de3ea48a1f36d2a84
-MISC ChangeLog 406 SHA256 a43bfe1dd18431e6b2854e6ebe9dc71e3263fd4b67255c1847a5d5d8aa2f0819 SHA512 0f07acbba1eb405869c96a4e076b4ac1a3f06db5b9828e5c00dfa2ccaabc7233f4941f81fe4f8339b46af824217bc2811bf0e1376dce62097a7288fafc04fdd1 WHIRLPOOL f17bce0f3e07cb0e2a3edade7d3fdb31b31a46855e4bfc303aa7d92ec0bbfe3985c1ed201f54645777b83dafc17ca2afe8c448fac2cbcd3834f1464bf8a01eea
-MISC metadata.xml 155 SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 SHA512 a525f91dd332fc144c42d1437bdae9c889cbcece6294c2d2f4baf6a532ac2e13492736e75b41c83fac31033a9ae53c37deb96286a5ab8575611136617640952c WHIRLPOOL 71a9c7aaf4e268c65c0d1e30e343911ccbcf99ef8c23773abc2b3af8d58d9f7d5c09632805d8ba9050c09eef629f2b340db9eb9ba8b9cd2e5d655fce3f91fcb6
+EBUILD uutf-0.9.4.ebuild 1445 SHA256 80251143d4e5048021b3ebcbd32727ea7003f6fbccaaacdf62ed12f4c879850a SHA512 f78bf443faac5d3955536fed48130b6daf80a536426608ccb11aaceda830349498d270a976d434b7430f10edb80e20d1090cb21c97c33d64872c5af77d67ed05 WHIRLPOOL e2ecc7904980c7c09b259ae630f7fcf5069a2a764780927c2f068d4c4b7c12581ea96c4f0bb5877903d724422651236457705d781fc21a12429024ae41e2a28c
+MISC ChangeLog 537 SHA256 63aa3e99d397a785f89a065fa4421f616e7fc98c84d0f15000bd68b2e260518a SHA512 4b9d4824ab180c976a1686b60e08d482a5768797f80758cf60b8c8de96164574a3df47d3568b7c9e0039afa36daee6a9656b10d09857ea4651a6a8f86a262011 WHIRLPOOL 42559b49b13d4e9af5dea0af8e6fe2572003163811e4df36d9ef9c2f6916911f97f955571ef6f67d89f50fef0e0e7dadb61c50faa0d65b2364adc884d1d0d79c
+MISC metadata.xml 309 SHA256 100cc060fc5e0fde6d55c1c1357d6183639887a8740830242f67606723c1e1f4 SHA512 48d3e981b9d6e1231e00b6fc848fed0ac60d90d6ee125c71b98171f410ae46ef478f416e9670b69e74d943d2a51d4387670c0e798825e39ae94fbad2dc8593d7 WHIRLPOOL cf7077a7b006835491fae6a9249167999e2992ad98283fc64ed5772216177d1b06e156d1c35a9bb2475ee2f35b5f6db1a43e519163261495932b467b5df13d16
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRQqDEACgkQvFcC4BYPU0pj2gCgnLXc14wfp/bRn+PmLSifo+Oo
-txcAn1vSufdJTMgn2mMFJrOCmLmmFaya
-=SzeT
+iEYEAREIAAYFAlTGRzMACgkQvFcC4BYPU0pSewCZAZ4i8i0+y6mFkJzoCZ+jYg+C
+vd0An0kirvwQvXo53+5qH8FqjVGzXEXp
+=eovj
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/uutf/metadata.xml b/dev-ml/uutf/metadata.xml
index 2193d772e351..959de7257d5d 100644
--- a/dev-ml/uutf/metadata.xml
+++ b/dev-ml/uutf/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>ml</herd>
+<use>
+<flag name="utftrip">Builds and install the utftrip executable: Among other things, reads unicode on stdin and rewrites it on stdout.</flag>
+</use>
 </pkgmetadata>
diff --git a/dev-ml/uutf/uutf-0.9.4.ebuild b/dev-ml/uutf/uutf-0.9.4.ebuild
new file mode 100644
index 000000000000..7494c84c3a5f
--- /dev/null
+++ b/dev-ml/uutf/uutf-0.9.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/uutf/uutf-0.9.4.ebuild,v 1.1 2015/01/26 13:54:58 aballier Exp $
+
+EAPI="5"
+
+inherit findlib
+
+DESCRIPTION="Non-blocking streaming Unicode codec for OCaml"
+HOMEPAGE="http://erratique.ch/software/uutf"
+SRC_URI="http://erratique.ch/software/uutf/releases/${P}.tbz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="utftrip +ocamlopt doc"
+
+RDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
+	utftrip? ( dev-ml/cmdliner:= )"
+DEPEND="${RDEPEND}"
+# https://github.com/dbuenzli/uutf/issues/3
+RESTRICT="test"
+
+src_compile() {
+	ocaml pkg/build.ml \
+		native=$(usex ocamlopt true false) \
+		native-dynlink=$(usex ocamlopt true false) \
+		cmdliner=$(usex utftrip true false) \
+		|| die
+}
+
+src_test() {
+	if use ocamlopt ; then
+		ocamlbuild tests.otarget || die
+		cd _build/test || die
+		./test.native || die
+	else
+		ewarn "Sorry, ${PN} tests require native support (ocamlopt)"
+	fi
+}
+
+src_install() {
+	# Can't use opam-installer here as it is an opam dep...
+	findlib_src_preinst
+	local nativelibs=""
+	use ocamlopt && nativelibs="$(echo _build/src/uutf.cm{x,xa,xs} _build/src/uutf.a)"
+	ocamlfind install uutf _build/pkg/META _build/src/uutf.mli _build/src/uutf.cm{a,i} ${nativelibs} || die
+	use utftrip && newbin utftrip.$(usex ocamlopt native byte) utftrip
+	dodoc CHANGES.md README.md
+	use doc && dohtml -r doc/*
+}