net-misc/libres3: fix dep for split lwt

Package-Manager: Portage-2.3.5, Repoman-2.3.2

3 files changed, 4 insertions, 81 deletions

diff --git a/net-misc/libres3/Manifest b/net-misc/libres3/Manifest
index 796d3a99d37f..c95cb9436c00 100644
--- a/net-misc/libres3/Manifest
+++ b/net-misc/libres3/Manifest
@@ -1,2 +1 @@
-DIST libres3-1.2.tar.gz 7112430 SHA256 d903196a3b9e0e65b67ba140f3fc1a8ef9f9c37b3c72389ba14ff0d3a40e3cd8 SHA512 4ea854abdaf5d6ca6ecb0bedd55af93a676ec465f30747a9e63e33dc145bbe17b466d394d784c420babe1b147076711ef99bf28f89ab3cc546a373cb72ede1fd WHIRLPOOL de955534136f9246417c3b56a8d0de186fa77f838e1b3708d3db22514f7ae0fac3bf3aee8a32691fbfe05f43814bdd353eba7766861dcdede22a5d15834ac3ef
 DIST libres3-1.3.tar.gz 7116418 SHA256 73d906ec42712bb7bd361d8bb0a8713ec08e20d77159ba32476207cd9491fc6c SHA512 a450635e395ad515974f20f6d47fb661dba7a6cbea0b43423ebaff5199031d7afdf19459fa2d232aea1bd356f49cb97f9ca6f2804d0b5e0cb1978410a95b05d0 WHIRLPOOL 9027853a80cc09e8a35f04517f1472cc04c2050a25647fa952d623da29fda91fed0f016c473e3305f7eaaa7126a6f15bdf1dcdb257848b67aba22bd535a9e936
diff --git a/net-misc/libres3/libres3-1.2.ebuild b/net-misc/libres3/libres3-1.2.ebuild
deleted file mode 100644
index aee69d932eca..000000000000
--- a/net-misc/libres3/libres3-1.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_TESTS=1
-inherit oasis findlib
-
-DESCRIPTION="Skylable LibreS3 - Amazon S3 open source replacement"
-HOMEPAGE="http://www.skylable.com/products/libres3"
-SRC_URI="http://cdn.skylable.com/source/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-OASIS_DOC_DIR="/usr/share/doc/${PF}"
-
-RDEPEND="
-	>=dev-lang/ocaml-4:=
-	dev-ml/camlp4:=
-	dev-ml/jsonm:=
-	dev-ml/lwt:=[react,ssl]
-	dev-ml/ocaml-base64:=
-	dev-ml/ocaml-dns:=[lwt(-)]
-	dev-ml/ocaml-ipaddr:=
-	dev-ml/ocaml-re:=
-	dev-ml/ocaml-ssl:=
-	>=dev-ml/ocamlnet-3.7.4:=[pcre]
-	<dev-ml/ocamlnet-4:=[pcre]
-	dev-ml/optcomp:=
-	dev-ml/ounit:=
-	dev-ml/pcre-ocaml:=
-	dev-ml/tyxml:=
-	dev-ml/uutf:=
-	dev-ml/xmlm:=
-	www-servers/ocsigenserver:=[sqlite]
-"
-DEPEND="
-	dev-ml/oasis
-	virtual/pkgconfig
-	${RDEPEND}
-"
-
-S="${WORKDIR}/${P}/libres3"
-
-src_prepare() {
-	sed -e '/..\/..\/COPYING/d' -i _oasis || die
-	rm setup.ml || die
-	emake update
-}
-
-src_configure() {
-	oasis_configure_opts="
-		--sysconfdir ${EPREFIX}/etc/${PN}
-		--localstatedir ${EPREFIX}/var" oasis_src_configure
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if [[ -d /etc/logrotate.d ]]; then
-		insinto /etc/logrotate.d
-		doins src/files/conf/logrotate.d/libres3
-	fi
-}
-
-pkg_postinst() {
-	elog "*******************************************************************************"
-	elog "Just as a heads-up: LibreS3 requires a working SX cluster (sys-cluster/sx) to"
-	elog "be of any use. Since LibreS3 is capable of connecting to a remote SX cluster it"
-	elog "doesn't depend on it. Hence you will likely want to install it."
-	elog ""
-	elog "Standard S3 client libraries and tools (for example s3cmd, python-boto,"
-	elog "ocaml-aws, etc.) can be used to access it."
-	elog "Enjoy."
-	elog "*******************************************************************************"
-}
diff --git a/net-misc/libres3/libres3-1.3.ebuild b/net-misc/libres3/libres3-1.3.ebuild
index aee69d932eca..3186ade09d7a 100644
--- a/net-misc/libres3/libres3-1.3.ebuild
+++ b/net-misc/libres3/libres3-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,9 @@ RDEPEND="
 	>=dev-lang/ocaml-4:=
 	dev-ml/camlp4:=
 	dev-ml/jsonm:=
-	dev-ml/lwt:=[react,ssl]
+	dev-ml/lwt:=
+	dev-ml/lwt_react:=
+	dev-ml/lwt_ssl:=
 	dev-ml/ocaml-base64:=
 	dev-ml/ocaml-dns:=[lwt(-)]
 	dev-ml/ocaml-ipaddr:=