Dependency checking fixes wrt bug #110030.

Package-Manager: portage-2.0.51.22-r2

diff --git a/www-apps/rt/ChangeLog b/www-apps/rt/ChangeLog
index e7d8ad035b406f22abe274b548b03a61a73e43a9..76001ff1aa830f94614e4e126abd91557200e0c2 100644 (file)
--- a/www-apps/rt/ChangeLog
+++ b/www-apps/rt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/rt
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.22 2005/09/24 11:01:36 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.23 2005/10/24 14:00:13 rl03 Exp $
+
+  24 Oct 2005; Renat Lumpau <rl03@gentoo.org> -rt-3.4.2-r1.ebuild,
+  rt-3.4.3.ebuild:
+  Dependency checking fixes wrt bug #110030.
 
   24 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> rt-3.4.3.ebuild:
   Added to ~ppc.

diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest
index 101b027e0dead301bd1fa82d24c924bdae0f576e..b62db6fc02840b3ffeeb45e09cfd876bb5b2af65 100644 (file)
--- a/www-apps/rt/Manifest
+++ b/www-apps/rt/Manifest
@@ -1,18 +1,26 @@
-MD5 224c312cc23d02aa06c26a4da3cc1f90 metadata.xml 221
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c6ad11fb5960b43189687370b23f3956 rt-3.4.3.ebuild 5967
 MD5 939107934a799efb520c62c057341273 rt-3.2.1.ebuild 4362
-MD5 d59ca5db6fb7df2efa715b7ff89c19cc ChangeLog 3839
-MD5 80bbc5f05aa4e04b8c49612f27f797b2 rt-3.4.3.ebuild 5596
-MD5 ff854fbeea1bb6607c7e72746159fda4 rt-3.4.2-r1.ebuild 5572
-MD5 74849aa771037cfdb03fc4a8b8d01af6 files/digest-rt-3.4.3 61
-MD5 af335c7cab7bfc09dbd08feba51d2879 files/digest-rt-3.4.2-r1 61
+MD5 29197b69d7a3cb53503620e0f1aa46a2 ChangeLog 3969
+MD5 224c312cc23d02aa06c26a4da3cc1f90 metadata.xml 221
 MD5 5f5c3f76ea4676e743612e38341780fe files/digest-rt-3.2.1 61
-MD5 3d2e627499ec86839cc0099719fcc3bd files/3.4.2/rt_apache.conf 574
+MD5 74849aa771037cfdb03fc4a8b8d01af6 files/digest-rt-3.4.3 61
+MD5 15fc088b37155656e008679f3c07eea7 files/3.2.1/postinstall-en.txt 1648
+MD5 0706d6edcd1c4e23f526d611c9c6b531 files/3.2.1/reconfig 1170
 MD5 4dcfdbf63b882b398473d975b34fa23e files/3.4.2/config.layout-gentoo 616
-MD5 bf81df666e02df7b1e6f73ee9908a767 files/3.4.2/reconfig 1206
-MD5 73c354dd8ba0f64a74e5c6cd01b33834 files/3.4.2/rt_apache2_fcgi.conf 993
 MD5 b54ebbfd3fc1dd2a49d396e3dba2b857 files/3.4.2/rt_apache1_fcgi.conf 990
-MD5 c807deb11e08ab9f37a658bd5e971c7f files/3.4.2/rt.conf.d 405
 MD5 3a24e1ccdc0d6b7c6b0d40e19c586365 files/3.4.2/postinstall-en.txt 703
+MD5 3d2e627499ec86839cc0099719fcc3bd files/3.4.2/rt_apache.conf 574
+MD5 c807deb11e08ab9f37a658bd5e971c7f files/3.4.2/rt.conf.d 405
 MD5 54a1cd04dc0d0788ce920d941e5601d0 files/3.4.2/rt.init.d 1019
