version bump

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

6 files changed, 142 insertions, 8 deletions

diff --git a/dev-ml/camlzip/ChangeLog b/dev-ml/camlzip/ChangeLog
index 4a48a472d6a1..518805df3472 100644
--- a/dev-ml/camlzip/ChangeLog
+++ b/dev-ml/camlzip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ml/camlzip
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlzip/ChangeLog,v 1.20 2011/04/27 17:58:49 angelos Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlzip/ChangeLog,v 1.21 2012/11/21 00:15:13 aballier Exp $
+
+*camlzip-1.05 (21 Nov 2012)
+
+  21 Nov 2012; Alexis Ballier <aballier@gentoo.org> +camlzip-1.05.ebuild:
+  version bump
 
   27 Apr 2011; Christoph Mende <angelos@gentoo.org> camlzip-1.04.ebuild:
   Stable on amd64 wrt bug #363617
diff --git a/dev-ml/camlzip/Manifest b/dev-ml/camlzip/Manifest
index de5a306294d9..a67882818654 100644
--- a/dev-ml/camlzip/Manifest
+++ b/dev-ml/camlzip/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX META 107 SHA256 e818e62be2760d708d62e2e4ef2fcea19b794f9b8d49a60b98c30951510bb5de SHA512 522f5d92e9db98f8db6fba1e5d2df353b0278580bc6ad33a2a878709f8fb9cf07f08887bfa7c5e8d4a2322178221ba0b522ca98a21e63591b8bab035a71e8bec WHIRLPOOL 0ef89ab6f6ff26684261a8119499c31c603c9a8750bca90fce6dbfc0b403c100beca73833fb58aadab1138d4ad8f7ddda8139324ed7bc1adc5df430cb7269936
 AUX camlzip-1.03-Makefile-findlib.patch 1005 SHA256 1e5e0b3d647a58fc3c02c77ee608db484aae5e30926d896d07802e5e714e71c8 SHA512 e68db81e5345089a1e3d9bb6f43c538c7282c5317c152c4337c79c51492817b087431bbfe98614dc30dee1d5c2b0a6e0a627195ecdd5afd68f1e20d9ccd7fd20 WHIRLPOOL b6d5826db63dfb20666722ebeed27ab62c1dbcd5df5d009425375e8495028aa9beed2fda122f5159c1f047affc0aac6c26c6269f38ee3a31b61c7c03c0dfe3d7
 DIST camlzip-1.04.tar.gz 25691 SHA256 76f5f88a468722e851b3a959ef93e7c61dffb877fbaafa2b71a7a7146e85ecfe SHA512 05203ce93d804c888526ae76ccb177b7d32658b1857c227c3cb2c7b9682b5913f9968e90d904701dcbd335a4ae2126b51f5001b8ab972c689fd6c0ab1173ebc5 WHIRLPOOL b004103e000cf11510379b82b6ebb0803e22bcf52ce60c3632290da241711139378c13a56222eeb204320ad1bac6c9e42342652aa1b0ae338e7bec6ee3a08f6b
+DIST camlzip-1.05.tar.gz 25817 SHA256 930b70c736ab5a7ed1b05220102310a0a2241564786657abe418e834a538d06b SHA512 5128243fc7528e5ec6cbb7d9b121e8cb0b6d486a95a82161cd74cafe05454602c9952ed6fee3d38a53614e5ecdc20ef88437681107c5952bf85b8f8c78bf042d WHIRLPOOL 26d2bf8d08a425b2297a913ec140fdfff78a31eb9a09e3641b38face44994c2f322354fddd9b96c003df74479e3d40dd12b5d9243160eeadd466b66e896b1acd
 EBUILD camlzip-1.04.ebuild 967 SHA256 9014e438fccce688bb7f92f1a8aaa837f0e386fbef7a5e40512c2e466d26abb0 SHA512 3f07548ea7ff332af07d65c7c2c9da1ab2d46298be1e1a61efc2961cb9c662f3e202a8e2eb6e36e3b09a9225f2ea109aee81da910d64f148460993e55f420e61 WHIRLPOOL e9d1fc2de6df6b6398644d024891ff73ff916350ffdf750b47a5b8e228ad7b57623c06b01a27b13c5592766ce5e0fb35ad5cd8be6a29377939d62b02fe3c51c9
