diff --git a/metadata/layout.conf b/metadata/layout.conf index 0cfa0c4..40225ed 100644 --- a/metadata/layout.conf +++ b/metadata/layout.conf @@ -1,13 +1,13 @@ # we inerhit eclasses from gentoo, if thats not possible, like on prefix with no g-x86 checked out, use prefix instead. -masters = gentoo gentoo_prefix +masters = gentoo # This goes live after stabilization of portage-2.1.10.21 #manifest-hashes = SHA256 SHA512 WHIRLPOOL # Bug #337853 - gentoo's council says to enable # --echangelog by default for the "gentoo" repo -# we do too, since we like to follow upstream standards -update-changelog = true +# we don't do it, use git log instead. +update-changelog = false # thin manifests are to be enabled somewhen after # portage-2.1.10.31 stabling. might do commit signing diff --git a/profiles/use.local.desc b/profiles/use.local.desc index fd8862a..9f69c31 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -20,4 +20,5 @@ www-apps/froxlor:log - Adds support for logging actions in the Panel www-apps/froxlor:mailquota - Adds support for Quotas for the maildirs of Customers www-apps/froxlor:nginx - use nginx instead of Apache www-apps/froxlor:pureftpd - use pure-FTPd instead of ProFTPd +www-apps/froxlor:quota - Adds support for Filesystem-Quotas www-apps/froxlor:tickets - Adds support for the Ticket System diff --git a/www-apps/froxlor/ChangeLog b/www-apps/froxlor/ChangeLog deleted file mode 100644 index 0dba509..0000000 --- a/www-apps/froxlor/ChangeLog +++ /dev/null @@ -1,278 +0,0 @@ -# ChangeLog for www-apps/froxlor -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - -*froxlor-0.9.25 (14 Nov 2011) - - 14 Nov 2011; Froxlor Release Team +froxlor-0.9.25.ebuild, - -froxlor-0.9.24.ebuild: - version bump - - 26 Oct 2011; Froxlor Release Team froxlor-0.9.24.ebuild, - froxlor-9999.ebuild: - fix some QA crap - -*froxlor-0.9.24 (26 Oct 2011) - - 14 Nov 2011; Froxlor Release Team +froxlor-0.9.24.ebuild, - -froxlor-0.9.19.ebuild: - version bump - - 20 Apr 2011; Froxlor Release Team froxlor-9999.ebuild: - migrate to git-2 - -*froxlor-0.9.19 (30 Mar 2011) - - 30 Mar 2011; Froxlor Release Team - -froxlor-0.9.18.1.ebuild, +froxlor-0.9.19.ebuild: - version bump - -*froxlor-0.9.18.1 (07 Mar 2011) - - 07 Mar 2011; Froxlor Release Team - -froxlor-0.9.18.ebuild, +froxlor-0.9.18.1.ebuild: - version bump - -*froxlor-0.9.18 (28 Feb 2011) - - 28 Feb 2011; Froxlor Release Team - -froxlor-0.9.17.ebuild, +froxlor-0.9.18.ebuild, froxlor-9999.ebuild, - metadata.xml: - version bump, switch to git and add nginx and FPM support - -*froxlor-0.9.17 (27 Jan 2011) - - 27 Jan 2011; Froxlor Release Team - -froxlor-0.9.16.ebuild, +froxlor-0.9.17.ebuild: - version bump - -*froxlor-0.9.16 (28 Dec 2010) - - 28 Dec 2010; Froxlor Release Team - -froxlor-0.9.15.1.ebuild, +froxlor-0.9.16.ebuild: - version bump - - 10 Dec 2010; Froxlor Release Team - froxlor-0.9.15.1.ebuild, froxlor-9999.ebuild: - fix #517, replace deprecated useq with use - - 07 Dec 2010; Froxlor Release Team - froxlor-0.9.15.1.ebuild, froxlor-9999.ebuild: - fix #510,#511,#512 - -*froxlor-0.9.15.1 (01 Dec 2010) - - 01 Dec 2010; Froxlor Release Team - -froxlor-0.9.15.ebuild, +froxlor-0.9.15.1.ebuild: - version bump - -*froxlor-0.9.15 (29 Nov 2010) - - 29 Nov 2010; Froxlor Release Team - -froxlor-0.9.14.ebuild, +froxlor-0.9.15.ebuild: - version bump - - 29 Nov 2010; Froxlor Release Team froxlor-9999.ebuild, - +files/aliases: - fix #412 - - 07 Nov 2010; Froxlor Release Team - froxlor-0.9.14.ebuild, froxlor-9999.ebuild: - fix typo for #463 - - 02 Nov 2010; Froxlor Release Team - froxlor-0.9.14.ebuild, froxlor-9999.ebuild: - depend on correct SAPI for lighttpd - -*froxlor-0.9.14 (25 Oct 2010) - - 25 Oct 2010; Froxlor Release Team - -froxlor-0.9.13.1.ebuild, +froxlor-0.9.14.ebuild: - version bump, remove old - - 23 Oct 2010; Froxlor Release Team - froxlor-9999.ebuild, metadata.xml: - remove realtime useflag - -*froxlor-0.9.13.1 (01 Oct 2010) - - 01 Oct 2010; Froxlor Release Team - -froxlor-0.9.13.ebuild, +froxlor-0.9.13.1.ebuild, froxlor-9999.ebuild: - version bump, remove old - -*froxlor-0.9.13 (27 Sep 2010) - - 27 Sep 2010; Froxlor Release Team - -froxlor-0.9.12.ebuild, +froxlor-0.9.13.ebuild: - version bump, remove old - - 24 Sep 2010; Froxlor Release Team - froxlor-9999.ebuild: - added php.ini for Froxlors own vhost - - 03 Sep 2010; Froxlor Release Team - froxlor-0.9.12.ebuild, froxlor-9999.ebuild: - fix typo, thanks to Emilien - -*froxlor-0.9.12 (23 Aug 2010) - - 23 Aug 2010; Froxlor Release Team - -froxlor-0.9.11.ebuild, +froxlor-0.9.12.ebuild: - version bump, remove old - - 09 Aug 2010; Froxlor Release Team - froxlor-9999.ebuild, metadata.xml: - add pureftpd support, fix disabling inserttask statement when bind useflag - is not set - -*froxlor-0.9.11 (26 Jul 2010) - - 26 Jul 2010; Froxlor Release Team - -froxlor-0.9.10.ebuild, +froxlor-0.9.11.ebuild: - version bump - - 15 Jul 2010; Froxlor Release Team - froxlor-9999.ebuild: - remove conditional dependency on dovecot 1.1 as per gentoo security bug - #314533 - - 29 Jun 2010; Froxlor Release Team - froxlor-0.9.10.ebuild, froxlor-9999.ebuild: - depend on virtual/cron instead of vixie-cron, thanks to marienz - -*froxlor-0.9.10 (28 Jun 2010) - - 28 Jun 2010; Froxlor Release Team - -froxlor-0.9.9.ebuild, +froxlor-0.9.10.ebuild: - version bump - -*froxlor-0.9.9 (14 Jun 2010) - - 14 Jun 2010; Froxlor Release Team - -froxlor-0.9.8.ebuild, +froxlor-0.9.9.ebuild: - version bump - - 10 Jun 2010; Froxlor Release Team - froxlor-0.9.8.ebuild, froxlor-9999.ebuild: - added USE-flag ftpquota to enable/disable quota in proftpd - - 09 Jun 2010; Froxlor Release Team - froxlor-0.9.8.ebuild, froxlor-9999.ebuild: - some fixes in pkg_config phase - -*froxlor-0.9.8 (31 May 2010) - - 31 May 2010; Froxlor Release Team - -froxlor-0.9.7.ebuild, +froxlor-0.9.8.ebuild: - version bump, remove old - - 28 May 2010; Froxlor Release Team - froxlor-9999.ebuild: - tweak php 5.3 depends, depend on virtual/mysql instead of dev-db/mysql - -*froxlor-0.9.7 (17 May 2010) - - 17 May 2010; Froxlor Release Team - -froxlor-0.9.6.ebuild, +froxlor-0.9.7.ebuild: - version bump, remove old - -*froxlor-0.9.6 (03 May 2010) - - 03 May 2010; Froxlor Release Team - -froxlor-0.9.5.ebuild, +froxlor-0.9.6.ebuild: - version bump, remove old - -*froxlor-0.9.5 (19 Apr 2010) - - 19 Apr 2010; Froxlor Release Team - -froxlor-0.9.4.ebuild, +froxlor-0.9.5.ebuild: - version bump, remove old - - 16 Apr 2010; Froxlor Release Team - froxlor-9999.ebuild: - support PHP 5.3, this is considered WIP until it hits the portage tree - - 11 Apr 2010; Froxlor Release Team - froxlor-0.9.4.ebuild, froxlor-9999.ebuild: - fixup bind permissions, bug 135 - - 10 Apr 2010; Froxlor Release Team - froxlor-0.9.4.ebuild, froxlor-9999.ebuild: - add pl to linguas, drop app-arch/unzip depend, we just expect people to - have a non-broken php version around - -*froxlor-0.9.4 (05 Apr 2010) - - 10 Apr 2010; Froxlor Release Team - froxlor-0.9.4.ebuild, froxlor-9999.ebuild: - add AWStats useflag - - 05 Apr 2010; Froxlor Release Team - -froxlor-0.9.3.ebuild, +froxlor-0.9.4.ebuild: - version bump, remove old - - 25 Mar 2010; Froxlor Release Team - froxlor-0.9.3.ebuild, froxlor-9999.ebuild: - adding ability to define the docroot in /etc/make.conf with - FROXLOR_DOCROOT - - 18 Mar 2010; Froxlor Release Team - froxlor-0.9.3.ebuild, froxlor-9999.ebuild: - add note for cron changes and fix messed up quoting - - 16 Mar 2010; Froxlor Release Team - froxlor-0.9.3.ebuild, froxlor-9999.ebuild: - call epatch_user, fixes #65 - -*froxlor-0.9.3 (14 Mar 2010) - - 14 Mar 2010; Froxlor Release Team - -froxlor-0.9.2.1.ebuild, +froxlor-0.9.3.ebuild: - version bump, remove old - - 02 Mar 2010; Froxlor Release Team - froxlor-0.9.2.1.ebuild, froxlor-9999.ebuild: - fixup installation from $FILESDIR just copy its contents to /usr/share to - make pkg_config(); install its files - -*froxlor-0.9.2.1 (02 Mar 2010) - - 02 Mar 2010; Froxlor Release Team - -froxlor-0.9.2.ebuild, +froxlor-0.9.2.1.ebuild: - version bump, remove old - -*froxlor-0.9.2 (01 Mar 2010) - - 01 Mar 2010; Froxlor Release Team - -froxlor-0.9.1.ebuild, +froxlor-0.9.2.ebuild: - version bump, remove old - - 23 Feb 2010; Froxlor Release Team - froxlor-0.9.1.ebuild, froxlor-9999.ebuild: - block the syscp package and tell people what to do when they upgrade - - 22 Feb 2010; Froxlor Release Team - froxlor-0.9.1.ebuild, froxlor-9999.ebuild: - do not block a dovecot 1.2 upgrade due to usedeps - - 21 Feb 2010; Froxlor Release Team - froxlor-0.9.1.ebuild, froxlor-9999.ebuild, metadata.xml: - add realtime useflag (no configuration yet, just ensure we have the right - php useflag to even make it work) - -*froxlor-0.9.1 (15 Feb 2010) - - 15 Feb 2010; Froxlor Release Team - -froxlor-0.9.ebuild, +froxlor-0.9.1.ebuild: - version bump, remove old - -*froxlor-0.9 (01 Feb 2010) - - 01 Feb 2010; Froxlor Release Team - +froxlor-0.9.ebuild, froxlor-9999.ebuild: - version bump, small cleanup - - 30 Jan 2010; Froxlor Release Team - froxlor-9999.ebuild: - pkg_preinst -> pkg_setup - diff --git a/www-apps/froxlor/Manifest b/www-apps/froxlor/Manifest index 8482877..b623400 100644 --- a/www-apps/froxlor/Manifest +++ b/www-apps/froxlor/Manifest @@ -5,6 +5,5 @@ AUX php-fcgi-starter 226 RMD160 feeb05480f03b357030a73c1192ecfc08598b2b5 SHA1 8d 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 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 +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 b2f75ee..81f1fdc 100644 --- a/www-apps/froxlor/froxlor-9999.ebuild +++ b/www-apps/froxlor/froxlor-9999.ebuild @@ -23,15 +23,14 @@ DESCRIPTION="A PHP-based webhosting-oriented control panel for servers." HOMEPAGE="http://www.froxlor.org/" LICENSE="GPL-2" SLOT="0" -IUSE="aps autoresponder awstats bind domainkey dovecot fcgid ftpquota fpm lighttpd +log mailquota nginx pureftpd ssl +tickets" +IUSE="aps autoresponder awstats bind domainkey dovecot fcgid ftpquota fpm lighttpd +log mailquota nginx pureftpd quota ssl +tickets" DEPEND=" !www-apps/syscp >=mail-mta/postfix-2.4[mysql,ssl=] virtual/cron virtual/mysql - >=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 ) + dev-lang/php[bcmath,cli,ctype,filter,ftp,gd,mysql,nls,pcre,pcntl,posix,session,simplexml,ssl=,tokenizer,xml,xsl,zlib] pureftpd? ( net-ftp/pure-ftpd[mysql,ssl=] ) @@ -60,8 +59,7 @@ DEPEND=" ) ) ) - fcgid? ( >=dev-lang/php-5.2[cgi] - || ( >=dev-lang/php-5.3 ) + fcgid? ( dev-lang/php[cgi] sys-auth/libnss-mysql ( !lighttpd? ( !nginx? ( @@ -80,7 +78,8 @@ DEPEND=" >=mail-mta/postfix-2.4[sasl] ) aps? ( dev-lang/php[zip] ) - mailquota? ( >=mail-mta/postfix-2.4[vda] )" + mailquota? ( >=mail-mta/postfix-2.4[vda] ) + quota? ( sys-fs/quotatool )" RDEPEND="${DEPEND}" diff --git a/www-apps/froxlor/metadata.xml b/www-apps/froxlor/metadata.xml index 77a4abc..312f700 100644 --- a/www-apps/froxlor/metadata.xml +++ b/www-apps/froxlor/metadata.xml @@ -23,6 +23,7 @@ Customers use nginx instead of Apache use pure-FTPd instead of ProFTPd + Adds support for Filesystem-Quotas Adds support for the Ticket System