-MD5 0706d6edcd1c4e23f526d611c9c6b531 files/3.2.1/reconfig 1170
-MD5 15fc088b37155656e008679f3c07eea7 files/3.2.1/postinstall-en.txt 1648
+MD5 bf81df666e02df7b1e6f73ee9908a767 files/3.4.2/reconfig 1206
+MD5 73c354dd8ba0f64a74e5c6cd01b33834 files/3.4.2/rt_apache2_fcgi.conf 993
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDXOkFEzitwsaoONoRAtLcAJ9kXFdVOAfm8wTP0QDEjdp28oDZtQCgjAAX
+8uckmYdsRjaVw9WOEJMLBfw=
+=KgcW
+-----END PGP SIGNATURE-----

diff --git a/www-apps/rt/files/digest-rt-3.4.2-r1 b/www-apps/rt/files/digest-rt-3.4.2-r1
deleted file mode 100644 (file)
index 550fde3..0000000
--- a/www-apps/rt/files/digest-rt-3.4.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a50158055fff423a557d43335ae1dc81 rt-3.4.2.tar.gz 1359775

diff --git a/www-apps/rt/rt-3.4.2-r1.ebuild b/www-apps/rt/rt-3.4.2-r1.ebuild
deleted file mode 100644 (file)
index 2b8f66d..0000000
--- a/www-apps/rt/rt-3.4.2-r1.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.4.2-r1.ebuild,v 1.8 2005/09/11 17:49:54 rl03 Exp $
-
-inherit webapp eutils
-
-IUSE="mysql postgres fastcgi apache2 lighttpd"
-
-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
-       ftp://ftp.eu.uu.net/pub/unix/ticketing/${PN}/release/${P}.tar.gz
-       ftp://rhinst.ece.cmu.edu/${PN}/release/${P}.tar.gz"
-
-KEYWORDS="~x86 ~ppc"
-
-DEPEND="
-       >=net-www/webapp-config-1.11-r1
-       >=dev-lang/perl-5.8.3
-       >=dev-perl/Params-Validate-0.02
-       dev-perl/Cache-Cache
-       >=dev-perl/Exception-Class-1.14
-       perl-core/CGI
-       >dev-perl/HTML-Mason-1.28
-       dev-perl/MLDBM
-       dev-perl/FreezeThaw
-       >=dev-perl/Apache-Session-1.53
-       dev-perl/XML-RSS
-       >=dev-perl/HTTP-Server-Simple-0.07
-       >=dev-perl/HTTP-Server-Simple-Mason-0.05
-       dev-perl/HTML-Tree
-       dev-perl/HTML-Format
-       dev-perl/libwww-perl
-       >=dev-perl/DBI-1.37
-       dev-perl/Test-Inline
-       >=dev-perl/class-returnvalue-0.40
-       >=dev-perl/dbix-searchbuilder-1.27
-       dev-perl/text-template
-       dev-perl/HTML-Parser
-       >=dev-perl/HTML-Scrubber-0.08
-       >=dev-perl/log-dispatch-2.0
-       >=dev-perl/locale-maketext-lexicon-0.32
-       dev-perl/locale-maketext-fuzzy
-       >=dev-perl/MIME-tools-5.417
-       >=dev-perl/MailTools-1.60
-       dev-perl/text-wrapper
-       dev-perl/Time-modules
-       dev-perl/TermReadKey
-       >=dev-perl/Text-Quoted-1.3
-       >=dev-perl/Tree-Simple-1.04
-       dev-perl/Module-Versions-Report
-       dev-perl/Cache-Simple-TimedExpiry
-       dev-perl/XML-Simple
-       dev-perl/regexp-common
-       dev-perl/WWW-Mechanize
-       dev-perl/Test-WWW-Mechanize
-       dev-perl/Module-Refresh
-
-       dev-perl/Font-AFM
-       dev-perl/text-autoformat
-       dev-perl/text-reform
-"
-
-RDEPEND="
-       ${DEPEND}
-       virtual/mta
-       mysql? ( >=dev-db/mysql-4.0.13 >=dev-perl/DBD-mysql-2.1018 )
-       postgres? ( >=dev-db/postgresql-7.4.2-r1 >=dev-perl/DBD-Pg-1.41 )
-       !lighttpd? (
-               >=dev-perl/Apache-DBI-0.92
-               apache2? ( >=net-www/apache-2
-                       fastcgi? ( dev-perl/FCGI net-www/mod_fastcgi )
-                       !fastcgi? ( >=www-apache/libapreq2-2.06 ) )
-               !apache2? ( =net-www/apache-1*
-                       fastcgi? ( dev-perl/FCGI net-www/mod_fastcgi )
-                       !fastcgi? ( =www-apache/libapreq-1* ) ) )
-       lighttpd? (
-               >=www-servers/lighttpd-1.3.13
-               dev-perl/FCGI )
-"
-
-LICENSE="GPL-2"
-
-add_user_rt() {
-       # add new user
-       # suexec2 requires uid >= 1000; enewuser is of no help here
-       # From: Mike Frysinger <vapier@gentoo.org>
-       # Date: Fri, 17 Jun 2005 08:41:44 -0400
-       # i'd pick a 5 digit # if i were you
-
-       local euser="rt"
-
-       # first check if username rt exists
-       if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
-               # check uid
-               rt_uid=$(egetent passwd "${euser}" | cut -d: -f3)
-               if $(expr ${rt_uid} '<' 1000 > /dev/null); then
-                       ewarn "uid of user rt is less than 1000. suexec2 will not work."
-                       ewarn "If you want to use FastCGI, please delete the user 'rt'"
-                       ewarn "from your system and re-emerge www-apps/rt"
-                       epause
-               fi
-               return 0 # all is well
-       fi
-
-       # add user
-       # stolen from enewuser
-       local pwrange euid
-
-       pwrange=$(seq 10001 11001)
-       for euid in ${pwrange} ; do
-               [[ -z $(egetent passwd ${euid}) ]] && break
-       done
-       if [[ ${euid} == "11001" ]]; then
-               # she gets around, doesn't she?
-               die "No available uid's found"
-       fi
-
-       einfo " - Userid: ${euid}"
-
-       enewuser rt ${euid} /bin/false /dev/null rt > /dev/null
-       return 0
-}
-
-pkg_setup() {
-       webapp_pkg_setup
-
-       if useq mysql; then
-               ewarn "RT needs MySQL with innodb support"
-       fi
-       ewarn
-       ewarn "If you are upgrading from an existing _RT2_ installation,"
-       ewarn "stop this ebuild (Ctrl-C now), download the upgrade tool,"
-       ewarn "http://bestpractical.com/pub/rt/devel/rt2-to-rt3.tar.gz"
-       ewarn "and follow the included instructions."
-       ewarn
-       enewgroup rt >/dev/null
-       add_user_rt || die "Could not add user"
-
-}
-
-src_unpack() {
-       unpack ${A}
-       cd ${S}
-
-       # add Gentoo-specific layout
-       cat ${FILESDIR}/${PV}/config.layout-gentoo >> config.layout
-       sed -e "s|PREFIX|${D}/${MY_HOSTROOTDIR}/${PF}|
-                       s|HTMLDIR|${D}/${MY_HTDOCSDIR}|g" -i ./config.layout || die
-}
-
-src_compile() {
-
-       local web="apache"
-       if useq lighttpd; then
-               web="lighttpd"
-       fi
-
-       ./configure --enable-layout=Gentoo \
-               --with-bin-owner=rt \
-               --with-libs-owner=rt \
-               --with-libs-group=rt \
-               --with-rt-group=rt \
-               --with-web-user=${web} \
-               --with-web-group=${web}
-
-       # check for missing deps and ask to report if something is broken
-       /usr/bin/perl ./sbin/rt-test-dependencies --verbose \
-               $(use_with mysql) \
-               $(use_with postgres pg) > ${T}/t
-       if grep -q "MISSING" ${T}/t; then
-               ewarn "Missing Perl dependency!"
-               ewarn
-               cat ${T}/t
-               ewarn
-               ewarn "Please file a bug in the Gentoo Bugzilla with the information above"
-               ewarn "and assign it to rl03@gentoo.org"
-               die "Missing dependencies."
-       fi
-}
-
-src_install() {
-       webapp_src_preinst
-
-       make install
-
-       # make sure we don't clobber existing site configuration
-       rm -f ${D}/${MY_HOSTROOTDIR}/${PF}/etc/RT_SiteConfig.pm
-
-       # copy upgrade files
-       cp -R etc/upgrade ${D}/${MY_HOSTROOTDIR}/${PF}
-
-       cd ${D}
-       grep -Rl "${D}" * | xargs dosed
-
-       if useq lighttpd; then
-               newinitd ${FILESDIR}/${PV}/${PN}.init.d ${PN}
-               insinto /etc/conf.d
-               newins ${FILESDIR}/${PV}/${PN}.conf.d ${PN}
-       else
-               if useq apache2; then
-                       webapp_server_configfile apache2 ${FILESDIR}/${PV}/rt_apache2_fcgi.conf
-               else
-                       webapp_server_configfile apache1 ${FILESDIR}/${PV}/rt_apache.conf
-                       webapp_server_configfile apache1 ${FILESDIR}/${PV}/rt_apache1_fcgi.conf
-               fi
-       fi
-       webapp_postinst_txt en ${FILESDIR}/${PV}/postinstall-en.txt
-       webapp_hook_script ${FILESDIR}/${PV}/reconfig
-       webapp_src_install
-}

