7 files changed, 53 insertions, 156 deletions
diff --git a/packages/dev-util/ccache/ccache.exlib b/packages/dev-util/ccache/ccache.exlib
deleted file mode 100644
index 18bc702..0000000
--- a/packages/dev-util/ccache/ccache.exlib
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2008 Bo Ørsted Andresen <zlin@exherbo.org>
-# Distributed under the terms of the GNU General Public License v2
-# Inspired from Gentoo's ccache-2.4-r7.ebuild which is:
-#   Copyright 1999-2008 Gentoo Foundation
-
-SUMMARY="Compiler cache"
-HOMEPAGE="https://${PN}.samba.org"
-DOWNLOADS="https://samba.org/ftp/${PN}/${PNV}.tar.xz"
-
-MY_PV=$(ever replace_all _)
-UPSTREAM_RELEASE_NOTES="${HOMEPAGE}/releasenotes.html#_${PN}_${MY_PV%_0}"
-
-LICENCES="GPL-3"
-SLOT="0"
-MYOPTIONS=""
-
-DEPENDENCIES="
-    build+run:
-        sys-libs/zlib[>=1.2.3]
-"
-
diff --git a/packages/dev-util/codeblocks/codeblocks-17.12.exheres-0 b/packages/dev-util/codeblocks/codeblocks-17.12.exheres-0
deleted file mode 100644
index 8ce497b..0000000
--- a/packages/dev-util/codeblocks/codeblocks-17.12.exheres-0
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2008-2016 Pierre Lejeune <superheron@gmail.com>
-# Distributed under the terms of the GNU General Public License v2
-
-require codeblocks
-
-PLATFORMS="~amd64"
-
-WORK="${WORKBASE}/${PNV}"
-
diff --git a/packages/dev-util/codeblocks/codeblocks-scm.exheres-0 b/packages/dev-util/codeblocks/codeblocks-scm.exheres-0
deleted file mode 100644
index b14029e..0000000
--- a/packages/dev-util/codeblocks/codeblocks-scm.exheres-0
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2008-2016 Pierre Lejeune <superheron@gmail.com>
-# Distributed under the terms of the GNU General Public License v2
-
-SCM_REPOSITORY="https://svn.code.sf.net/p/${PN}/code"
-#SCM_SECONDARY_REPOSITORIES="FortranProject PythonPlugins wxCrafterCB"
-#SCM_FortranProject_REPOSITORY="https://svn.code.sf.net/p/fortranproject/code"
-#SCM_PythonPlugins_REPOSITORY="https://github.com/spillz/codeblocks-python"
-#SCM_wxCrafterCB_REPOSITORY="https://github.com/eranif/wxCrafterCB"
-#SCM_EXTERNAL_REFS="
-#    src/plugins/contrib/FortranProject:FortranProject
-#    src/plugins/contrib/PythonPlugins:PythonPlugins
-#    src/plugins/contrib/wxCrafterCB:wxCrafterCB
-#"
-
-require codeblocks scm-svn
-
-PLATFORMS="~amd64 ~x86"
-
diff --git a/packages/dev-util/codeblocks/codeblocks.exlib b/packages/dev-util/codeblocks/codeblocks.exlib
deleted file mode 100644
index 1afda42..0000000
--- a/packages/dev-util/codeblocks/codeblocks.exlib
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2008-2016 Pierre Lejeune <superheron@gmail.com>
-# Distributed under the terms of the GNU General Public License v2
-
-require sourceforge [ pnv="${PN}_${PV}" suffix='tar.xz' ]
-require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 1.13 1.12 1.11 1.10 ] ]
-require freedesktop-desktop freedesktop-mime
-export_exlib_phases src_prepare src_install pkg_postinst pkg_postrm
-
-SUMMARY="Code::Blocks C/C++ IDE"
-DESCRIPTION="Code::Blocks free C/C++ IDE"
-HOMEPAGE="http://www.codeblocks.org"
-
-LICENCES="GPL-3"
-SLOT="0"
-MYOPTIONS="
-    contrib-plugins [[ description = [ Build community-contributed plugins ] ]]
-"
-
-DEPENDENCIES="
-    build:
-        app-arch/zip
-        virtual/pkg-config
-    build+run:
-        app-admin/gamin
-        app-spell/hunspell:=
-        dev-libs/boost
-        media-libs/fontconfig
-        x11-libs/wxGTK:=[>=2.8.12]
-"
-
-DEFAULT_SRC_CONFIGURE_OPTION_WITHS=( 'contrib-plugins' )
-
-codeblocks_src_prepare() {
-    if ever at_least scm; then
-        edo chmod +x update_revision.sh
-        edo ./update_revision.sh
-    fi
-
-    edo sed -e "s/pkg-config,/${PKG_CONFIG},/" -i configure.ac
-
-    [[ -e "${WORK}/m4" ]] || edo mkdir "${WORK}/m4"
-
-    autotools_src_prepare
-}
-
-codeblocks_src_install() {
-    default
-    hereenvd 50codeblocks <<EOF
-CODEBLOCKS_DATA_DIR="/usr"
-EOF
-}
-
-codeblocks_pkg_postinst() {
-    freedesktop-desktop_pkg_postinst
-    freedesktop-mime_pkg_postinst
-}
-
-codeblocks_pkg_postrm() {
-    freedesktop-desktop_pkg_postrm
-    freedesktop-mime_pkg_postrm
-}
-
diff --git a/packages/dev-util/ccache/ccache-3.3.6.exheres-0 b/packages/dev-util/codelite/codelite-12.0.exheres-0
index b504532..1405ecd 100644
--- a/packages/dev-util/ccache/ccache-3.3.6.exheres-0
+++ b/packages/dev-util/codelite/codelite-12.0.exheres-0
@@ -1,7 +1,7 @@
-# Copyright 2008 Bo Ørsted Andresen <zlin@exherbo.org>
 # Distributed under the terms of the GNU General Public License v2
 
