From: Benedikt Boehm Date: Fri, 7 Mar 2008 14:37:30 +0000 (+0000) Subject: version bump wrt #195351; ebuild cleanup wrt #208584 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=642856b981886ccf82a0978961903ffcf2e504a3;p=gentoo.git version bump wrt #195351; ebuild cleanup wrt #208584 Package-Manager: portage-2.1.4.4 --- diff --git a/www-apps/rt/ChangeLog b/www-apps/rt/ChangeLog index c1a931e0aad3..5f32c0016ad3 100644 --- a/www-apps/rt/ChangeLog +++ b/www-apps/rt/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for www-apps/rt # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.54 2008/02/05 15:04:28 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.55 2008/03/07 14:37:28 hollow Exp $ + +*rt-3.6.6 (07 Mar 2008) + + 07 Mar 2008; Benedikt Böhm + -files/3.2.1/postinstall-en.txt, -files/3.2.1/reconfig, + -files/rt_apache.conf, -files/rt_apache1_fcgi.conf, metadata.xml, + -rt-3.4.5.ebuild, +rt-3.6.6.ebuild: + version bump wrt #195351; ebuild cleanup wrt #208584 05 Feb 2008; Benedikt Böhm rt-3.4.5.ebuild, rt-3.6.3.ebuild: diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest index 5a3ff804c7a9..65325845ad49 100644 --- a/www-apps/rt/Manifest +++ b/www-apps/rt/Manifest @@ -1,27 +1,23 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX 3.2.1/postinstall-en.txt 1648 RMD160 9c815e52de1437f2dffaf21dfdb9e385c9304542 SHA1 e55e498670fe2897b22af8c292d4a0b34c67d94a SHA256 fb97b5637b5f02679b937b6113c28370ed06389d3527598f0a2887928a300d66 -AUX 3.2.1/reconfig 1213 RMD160 ccec7b2394dca3ffb9996770eafa4ba51abd8237 SHA1 a6ba1e297ead5bd71f4f49ad3a6918fe2d48a1ca SHA256 f36fa5d058a9e3f80e390d9565daea9b263fe76c9cb61cc98e46960579dbb084 AUX 3.4.5/postinstall-en.txt 703 RMD160 5bddbc2097afd96da1ff2993befdb1c8b27769ef SHA1 c212a6095f9191885ea335de1981a6a89437dd7f SHA256 497e75437529d61f69b628b0f7ab4ffa51dd0be9292220e657c4148345ab5a35 AUX 3.4.5/reconfig 1585 RMD160 7f925ed321ec02f42cd1f8fe2c6b962961769e17 SHA1 3743d1cbf640cb7295559ae294934e2626cda2ec SHA256 dc54bf257e1ab8eecffdc4941744d4f7eb11691ef02ea5235f5c3ffd3cec9a0a AUX config.layout-gentoo 616 RMD160 5a67ad1cb45ad067f66c5348acfedc45841ab252 SHA1 67e1d7d24b4593f5a2301cf5584cb83109c6a497 SHA256 edf9ae9b820a072cacf2bc6f43b3147d746037ba299265c62bcfafb50be06759 AUX rt.conf.d 399 RMD160 da84c7fc8ddba2e01cd58fe706cc64501ff8deeb SHA1 824af6197cc3da5cb832cec0bada938c13281a18 SHA256 6f705188c9b9c57dbb7a9726d00624dbd5c267d4dc7415d81fd972f4d3300542 AUX rt.init.d 1013 RMD160 c6853447d8653cfbcf26316c0a432e3474298467 SHA1 bf7408b6c3a30a7a80ece3e51bf1b0446f68e5df SHA256 45f75de68ee588538d093eb6d57d8368004e075fecafff2f82bb0f2978da79d7 -AUX rt_apache.conf 574 RMD160 19a49aca4870750ad397916f7a16433624be2b12 SHA1 70e337d2f3b3fd8295703672a1af1dc3bdd55d5a SHA256 7d801941fafb9656848fa3c57ee142203a66c121dfc0eef616a4ca2146644419 -AUX rt_apache1_fcgi.conf 990 RMD160 313227236915d9120281f048f0753df5248544f0 SHA1 0b42a0680b74dd986e42ffd53b471465d28bfdda SHA256 b71473d61581fd365c84cd71c5c8825fa1cfd002ce140b71c0bb50b37333ca68 AUX rt_apache2.conf 574 RMD160 19a49aca4870750ad397916f7a16433624be2b12 SHA1 70e337d2f3b3fd8295703672a1af1dc3bdd55d5a SHA256 7d801941fafb9656848fa3c57ee142203a66c121dfc0eef616a4ca2146644419 AUX rt_apache2_fcgi.conf 993 RMD160 a59e337ff39bf9a1cb8793d63f5cc6583f2a0615 SHA1 8c20b094785f29f87ceca08ff7ea365d8ed93681 SHA256 166f5a60e443351228ba215a460603b106074e6f150e878a34ccd18b825026aa -DIST rt-3.4.5.tar.gz 1410154 RMD160 aa86f6cd4039ce6f6fdfaabf0e2807e93d0786b5 SHA1 a2609ffc168829a179bea70006e57aee6d6367f9 SHA256 20eb89af3245b7021e53cdefd0ed0716443c3a4f9e8536e0c2c29b901942e917 DIST rt-3.6.3.tar.gz 1602818 RMD160 3eab454d374334e5df4939c2c4af316628b12965 SHA1 793de4655c0fa7bbfd3aa6eeefe5a1d143d07677 SHA256 fc29f1fd95b3cd4813e3fbdef1882e8cd6c4516c66b3e78237272bdd200a1a67 -EBUILD rt-3.4.5.ebuild 6011 RMD160 87c19fb60fe83f139624691c3adde7a5c1df4ae1 SHA1 bee4a81d14c56d4211cf512292fe1cca080a3131 SHA256 1ca5d946808494fbb2bf20aeb943257e2feefcb51b5c1e551741e447c1dfcc3f +DIST rt-3.6.6.tar.gz 1715913 RMD160 46d928304d0435f122cecb9a62df137bf47b0e56 SHA1 fa0f3787027851348f52eefda8fee13f30b43ca7 SHA256 509bac5ab588b0a69030d6ee91061e27dd124d9f8d795000b307e5d85a2dbf14 EBUILD rt-3.6.3.ebuild 6215 RMD160 316f68c792d662f2d5525326e7d5a3a261a7c17b SHA1 56502269d5e4e321b62a97d63fb9e65327990f31 SHA256 08a8655b7ca2adba31ba5b213182bb318bbd11c04e3ac351d350cdf39bff4e03 -MISC ChangeLog 8184 RMD160 576c62251f5b73cf3ea0c5c08b280dc8b81a3b05 SHA1 4c575db3d5b43bca55e6c8a343c743d17e955276 SHA256 2d3c709e86243fc2c654091d6d525f93e04eb422635e187e9ae2822de86d9818 -MISC metadata.xml 221 RMD160 cb776d24349e87dce7784e24e35d9d84f91da1f7 SHA1 0f301c536f2b097bd3ff21cc1dd05fe6d8f4713e SHA256 e9d20baa1edc4def48ad57c9620d3d0ee361888408261619ff9ea9edb47ce67a +EBUILD rt-3.6.6.ebuild 6096 RMD160 f19a22d2a7cafeaf1aa783ef0f53d872a1ca1de8 SHA1 77e76bdbc8b5de313cc00be197b9ee2420335256 SHA256 c47876aac2b9bf4ebf74c612fcf14b4ac6e960b5047d85f14e431c3af408ba39 +MISC ChangeLog 8479 RMD160 79fbceb53e8f74b3452c484321c2de07c61bdfc1 SHA1 c0a5455b614fa4a7b38efef2fecc1d96f7d63780 SHA256 b4e74dd204adf4af5a41ad6418e27d2a9017cc2f164c5ea72cc0e0837ea4ac84 +MISC metadata.xml 224 RMD160 6473c0e4796e967137528ff82a99aad5b7e410c9 SHA1 b69add64067ccc2d56e521ac0e5799cc8a47fd75 SHA256 d093d9f523cc0019dc1107d9955a0b24fb0a796dbc032775dbdafe782c0c4066 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.8 (GNU/Linux) -iEYEARECAAYFAkeoewUACgkQmPFBzbX68WH3CACfeDtuwg7xApDqnb7IcG9azeh7 -7oYAnitS5EwhkqWbSxp5F/91DDhDwvT0 -=ceUm +iEYEARECAAYFAkfRUzQACgkQmPFBzbX68WEmVgCffI4CJQdHQ+r6ngha9h+98a5s +/RMAn2oQVh3OGPn9MBT3IsPK0e/yjOPI +=d5oA -----END PGP SIGNATURE----- diff --git a/www-apps/rt/files/3.2.1/postinstall-en.txt b/www-apps/rt/files/3.2.1/postinstall-en.txt deleted file mode 100644 index e2f9ad510ff6..000000000000 --- a/www-apps/rt/files/3.2.1/postinstall-en.txt +++ /dev/null @@ -1,42 +0,0 @@ - -*********************************************************** -You now need to edit your local config files, -which will be located in ${VHOST_ROOT}/rt-config/RT_Config.pm and RT_SiteConfig.pm - -BE SURE TO READ /usr/share/doc/${P}/README.gz , especially if -you'd prefer to use an alias, or if you want to setup RT's e-mail gateway - -RT documentation can be found at http://www.bestpractical.com/rt/docs.html -If you need more help, consider searching the mailing list (Google site:lists.fsck.com ) - -*********************************************************** -1. If this is a new install, you now need to initialize RT's database. - -For MySQL: -rt-setup-database --action init --dba root --prompt-for-dba-password -For PostgreSQL: -rt-setup-database --action init --dba postgres --prompt-for-dba-password - -For this to work, PostgreSQL needs to listen on TCP 5432: -In your postgresql.conf, set tcpip_socket = true, port = 5432 - -*********************************************************** -2. Read the README to configure your webserver for RT. For the impatient: -put this in ${MY_INSTALLDIR}/.htaccess (although you really should put it in -your Apache configs) - -AddDefaultCharset UTF-8 - -PerlModule Apache::DBI -PerlRequire /usr/bin/webmux.pl - -SetHandler perl-script -PerlHandler RT::Mason -PerlSetEnv PERL5LIB /usr/lib - -*********************************************************** -3. Restart your webserver (e.g., for Apache: /etc/init.d/apache restart ) - -*********************************************************** -4. Note that the default login is 'root', and the password is 'password'. It is -a Good Idea(TM) to change the defaults to something more secure. diff --git a/www-apps/rt/files/3.2.1/reconfig b/www-apps/rt/files/3.2.1/reconfig deleted file mode 100644 index 447c5b490234..000000000000 --- a/www-apps/rt/files/3.2.1/reconfig +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -if [ $1 = "start" -o $1 = "install" ]; then - # don't fix location - breaks sandbox - #sed -i "s|${MY_HOSTROOTDIR}|${VHOST_ROOT}|g" /usr/bin/standalone_httpd /usr/bin/rt-crontool /usr/bin/webmux.pl /usr/lib/RT.pm - # sed -i "s|${MY_HOSTROOTDIR}|\/usr|" /usr/bin/mason_handler.scgi - # sed -i "s|${MY_HTDOCSDIR}|${MY_INSTALLDIR}|" /usr/lib/RT.pm /usr/bin/rt-mailgate - - # fix permissions - # chown -R ${VHOST_SERVER_GID}:${VHOST_SERVER_UID} /var/rt - - # check for upgrades - cd ${VHOST_ROOT}/rt-config/upgrade - echo "You may need to update your database." - echo "For each item in the output below" - echo "whose name is greater than your previously installed RT version," - echo "rt-setup-database --action schema --datadir ${VHOST_ROOT}/rt-config/upgrade/" - echo "rt-setup-database --action acl --datadir ${VHOST_ROOT}/rt-config/upgrade/" - echo "rt-setup-database --action insert --datadir ${VHOST_ROOT}/rt-config/upgrade/" - echo "Don't forget to read the README for more details" - ls - -elif [ $1 = "clean" ]; then - echo $1 - # rm -f /usr/bin/standalone_httpd /usr/bin/rt-crontool /usr/bin/webmux.pl /usr/lib/RT.pm /usr/bin/mason_handler.scgi /usr/bin/rt-mailgate - # rm -rf /var/rt -fi diff --git a/www-apps/rt/files/rt_apache.conf b/www-apps/rt/files/rt_apache.conf deleted file mode 100644 index 896f642c55af..000000000000 --- a/www-apps/rt/files/rt_apache.conf +++ /dev/null @@ -1,30 +0,0 @@ - - - ServerName MY_RT_DOMAIN - - DocumentRoot HTDOCS - ServerAdmin YOUR_EMAIL_HERE - - AddDefaultCharset UTF-8 - - UserDir disabled - - - PerlModule Apache::DBI - PerlRequire RT_DIR/bin/webmux.pl - - - SetHandler perl-script - PerlHandler RT::Mason - PerlSetEnv PERL5LIB /usr/lib - - - - Options Indexes FollowSymLinks - AllowOverride None - Order allow,deny - Allow from all - - - - diff --git a/www-apps/rt/files/rt_apache1_fcgi.conf b/www-apps/rt/files/rt_apache1_fcgi.conf deleted file mode 100644 index 0bff8a0556f9..000000000000 --- a/www-apps/rt/files/rt_apache1_fcgi.conf +++ /dev/null @@ -1,41 +0,0 @@ - - - # Tell FastCGI to put its temporary files somewhere sane. - FastCgiIpcDir /tmp - - # Tell FastCGI that it should use apache's "suexec" binary to call any FastCGI script. - # This is a GLOBAL setting - FastCgiWrapper /usr/sbin/suexec - - # Apache 1.3 discards the user and group parameters on the FastCgiServer line. - # Apache 2.0 requires them. - FastCgiServer RT_DIR/bin/mason_handler.fcgi -idle-timeout 120 -user rt -group rt -processes 4 - - - - ServerName MY_RT_DOMAIN - - DocumentRoot HTDOCS - ServerAdmin YOUR_EMAIL_HERE - - AddDefaultCharset UTF-8 - - UserDir disabled - - - # Set the rt user and group as the executing user for this virtual host - User rt - Group rt - - AddHandler fastcgi-script fcgi - ScriptAlias / RT_DIR/bin/mason_handler.fcgi/ - - - Options Indexes FollowSymLinks - AllowOverride None - Order allow,deny - Allow from all - - - - diff --git a/www-apps/rt/metadata.xml b/www-apps/rt/metadata.xml index 43819e102566..5e4c3a3a245d 100644 --- a/www-apps/rt/metadata.xml +++ b/www-apps/rt/metadata.xml @@ -1,8 +1,8 @@ -web-apps - - rl03@gentoo.org - + web-apps + + rl03@gentoo.org + diff --git a/www-apps/rt/rt-3.4.5.ebuild b/www-apps/rt/rt-3.6.6.ebuild similarity index 69% rename from www-apps/rt/rt-3.4.5.ebuild rename to www-apps/rt/rt-3.6.6.ebuild index 0cfbed73427e..30dad35a791b 100644 --- a/www-apps/rt/rt-3.4.5.ebuild +++ b/www-apps/rt/rt-3.6.6.ebuild @@ -1,89 +1,82 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.4.5.ebuild,v 1.19 2008/02/05 15:04:28 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.6.6.ebuild,v 1.1 2008/03/07 14:37:28 hollow Exp $ -inherit webapp eutils depend.apache - -IUSE="mysql postgres fastcgi lighttpd" +inherit webapp eutils depend.apache confutils DESCRIPTION="RT is an enterprise-grade ticketing system" HOMEPAGE="http://www.bestpractical.com/rt/" SRC_URI="http://download.bestpractical.com/pub/${PN}/release/${P}.tar.gz" KEYWORDS="~amd64 ~ppc ~x86" +LICENSE="GPL-2" +IUSE="mysql postgres fastcgi lighttpd" DEPEND=" >=dev-lang/perl-5.8.3 - >=dev-perl/Params-Validate-0.02 - dev-perl/Cache-Cache - >=dev-perl/Exception-Class-1.14 - >dev-perl/HTML-Mason-1.23 - dev-perl/MLDBM - dev-perl/FreezeThaw - >=virtual/perl-Digest-MD5-2.27 - >=virtual/perl-CGI-2.92 - >=virtual/perl-Storable-2.08 >=dev-perl/Apache-Session-1.53 - >=dev-perl/XML-RSS-1.05 - >=dev-perl/HTTP-Server-Simple-0.07 - >=dev-perl/HTTP-Server-Simple-Mason-0.09 - dev-perl/Text-WikiFormat - - !lighttpd? ( - >=dev-perl/Apache-DBI-0.92 - !fastcgi? ( >=www-apache/libapreq2-2.06 - >=dev-perl/HTML-Mason-1.31 ) - fastcgi? ( dev-perl/FCGI ) - ) - lighttpd? ( dev-perl/FCGI ) - - mysql? ( >=dev-perl/DBD-mysql-2.1018 ) - postgres? ( >=dev-perl/DBD-Pg-1.41 ) - - >=virtual/perl-Getopt-Long-2.24 - - dev-perl/HTML-Tree - dev-perl/HTML-Format - dev-perl/libwww-perl - - virtual/perl-digest-base - >=dev-perl/DBI-1.37 - dev-perl/Test-Inline + dev-perl/Cache-Simple-TimedExpiry + dev-perl/Calendar-Simple >=dev-perl/class-returnvalue-0.40 - >=dev-perl/dbix-searchbuilder-1.35 - dev-perl/text-template - >=virtual/perl-File-Spec-0.8 + >=dev-perl/CSS-Squish-0.06 + >=dev-perl/DBI-1.37 + >=dev-perl/dbix-searchbuilder-1.50 + dev-perl/GD + dev-perl/GDGraph + dev-perl/GDTextUtil + dev-perl/HTML-Format + >dev-perl/HTML-Mason-1.31 dev-perl/HTML-Parser >=dev-perl/HTML-Scrubber-0.08 - virtual/perl-libnet - >=dev-perl/log-dispatch-2.0 - >=dev-perl/locale-maketext-lexicon-0.32 + dev-perl/HTML-Tree + >=dev-perl/HTTP-Server-Simple-0.07 + >=dev-perl/HTTP-Server-Simple-Mason-0.09 + dev-perl/libwww-perl dev-perl/locale-maketext-fuzzy - >=dev-perl/MIME-tools-5.417 + >=dev-perl/locale-maketext-lexicon-0.32 + >=dev-perl/log-dispatch-2.0 >=dev-perl/MailTools-1.60 - dev-perl/text-wrapper - dev-perl/Time-modules - virtual/perl-File-Temp + >=dev-perl/MIME-tools-5.417 + dev-perl/Module-Versions-Report + dev-perl/regexp-common dev-perl/TermReadKey dev-perl/text-autoformat - >=dev-perl/Text-Quoted-1.3 + >=dev-perl/Text-Quoted-2.02 + dev-perl/text-template + >=dev-perl/Text-WikiFormat-0.76 + dev-perl/text-wrapper + dev-perl/TimeDate + dev-perl/Time-modules >=dev-perl/Tree-Simple-1.04 + dev-perl/UNIVERSAL-require + >=dev-perl/XML-RSS-1.05 + >=virtual/perl-CGI-2.92 + virtual/perl-digest-base + >=virtual/perl-Digest-MD5-2.27 + >=virtual/perl-File-Spec-0.8 + virtual/perl-File-Temp + >=virtual/perl-Getopt-Long-2.24 + virtual/perl-libnet + >=virtual/perl-locale-maketext-1.06 virtual/perl-Scalar-List-Utils - dev-perl/Module-Versions-Report - dev-perl/Cache-Simple-TimedExpiry - dev-perl/XML-Simple - dev-perl/regexp-common + >=virtual/perl-Storable-2.08 + virtual/perl-Time-HiRes + + !lighttpd? ( dev-perl/Apache-DBI ) + lighttpd? ( dev-perl/FCGI ) + fastcgi? ( dev-perl/FCGI ) + mysql? ( >=dev-perl/DBD-mysql-2.1018 ) + postgres? ( >=dev-perl/DBD-Pg-1.43 ) " -RDEPEND=" - ${DEPEND} +RDEPEND="${DEPEND} virtual/mta !lighttpd? ( ${APACHE2_DEPEND} ) lighttpd? ( >=www-servers/lighttpd-1.3.13 ) " -LICENSE="GPL-2" +need_httpd_cgi add_user_rt() { # add new user @@ -128,8 +121,6 @@ add_user_rt() { pkg_setup() { webapp_pkg_setup - - use mysql && ewarn "RT needs MySQL with innodb support" ewarn ewarn "If you are upgrading from an existing _RT2_ installation," ewarn "stop this ebuild (Ctrl-C now), download the upgrade tool," @@ -139,15 +130,14 @@ pkg_setup() { epause 5 enewgroup rt >/dev/null add_user_rt || die "Could not add user" - } src_unpack() { unpack ${A} - cd ${S} + cd "${S}" # add Gentoo-specific layout - cat ${FILESDIR}/config.layout-gentoo >> config.layout + cat "${FILESDIR}"/config.layout-gentoo >> config.layout sed -e "s|PREFIX|${D}/${MY_HOSTROOTDIR}/${PF}| s|HTMLDIR|${D}/${MY_HTDOCSDIR}|g" -i ./config.layout || die @@ -156,22 +146,20 @@ src_unpack() { } src_compile() { - local web="apache" - useq lighttpd && web="lighttpd" + use lighttpd && web="lighttpd" - local dbtype="" - local dba="" + local dbtype dba - if useq mysql; then + if use mysql; then dbtype="--with-db-type=mysql" dba="--with-db-dba=root" fi - if useq postgres;then + if use postgres;then dbtype="--with-db-type=Pg" dba="--with-db-dba=postgres" fi - if useq postgres && useq mysql; then + if use postgres && use mysql; then ewarn "Both mysql and postgres USE flags enabled, default is mysql." ewarn "You can set the default value in RT_SiteConfig before DB init." dbtype="--with-db-type=mysql" @@ -188,48 +176,53 @@ src_compile() { ${dbtype} ${dba} # check for missing deps and ask to report if something is broken - local myconf="--verbose $(use_with mysql) \ - $(use_with postgres pg) \ - $(use_with fastcgi) \ - $(use_with lighttpd fastcgi)" - if ! useq fastcgi && ! useq lighttpd ; then + local myconf="--verbose \ + $(enable_extension_withonly mysql mysql) \ + $(enable_extension_withonly postgresql postgres) \ + $(enable_extension_withonly fastcgi fastcgi) \ + $(enable_extension_withonly fastcgi lighttpd)" \ + + if ! useq fastcgi && ! useq lighttpd; then myconf="${myconf} --with-modperl2" fi - /usr/bin/perl ./sbin/rt-test-dependencies ${myconf} > ${T}/t - if grep -q "MISSING" ${T}/t; then + /usr/bin/perl ./sbin/rt-test-dependencies ${myconf} > "${T}"/t + if grep -q "MISSING" "${T}"/t; then ewarn "Missing Perl dependency!" ewarn - cat ${T}/t + cat "${T}"/t | grep MISSING ewarn - ewarn "Please file a bug in the Gentoo Bugzilla with the information above" - ewarn "and assign it to rl03@gentoo.org" + ewarn "Please run perl-cleaner. If the problem persists," + ewarn "please file a bug in the Gentoo Bugzilla with the information above" die "Missing dependencies." fi } src_install() { webapp_src_preinst - - make install + emake install || die # make sure we don't clobber existing site configuration - rm -f ${D}/${MY_HOSTROOTDIR}/${PF}/etc/RT_SiteConfig.pm + rm -f "${D}"/${MY_HOSTROOTDIR}/${PF}/etc/RT_SiteConfig.pm - # copy upgrade files - cp -R etc/upgrade ${D}/${MY_HOSTROOTDIR}/${PF} + # fix paths + find "${D}" -type f -print0 | xargs -0 dosed - cd ${D} - grep -Rl "${D}" * | xargs dosed + # copy upgrade files + insinto "${MY_HOSTROOTDIR}/${PF}" + doins -r etc/upgrade - if useq lighttpd; then - newinitd ${FILESDIR}/${PN}.init.d ${PN} - newconfd ${FILESDIR}/${PN}.conf.d ${PN} + if use lighttpd; then + newinitd "${FILESDIR}"/${PN}.init.d ${PN} + newconfd "${FILESDIR}"/${PN}.conf.d ${PN} else - local CONF="rt_apache2_fcgi.conf rt_apache2.conf" - cd ${FILESDIR} && cp ${CONF} ${D}/${MY_HOSTROOTDIR}/${PF}/etc + doins "${FILESDIR}"/{rt_apache2_fcgi.conf,rt_apache2.conf} fi - webapp_postinst_txt en ${FILESDIR}/${PV}/postinstall-en.txt - webapp_hook_script ${FILESDIR}/${PV}/reconfig + + webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/var + + webapp_postinst_txt en "${FILESDIR}"/3.4.5/postinstall-en.txt + webapp_hook_script "${FILESDIR}"/3.4.5/reconfig + webapp_src_install }