changes requested by exherbo devs

65 files changed, 79 insertions, 28 deletions

diff --git a/packages/apache-mod/mod_rpaf/mod_rpaf-scm.exheres-0 b/packages/apache-mod/mod_rpaf/mod_rpaf-scm.exheres-0
index b01fdb0..2c5d317 100644
--- a/packages/apache-mod/mod_rpaf/mod_rpaf-scm.exheres-0
+++ b/packages/apache-mod/mod_rpaf/mod_rpaf-scm.exheres-0
@@ -4,3 +4,4 @@
 require mod_rpaf
 
 PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/apache-mod/mod_rpaf/mod_rpaf.exlib b/packages/apache-mod/mod_rpaf/mod_rpaf.exlib
index 5c59a90..513bfb5 100644
--- a/packages/apache-mod/mod_rpaf/mod_rpaf.exlib
+++ b/packages/apache-mod/mod_rpaf/mod_rpaf.exlib
@@ -2,11 +2,9 @@
 # Copyright 2018 Gluzskiy Alexandr <sss@sss.chaoslab.ru>
 
 
-require github [ user=gnif tag=v${PV} force_git_clone=true ]
+require github [ user=gnif tag=v${PV} branch=stable ]
 export_exlib_phases src_install
 
-SCM_BRANCH="stable"
-
 SLOT="0"
 
 SUMMARY="reverse proxy add forward"
@@ -26,4 +24,6 @@ DEPENDENCIES="
 mod_rpaf_src_install() {
     edo mkdir -p "${IMAGE}"/usr/$(exhost --target)/libexec/apache2/modules
     edo cp "${WORK}"/.libs/mod_rpaf.so "${IMAGE}"/usr/$(exhost --target)/libexec/apache2/modules
+    emagicdocs
 }
+
diff --git a/packages/app-arch/mt-st/mt-st-1.3.exheres-0 b/packages/app-arch/mt-st/mt-st-1.3.exheres-0
index e60ed8d..47383c8 100644
--- a/packages/app-arch/mt-st/mt-st-1.3.exheres-0
+++ b/packages/app-arch/mt-st/mt-st-1.3.exheres-0
@@ -4,3 +4,4 @@
 require mt-st
 
 PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/app-arch/mt-st/mt-st.exlib b/packages/app-arch/mt-st/mt-st.exlib
index 4bc1132..cfffba8 100644
--- a/packages/app-arch/mt-st/mt-st.exlib
+++ b/packages/app-arch/mt-st/mt-st.exlib
@@ -1,7 +1,7 @@
 # Copyright 2018 Gluzskiy Alexandr <sss@sss.chaoslab.ru>
 # Distributed under the terms of the GNU General Public License v2
 
-require github [ user=iustin tag=mt-st-${PV} force_git_clone=true ]
+require github [ user=iustin tag=mt-st-${PV} ]
 
 export_exlib_phases src_install
 
@@ -16,3 +16,4 @@ mt-st_src_install() {
     doman mt.1 stinit.8
     dodoc README* stinit.def.examples
 }
