diff --git a/metadata/layout.conf b/metadata/layout.conf
index 40225ed..b87609f 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -1,8 +1,8 @@
-# we inerhit eclasses from gentoo, if thats not possible, like on prefix with no g-x86 checked out, use prefix instead.
+# we inerhit eclasses from gentoo
 masters = gentoo
 
 # This goes live after stabilization of portage-2.1.10.21
-#manifest-hashes = SHA256 SHA512 WHIRLPOOL
+manifest-hashes = SHA256 SHA512 WHIRLPOOL
 
 # Bug #337853 - gentoo's council says to enable
 # --echangelog by default for the "gentoo" repo
@@ -12,7 +12,7 @@ update-changelog = false
 # thin manifests are to be enabled somewhen after
 # portage-2.1.10.31 stabling. might do commit signing
 # differently then, or probably drop it alltogether.
-#thin-manifests = true
+thin-manifests = true
 
 # the default *is* actually pms, but better safe then sorry
 # since we don't actually need stuff like package.* as
diff --git a/www-apps/froxlor/Manifest b/www-apps/froxlor/Manifest
index b623400..695806f 100644
--- a/www-apps/froxlor/Manifest
+++ b/www-apps/froxlor/Manifest
@@ -1,9 +1 @@
-AUX aliases 820 RMD160 c4c86731b7b8337890677093267c52ea4805af84 SHA1 ce782e4207d50d71446cbe483e5d2b7e99968487 SHA256 809990aeef45ae1c1e46f484b397d6e4b683166fcd55608a0b0efdfb7e6e12ef
-AUX domainkey.conf 102 RMD160 7cf298411682321f4f9b97fee313668767a1301e SHA1 ad9a8bb7be54b6fc15c6db6140b11ffd9b4894ae SHA256 30c86dd638888eb92456fd053e25a86b6df7a025f3972e6dc5976d10347a6524
-AUX froxlor.cron 255 RMD160 a506d5165dff33b1a9c3b466441139af73921709 SHA1 bb0d4d5fb6128598883b97babaa4b2a83bd1fdbb SHA256 5a4ff57d65b563d32f1da76726f3fafc3e45cba956e357d7bc7dfe48693edb3d
-AUX php-fcgi-starter 226 RMD160 feeb05480f03b357030a73c1192ecfc08598b2b5 SHA1 8dad00ef853d0a0fb1800d231f2f0309e8c3d44f SHA256 1ce8e33e7c89172d24bc95eba804f871c6a72ea7739e3084198d835544ca0535
-AUX php.ini 1765 RMD160 678be9f350668bca899c6dac5fce5c9fe074b28b SHA1 564634c696e38b2b51352e85f9954b66844c46f9 SHA256 b8efce5d40dec9ae0361f7cf0314169c32b68f7cc130f5e1a11093b7d54affa5
 DIST froxlor-0.9.26.tar.gz 1602312 RMD160 a105c5439c50b6624785f5469d55892f84e7fe8f SHA1 6e85f8bac27bd715d642547949c5ac9f84d18e23 SHA256 99c47a7127d672778e898e1916b0a1be74378ae7694669bb9c01f4b887951e5c
-EBUILD froxlor-0.9.26.ebuild 56687 RMD160 244d77fe39d39e4c7948cf76cbff8e0a2f5aade5 SHA1 af2d7f67b6084041d6dba9a9a12ccae3907c32e7 SHA256 f43598ff6f7a6c69cf6868a089d79f2671df9050732d7a0377a3e60b8a4998ff
-EBUILD froxlor-9999.ebuild 56636 RMD160 ef51177efd0a6f7a0c98f6473457a4c15afc51ce SHA1 2ee7c17c4edbdad93f5246ea957af6dcc2a7befc SHA256 eca26312d799cc049b79a8633edaf1fa43c36575cef7f83b393bf61d28babe51
-MISC metadata.xml 1465 RMD160 5c71d9636a6cd9b6316cb6caf7145c8297053331 SHA1 1617d55badbb4ab048b92ae08f273923e9708295 SHA256 3364ac0f708bd2816faad92855819381ea4b969495e68bd3f2efb937d2fb1741
diff --git a/www-apps/froxlor/froxlor-9999.ebuild b/www-apps/froxlor/froxlor-9999.ebuild
index 81f1fdc..6e01534 100644
--- a/www-apps/froxlor/froxlor-9999.ebuild
+++ b/www-apps/froxlor/froxlor-9999.ebuild
@@ -5,9 +5,10 @@
 EAPI="2"
 
 [[ ${PV} == 9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.froxlor.org/froxlor.git"
+EGIT_REPO_URI="https://github.com/Froxlor/Froxlor.git"
+EGIT_PROJECT="froxlor"
 
-inherit eutils depend.php ${SCM}
+inherit eutils ${SCM}
 
 if [[ ${PV} != "9999" ]] ; then
 	RESTRICT="mirror"
@@ -30,7 +31,7 @@ DEPEND="
 	>=mail-mta/postfix-2.4[mysql,ssl=]
 	virtual/cron
 	virtual/mysql
-	dev-lang/php[bcmath,cli,ctype,filter,ftp,gd,mysql,nls,pcre,pcntl,posix,session,simplexml,ssl=,tokenizer,xml,xsl,zlib]
+	>=dev-lang/php-5.2[bcmath,cli,ctype,filter,ftp,gd,mysql,nls,pcntl,posix,session,simplexml,ssl=,tokenizer,xml,xsl,zlib]
 	pureftpd? (
 		net-ftp/pure-ftpd[mysql,ssl=]
 	)
@@ -92,9 +93,6 @@ done
 # lets check user defined variables
 FROXLOR_DOCROOT="${FROXLOR_DOCROOT:-/var/www}"
 
-need_php5_httpd
-need_php5_cli
-
 S="${WORKDIR}/${PN}"
 
 src_unpack() {