diff --git a/dev-java/nexus-oss-bin/Manifest b/dev-java/nexus-oss-bin/Manifest
index 4876a46..7834eb3 100644
--- a/dev-java/nexus-oss-bin/Manifest
+++ b/dev-java/nexus-oss-bin/Manifest
@@ -1,4 +1,4 @@
 AUX init.sh 381 SHA256 7adb00b5de411223dcdaf017005e7103d8716e885a008f19aa8d56db2afa47de SHA512 b458fda89207b327f34c3e14f0c51ab86e7aa271867ec9a6c72634e1b8d81aebafba8ac6279f359fc9ba520920bee64fb439588b3f771d647ee8f3fde0ea742d WHIRLPOOL ac4d4fc6facc926f697706beb7b95d9c3bceb35a2e2d04eb656a73b2ed397c4dac521b3566307189655d6afcaa1ea116fbb8ff645a32cad484bf3ed0380b2dc8
 AUX nexus-wrapper-2.11.2.patch 1193 SHA256 f77229f2dddaae7205eec13188487ff73a663bbcd5d45b01201706044c1f18e0 SHA512 6f7230eeebe94e2cee426ffb3f1939c0a5e3b637002de7aef36608c4e95e399db1c9e28883f6e6a67cdff08804baa69efaae310871c3a9442508c72af556da6f WHIRLPOOL 2c3b48a30f4202177deb75d437a3aedc4ecf86870d4ab8e2ea79b5cb909a34630677f1fa006328554ea08807a88c1959fbf7e86ea49981dd1847687183d4ed70
 DIST nexus-2.11.2-06-bundle.tar.gz 70793247 SHA256 e3fe7811d932ef449fafc4287a27fae62127154297d073f594ca5cba4721f59e SHA512 31b33afad7f31d33af78f9430c04c20ea6a9f4c7391c014493ecd0d02837f9eef99443012682ac0f463ae113b11fb2736078a36f25c1e69f510abc2c5c3a7f7d WHIRLPOOL c4ad2eb6bf1c78ae60de923e741e99bc85c61a68799f8329194648cc6669d0c6a411d0440620069637b480f7cd79ebbbba507a9ef846c678e218c81a084a37f1