diff --git a/www-apps/rt/rt-3.4.3.ebuild b/www-apps/rt/rt-3.4.3.ebuild
index f0c84e099262e507531a95adff601a1b1b6ebbc9..e730304bde08aa8054df6d96e328ef6b2e2441e6 100644 (file)
--- a/www-apps/rt/rt-3.4.3.ebuild
+++ b/www-apps/rt/rt-3.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.4.3.ebuild,v 1.5 2005/09/24 11:01:36 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.4.3.ebuild,v 1.6 2005/10/24 14:00:13 rl03 Exp $
 
 inherit webapp eutils
 
@@ -148,6 +148,9 @@ src_unpack() {
        cat ${FILESDIR}/3.4.2/config.layout-gentoo >> config.layout
        sed -e "s|PREFIX|${D}/${MY_HOSTROOTDIR}/${PF}|
                        s|HTMLDIR|${D}/${MY_HTDOCSDIR}|g" -i ./config.layout || die
+
+       # don't need to check dev dependencies
+       sed -e "s|\$args{'with-DEV'} =1;|#\$args{'with-DEV'} =1;|" -i sbin/rt-test-dependencies.in || die
 }
 
 src_compile() {
@@ -166,9 +169,16 @@ src_compile() {
                --with-web-group=${web}
 
        # check for missing deps and ask to report if something is broken
-       /usr/bin/perl ./sbin/rt-test-dependencies --verbose \
-               $(use_with mysql) \
-               $(use_with postgres pg) > ${T}/t
+       local myconf="--verbose $(use_with mysql) \
+               $(use_with postgres pg) \
+               $(use_with fastcgi) \
+               $(use_with lighttpd fastcgi)"
+       if ! useq fastcgi && ! useq lighttpd; then
+               myconf="${myconf} $(use_with apache2 modperl2)"
+               ! useq apache2 && myconf="${myconf} --with-modperl1"
+       fi
+
+       /usr/bin/perl ./sbin/rt-test-dependencies ${myconf} > ${T}/t
        if grep -q "MISSING" ${T}/t; then
                ewarn "Missing Perl dependency!"
                ewarn