+
diff --git a/packages/app-backup/bacula/bacula.exlib b/packages/app-backup/bacula/bacula.exlib
index b4d8402..87f951e 100644
--- a/packages/app-backup/bacula/bacula.exlib
+++ b/packages/app-backup/bacula/bacula.exlib
@@ -224,7 +224,7 @@ bacula_src_install() {
         insinto /usr/share/vim/vimfiles/ftdetect
         newins scripts/filetype.vim bacula_ft.vim
     fi
-    
+
     if option minimal && ! option qt5; then
         edo rmdir "${IMAGE}"/usr/share/man/man1
     fi
diff --git a/packages/app-misc/radeontop/radeontop-1.1.exheres-0 b/packages/app-misc/radeontop/radeontop-1.1.exheres-0
index 06d0e41..7e22875 100644
--- a/packages/app-misc/radeontop/radeontop-1.1.exheres-0
+++ b/packages/app-misc/radeontop/radeontop-1.1.exheres-0
@@ -3,3 +3,4 @@
 
 require radeontop
 PLATFORMS="~x86 ~amd64"
+
diff --git a/packages/app-misc/radeontop/radeontop-scm.exheres-0 b/packages/app-misc/radeontop/radeontop-scm.exheres-0
index 06d0e41..7e22875 100644
--- a/packages/app-misc/radeontop/radeontop-scm.exheres-0
+++ b/packages/app-misc/radeontop/radeontop-scm.exheres-0
@@ -3,3 +3,4 @@
 
 require radeontop
 PLATFORMS="~x86 ~amd64"
+
diff --git a/packages/app-misc/radeontop/radeontop.exlib b/packages/app-misc/radeontop/radeontop.exlib
index f8f941b..a401271 100644
--- a/packages/app-misc/radeontop/radeontop.exlib
+++ b/packages/app-misc/radeontop/radeontop.exlib
@@ -1,7 +1,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # Copyright 2018 Gluzskiy Alexandr <sss@sss.chaoslab.ru>
 
-require github [ user=clbr tag=v${PV} force_git_clone=true ]
+require github [ user=clbr tag=v${PV} ]
 
 export_exlib_phases src_configure src_prepare src_install
 
@@ -34,3 +34,4 @@ radeontop_src_install() {
     edo mv "${IMAGE}"/usr/sbin "${prefixed_dir}"/bin
     edo mv "${IMAGE}"/usr/lib "${prefixed_dir}"/
 }
+
diff --git a/packages/dev-libs/log4cxx/log4cxx-0.10.0.exheres-0 b/packages/dev-libs/log4cxx/log4cxx-0.10.0.exheres-0
index 6b5e204..2d66d86 100644
--- a/packages/dev-libs/log4cxx/log4cxx-0.10.0.exheres-0
+++ b/packages/dev-libs/log4cxx/log4cxx-0.10.0.exheres-0
@@ -4,3 +4,4 @@
 require log4cxx
 
 PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/dev-libs/log4cxx/log4cxx-scm.exheres-0 b/packages/dev-libs/log4cxx/log4cxx-scm.exheres-0
index 6b5e204..2d66d86 100644
--- a/packages/dev-libs/log4cxx/log4cxx-scm.exheres-0
+++ b/packages/dev-libs/log4cxx/log4cxx-scm.exheres-0
@@ -4,3 +4,4 @@
 require log4cxx
 
 PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/dev-libs/log4cxx/log4cxx.exlib b/packages/dev-libs/log4cxx/log4cxx.exlib
index 40ac126..1db3b65 100644
--- a/packages/dev-libs/log4cxx/log4cxx.exlib
+++ b/packages/dev-libs/log4cxx/log4cxx.exlib
@@ -2,7 +2,7 @@
 # Copyright 2018 Gluzskiy Alexandr <sss@sss.chaoslab.ru>
 
 
-require github [ user=apache project=logging-log4cxx tag=v$(ever replace_all _) force_git_clone=true ]
+require github [ user=apache project=logging-log4cxx tag=v$(ever replace_all _) ]
 #TODO: version 0.10.0 require earlier autotools
 require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
 
@@ -46,3 +46,4 @@ DEFAULT_SRC_CONFIGURE_OPTION_WITHS=(
     'providers:unixodbc ODBC unixODBC'
     'providers:iodbc ODBC iODBC'
 )
+
diff --git a/packages/dev-libs/rapidjson/rapidjson-1.1.0.exheres-0 b/packages/dev-libs/rapidjson/rapidjson-1.1.0.exheres-0
index e27c7a3..6318f69 100644
--- a/packages/dev-libs/rapidjson/rapidjson-1.1.0.exheres-0
+++ b/packages/dev-libs/rapidjson/rapidjson-1.1.0.exheres-0
@@ -4,3 +4,4 @@
 require rapidjson
 
 PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/dev-libs/rapidjson/rapidjson-scm.exheres-0 b/packages/dev-libs/rapidjson/rapidjson-scm.exheres-0
index e27c7a3..6318f69 100644
--- a/packages/dev-libs/rapidjson/rapidjson-scm.exheres-0
+++ b/packages/dev-libs/rapidjson/rapidjson-scm.exheres-0
@@ -4,3 +4,4 @@
 require rapidjson
 
 PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/dev-libs/rapidjson/rapidjson.exlib b/packages/dev-libs/rapidjson/rapidjson.exlib
index f4baff7..4e6cf9f 100644
--- a/packages/dev-libs/rapidjson/rapidjson.exlib
+++ b/packages/dev-libs/rapidjson/rapidjson.exlib
@@ -11,7 +11,7 @@ SCM_SECONDARY_REPOSITORIES="gtest"
 SCM_gtest_REPOSITORY="https://github.com/google/googletest.git"
 
 
-require github [ user=miloyip tag=v${PV}  force_git_clone=true ]
+require github [ user=miloyip tag=v${PV} ]
 require cmake [ api=2 ]
 
 SUMMARY="A fast JSON parser/generator for C++ with both SAX/DOM style API"
diff --git a/packages/dev-util/codelite/codelite-scm.exheres-0 b/packages/dev-util/codelite/codelite-scm.exheres-0
index b0045e9..4f09111 100644
--- a/packages/dev-util/codelite/codelite-scm.exheres-0
+++ b/packages/dev-util/codelite/codelite-scm.exheres-0
@@ -1,7 +1,7 @@
 # Copyright 2018 Gluzskiy Alexandr <sss@sss.chaoslab.ru>
 # Distributed under the terms of the GNU General Public License v2
 
-#SCM_REVISION="a02750c87b0835018138fc131fe0ef0dd47be806"
+SCM_REVISION="a02750c87b0835018138fc131fe0ef0dd47be806"
 
 require codelite
 PLATFORMS="~amd64 ~x86"
diff --git a/packages/dev-util/codelite/codelite.exlib b/packages/dev-util/codelite/codelite.exlib
index cd60a36..018cf27 100644
--- a/packages/dev-util/codelite/codelite.exlib
+++ b/packages/dev-util/codelite/codelite.exlib
@@ -1,7 +1,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # Copyright 2018 Gluzskiy Alexandr <sss@sss.chaoslab.ru>
 
-require github [ user=eranif force_git_clone=true ]
+require github [ user=eranif ] cmake [ api=2 ]
 
 HOMEPAGE="http://www.codelite.org"
 SUMMARY="A Free, open source, cross platform C,C++,PHP and Node.js IDE"
@@ -9,8 +9,6 @@ DESCRIPTION=""
 SLOT="0"
 LICENCES="GPL-2"
 
-require cmake [ api=2 ]
-
 MYOPTIONS="
     clang [[ description = [ Use clang for codecompletion ]  ]]
     flex [[ description = [ Add support for sys-devel/flex ] ]]
diff --git a/packages/dev-util/google-perf-tools/google-perf-tools-scm.exheres-0 b/packages/dev-util/google-perf-tools/google-perf-tools-scm.exheres-0
index 537eb0a..437df45 100644
--- a/packages/dev-util/google-perf-tools/google-perf-tools-scm.exheres-0
+++ b/packages/dev-util/google-perf-tools/google-perf-tools-scm.exheres-0
@@ -14,7 +14,8 @@ DESCRIPTION=""
 
 MYOPTIONS="
     debug
-    largepages [[ description = [ Use (experimental) larger pages for tcmalloc, this increases memory usage, but should speed up the allocation/free operations. ] ]]
+    largepages [[ description = [ Use (experimental) larger pages for tcmalloc,\
+this increases memory usage, but should speed up the allocation/free operations. ] ]]
     minimal
     optimisememory [[ description = [ build libtcmalloc with smaller internal caches. ] ]]
 "
diff --git a/packages/kde/soundkonverter/soundkonverter-3.0.1.exheres-0 b/packages/kde/soundkonverter/soundkonverter-3.0.1.exheres-0
index b048359..90013a1 100644
--- a/packages/kde/soundkonverter/soundkonverter-3.0.1.exheres-0
+++ b/packages/kde/soundkonverter/soundkonverter-3.0.1.exheres-0
@@ -4,3 +4,4 @@
 require soundkonverter
 
 PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/kde/soundkonverter/soundkonverter.exlib b/packages/kde/soundkonverter/soundkonverter.exlib
index a0d6523..a2ca906 100644
--- a/packages/kde/soundkonverter/soundkonverter.exlib
+++ b/packages/kde/soundkonverter/soundkonverter.exlib
@@ -1,12 +1,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # Copyright 2018 Gluzskiy Alexandr <sss@sss.chaoslab.ru>
 
-require github [ user=dfaust force_git_clone=true tag=v${PV} ]
+require github [ user=dfaust tag=v${PV} ]
 require cmake [ api=2 ]
 
 SUMMARY="Frontend to various audio converters"
 LICENCES="GPL-2"
 SLOT="0"
+MYOPTIONS=""
 
 DEPENDENCIES="
     build+run:
diff --git a/packages/mail-filter/dcc/dcc-1.3.163.exheres-0 b/packages/mail-filter/dcc/dcc-1.3.163.exheres-0
index 59e80f9..9c6f084 100644
--- a/packages/mail-filter/dcc/dcc-1.3.163.exheres-0
+++ b/packages/mail-filter/dcc/dcc-1.3.163.exheres-0
@@ -4,3 +4,4 @@
 require dcc
 
 PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/mail-filter/dcc/dcc.exlib b/packages/mail-filter/dcc/dcc.exlib
index e644730..4d96c76 100644
--- a/packages/mail-filter/dcc/dcc.exlib
+++ b/packages/mail-filter/dcc/dcc.exlib
@@ -61,3 +61,4 @@ dcc_src_install(){
     default
     keepdir /var/dcc/log
 }
+
diff --git a/packages/mail-filter/libspf2/libspf2-1.2.10.exheres-0 b/packages/mail-filter/libspf2/libspf2-1.2.10.exheres-0
index 18ff45d..4cc604f 100644
--- a/packages/mail-filter/libspf2/libspf2-1.2.10.exheres-0
+++ b/packages/mail-filter/libspf2/libspf2-1.2.10.exheres-0
@@ -8,3 +8,4 @@ PLATFORMS="~amd64 ~x86"
 DEFAULT_SRC_PREPARE_PATCHES=(
     "${FILES}"/libspf2-1.2.10-gcc5.patch
 )
+
diff --git a/packages/mail-filter/libspf2/libspf2.exlib b/packages/mail-filter/libspf2/libspf2.exlib
index c0b2ba0..8996609 100644
--- a/packages/mail-filter/libspf2/libspf2.exlib
+++ b/packages/mail-filter/libspf2/libspf2.exlib
@@ -10,3 +10,4 @@ LICENCES="LGPL-2.1 BSD-2"
 DOWNLOADS="https://www.libspf2.org/spf/${PNV}.tar.gz"
 MYOPTIONS=""
 DEPENDENCIES=""
+
diff --git a/packages/media-gfx/nomacs/nomacs-3.10.2.exheres-0 b/packages/media-gfx/nomacs/nomacs-3.10.2.exheres-0
index ad895b0..75cc531 100644
--- a/packages/media-gfx/nomacs/nomacs-3.10.2.exheres-0
+++ b/packages/media-gfx/nomacs/nomacs-3.10.2.exheres-0
@@ -4,4 +4,3 @@
 require nomacs
 PLATFORMS="~amd64 ~x86"
 
-
diff --git a/packages/media-gfx/nomacs/nomacs-3.8.1.exheres-0 b/packages/media-gfx/nomacs/nomacs-3.8.1.exheres-0
index ad895b0..75cc531 100644
--- a/packages/media-gfx/nomacs/nomacs-3.8.1.exheres-0
+++ b/packages/media-gfx/nomacs/nomacs-3.8.1.exheres-0
@@ -4,4 +4,3 @@
 require nomacs
 PLATFORMS="~amd64 ~x86"
 
-
diff --git a/packages/media-video/motion/motion-4.1.1.exheres-0 b/packages/media-video/motion/motion-4.1.1.exheres-0
index 07d86fc..b6ab39b 100644
--- a/packages/media-video/motion/motion-4.1.1.exheres-0
+++ b/packages/media-video/motion/motion-4.1.1.exheres-0
@@ -4,3 +4,4 @@
 require motion
 
 PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/media-video/motion/motion-scm.exheres-0 b/packages/media-video/motion/motion-scm.exheres-0
index 709e105..6da241f 100644
--- a/packages/media-video/motion/motion-scm.exheres-0
+++ b/packages/media-video/motion/motion-scm.exheres-0
@@ -9,3 +9,4 @@ DEPENDENCIES+="
 "
 
 PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/media-video/motion/motion.exlib b/packages/media-video/motion/motion.exlib
index 49faec0..02685ba 100644
--- a/packages/media-video/motion/motion.exlib
+++ b/packages/media-video/motion/motion.exlib
@@ -63,3 +63,4 @@ motion_src_install() {
     insinto /etc/motion
     doins motion-dist.conf
 }
+
diff --git a/packages/net-im/psi/psi-scm.exheres-0 b/packages/net-im/psi/psi-scm.exheres-0
index cd26f67..5ddcaa8 100644
--- a/packages/net-im/psi/psi-scm.exheres-0
+++ b/packages/net-im/psi/psi-scm.exheres-0
@@ -201,3 +201,4 @@ src_install() {
         fi
     done
 }
+
diff --git a/packages/net-im/psimedia/psimedia-scm.exheres-0 b/packages/net-im/psimedia/psimedia-scm.exheres-0
index c93505b..5cd66fc 100644
--- a/packages/net-im/psimedia/psimedia-scm.exheres-0
+++ b/packages/net-im/psimedia/psimedia-scm.exheres-0
@@ -4,3 +4,4 @@
 require psimedia
 
 PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/net-im/psimedia/psimedia.exlib b/packages/net-im/psimedia/psimedia.exlib
index 15c3c14..2836f7c 100644
--- a/packages/net-im/psimedia/psimedia.exlib
+++ b/packages/net-im/psimedia/psimedia.exlib
@@ -1,7 +1,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # Copyright 2018 Gluzskiy Alexandr <sss@sss.chaoslab.ru>
 
-require github [ user=psi-im force_git_clone=true ]
+require github [ user=psi-im ]
 require cmake [ api=2 ]
 
 export_exlib_phases src_install
@@ -24,5 +24,6 @@ DEPENDENCIES="
 
 psimedia_src_install() {
     cmake_src_install
-    nonfatal edo mv "${IMAGE}"/usr/$(exhost --target)/lib/psi "${IMAGE}"/usr/$(exhost --target)/lib/psi-plus 
+    edo mv "${IMAGE}"/usr/$(exhost --target)/lib/psi "${IMAGE}"/usr/$(exhost --target)/lib/psi-plus 
 }
+
diff --git a/packages/net-im/qtox/qtox-1.16.3.exheres-0 b/packages/net-im/qtox/qtox-1.16.3.exheres-0
index 6e8464e..850c4ea 100644
--- a/packages/net-im/qtox/qtox-1.16.3.exheres-0
+++ b/packages/net-im/qtox/qtox-1.16.3.exheres-0
@@ -4,3 +4,4 @@
 require qtox
 
 PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/net-im/qtox/qtox-scm.exheres-0 b/packages/net-im/qtox/qtox-scm.exheres-0
index 6e8464e..850c4ea 100644
--- a/packages/net-im/qtox/qtox-scm.exheres-0
+++ b/packages/net-im/qtox/qtox-scm.exheres-0
@@ -4,3 +4,4 @@
 require qtox
 
 PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/net-im/qtox/qtox.exlib b/packages/net-im/qtox/qtox.exlib
index fe9fb4b..15f65e8 100644
--- a/packages/net-im/qtox/qtox.exlib
+++ b/packages/net-im/qtox/qtox.exlib
@@ -1,7 +1,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # Copyright 2018 Gluzskiy Alexandr <sss@sss.chaoslab.ru>
 
-require github [ user=qTox project=qTox tag=v${PV} force_git_clone=true ]
+require github [ user=qTox project=qTox tag=v${PV} ]
 require cmake [ api=2 ]
 
 export_exlib_phases src_configure
@@ -53,3 +53,4 @@ qtox_src_configure() {
         )
         ecmake "${cmakeparams[@]}"
 }
