7 files changed, 31 insertions, 15 deletions
diff --git a/packages/net-libs/tox/files/confd b/packages/net-libs/toxcore/files/confd
index 33f850b..33f850b 100644
--- a/packages/net-libs/tox/files/confd
+++ b/packages/net-libs/toxcore/files/confd
diff --git a/packages/net-libs/tox/files/initd b/packages/net-libs/toxcore/files/initd
index 101d329..101d329 100644
--- a/packages/net-libs/tox/files/initd
+++ b/packages/net-libs/toxcore/files/initd
diff --git a/packages/net-libs/tox/files/systemd/tox-bootstrapd.service b/packages/net-libs/toxcore/files/systemd/tox-bootstrapd.service
index ae2f238..ae2f238 100644
--- a/packages/net-libs/tox/files/systemd/tox-bootstrapd.service
+++ b/packages/net-libs/toxcore/files/systemd/tox-bootstrapd.service
diff --git a/packages/net-libs/tox/files/tox-bootstrapd.conf b/packages/net-libs/toxcore/files/tox-bootstrapd.conf
index 3413f59..3413f59 100644
--- a/packages/net-libs/tox/files/tox-bootstrapd.conf
+++ b/packages/net-libs/toxcore/files/tox-bootstrapd.conf
diff --git a/packages/net-libs/toxcore/toxcore-0.2.4.exheres-0 b/packages/net-libs/toxcore/toxcore-0.2.4.exheres-0
new file mode 100644
index 0000000..8e145c2
--- /dev/null
+++ b/packages/net-libs/toxcore/toxcore-0.2.4.exheres-0
@@ -0,0 +1,6 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+require toxcore
+
+PLATFORMS="~amd64 ~x86"
diff --git a/packages/net-libs/toxcore/toxcore-scm.exheres-0 b/packages/net-libs/toxcore/toxcore-scm.exheres-0
new file mode 100644
index 0000000..8e145c2
--- /dev/null
+++ b/packages/net-libs/toxcore/toxcore-scm.exheres-0
@@ -0,0 +1,6 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+require toxcore
+
+PLATFORMS="~amd64 ~x86"
diff --git a/packages/net-libs/tox/tox-scm.exheres-0 b/packages/net-libs/toxcore/toxcore.exlib
index e6f5359..63b2927 100644
--- a/packages/net-libs/tox/tox-scm.exheres-0
+++ b/packages/net-libs/toxcore/toxcore.exlib
@@ -1,27 +1,31 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-SCM_REPOSITORY="https://github.com/TokTok/c-toxcore.git"
-
-require scm-git systemd-service
+require github [ user=TokTok project=c-toxcore tag=v${PV} ]
+#require scm-git
+require systemd-service
 require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 1.13 1.12 1.11 ] need_libtool=false ]
 
-DOWNLOADS=""
+export_exlib_phases src_configure src_install
+
 SLOT="0"
-PLATFORMS="~amd64 ~x86"
 SUMMARY="Encrypted P2P, messaging, and audio/video calling platform"
 DESCRIPTION=""
 HOMEPAGE="https://tox.chat"
 LICENCES="GPL-3+"
 MYOPTIONS="
-		av
-		daemon
-		log-debug [[ requires = [ -log-error -log-info -log-trace -log-warn ] ]]
-		log-error [[ requires = [ -log-debug -log-info -log-trace -log-warn ] ]]
-		log-info [[ requires = [ -log-debug -log-error -log-trace -log-warn ] ]]
-		log-trace [[ requires = [ -log-debug -log-error -log-info -log-warn ] ]]
-		log-warn [[ requires = [ -log-debug -log-error -log-info -log-trace ] ]]
-		ntox"
+		av [[ description = [ Enable audio/video support ] ]]
+		daemon [[ description = [ Build and install tox network booststrap daemon ] ]]
+		ntox [[ description = [ Build testing console-based client ] ]]
+        (
+    		log-debug [[ description = [ Turn on debug logging ] ]]
+	    	log-error [[ description = [ Turn on error logging ] ]] 
+		    log-info [[ description = [ Turn on info logging ] ]] 
+    		log-trace [[ description = [ Turn on trace logging ] ]] 
+    		log-warn [[ description = [ Turn on warn logging ] ]] 
+        )
+        [[ number-selected = at-most-one ]]
+"
 
 DEPENDENCIES="
     build+run:
@@ -31,7 +35,7 @@ DEPENDENCIES="
         dev-libs/libsodium
 "
 
-src_configure() {
+toxcore_src_configure() {
     myconf=()
     if option log-debug; then
         myconf+=( --enable-logging )
@@ -57,7 +61,7 @@ src_configure() {
         
 }
 
-src_install() {
+toxcore_src_install() {
     default_src_install
     if option daemon; then
         newconfd "${FILESDIR}"/confd tox-dht-daemon