-MISC ChangeLog 2872 SHA256 f8e43999e76ca942e35c4f6bdb3d38e54daadb42711a6ddbc6cca0fc32df8639 SHA512 11a9e9e5a90b178b53b62536360ee80a06201198cb4788081f0e9a5fc296efc21c6276ac3029abee471cdb70110a8015b495c53381c22d9b767cb11254954869 WHIRLPOOL 174b88adfdfb197b24fe703c08e42c05df76294c82ac00e1fe958b394d11ffacea0b19a17e9d54cd00fb76eb26c0931a2646ccab6c74ae9cdb3abbe9b44e7d94
+EBUILD camlzip-1.05.ebuild 796 SHA256 63ec766d10cdeb3a1456cdd56d2321a59c9411d427c11f7856c95998bcafcfc1 SHA512 ae52be5c3f3fbe280ae40ed629003339b98d205fa86ab88daffb4464d7e57249252dc06e2277a47b8de5cf123bb7fb7b9f758270c0abb42fcdda5d34608dff06 WHIRLPOOL 098d508fa66c53cb22c673927e0840a72c06b66bc6271149f9919e87780f4e17f2da4ba4e93f7b0a74177197992dfe88cd17ebb8aa35b480a371cb4761556ec4
+MISC ChangeLog 2992 SHA256 18b61f6edca70a9fbc726153fdb5e86c49e64d1c78b5503461eed30c5790fd30 SHA512 bb5c8caeebedda5852909f86884b6cc91230ada96e9672c34fde8c6d1753f2e44dd86025d44654cdd195d3454a315df976d8acba077927026e98176dba8da8cb WHIRLPOOL 17797e64c9bbaa0e75f900fb6da8ec8eb9410bd9aadcccfa53383c852fa8cfebebe8e19cfd137d7b93db6f7b82f3c079998c24bc6a3f9505e8762ffd424494c2
 MISC metadata.xml 155 SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 SHA512 a525f91dd332fc144c42d1437bdae9c889cbcece6294c2d2f4baf6a532ac2e13492736e75b41c83fac31033a9ae53c37deb96286a5ab8575611136617640952c WHIRLPOOL 71a9c7aaf4e268c65c0d1e30e343911ccbcf99ef8c23773abc2b3af8d58d9f7d5c09632805d8ba9050c09eef629f2b340db9eb9ba8b9cd2e5d655fce3f91fcb6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlCsHRIACgkQvFcC4BYPU0oUsACeJy10C3sn65EpVT6RRnPzlDpG
+tlkAnR/+XhVveXBtF8V5ENfDGO1tcNht
+=2lVs
+-----END PGP SIGNATURE-----
diff --git a/dev-ml/camlzip/camlzip-1.05.ebuild b/dev-ml/camlzip/camlzip-1.05.ebuild
new file mode 100644
index 000000000000..d26ac155df55
--- /dev/null
+++ b/dev-ml/camlzip/camlzip-1.05.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlzip/camlzip-1.05.ebuild,v 1.1 2012/11/21 00:15:13 aballier Exp $
+
+EAPI="4"
+
+inherit findlib eutils
+
+IUSE="+ocamlopt"
+
+DESCRIPTION="Compressed file access ML library (ZIP, GZIP and JAR)"
+HOMEPAGE="http://forge.ocamlcore.org/projects/camlzip/"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/1037/${P}.tar.gz"
+
+SLOT="1"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+RDEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]
+		>=sys-libs/zlib-1.1.3"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	emake all
+	if use ocamlopt; then
+		emake allopt
+	fi
+}
+
+src_install() {
+	findlib_src_preinst
+	emake DESTDIR="${D}" install-findlib
+
+	dodoc README Changes
+}
diff --git a/dev-ml/ocamlnet/ChangeLog b/dev-ml/ocamlnet/ChangeLog
index 9c76562d28a9..f94b48d85838 100644
--- a/dev-ml/ocamlnet/ChangeLog
+++ b/dev-ml/ocamlnet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ml/ocamlnet
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v 1.64 2012/08/03 22:38:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v 1.65 2012/11/21 00:10:32 aballier Exp $
+
+*ocamlnet-3.6.1 (21 Nov 2012)
+
+  21 Nov 2012; Alexis Ballier <aballier@gentoo.org> +ocamlnet-3.6.1.ebuild:
+  version bump
 
   03 Aug 2012; Alexis Ballier <aballier@gentoo.org> ocamlnet-3.6.ebuild:
   license is ZLIB
