Browse Source

bump and cleanup

master
Robert Förster (Dessa) 8 years ago
parent
commit
f69bafc334
  1. 19
      metadata/layout.conf
  2. 14
      profiles/use.local.desc
  3. 2
      www-apps/froxlor/Manifest
  4. 51
      www-apps/froxlor/froxlor-0.9.32.ebuild
  5. 24
      www-apps/froxlor/froxlor-9999.ebuild
  6. 2
      www-apps/froxlor/metadata.xml

19
metadata/layout.conf

@ -1,19 +1,26 @@
# we inerhit eclasses from gentoo
masters = gentoo
# This goes live after stabilization of portage-2.1.10.51 (fixes bug #406407)
# This went live Wednesday, July 4, 2012 at 10:00 UTC
# For more details, please see: http://archives.gentoo.org/gentoo-dev-announce/msg_00000.xml
# and/or GLEP 59.
manifest-hashes = SHA256 SHA512 WHIRLPOOL
# Bug #470670 - gentoo's council says to deprecate EAPIs 1 and 2.
# 2014-02-25 council meeting deprecated EAPIs 0 and 3.
eapis-deprecated = 0 1 2 3
# Bug #337853 - gentoo's council says to enable
# --echangelog by default for the "gentoo" repo
# 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
# differently then, or probably drop it alltogether.
# Use thin manifests
thin-manifests = true
# Dont sign thin manifests. There is no current policy for git commit signing
sign-manifests = false
# the default *is* actually pms, but better safe then sorry
# since we don't actually need stuff like package.* as
# directory
@ -22,4 +29,6 @@ profile-formats = pms
# Make egencache generate newer (more reliable)
# md5-dict cache format (see bug #409445).
# NOTE: list md5-dict first so clients prefer it
cache-formats = md5-dict pms
# INFRA NOTE: Format 'pms' was removed on Aug 6 2012. (Announced prior as Aug 1
# 2012 was the removal date)
cache-formats = md5-dict

14
profiles/use.local.desc

@ -1,20 +1,14 @@
# Copyright 1999-2011 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
# $Header$
# This file contains descriptions of local USE flags, and the ebuilds which
# contain them.
# Keep it sorted (use "LC_ALL=C sort -t: -k1,1 -k2 | LC_ALL=C sort -s -t/ -k1,1")
# Declaring the locale for the sort is critical to avoid flapping.
# This file is deprecated as per GLEP 56 in favor of metadata.xml. Please add
# your descriptions to your package's metadata.xml ONLY.
# * generated automatically using egencache *
www-apps/froxlor:aps - Support for the Application Packaging Standard
www-apps/froxlor:autoresponder - E-Mail Autoresponder Support for Customers
www-apps/froxlor:awstats - use AWStats instead of Webalizer
www-apps/froxlor:bind - Adds support for writing BIND configuration files
www-apps/froxlor:domainkey - Adds support for writing DKIM DNS-Records and Filters for them
www-apps/froxlor:dovecot - use Dovecot instead of Courier
www-apps/froxlor:fcgid - Adds support for FCGId
www-apps/froxlor:ftpquota - Adds support for FTP Quotas for use with ProFTPd
www-apps/froxlor:fpm - Adds support for PHP-FPM
www-apps/froxlor:ftpquota - Adds support for FTP Quotas for use with ProFTPd
www-apps/froxlor:lighttpd - use ligHTTPd instead of Apache
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

2
www-apps/froxlor/Manifest

@ -1 +1 @@
DIST froxlor-0.9.31.2.tar.gz 1804242 SHA256 1d9e2bffb8593babb7fc107da6d9ff8b47d1faa132e5dcdfb101167d94cfdf06 SHA512 f4311dd0be0a29b8507f876316c0804b34c0a2728e2b1f926675b2b8d79a9aaff9f6fa056523fd616c97f1d3fe88c82e8616d8dc1332b6d0a0a11469e6b1fea6 WHIRLPOOL 97d43d392c92ff41cd7bcc4a37781cf70302c37c937aa46cd650004cf0a84f8c0b8fdb129b2367f4906637ac86ecffddd25c0ad982b5b1a68aadc4e8122d4b8b
DIST froxlor-0.9.32.tar.gz 1406808 SHA256 f032440d33bddc03265656ed03126926ff618f82b71925c1c1684e46a219dfc9 SHA512 33fcaa6761e952477c088adfe987286e6a3cff8cc8f5ec725cfbf04683e4c8f03a493f68767154d97004fefe5735e9c1a4a4e80d7a1f9b1c19a167868ddce983 WHIRLPOOL 817c4f26971c0b4b708dfe97f2711aaa05093f80c1c4835877c1f678619459d1560857e81d117d189b5a5bc7415fa15df2996a4c42f223c54e01dc9d4250af9b