+
diff --git a/packages/net-im/spectrum/spectrum-2.0.7.exheres-0 b/packages/net-im/spectrum/spectrum-2.0.7.exheres-0
index 23009e9..5ff3942 100644
--- a/packages/net-im/spectrum/spectrum-2.0.7.exheres-0
+++ b/packages/net-im/spectrum/spectrum-2.0.7.exheres-0
@@ -4,3 +4,4 @@
 require spectrum
 
 PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/net-im/spectrum/spectrum-2.0.9.exheres-0 b/packages/net-im/spectrum/spectrum-2.0.9.exheres-0
index 23009e9..5ff3942 100644
--- a/packages/net-im/spectrum/spectrum-2.0.9.exheres-0
+++ b/packages/net-im/spectrum/spectrum-2.0.9.exheres-0
@@ -4,3 +4,4 @@
 require spectrum
 
 PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/net-im/spectrum/spectrum-scm.exheres-0 b/packages/net-im/spectrum/spectrum-scm.exheres-0
index 23009e9..5ff3942 100644
--- a/packages/net-im/spectrum/spectrum-scm.exheres-0
+++ b/packages/net-im/spectrum/spectrum-scm.exheres-0
@@ -4,3 +4,4 @@
 require spectrum
 
 PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/net-im/spectrum/spectrum.exlib b/packages/net-im/spectrum/spectrum.exlib