-EBUILD nexus-oss-bin-2.11.2.ebuild 1089 SHA256 0d5aeb1e44ed49c269f0113aa7b7b66cabd3999ecbeacceef1c47d116aefcc9d SHA512 99ce64c548fdf6361a4faeb42927841354ffe9e77a8be77aea2a231db35a4c4509456b8c22f03efc7c0aac39c9bb8ced22b68a2398426ea4c28bc9403abf4265 WHIRLPOOL 18e5712133f11c4ea00e0a1ed1597e2e0117f683277d90740a2f423eebeab993c897c69c62e41bdee0cb51dfc792926bedc295c844757ae1abe01005655e7b58
+EBUILD nexus-oss-bin-2.11.2.ebuild 962 SHA256 e900126018a780ab9e334071f783b0eb61fad72319d8723b2a09ced34ce2eccd SHA512 a955efe82d1e2ef4b08f1667f751657d37c53a1637ff8dcca51c7cca0463110718cf994e0914e4607cfb8d82768c8b8cc849ec50b227a9354fae6b6503699987 WHIRLPOOL 0cc7dbdcc8debc325c18a65e5b3f5ced22bd04233798a083be9102bbf2c678d61738dd4929026e1c5ba75d68aee9aae4a51288bcddf63b8df712b89cbfb3984e
diff --git a/dev-java/nexus-oss-bin/nexus-oss-bin-2.11.2.ebuild b/dev-java/nexus-oss-bin/nexus-oss-bin-2.11.2.ebuild
index 2cd982a..5ee6b3c 100644
--- a/dev-java/nexus-oss-bin/nexus-oss-bin-2.11.2.ebuild
+++ b/dev-java/nexus-oss-bin/nexus-oss-bin-2.11.2.ebuild
@@ -21,29 +21,27 @@ INSTALL_DIR="/opt/nexus"
 WEBAPP_DIR="${INSTALL_DIR}/nexus-oss-webapp"
 
 pkg_setup() {
-    #enewgroup <name> [gid]
-    enewgroup nexus
-    #enewuser <user> [uid] [shell] [homedir] [groups] [params]
-    enewuser nexus -1 /bin/bash /opt/nexus "nexus"
+	enewgroup nexus
+	enewuser nexus -1 /bin/bash /opt/nexus "nexus"
 }
 
 src_unpack() {
-    unpack ${A}
-    cd "${S}"
+	unpack ${A}
+	cd "${S}"
 }
 
 src_prepare() {
-    epatch "${FILESDIR}/nexus-wrapper-${PV}.patch"
+	epatch "${FILESDIR}/nexus-wrapper-${PV}.patch"
 }
 
 src_install() {
-    insinto ${WEBAPP_DIR}
-    doins -r nexus-${PV}${SUB_VERSION}/*
+	insinto ${WEBAPP_DIR}
+	doins -r nexus-${PV}${SUB_VERSION}/*
 
-    newinitd "${FILESDIR}/init.sh" nexus
+	newinitd "${FILESDIR}/init.sh" nexus
 
-    fowners -R nexus:nexus ${INSTALL_DIR}
-    fperms 755 "${INSTALL_DIR}/nexus-oss-webapp/bin/jsw/linux-x86-64/wrapper"
-    fperms 755 "${INSTALL_DIR}/nexus-oss-webapp/bin/jsw/linux-x86-32/wrapper"
-    fperms 755 "${INSTALL_DIR}/nexus-oss-webapp/bin/nexus"
+	fowners -R nexus:nexus ${INSTALL_DIR}
+	fperms 755 "${INSTALL_DIR}/nexus-oss-webapp/bin/jsw/linux-x86-64/wrapper"
+	fperms 755 "${INSTALL_DIR}/nexus-oss-webapp/bin/jsw/linux-x86-32/wrapper"
+	fperms 755 "${INSTALL_DIR}/nexus-oss-webapp/bin/nexus"
 }
diff --git a/dev-vcs/gitlab-ci-multi-runner/Manifest b/dev-vcs/gitlab-ci-multi-runner/Manifest
index 8c5a5ed..35863e3 100644
--- a/dev-vcs/gitlab-ci-multi-runner/Manifest
+++ b/dev-vcs/gitlab-ci-multi-runner/Manifest
@@ -3,4 +3,4 @@ AUX gitlab-ci-multi-runner.init 696 SHA256 03fc8cf6f5d8883b69122362202779f1ef8c8
 DIST gitlab-ci-multi-runner-0.5.5-amd64 11633640 SHA256 00982b6f9cfea548a3e41fad9f50f2c8b221251ea2e7e8ac64563f62663537a3 SHA512 89a9474b5dc0dfd5bf53e4c60f40c43f8db1288e49960dc58d5283a61c22474c682041b3b04a4b4533536deef63cc06a65f0b5440891c5f7951d45508236563a WHIRLPOOL 1375f34887bc09d29ff2009a8344e6ec7c2a7d16f31ca1d063cce30607c003df99f80dd4d01244e991745d0ccdccce76077e6597e5ccb38a89a6cce59324b2b9
 DIST gitlab-ci-multi-runner-0.5.5-arm 9292840 SHA256 0c1641fe1bff208e9166ad1ea3898652989017711e51b38838c48365de2870f5 SHA512 1d9a6c7200614acfa5c3461187ab9df0fe46bead5284d586ea24e2c7c243422ae096dd6faf40ca2b05d3fe567d589a33a87212449fcc7ff56ec1e759955d44c9 WHIRLPOOL 8ea40c13de87cffd1c77dedba64315133106bdfe0cfb8d87da8932d6abde0e88d6577fb9c8ada090b98a0f65d82e105b57a2236fe24385ed72c62a760f36256a
 DIST gitlab-ci-multi-runner-0.5.5-x86 9377072 SHA256 d9cfc1fb809a4954b18b9d15cae078c552715ab8d596c5e07db2104131c286fb SHA512 952f60dca6cc5a46bc2906ad38e3f02b97181c48480fd0ea91c00e96a266cf37d105da4af1934b294c72a507cfd8e114c2907df80e4269cb082bc0775e451258 WHIRLPOOL 1d512571520a2901e00f758cdfb33441f885a801c717b06b72b626731b9c7e4637b6796fd21944032a1ab5215228e5f288577c4498a52256321446e8ef7fb8aa
-EBUILD gitlab-ci-multi-runner-0.5.5-r1.ebuild 2318 SHA256 7176917ec5a10bf8e2359d24e407416d1b9fdf81346105ac3a7cea3a6007fd35 SHA512 4e188a45f7d65b87b0731afc577bdfa743c88a581a39b2cf47beba183bc34ca8267fed4c8d692bed1df8727b561f4319f7cbe0b8fba3b3378090fc116d71ccb1 WHIRLPOOL bc3146adf2d19fe156fbcebff4b2f277bd589d7ec9885e93c4b36977d7195b975a0e505df3284bb38cf044df919193c990830f8cc4f4eafc53a36a38d3b904d4
+EBUILD gitlab-ci-multi-runner-0.5.5-r1.ebuild 2293 SHA256 b8aa2884cf2c7026d3e5296c4113933cac9adc609a54708222777af9a1cd133a SHA512 ec8d2efb167867ae0ff92dac63401e1f289291a29f5da530b2905a3982be370dfa701f0d7ba883f47ad6788b10c74bda5dc5b8982fed113f761f61f87a9d047c WHIRLPOOL e9dbb21323bf843809254d145133455e318fe87b038d8db428ffa9b3233bc94d6868c64fba3e7194fe0196eafe2475e71a2af111872e2e2ea9e8f42fb04e0f62
diff --git a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-0.5.5-r1.ebuild b/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-0.5.5-r1.ebuild
index fe58f24..64f5ab9 100644
--- a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-0.5.5-r1.ebuild
+++ b/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-0.5.5-r1.ebuild
@@ -9,8 +9,8 @@ inherit eutils user
 DESCRIPTION="GitLab CI Multi Runner is the new build processor needed for GitLab CI >= 7.12"
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-ci-multi-runner"
 SRC_URI="x86?   ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-386 -> ${P}-x86 )
-         amd64? ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-amd64 -> ${P}-amd64 )
-         arm?   ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-arm -> ${P}-arm )"
+	amd64? ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-amd64 -> ${P}-amd64 )
+	arm?   ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-arm -> ${P}-arm )"
 
 RESTRICT="mirror"
 
@@ -40,9 +40,9 @@ pkg_setup() {
 }
 
 src_unpack() {
-    local a="$(usev amd64)$(usev arm)$(usev x86)"
-    mkdir -p "${S}"
-    cp "${DISTDIR}/${P}-${a}" "${S}/${PN}"
+	local a="$(usev amd64)$(usev arm)$(usev x86)"
+	mkdir -p "${S}"
+	cp "${DISTDIR}/${P}-${a}" "${S}/${PN}"
 }
 
 src_prepare() {
diff --git a/games-rpg/ankh/Manifest b/games-rpg/ankh/Manifest
index 21c8321..54d058a 100644
--- a/games-rpg/ankh/Manifest
+++ b/games-rpg/ankh/Manifest
@@ -1 +1 @@
-EBUILD ankh-1.0.ebuild 1630 SHA256 faecf4a190171a364e6142184512a4b5cb5b2c36f4fe66d767a4e0b0e6f047f9 SHA512 9377d2cb938663c9aee67187171bdf2b73fb4449bcb8f87c282b7f241349022224369f298cf090a1e32bc3b8f345da30a61e7868f439f0dacedadbb457782b20 WHIRLPOOL fbd6f45ca293bf37a225ff2accb793ab11136b0867d607dbc5d737a9e4ea9b6e2d27a9f56c3283cae3fa6778e8a3c3eed8e86e47753b42a8236c21ce73d14ece
+EBUILD ankh-1.0.ebuild 1554 SHA256 254a4ee1b12cfd57fd073af946975c96dc5b04ba2bb6943a2ab22979025c3379 SHA512 7f5d7de13ed22158104bdef214c2b57a25465b9c3abbf820fee3ac4b4633895289538802e9f746512c07cbc1ebb99898fb9845fd8add39382b47c85e13ce9a58 WHIRLPOOL 26e8d46c3f2886fe7db6f5bb9f08ce876a1b352a55da64f415939f2df4341408174729ea858245dc13951701a497c38fef73afdccc061962c066a830c083afe1
diff --git a/games-rpg/ankh/ankh-1.0.ebuild b/games-rpg/ankh/ankh-1.0.ebuild
index aa8e189..9c52a0f 100644
--- a/games-rpg/ankh/ankh-1.0.ebuild
+++ b/games-rpg/ankh/ankh-1.0.ebuild
@@ -8,22 +8,22 @@ IUSE=""
 RESTRICT="strip"
 
 DEPEND="app-arch/bzip2
-   app-arch/tar
-   app-arch/unzip"
+	app-arch/tar
+	app-arch/unzip"
 
 RDEPEND="sys-libs/glibc
-   virtual/opengl
-   x11-libs/libXext
-   x11-libs/libX11
-   x11-libs/libXau
-   x11-libs/libXdmcp
-   amd64? ( app-emulation/emul-linux-x86-xlibs
-      app-emulation/emul-linux-x86-soundlibs
-      || (
-         >=app-emulation/emul-linux-x86-xlibs-7.0
-         x11-drivers/nvidia-drivers
-         x11-drivers/nvidia-legacy-drivers
-         >=x11-drivers/ati-drivers-8.8.25-r1 ) )"
+	virtual/opengl
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	amd64? ( app-emulation/emul-linux-x86-xlibs
+		app-emulation/emul-linux-x86-soundlibs
+		|| (
+			>=app-emulation/emul-linux-x86-xlibs-7.0
+			x11-drivers/nvidia-drivers
+			x11-drivers/nvidia-legacy-drivers
+			>=x11-drivers/ati-drivers-8.8.25-r1 ) )"
 
 S=${WORKDIR}
 
@@ -31,28 +31,26 @@ GAMES_CHECK_LICENSE="no"
 dir=${GAMES_PREFIX_OPT}/ankh
 Ddir=${D}/${dir}
 
-
-
 src_install() {
-   cdrom_get_cds data/Ankh.tar.gz
-   insinto "${dir}"
-   exeinto "${dir}"
-   einfo "Unpacking common.zip from Disk..."
-   unzip -qo ${CDROM_ROOT}/data/common.zip -d $Ddir
-   einfo "Unpacking bin-x86.tar.gz from Disk..."
-   tar xzf ${CDROM_ROOT}/data/bin-x86.tar.gz -C $Ddir
-   einfo "Unpacking libs-x86.tar.gz from Disk..."
-   tar xzf ${CDROM_ROOT}/data/libs-x86.tar.gz -C $Ddir
-   einfo "Unpacking Ankh.tar.gz from Disk..."
-   tar xzf ${CDROM_ROOT}/data/Ankh.tar.gz -C $Ddir
+	cdrom_get_cds data/Ankh.tar.gz
+	insinto "${dir}"
+	exeinto "${dir}"
+	einfo "Unpacking common.zip from Disk..."
+	unzip -qo "${CDROM_ROOT}"/data/common.zip -d "$Ddir"
+	einfo "Unpacking bin-x86.tar.gz from Disk..."
+	tar xzf "${CDROM_ROOT}"/data/bin-x86.tar.gz -C "$Ddir"
+	einfo "Unpacking libs-x86.tar.gz from Disk..."
+	tar xzf "${CDROM_ROOT}"/data/libs-x86.tar.gz -C "$Ddir"
+	einfo "Unpacking Ankh.tar.gz from Disk..."
+	tar xzf "${CDROM_ROOT}"/data/Ankh.tar.gz -C "$Ddir"
 
-   find ${Ddir} -exec touch '{}' \;
-   # Argh the Program saves the settings in his install dir :(
-        # so we have to set some dir to be writeable by the group
-        chmod g+w ${Ddir}/media/     # the settings are saved here
-        chmod g+w ${Ddir}/bin/release # the log-files are saved here
-   dosym ${dir}/Ankh /usr/games/bin/ankh
+	find "${Ddir}" -exec touch '{}' \;
+	# Argh the Program saves the settings in his install dir :(
+	# so we have to set some dir to be writeable by the group
+	chmod g+w "${Ddir}"/media/     # the settings are saved here
+	chmod g+w "${Ddir}"/bin/release # the log-files are saved here
+	dosym "${dir}"/Ankh /usr/games/bin/ankh
 
-   prepgamesdirs
-   make_desktop_entry ankh "Ankh" ${dir}/Ankh.xpm
-}
\ No newline at end of file
+	prepgamesdirs
+	make_desktop_entry ankh "Ankh" "${dir}"/Ankh.xpm
+}
diff --git a/media-fonts/andalus/Manifest b/media-fonts/andalus/Manifest
index 6662512..2e47b78 100644
--- a/media-fonts/andalus/Manifest
+++ b/media-fonts/andalus/Manifest
@@ -1,2 +1,2 @@
 DIST andalus.zip 52912 SHA256 defac8411a7e77a5b8345957a60d461eccbda386f59b3872ea1ab3c8bcd9e4fe
-EBUILD andalus-1-r1.ebuild 696 SHA256 7f8228d445640cddd4789875ae5269baec8f4d5ade13f571f2870a4289bc48ef SHA512 1db88fe46c3aa9f26ca52eaabf04044806dd568729bd0f2c307234949b680b7eba12c49d9aa04968973fe8f1eb79bae052958f0edd1311b615749269d6d58f4d WHIRLPOOL b207252cda4c9bd765f4b96f70930a07c2d24d2cd4d009e5691dad2fc9a66820baa9a0993dc81d15c1eed54d7a37315206eba26c7a966830716e0eaea10b03d8
+EBUILD andalus-1-r1.ebuild 695 SHA256 eb236724a763c91e821898a0f411bee7ee1406d063ef5381a9b044baeafbd62f SHA512 f7120d9e2f7610c3410ae40703d564b99d38d49cdc5ada29afc4366d8f195d4002980e3e4d4ebde5db33849bb966eadc3e7855548c739147e57629769815ce18 WHIRLPOOL d057d27f0468b3effa4dd1f66b38eba551998161e834628093d928e9d2382d6e48bf559cbeaa29ba638901d65cf6a1670ddcced8a6340a059239abc9115be4df
diff --git a/media-fonts/andalus/andalus-1-r1.ebuild b/media-fonts/andalus/andalus-1-r1.ebuild
index 3f1ce15..6c4b47c 100644
--- a/media-fonts/andalus/andalus-1-r1.ebuild
+++ b/media-fonts/andalus/andalus-1-r1.ebuild
@@ -30,4 +30,3 @@ pkg_nofetch() {
 #src_unpack() {
 #	unzip $A
 #}
- 
\ No newline at end of file
diff --git a/sci-geosciences/garmintools/Manifest b/sci-geosciences/garmintools/Manifest
index 20c6aad..740f8ff 100644
--- a/sci-geosciences/garmintools/Manifest
+++ b/sci-geosciences/garmintools/Manifest
@@ -1,3 +1,3 @@
 AUX garmintools-0.10-add-xml-root.patch 419 SHA256 58802fbddf121cc9c2236fac5220895248854e438bee2e43a35b2129ffa7f7a2 SHA512 b61dd12999686905869ad3e32324b3f246fda685d79f4e867b4f10c125a89cca105d295b62f6181099b9f014b3c1f97b2a4a5753fb6688842553d83c129b984d WHIRLPOOL 94a6cdfed71066f580925bce4eccd7615364bc9ee836d286f2f7299ea51f9325de9141cd102f6f26d2be65a459c0d480e692509881bb1496278c6ff8a1bd8d53
 DIST garmintools-0.10.tar.gz 396659 SHA256 ffd50b7f963fa9b8ded3223c4786b07906c887ed900de64581a24ff201444cee
-EBUILD garmintools-0.10.ebuild 873 SHA256 dbbe9a1f001af7667cf189ac61318faebead1f5136a83f4877da36f885c4a932 SHA512 4602066d00a362917cbf06d59215364ce7f8127d6145696b41801f0ec59ac063be45d017ddd225a225837d6a1228637287df449a0f4fe93e19480e4ee9c4a038 WHIRLPOOL 7291b5eb6985144ae1ec5b54fa4416ea1359c2163e12e5af3da223397c86cd24a46e8debc58ed3ad054987dfefa3efc6be1f4a69df172aa2b6a6f25b01b4d075
+EBUILD garmintools-0.10.ebuild 1017 SHA256 c1388dfb1e7a8924fbecdee27427267dd607cc7e2654af036e2ed62472874638 SHA512 0b4411aefe16b1fa132c0f9af90488faa50bc154d2ff91ff6eadeaaf9dace72402b97a9489bc9de07ca80e1a590ae7bd797de35fd469e4b477e6fc802c9035b7 WHIRLPOOL 6d0cd50726f082c9cbdfce741fa598d601b4a2a14806fc630286e91a622ddd8dbd2712d33568158f1503b9e086102d99a5dddf4f02a9d5bb0fc5869358de6faa
diff --git a/sci-geosciences/garmintools/garmintools-0.10.ebuild b/sci-geosciences/garmintools/garmintools-0.10.ebuild
index 5227c56..a003465 100644
--- a/sci-geosciences/garmintools/garmintools-0.10.ebuild
+++ b/sci-geosciences/garmintools/garmintools-0.10.ebuild
@@ -24,15 +24,22 @@ RDEPEND="usb? ( virtual/libusb:1 )"
 
 DEPEND="${RDEPEND}"
 
-src_unpack(){
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PF}-add-xml-root.patch || die "Unable to apply ${PF}-add-xml-root.patch"
+src_prepare() {
+	epatch "${FILESDIR}"/"${PF}"-add-xml-root.patch || die "Unable to apply ${PF}-add-xml-root.patch"
+}
+
+#src_unpack(){
+#	unpack ${A}
+#	cd "${S}"
+#	epatch "${FILESDIR}"/${PF}-add-xml-root.patch || die "Unable to apply ${PF}-add-xml-root.patch"
+#}
+
+src_configure() {
+	local myconf="";
+	econf ${myconf}
 }
 
 src_compile() {
-	local myconf="";
-	econf ${myconf}
 	emake || die "emake failed"
 }