version bump, fixes #993

(Portage version: 2.2.01.20062-prefix/git/Interix x86, unsigned Manifest commit)

www-apps/froxlor/Manifest

@@ -3,8 +3,8 @@ AUX domainkey.conf 102 RMD160 7cf298411682321f4f9b97fee313668767a1301e SHA1 ad9a
 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.25.tar.gz 1632798 RMD160 d3044e280ca4673fd3d557a3c58f1693bc3d1fb5 SHA1 3e981f6f823c7384baae092a612dae1163787e78 SHA256 8febc4f277734d0e44bd42fc0d4613e654f80ce2ba8004806f9767400bd919b6
-EBUILD froxlor-0.9.25.ebuild 56584 RMD160 a3c61cc100e053562924c97d09ca5586134297fd SHA1 30f6205f891728f240f08f52f51c4f55df794a70 SHA256 2ec679cc8d94912129d2aae480322a6e3b07a3a5eeb84ea2baa0571071eb0067
-EBUILD froxlor-9999.ebuild 56689 RMD160 d64ab2c112912f806074d408c726157c55ff8b64 SHA1 c24149b2047c6e6a2947b66d2efa27c75d48b13f SHA256 503c73daefb7f34ab5374feec9caf0103e97367c0529f85c8d2bc6edd0663812
+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 56687 RMD160 244d77fe39d39e4c7948cf76cbff8e0a2f5aade5 SHA1 af2d7f67b6084041d6dba9a9a12ccae3907c32e7 SHA256 f43598ff6f7a6c69cf6868a089d79f2671df9050732d7a0377a3e60b8a4998ff
 MISC ChangeLog 8644 RMD160 8500ffb578f21a44760c5e0c186b053158a3a261 SHA1 529fa8845b6b9081e56158c6bfaf8ecb541249bd SHA256 2259314570f2414c15757a478d7cdf3e62850cfe1b4546db029cc86c07aefb8d
 MISC metadata.xml 1402 RMD160 0d90a92a8e3f27b3c7f0eb51380b668f460f4d76 SHA1 2e23b043835c5fc40e131ccbb59f9309379593a4 SHA256 56ff2ad314874127dc404ec42450ad4e3fcfddbc0ca16ce98cb71ad10157661b

www-apps/froxlor/froxlor-0.9.25.ebuild → www-apps/froxlor/froxlor-0.9.26.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -30,7 +30,7 @@ DEPEND="
 	>=mail-mta/postfix-2.4[mysql,ssl=]
 	virtual/cron
 	virtual/mysql
-	>=dev-lang/php-5.2[bcmath,cli,ctype,filter,ftp,gd,mysql,nls,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]
 	|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
 	pureftpd? (
 		net-ftp/pure-ftpd[mysql,ssl=]
@@ -100,7 +100,7 @@ S="${WORKDIR}/${PN}"
 
 src_unpack() {
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${A}
 	fi
@@ -125,10 +125,6 @@ pkg_setup() {
 
 src_prepare() {
 	epatch_user
-	# Delete any mention of inserttask('4') if no Bind is used
-	if ! use bind ; then
-		find "${S}/" -type f -exec sed -e "s|inserttask('4');||g" -i {} \;
-	fi
 }
 
 src_install() {
@@ -218,8 +214,6 @@ src_install() {
 
 		einfo "Creating tmp-directory"
 		dodir "/var/customers/tmp"
-
-		ewarn "You have to remove the '-D PHP5' entry from /etc/conf.d/apache2 if it exists!"
 	fi
 
 	if use fpm ; then
@@ -241,9 +235,10 @@ src_install() {
 		dodir "/var/customers/tmp"
 	fi
 
-	# If Bind will not used, change the reload path for it
+	# If Bind will not used disable it and change the reload path for it
 	if ! use bind ; then
 		einfo "Switching 'bind' to 'Off'"
+		sed -e 's|'bind_enable', '1'|'bind_enable', '0'|g' -i "${S}/install/froxlor.sql" || die "Unable to change reload path for Bind"
 		sed -e 's|/etc/init.d/named reload|/bin/true|g' -i "${S}/install/froxlor.sql" || die "Unable to change reload path for Bind"
 	fi
 
@@ -906,15 +901,20 @@ php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f admin@${servername}
 		if use fcgid ; then
 			# create php-starter file
 			FCGIDPATH="${ROOT}${FROXLOR_DOCROOT}/php-fcgi-scripts/froxlor.panel/${servername}"
+			chmod 0750 "${FCGIDPATH}"
+			chown froxlor:froxlor "${FCGIDPATH}"
 			mkdir -p "${FCGIDPATH}/php-fcgi-script"
+			chown froxlor:froxlor "${FCGIDPATH}/php-fcgi-script" || die "Unable to fix owner for php-fcgi-script folder"
 			mkdir -p "${FCGIDPATH}/tmp"
 			chmod 0750 "${FCGIDPATH}/tmp"
+			chown froxlor:froxlor "${FCGIDPATH}/tmp"
 			touch "${FCGIDPATH}/php-fcgi-starter"
 			cp "${ROOT}/usr/share/${PN}/php-fcgi-starter" "${FCGIDPATH}/php-fcgi-starter"
 			chmod 0750 "${FCGIDPATH}/php-fcgi-starter"
 			touch "${FCGIDPATH}/php.ini"
 			cp "${ROOT}/usr/share/${PN}/php.ini" "${FCGIDPATH}/php.ini"
-			chown froxlor:froxlor -R "${FCGIDPATH}/php-fcgi-script" || die "Unable to fix owner for php-fcgi-script folder"
+			chmod 0750 "${FCGIDPATH}/php.ini"
+			chown froxlor:froxlor "${FCGIDPATH}/php.ini"
 			chattr +i "${FCGIDPATH}/php-fcgi-starter"
 		fi
 

www-apps/froxlor/froxlor-9999.ebuild

@@ -239,7 +239,7 @@ src_install() {
 	if ! use bind ; then
 		einfo "Switching 'bind' to 'Off'"
 		sed -e 's|'bind_enable', '1'|'bind_enable', '0'|g' -i "${S}/install/froxlor.sql" || die "Unable to change reload path for Bind"
-    sed -e 's|/etc/init.d/named reload|/bin/true|g' -i "${S}/install/froxlor.sql" || die "Unable to change reload path for Bind"
+		sed -e 's|/etc/init.d/named reload|/bin/true|g' -i "${S}/install/froxlor.sql" || die "Unable to change reload path for Bind"
 	fi
 
 	# default value is logging_enabled='1'