index f1f2ba5..65841c3 100644
--- a/packages/net-im/spectrum/spectrum.exlib
+++ b/packages/net-im/spectrum/spectrum.exlib
@@ -10,7 +10,7 @@ if ! ever at_least 2.0.7; then
 fi
 
 
-require github [ user=hanzz project=libtransport force_git_clone=true ]
+require github [ user=hanzz project=libtransport ]
 require cmake [ api=2 ]
 
 
@@ -94,3 +94,4 @@ if ever at_least 2.0.8; then
         edo cp "${FILES}"/Findjsoncpp.cmake "${WORKBASE}/${PNV}"/cmake_modules/Findjsoncpp.cmake
     }
 fi
+
diff --git a/packages/net-im/swiften/swiften-4.0.2.exheres-0 b/packages/net-im/swiften/swiften-4.0.2.exheres-0
index d507be9..5bbe6ff 100644
--- a/packages/net-im/swiften/swiften-4.0.2.exheres-0
+++ b/packages/net-im/swiften/swiften-4.0.2.exheres-0
@@ -4,3 +4,4 @@
 require swiften
 
 PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/net-im/swiften/swiften-scm.exheres-0 b/packages/net-im/swiften/swiften-scm.exheres-0
index d507be9..5bbe6ff 100644
--- a/packages/net-im/swiften/swiften-scm.exheres-0
+++ b/packages/net-im/swiften/swiften-scm.exheres-0
@@ -4,3 +4,4 @@
 require swiften
 
 PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/net-im/swiften/swiften.exlib b/packages/net-im/swiften/swiften.exlib