diff --git a/dev-ml/ocamlnet/Manifest b/dev-ml/ocamlnet/Manifest
index f76e821b69ce..f36d7d4265ff 100644
--- a/dev-ml/ocamlnet/Manifest
+++ b/dev-ml/ocamlnet/Manifest
@@ -3,16 +3,18 @@ Hash: SHA256
 
 DIST ocamlnet-3.5.1.tar.gz 3290994 SHA256 1304eea88aacbc08864e7ff8fce58fab495f41c99b6379784121fc9e92ca8426 SHA512 9e8ab47bfe365a810e016e1293053c4d8c82e85350683d40ee6dbaff06b0a9e4be965234494738cc9d773f35075cba6fccdb861828ea9a33139a1fe48c0e9335 WHIRLPOOL c49b11e05393e65eba725f72badfb6eeab5d3aaabc3ac4795ff3c47476f5ee31b52ecb42de626658de7d8f5379d9cfb15d76aebbe00ec320345c416abf3e29d0
 DIST ocamlnet-3.5.tar.gz 3290489 SHA256 bf509cdbfefa7cead1676131c41f22ea0aa516b8ade57a7d961cde9a1cb623f1 SHA512 d78e3abd46f5cee0f6672af8cbb140d680d8f49d408ee9448279daec7af210f3898e2f3a5aa80ccccf1d4ab4cf3d46cc9fc803c2c45cc7a96454769a1ab8932b WHIRLPOOL dcecf389b602f30edc78bc650c6f213fc05a7bfbd260c74450617f1d7d454f26f17e5337e744253333504b58098391849714b57fd927179c5e0c5b255e6ed45a
+DIST ocamlnet-3.6.1.tar.gz 3333742 SHA256 f283aa9604e4b29e11c4e45f8c44dff6317d7928bef37e5088fb66a66602d3ef SHA512 6efacabc6b3c8297a685b4e6a24f18687b2adee4b583b65eda2bd96c9a3fbda0a58a1f956d4990c7e204317edb57e4ff4bf6c26a2bde0f5e112a04649dcd6e15 WHIRLPOOL 5d955aa38d1d70b9915198191a36ae53a455d50c0f00153858f28f719a7c95c6db6b4e154bd163ba5d5a8aba535400c722ee75989b648b544e14ae3e1f6df3c0
 DIST ocamlnet-3.6.tar.gz 3322518 SHA256 306c20aee6512be3564c0f39872b70f929c06e1e893cfcf528ac47ae35cf7a69 SHA512 10d30ecfa1bc1f40d107a04abceb05c8a136cbc77b48a3343091c479c53a66337b13e88bf29ec4044e472dfb6868d7ad3c10dd5469839907e4fd95a0855016bc WHIRLPOOL f8c1e73f5efb84c0e61623090cedb5ce7337b4ff14fcaa4a164d6834274f37c26a835f6c9ff67d6e2fbd0c282d4db191f53dca44107c26aa49bd8c6ed6c3f2d4
 EBUILD ocamlnet-3.5.1.ebuild 1772 SHA256 ba7cbc705ef5450df847f9e22fdbb6d7c352a262ffc1059e5593ab9aafebcfce SHA512 6bdf3820e22b580eeac94e3149c949b19eaaf6ec2354f23a894c531c04129b28d65e972746dd8d01143b46965ddb602fde244925da9517cc2080cf238b0a49fa WHIRLPOOL f3a08a5d8abe5f44c8ebe575b322cd18c1e0f46f316d0413618a7d76a0b3507041093563d0e477830d73a436c56d074a437428ab7a89aaac50f602cbf0aef050
 EBUILD ocamlnet-3.5.ebuild 1762 SHA256 b6f2c62e88be367aec75d6bcb9cbdf49f522b4c4f50fca794c171fbdbf4832df SHA512 1bba36a7feb88935a00738514106b6c5e290f597aac2d4ffd4d1c0d5d57be7eb1aa0eed82e05ef1d107dd2fa6b6a7c0eb3b8fae1eb3fd9212e1e649769c165c1 WHIRLPOOL 5834d390b0aebeb7a8376da81b07880333107777906572e4cf2495cdb808712eaf74192707c270fb21cff35652ddcc154b56443d1a6567c60e25583578457c03
+EBUILD ocamlnet-3.6.1.ebuild 1771 SHA256 7b96cb5983f6bea811fe35880106ab322f82079202c42270f3b3ee6d87565813 SHA512 31932bb7a5d1fa313fe302d21af3ecaec10f8f1ef3e3e9c21de2879a77a603646a9b7653eceb7c359f31d9969119c3c8d2dd62a09be6a37271e88d625928f0d1 WHIRLPOOL 17f612d1fd83ea4f22ed5ba809a7c9cf594bddc8914da891038cb29cfb749850006946785a916d3cd2e31ae9a39e953e1537ef843ea23962e9691f4ad8973e43
 EBUILD ocamlnet-3.6.ebuild 1769 SHA256 ee3038ea1400a392f3281a47e015195d364118b6c6f4862fc23e1865cefb9cfa SHA512 bbb54d8ee40b3ac4f35ccb8ec375ce2f0ff3b857263465b1ccaac63f315b74bdb948c0b68fcc1256a07aaa1cc75767a3d79472b7ade8641890fe911fb2a88208 WHIRLPOOL bc944764ab5cf252633ebecdfd4d4df61f1f142837e6564b8459cc275db86681627a63ce9e97f611223ad2b28c2317306460b772b6cc731d8657e0d84a9f4827
