first sane version of net-misc/sx. still missing init-scripts and

setup-info.

6 files changed, 78 insertions, 83 deletions

diff --git a/dev-db/sx/Manifest b/dev-db/sx/Manifest
deleted file mode 100644
index afbb21b..0000000
--- a/dev-db/sx/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD sx-1.1.ebuild 707 SHA256 66973dd86288bc3a0997cd152335481f71e0f75311b7d261a4cb2aa5aa9b4fe9 SHA512 73b0454458b2b189207a13a1a6ff8f0cc3877a5684ff3add2a3d254d6b055119040e78b6db6c19b2c577d2b71bcbe8207ab3f7ab6583dac1dc39eb4d64f7c0d9 WHIRLPOOL b9f0a2c6e5f46c5175d96cfb4e45e1b8301f904754b7f7a1b7ad8008ab4886c78429c1bd0010c247f769262577fd90d657a5e5de96841b68e6202f42dd204d01
-EBUILD sx-1.2.ebuild 874 SHA256 383deb236edaa762e4a13b4705b21f0c47e32f89b89b85e7e02457e7a3ccb7b3 SHA512 8a83ba5b1097ac014305df00753fdb4bbfa1c0ba9868e4081601ccf716c77c55793966afd9a2d0528e3cd9f99e2196378d9470fb7b27a2702471586e7a09f506 WHIRLPOOL e74b7d85368c97f1ca62420f1e5b28ed149b2c9bcb64fe112412d89961b51ebe75ac0dbc1abd5002e1919cc31ea131b0777cf07e9eff901de5c5f19bfceca8bd
diff --git a/dev-db/sx/sx-1.1.ebuild b/dev-db/sx/sx-1.1.ebuild
deleted file mode 100644
index 06896c7..0000000
--- a/dev-db/sx/sx-1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit git-r3
-
-DESCRIPTION="Skylable SX - a distributed object-storage software for data clusters."
-HOMEPAGE="http://www.skylable.com/products/sx"
-EGIT_REPO_URI="https://github.com/sx-mirror/sx.git"
-EGIT_COMMIT="${PV}"
-
-LICENSE="GPL-2 LGPL-2.1 openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/fcgi
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-src_configure() {
-	./configure --prefix=${D} \
-				--enable-dependency-tracking \
-				--disable-silent-rules \
-				--with-system-libs || die "Configure failed."
-}
-
-src_install() {
-	src_install
-}
diff --git a/dev-db/sx/sx-1.2.ebuild b/dev-db/sx/sx-1.2.ebuild
deleted file mode 100644
index 155c075..0000000
--- a/dev-db/sx/sx-1.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils git-r3
-
-DESCRIPTION="Skylable SX - a distributed object-storage software for data clusters."
-HOMEPAGE="http://www.skylable.com/products/sx"
-EGIT_REPO_URI="https://github.com/sx-mirror/sx.git"
-EGIT_COMMIT="${PV}"
-
-LICENSE="GPL-2 LGPL-2.1 openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-db/sqlite:3
-	dev-libs/libltdl:0
-	dev-libs/fcgi
-	dev-libs/openssl
-	dev-libs/yajl
-	sys-libs/zlib
-	net-libs/curl
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-src_configure() {
-	./configure --prefix=/usr/ \
-				--enable-dependency-tracking \
-				--disable-silent-rules \
-				--with-system-libs \
-				|| die "Configure failed."
-}
-
-src_install() {
-	emake DESTDIR=${D} install
-	prune_libtool_files --all
-}
-
diff --git a/net-misc/sx/Manifest b/net-misc/sx/Manifest
new file mode 100644
index 0000000..f87bb5f
--- /dev/null
+++ b/net-misc/sx/Manifest
@@ -0,0 +1,3 @@
+DIST sx-1.2.tar.gz 7218016 SHA256 98c37a84e1653364226aff47e63b715500636c0af3b20f4e74eefe3397ee2d63 SHA512 b1366cd7968b678a877d163e4183d7dbdc1b1d0a90fd1a8bc9e795cbbeb75677e6f15da7f770c77e61cf97ed20c27acc5ab1d17d25cd1c5f1f40271ced42b41a WHIRLPOOL 4dbb5453b4123bfe5380e604ad2782e66642b442e2e2b2609d847de4e06a1bb543231273f55c4605f9562c3936f8c91a150851182fbed3150c92402c44ad16c5
+EBUILD sx-1.2.ebuild 1754 SHA256 f95c5e24bbba89d7260f1db9b9a4aa94fd2733130b4cfe0654c0e0902bd8675c SHA512 c95f7516e3559c59ae0219691ebc0295f34e2d3663cc831e256ba1efa7ab6f07fa79936b6ef46cbe2b924393a944593ea66ade612be02b18fd66ea91e341a8b0 WHIRLPOOL 8b1e246412becf3ced470aff445aa4b43d820a3f545f224bc650263a0235bc43af2c55b3dcff5bc8b89554baead5268edc2afb1c46967d4546fc50b38c53d758
+MISC metadata.xml 1123 SHA256 e9a332cb75c938df762a9757d6e3bb88557715d9ec5e0376c70623deef940358 SHA512 bbb1d7b6c2470e65ae75e0dc6f48eee2ed1667608a0c249b3bc4cdabafb4c2ba87dfee474d39d9e8fb38bf4facec49347719c6fbe49568b2d728692a63745afb WHIRLPOOL 095235530033c087708490e1299bfbbe403295f19451a1e4c91ed021cb86dd8d4045a8f8f745a51ed65aa4cc08c97180fe9621747dbd39f844571784e9527383
diff --git a/net-misc/sx/metadata.xml b/net-misc/sx/metadata.xml
new file mode 100644
index 0000000..83ba010
--- /dev/null
+++ b/net-misc/sx/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>tomboy64@sina.cn</email>
+	</maintainer>
+	<longdescription lang="en">
+		SX Cluster is a reliable, fully distributed cluster solution for your data storage needs, released under the GPL licence. With SX Cluster you aggregate the disk space available on multiple servers and merge it into a single storage system. The cluster makes sure that your data is always replicated over multiple nodes (the exact number of copies is defined by the sysadmin) and synchronized. Additionally Sx has built-in support for deduplication, client-side encryption, on-the-fly compression and much more.
+	</longdescription>
+	<use>
+		<flag name="client">Access the SX Cluster from this machine via its Nginx server. Also responsible for tools required to run the server.</flag>
+		<flag name="ipv6">Enable support for communication via IPv6.</flag>
+		<flag name="server">Enable SX's server component.</flag>
+		<flag name="ssl">Enable communication security via OpenSSL.</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/sx/sx-1.2.ebuild b/net-misc/sx/sx-1.2.ebuild
new file mode 100644
index 0000000..b72eef0
--- /dev/null
+++ b/net-misc/sx/sx-1.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Skylable SX - a distributed object-storage software for data clusters."
+HOMEPAGE="http://www.skylable.com/products/sx"
+SRC_URI="http://cdn.skylable.com/source/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+client ipv6 +server ssl"
+REQUIRED_USE="server? ( client )"
+
+nginx_modules_use="nginx_modules_http_fastcgi(-),nginx_modules_http_gzip(-),nginx_modules_http_proxy(-),nginx_modules_http_scgi(-),nginx_modules_http_uwsgi(-)"
+
+DEPEND="
+	dev-libs/libltdl:0
+	dev-libs/yajl
+	net-misc/curl[idn,ipv6(-)?,ldap,ssh,ssl(-)?]
+	net-nds/openldap
+	server? ( >=dev-db/sqlite-3.8.4.3:3
+		dev-libs/fcgi
+		www-servers/nginx:mainline[http,ipv6(-)?,${nginx_modules_use},ssl(-)?] )
+"
+RDEPEND="${DEPEND}"
+
+LICENSE="GPL-2"
+
+pkg_setup() {
+	if ! use client && ! use server; then
+		ewarn "********************************************************************************"
+		ewarn "You deactivated both the client and the server use-flag. Unless you know what"
+		ewarn "you're doing, this software will very likely be very useless to you."
+		ewarn "Have a nice day."
+		ewarn "********************************************************************************"
+	fi
+}
+
+src_configure() {
+	econf --prefix=/usr/ \
+          --sysconfdir=/etc/ \
+          --enable-dependency-tracking \
+          --disable-silent-rules \
+          --disable-sxhttpd \
+          --with-system-libs \
+          $(use_enable client sxclient) \
+          $(use_enable server) \
+          || die "Configure failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	prune_libtool_files --all
+}