codelite: changes requested by exherbo developers

	- github.exlib does not work properly from another exlib, so still using scm-git.exlib.
	- i am not abe to set proper install paths via cmake params, so manual file moving code kept.

2 files changed, 33 insertions, 27 deletions

diff --git a/packages/dev-util/codelite/codelite-12.0.exheres-0 b/packages/dev-util/codelite/codelite-12.0.exheres-0
index 1405ecd..ecec397 100644
--- a/packages/dev-util/codelite/codelite-12.0.exheres-0
+++ b/packages/dev-util/codelite/codelite-12.0.exheres-0
@@ -1,6 +1,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
-SCM_TAG="12.0"
+SCM_TAG="${PV}"
 
 require codelite
 PLATFORMS="~amd64 ~x86"
diff --git a/packages/dev-util/codelite/codelite.exlib b/packages/dev-util/codelite/codelite.exlib
index 59e807b..b18d62b 100644
--- a/packages/dev-util/codelite/codelite.exlib
+++ b/packages/dev-util/codelite/codelite.exlib
@@ -1,6 +1,9 @@
 # Distributed under the terms of the GNU General Public License v2
+# Copyright 2018 Gluzskiy Alexandr <sss@sss.chaoslab.ru>
 
 SCM_REPOSITORY="git://github.com/eranif/codelite.git"
+#require github [ user=eranif ]
+#TODO: for some reason github.exlib does not work from another exlib
 require scm-git
 
 HOMEPAGE="http://www.codelite.org"
@@ -11,40 +14,43 @@ LICENCES="GPL-2"
 
 require cmake [ api=2 ]
 
-export_exlib_phases src_configure src_install
+export_exlib_phases src_install
 
 DOWNLOADS=""
 MYOPTIONS="
-	clang
-	flex
-	pch
-	sftp
-	webview
+    clang [[ description = [ Use clang for codecompletion ]  ]]
+    flex [[ description = [ Add support for sys-devel/flex ] ]]
+    pch [[ description = [ Use precompilled headers during build (speedup build a lot on single machine, may cause problems with distcc/icecc) ] ]]
+    ssh [[ description = [ Support ssh in scm modules via libssh ] ]]
+    webview [[ description = [ Use webview in wxGTK ] ]]
 "
 
 DEPENDENCIES="
-	build+run:
-		x11-libs/wxGTK[>=3]
-		net-libs/libssh
-		dev-db/sqlite
+    build+run:
+        dev-db/sqlite
+        x11-libs/wxGTK[>=3]
+        flex? ( sys-devel/flex )
+        ssh? ( net-libs/libssh )
+        webview? ( x11-libs/wxGTK[webkit] )
 "
 
-codelite_src_configure() {
-	local cmakeparams=()
-	cmakeparams+=(
-		$(cmake_enable clang CLANG)
-		$(cmake_with flex FLEX)
-		$(cmake_with pch PCH)
-		$(cmake_enable sftp SFTP)
-		$(cmake_with webview WEBVIEW)
-	)
-	ecmake "${cmakeparams[@]}"
-}
+
+CMAKE_SRC_CONFIGURE_OPTION_ENABLES=(
+    "clang CLANG"
+    "ssh SFTP"
+)
+
+CMAKE_SRC_CONFIGURE_OPTION_WITHS=(
+    "flex FLEX"
+    "pch PCH"
+    "webview WEBVIEW"
+)
+
 
 codelite_src_install() {
-	cmake_src_install
-	cd "${IMAGE}"/usr
-	mkdir $(exhost --target)
-	edo mv bin $(exhost --target)/
-	edo mv lib $(exhost --target)/
+    cmake_src_install
+    cd "${IMAGE}"/usr
+    edo mkdir $(exhost --target)
+    edo mv bin $(exhost --target)/
+    edo mv lib $(exhost --target)/
 }