-MISC ChangeLog 8260 SHA256 044b5d2fec8c967142b2cb8434a12ba8bad8ade47ebfdd66bfaf530340f82559 SHA512 e9cf811c24ef1c70b18443b846c41152098ccee09abca8b277d31db639ae3b86b2427c7b42ee533edb88abc1572eef971ce4dd878f7b4bbe62b819abdfcf4b35 WHIRLPOOL 1b148e2c59722706b2b261d3337b9c428845d11c661b33a1ad0c456ac1777d4db4c205f5a9608f393db5d9dbaf65c3e2d5729d09d927939a03ff707b1e288a1e
+MISC ChangeLog 8383 SHA256 d2f65193c6d6d5b7c586617ca610a2dd5a7e8a5b0bc7da33aee28d7de311ec25 SHA512 3a8deed82af1ef07363b6c030a45d2cbd231866b725cb990878c83621a6e9215785305c871862700d263ba501e2dbe39c1fcdbf1a70d44a1822b3320ec40e537 WHIRLPOOL 327389d8e6f692a125f422211723dfa6c6e39f6e9c8400e9101851e00ee14db406bdd0f0ab66340cb3ff0c2239243276153fcc4e21e4551fd7ed9962190e3029
 MISC metadata.xml 419 SHA256 b8b5005c86a12de781987f6a36917a635b46469a5ef497d6fec80e3d8737e7fb SHA512 2b97106f579b12cfe3378530f9e409f436fb60dba4175ca8ca59e4fef48c25d8a8574876b34efbf08f822d7c394ecbdf17510f3864924d14e1151d0ef0ce5400 WHIRLPOOL 59856d3d135f4b61e511a1321b8178c8a82bb2b1989f00e751d61662d09cf4551a271eeafcf1f8a041f64bdd397db8526338ec9b859287d16070e97c170b51c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAcUtEACgkQvFcC4BYPU0ppDgCfSfIuEePR6aVzDqN7zxrT0eZp
-sIYAn2KYdvb35T9Yv4+BM8RPaN0NFs8c
-=hkbM
+iEYEAREIAAYFAlCsG/oACgkQvFcC4BYPU0qF/QCfWTkbEchEdmZqrkL7Y07cTHrM
+n/gAn1m1xQ/SYWFlscN0TCG7OFZA7Ipa
+=63jz
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/ocamlnet/ocamlnet-3.6.1.ebuild b/dev-ml/ocamlnet/ocamlnet-3.6.1.ebuild
new file mode 100644
index 000000000000..47f2601681ca
--- /dev/null
+++ b/dev-ml/ocamlnet/ocamlnet-3.6.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-3.6.1.ebuild,v 1.1 2012/11/21 00:10:32 aballier Exp $
+
+EAPI="2"
+
+inherit eutils findlib
+
+MY_P=${P/_beta/test}
+DESCRIPTION="Modules for OCaml application-level Internet protocols"
+HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
+SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
+
+LICENSE="ZLIB GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="cryptokit gtk ssl tk httpd +ocamlopt +pcre zip"
+RESTRICT="installsources"
+
+# the auth-dh compile flag has been disabled as well, since it depends on
+# ocaml-cryptgps, which is not available.
+
+DEPEND=">=dev-ml/findlib-1.0
+		pcre? ( >=dev-ml/pcre-ocaml-5 )
+		>=dev-lang/ocaml-3.10.2[tk?,ocamlopt?]
+		cryptokit? ( dev-ml/cryptokit )
+		gtk? ( >=dev-ml/lablgtk-2 )
+		ssl? ( >=dev-ml/ocaml-ssl-0.4 )
+		zip? ( dev-ml/camlzip )
+		"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+ocamlnet_use_with() {
+	if use $1; then
+		echo "-with-$2"
+	else
+		echo "-without-$2"
+	fi
+}
+
+ocamlnet_use_enable() {
+	if use $1; then
+		echo "-enable-$2"
+	else
+		echo "-disable-$2"
+	fi
+}
+
+src_configure() {
+	./configure \
+	    -bindir /usr/bin \
+		-datadir /usr/share/${PN} \
+		$(ocamlnet_use_enable cryptokit crypto) \
+		$(ocamlnet_use_enable gtk gtk2) \
+		$(ocamlnet_use_enable pcre pcre) \
+		$(ocamlnet_use_enable ssl ssl) \
+		$(ocamlnet_use_enable tk tcl) \
+		$(ocamlnet_use_enable zip zip) \
+		$(ocamlnet_use_with httpd nethttpd) \
+		|| die "Error : econf failed!"
+}
+
+src_compile() {
+	emake -j1 all || die "make failed"
+	if use ocamlopt; then
+		emake -j1 opt || die "make failed"
+	fi
+}
+
+src_install() {
+	export STRIP_MASK="*/bin/*"
+	findlib_src_install
+}