51
www-apps/froxlor/froxlor-0.9.31.2.ebuild → www-apps/froxlor/froxlor-0.9.32.ebuild

@ -1,4 +1,4 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@ -22,7 +22,7 @@ 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 quota ssl +tickets"
IUSE="awstats bind domainkey dovecot fcgid ftpquota fpm lighttpd +log mailquota nginx pureftpd quota ssl +tickets"
PHP_REQUIRED_FLAGS="bcmath,cli,ctype,filter,ftp,gd,mysql,nls,pcntl,pdo,posix,session,simplexml,ssl=,tokenizer,xml,xslt,zlib"
@ -73,7 +73,7 @@ DEPEND="
fpm? ( dev-lang/php[fpm]
sys-auth/libnss-mysql
)
dovecot? ( >=net-mail/dovecot-1.2.0[mysql,ssl=]
dovecot? ( >=net-mail/dovecot-2.2.0[mysql,ssl=]
>=mail-mta/postfix-2.4[dovecot-sasl]
)
!dovecot? ( dev-libs/cyrus-sasl[crypt,mysql,ssl=]
@ -81,7 +81,6 @@ DEPEND="
net-mail/courier-imap
>=mail-mta/postfix-2.4[sasl]
)
aps? ( dev-lang/php[zip] )
mailquota? ( >=mail-mta/postfix-2.4[vda] )
quota? ( sys-fs/quotatool )"
@ -90,7 +89,7 @@ RDEPEND="${DEPEND}"
REQUIRED_USE="lighttpd? ( !nginx ) fcgid? ( !fpm )"
# we need that to set the standardlanguage later
LANGS="bg ca cs de da en es fr hu it nl pl pt ru se sl zh_CN"
LANGS="de en fr it nl pt se"
for X in ${LANGS} ; do
IUSE="${IUSE} linguas_${X}"
done
@ -115,38 +114,18 @@ src_prepare() {
src_install() {
# set default language
local MYLANG=""
if use linguas_bg ; then
MYLANG="Bulgarian"
elif use linguas_ca ; then
MYLANG="Catalan"
elif use linguas_cs ; then
MYLANG="Czech"
elif use linguas_de ; then
MYLANG="Deutsch"
elif use linguas_da ; then
MYLANG="Danish"
elif use linguas_es ; then
MYLANG="Español"
elif use linguas_fr ; then
MYLANG="Français"
elif use linguas_hu ; then
MYLANG="Hungarian"
elif use linguas_it ; then
MYLANG="Italian"
elif use linguas_nl ; then
MYLANG="Dutch"
elif use linguas_pl ; then
MYLANG="Polski"
elif use linguas_pt ; then
MYLANG="Português"
elif use linguas_ru ; then
MYLANG="Russian"
elif use linguas_se ; then
MYLANG="Swedish"
elif use linguas_sl ; then
MYLANG="Slovak"
elif use linguas_zh_CN ; then
MYLANG="Chinese"
fi
if [[ ${MYLANG} != '' ]] ; then
@ -177,7 +156,7 @@ src_install() {
sed -e "s|'apacheconf_htpasswddir', '/etc/apache2/htpasswd/'|'apacheconf_htpasswddir', '/etc/nginx/htpasswd/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver htpasswd directory"
sed -e "s|'httpuser', 'www-data'|'httpuser', 'nginx'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver user"
sed -e "s|'httpgroup', 'www-data'|'httpgroup', 'nginx'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver group"
sed -e "s|'fastcgi_ipcdir', '/var/lib/apache2/fastcgi/'|'fastcgi_ipcdir', '/var/run/nginx/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change php-ipc directory"
sed -e "s|'fastcgi_ipcdir', '/var/lib/apache2/fastcgi/'|'fastcgi_ipcdir', '/var/run/nginx/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change php-ipc directory"
else
einfo "Switching settings to fit 'apache2'"
sed -e "s|'apacheconf_vhost', '/etc/apache2/vhosts.conf'|'apacheconf_vhost', '/etc/apache2/vhosts.d/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver vhost directory"
@ -236,12 +215,6 @@ src_install() {
sed -e "s|'mail_quota_enabled', '0'|'mail_quota_enabled', '1'|g" -i "${S}/install/froxlor.sql" || die "Unable to set mailquota to 'On'"
fi
# default value is autoresponder='0'
if use autoresponder ; then
einfo "Switching 'autoresponder' to 'On'"
sed -e "s|'autoresponder_active', '0'|'autoresponder_active', '1'|g" -i "${S}/install/froxlor.sql" || die "Unable to set autoresponder to 'On'"
fi
# default value is dkim_enabled='0'
if use domainkey && use bind ; then
einfo "Switching 'domainkey' to 'On'"
@ -251,18 +224,6 @@ src_install() {
sed -e "s|'dkim_prefix', '/etc/postfix/dkim/'|'dkim_prefix', '/etc/mail/dkim-filter/'|g" -i "${S}/install/froxlor.sql" || die "Unable to set domainkey prefix"
fi
# default value is aps_enabled='0'
if use aps ; then
einfo "Switching 'APS' to 'On'"
sed -e "s|'aps_active', '0'|'aps_active', '1'|g" -i "${S}/install/froxlor.sql" || die "Unable to set aps to 'On'"
# if aps is used we enable required features in the php-cli php.ini
ewarn
ewarn "Note: APS requires the php setting 'allow_url_fopen' to be enabled"
ewarn " for the Froxlor vhost. Please adjust the corresponding php.ini"
ewarn
fi
# default value is ssl_enabled='1'
if ! use ssl ; then
einfo "Switching 'SSL' to 'Off'"
@ -284,8 +245,6 @@ src_install() {
einfo "Installing Froxlor files"
dodir ${FROXLOR_DOCROOT}
cp -Rf "${S}/" "${D}${FROXLOR_DOCROOT}/" || die "Installation of the Froxlor files failed"
fperms 0775 ${FROXLOR_DOCROOT}/froxlor/{temp,packages}
}
pkg_postinst() {

24
www-apps/froxlor/froxlor-9999.ebuild

@ -89,7 +89,7 @@ RDEPEND="${DEPEND}"
REQUIRED_USE="lighttpd? ( !nginx ) fcgid? ( !fpm )"
# we need that to set the standardlanguage later
LANGS="bg ca cs de da en es fr hu it nl pl pt ru se sl zh_CN"
LANGS="de en fr it nl pt se"
for X in ${LANGS} ; do
IUSE="${IUSE} linguas_${X}"
done
@ -114,38 +114,18 @@ src_prepare() {
src_install() {
# set default language
local MYLANG=""
if use linguas_bg ; then
MYLANG="Bulgarian"
elif use linguas_ca ; then
MYLANG="Catalan"
elif use linguas_cs ; then
MYLANG="Czech"
elif use linguas_de ; then
MYLANG="Deutsch"
elif use linguas_da ; then
MYLANG="Danish"
elif use linguas_es ; then
MYLANG="Español"
elif use linguas_fr ; then
MYLANG="Français"
elif use linguas_hu ; then
MYLANG="Hungarian"
elif use linguas_it ; then
MYLANG="Italian"
elif use linguas_nl ; then
MYLANG="Dutch"
elif use linguas_pl ; then
MYLANG="Polski"
elif use linguas_pt ; then
MYLANG="Português"
elif use linguas_ru ; then
MYLANG="Russian"
elif use linguas_se ; then
MYLANG="Swedish"
elif use linguas_sl ; then
MYLANG="Slovak"
elif use linguas_zh_CN ; then
MYLANG="Chinese"
fi
if [[ ${MYLANG} != '' ]] ; then
@ -176,7 +156,7 @@ src_install() {
sed -e "s|'apacheconf_htpasswddir', '/etc/apache2/htpasswd/'|'apacheconf_htpasswddir', '/etc/nginx/htpasswd/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver htpasswd directory"
sed -e "s|'httpuser', 'www-data'|'httpuser', 'nginx'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver user"
sed -e "s|'httpgroup', 'www-data'|'httpgroup', 'nginx'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver group"
sed -e "s|'fastcgi_ipcdir', '/var/lib/apache2/fastcgi/'|'fastcgi_ipcdir', '/var/run/nginx/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change php-ipc directory"
sed -e "s|'fastcgi_ipcdir', '/var/lib/apache2/fastcgi/'|'fastcgi_ipcdir', '/var/run/nginx/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change php-ipc directory"
else
einfo "Switching settings to fit 'apache2'"
sed -e "s|'apacheconf_vhost', '/etc/apache2/vhosts.conf'|'apacheconf_vhost', '/etc/apache2/vhosts.d/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver vhost directory"

2
www-apps/froxlor/metadata.xml

@ -7,8 +7,6 @@
</maintainer>
<longdescription>A PHP-based webhosting-oriented control panel for servers.</longdescription>
<use>
<flag name='aps'>Support for the Application Packaging Standard</flag>
<flag name='autoresponder'>E-Mail Autoresponder Support for Customers</flag>
<flag name='awstats'>use AWStats instead of Webalizer</flag>
<flag name='bind'>Adds support for writing BIND configuration files</flag>
<flag name='domainkey'>Adds support for writing DKIM DNS-Records and

Loading…
Cancel
Save