index 35920f7..f7755be 100644
--- a/packages/net-im/swiften/swiften.exlib
+++ b/packages/net-im/swiften/swiften.exlib
@@ -78,3 +78,4 @@ swiften_src_install() {
         SWIFTEN_LIBDIR="${IMAGE}"/usr/$(exhost --target)/lib \
         "${IMAGE}"/usr/$(exhost --target)
 }
+
diff --git a/packages/net-libs/cppzmq/cppzmq-4.2.3.exheres-0 b/packages/net-libs/cppzmq/cppzmq-4.2.3.exheres-0
index 3470791..d73204f 100644
--- a/packages/net-libs/cppzmq/cppzmq-4.2.3.exheres-0
+++ b/packages/net-libs/cppzmq/cppzmq-4.2.3.exheres-0
@@ -4,3 +4,4 @@
 require cppzmq
 
 PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/net-libs/cppzmq/cppzmq-scm.exheres-0 b/packages/net-libs/cppzmq/cppzmq-scm.exheres-0
index 3470791..d73204f 100644
--- a/packages/net-libs/cppzmq/cppzmq-scm.exheres-0
+++ b/packages/net-libs/cppzmq/cppzmq-scm.exheres-0
@@ -4,3 +4,4 @@
 require cppzmq
 
 PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/net-libs/cppzmq/cppzmq.exlib b/packages/net-libs/cppzmq/cppzmq.exlib