-require ccache
+SCM_TAG="12.0"
 
+require codelite
 PLATFORMS="~amd64 ~x86"
 
diff --git a/packages/dev-util/codelite/codelite-scm.exheres-0 b/packages/dev-util/codelite/codelite-scm.exheres-0
index 32daacf..f10af18 100644
--- a/packages/dev-util/codelite/codelite-scm.exheres-0
+++ b/packages/dev-util/codelite/codelite-scm.exheres-0
@@ -1,48 +1,5 @@
 # Distributed under the terms of the GNU General Public License v2
 
-SCM_REPOSITORY="git://github.com/eranif/codelite.git"
-require scm-git
-
-HOMEPAGE="http://www.codelite.org"
-SUMMARY="A Free, open source, cross platform C,C++,PHP and Node.js IDE"
-DESCRIPTION=""
-SLOT="0"
-
-require cmake [ api=2 ]
-
-DOWNLOADS=""
+require codelite
 PLATFORMS="~amd64 ~x86"
-MYOPTIONS="
-	clang
-	flex
-	pch
-	sftp
-	webview
-"
-
-DEPENDENCIES="
-	build+run:
-		x11-libs/wxGTK[>=3]
-		net-libs/libssh
-		dev-db/sqlite
-"
-
-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[@]}"
-}
 
-src_install() {
-	cmake_src_install
-	cd "${IMAGE}"/usr
-	mkdir $(exhost --target)
-	edo mv bin $(exhost --target)/
-	edo mv lib $(exhost --target)/
-}
diff --git a/packages/dev-util/codelite/codelite.exlib b/packages/dev-util/codelite/codelite.exlib
new file mode 100644
index 0000000..59e807b
--- /dev/null
+++ b/packages/dev-util/codelite/codelite.exlib
@@ -0,0 +1,50 @@
+# Distributed under the terms of the GNU General Public License v2
+
+SCM_REPOSITORY="git://github.com/eranif/codelite.git"
+require scm-git
+
+HOMEPAGE="http://www.codelite.org"
+SUMMARY="A Free, open source, cross platform C,C++,PHP and Node.js IDE"
+DESCRIPTION=""
+SLOT="0"
+LICENCES="GPL-2"
+
+require cmake [ api=2 ]
+
+export_exlib_phases src_configure src_install
+
+DOWNLOADS=""
+MYOPTIONS="
+	clang
+	flex
+	pch
+	sftp
+	webview
+"
+
+DEPENDENCIES="
+	build+run:
+		x11-libs/wxGTK[>=3]
+		net-libs/libssh
+		dev-db/sqlite
+"
+
+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[@]}"
+}
+
+codelite_src_install() {
+	cmake_src_install
+	cd "${IMAGE}"/usr
+	mkdir $(exhost --target)
+	edo mv bin $(exhost --target)/
+	edo mv lib $(exhost --target)/
+}