index 8369ff6..82ded3e 100644
--- a/packages/net-libs/cppzmq/cppzmq.exlib
+++ b/packages/net-libs/cppzmq/cppzmq.exlib
@@ -2,7 +2,7 @@
 # Copyright 2018 Gluzskiy Alexandr <sss@sss.chaoslab.ru>
 
 
-require github [ user=zeromq tag=v${PV} force_git_clone=true ]
+require github [ user=zeromq tag=v${PV} ]
 
 SUMMARY="High-level CPP Binding for ZeroMQ"
 HOMEPAGE="https://github.com/zeromq/cppzmq"
diff --git a/packages/net-libs/stem/stem-1.6.0.exheres-0 b/packages/net-libs/stem/stem-1.6.0.exheres-0
index c1e5b1b..29f7502 100644
--- a/packages/net-libs/stem/stem-1.6.0.exheres-0
+++ b/packages/net-libs/stem/stem-1.6.0.exheres-0
@@ -3,3 +3,4 @@
 require stem
 
 PLATFORMS="~x86 ~amd64"
+
diff --git a/packages/net-libs/stem/stem-1.7.0.exheres-0 b/packages/net-libs/stem/stem-1.7.0.exheres-0
index c1e5b1b..29f7502 100644
--- a/packages/net-libs/stem/stem-1.7.0.exheres-0
+++ b/packages/net-libs/stem/stem-1.7.0.exheres-0
@@ -3,3 +3,4 @@
 require stem
 
 PLATFORMS="~x86 ~amd64"
+
diff --git a/packages/net-libs/stem/stem-scm.exheres-0 b/packages/net-libs/stem/stem-scm.exheres-0
index c1e5b1b..29f7502 100644
--- a/packages/net-libs/stem/stem-scm.exheres-0
+++ b/packages/net-libs/stem/stem-scm.exheres-0
@@ -3,3 +3,4 @@
 require stem
 
 PLATFORMS="~x86 ~amd64"
+
diff --git a/packages/net-libs/stem/stem.exlib b/packages/net-libs/stem/stem.exlib
index 95eddf2..c008836 100644
--- a/packages/net-libs/stem/stem.exlib
+++ b/packages/net-libs/stem/stem.exlib
@@ -20,3 +20,4 @@ DEPENDENCIES="
         net-misc/tor
 "
 RESTRICT="test"
+
diff --git a/packages/net-libs/toxcore/toxcore-0.2.4.exheres-0 b/packages/net-libs/toxcore/toxcore-0.2.4.exheres-0
index 8e145c2..d994036 100644
--- a/packages/net-libs/toxcore/toxcore-0.2.4.exheres-0
+++ b/packages/net-libs/toxcore/toxcore-0.2.4.exheres-0
@@ -4,3 +4,4 @@
 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
index 8e145c2..d994036 100644
--- a/packages/net-libs/toxcore/toxcore-scm.exheres-0
+++ b/packages/net-libs/toxcore/toxcore-scm.exheres-0
@@ -4,3 +4,4 @@
 require toxcore
 
 PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/net-libs/toxcore/toxcore.exlib b/packages/net-libs/toxcore/toxcore.exlib
index 9630a2b..f7af18b 100644
--- a/packages/net-libs/toxcore/toxcore.exlib
+++ b/packages/net-libs/toxcore/toxcore.exlib
@@ -3,7 +3,7 @@
 #     Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-require github [ user=TokTok project=c-toxcore tag=v${PV} force_git_clone=true ]
+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 ]
@@ -69,3 +69,4 @@ toxcore_src_install() {
         edo rmdir "${IMAGE}"/usr/$(exhost --target)/bin
     fi
 }
+
diff --git a/packages/net-misc/nyx/nyx-2.0.4.exheres-0 b/packages/net-misc/nyx/nyx-2.0.4.exheres-0
index ba52abd..2fdb746 100644
--- a/packages/net-misc/nyx/nyx-2.0.4.exheres-0
+++ b/packages/net-misc/nyx/nyx-2.0.4.exheres-0
@@ -3,3 +3,4 @@
 require nyx
 
 PLATFORMS="~x86 ~amd64"
+
diff --git a/packages/net-misc/radvd/radvd.exlib b/packages/net-misc/radvd/radvd.exlib
index 671c321..e90c4cc 100644
--- a/packages/net-misc/radvd/radvd.exlib
+++ b/packages/net-misc/radvd/radvd.exlib
@@ -1,7 +1,7 @@
 # Copyright 2018 Gluzskiy Alexandr <sss@sss.chaoslab.ru>
 # Distributed under the terms of the GNU General Public License v2
 
-require github [ user=reubenhwk tag=v${PV} force_git_clone=true ]
+require github [ user=reubenhwk tag=v${PV} ]
 require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
 
 export_exlib_phases src_prepare
@@ -34,3 +34,4 @@ radvd_src_prepare() {
     autotools_src_prepare
     edo sed -i -e "s/AR = ar/AR = $(exhost --target)-ar/g" "${WORK}"/Makefile.in
 }
+
diff --git a/packages/net-print/foo2zjs/foo2zjs-20180721.exheres-0 b/packages/net-print/foo2zjs/foo2zjs-20180721.exheres-0
index c42109e..a32838e 100644
--- a/packages/net-print/foo2zjs/foo2zjs-20180721.exheres-0
+++ b/packages/net-print/foo2zjs/foo2zjs-20180721.exheres-0
@@ -44,3 +44,4 @@ src_install() {
     edo rmdir usr/bin
     edo rmdir bin
 }
+
diff --git a/packages/net-print/foo2zjs/foo2zjs-scm.exheres-0 b/packages/net-print/foo2zjs/foo2zjs-scm.exheres-0
index 77b23a2..637d1f5 100644
--- a/packages/net-print/foo2zjs/foo2zjs-scm.exheres-0
+++ b/packages/net-print/foo2zjs/foo2zjs-scm.exheres-0
@@ -73,3 +73,4 @@ src_install() {
     edo rmdir usr/bin
     edo rmdir bin
 }
+
diff --git a/packages/net-vpn/i2pd/i2pd-scm.exheres-0 b/packages/net-vpn/i2pd/i2pd-scm.exheres-0
index 7fb17c2..29f0539 100644
--- a/packages/net-vpn/i2pd/i2pd-scm.exheres-0
+++ b/packages/net-vpn/i2pd/i2pd-scm.exheres-0
@@ -59,3 +59,4 @@ src_configure() {
     CMAKE_SOURCE=${WORKBASE}/${PNV}/build
     ecmake "${cmakeparams[@]}"
 }
+
diff --git a/packages/sys-apps/firejail/firejail-0.9.56.exheres-0 b/packages/sys-apps/firejail/firejail-0.9.56.exheres-0
index 85b279b..641b8cf 100644
--- a/packages/sys-apps/firejail/firejail-0.9.56.exheres-0
+++ b/packages/sys-apps/firejail/firejail-0.9.56.exheres-0
@@ -4,3 +4,4 @@
 require firejail
 
 PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/sys-apps/firejail/firejail-scm.exheres-0 b/packages/sys-apps/firejail/firejail-scm.exheres-0
index 85b279b..641b8cf 100644
--- a/packages/sys-apps/firejail/firejail-scm.exheres-0
+++ b/packages/sys-apps/firejail/firejail-scm.exheres-0
@@ -4,3 +4,4 @@
 require firejail
 
 PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/sys-apps/firejail/firejail.exlib b/packages/sys-apps/firejail/firejail.exlib
index e5639bd..e23358d 100644
--- a/packages/sys-apps/firejail/firejail.exlib
+++ b/packages/sys-apps/firejail/firejail.exlib
@@ -1,7 +1,7 @@
 # Copyright 2018 Gluzskiy Alexandr <sss@sss.chaoslab.ru>
 # Distributed under the terms of the GNU General Public License v2
 
-require github [ user=netblue30 force_git_clone=true tag=${PV} ]
+require github [ user=netblue30 tag=${PV} ]
 #require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
 
 SUMMARY="Firejail is a SUID sandbox program"
@@ -27,3 +27,4 @@ DEFAULT_SRC_CONFIGURE_PARAMS=(
 	--hates=disable-silent-rules
 	--hates=enable-fast-install
 )
+
diff --git a/packages/sys-apps/qdirstat/qdirstat.exlib b/packages/sys-apps/qdirstat/qdirstat.exlib
index 7210523..c330fcd 100644
--- a/packages/sys-apps/qdirstat/qdirstat.exlib
+++ b/packages/sys-apps/qdirstat/qdirstat.exlib
@@ -1,7 +1,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # Copyright 2018 Gluzskiy Alexandr <sss@sss.chaoslab.ru>
 
-require github [ user=shundhammer tag=${PV} force_git_clone=true ]
+require github [ user=shundhammer tag=${PV} ]
 require gtk-icon-cache freedesktop-desktop qmake [ slot=5 ]
 
 export_exlib_phases src_prepare src_install pkg_postinst pkg_postrm
diff --git a/packages/sys-block/mtx/mtx-1.3.12.exheres-0 b/packages/sys-block/mtx/mtx-1.3.12.exheres-0
index e192f37..7d18fe1 100644
--- a/packages/sys-block/mtx/mtx-1.3.12.exheres-0
+++ b/packages/sys-block/mtx/mtx-1.3.12.exheres-0
@@ -4,3 +4,4 @@
 require mtx
 
 PLATFORMS="amd64 ~amd64 x86 ~x86"
+
diff --git a/packages/sys-devel/qconf/qconf-scm.exheres-0 b/packages/sys-devel/qconf/qconf-scm.exheres-0
index 539dc90..380b03b 100644
--- a/packages/sys-devel/qconf/qconf-scm.exheres-0
+++ b/packages/sys-devel/qconf/qconf-scm.exheres-0
@@ -35,6 +35,6 @@ src_configure() {
 }
 
 src_install() {
-    default_src_install
-
+    default
 }
+
diff --git a/packages/sys-power/nut/nut-2.7.4.exheres-0 b/packages/sys-power/nut/nut-2.7.4.exheres-0
index 7e2a55b..09dc493 100644
--- a/packages/sys-power/nut/nut-2.7.4.exheres-0
+++ b/packages/sys-power/nut/nut-2.7.4.exheres-0
@@ -5,3 +5,4 @@
 require nut
 
 PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/sys-power/nut/nut-scm.exheres-0 b/packages/sys-power/nut/nut-scm.exheres-0
index 7e2a55b..09dc493 100644
--- a/packages/sys-power/nut/nut-scm.exheres-0
+++ b/packages/sys-power/nut/nut-scm.exheres-0
@@ -5,3 +5,4 @@
 require nut
 
 PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/sys-power/nut/nut.exlib b/packages/sys-power/nut/nut.exlib
index 666efdc..c18de3b 100644
--- a/packages/sys-power/nut/nut.exlib
+++ b/packages/sys-power/nut/nut.exlib
@@ -1,7 +1,7 @@
 # Copyright 2018 Gluzskiy Alexandr <sss@sss.chaoslab.ru>
 # Distributed under the terms of the GNU General Public License v2
 
-require github [ user=networkupstools tag=v${PV} force_git_clone=true ]
+require github [ user=networkupstools tag=v${PV} ]
 require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
 require systemd-service
 
@@ -86,3 +86,4 @@ nut_src_install() {
         edo rm -rf "${IMAGE}"/lib
     fi
 }
+