fix stable ebuild too wrt #208584; cleanup

Package-Manager: portage-2.1.4.4

diff --git a/www-apps/bugport/ChangeLog b/www-apps/bugport/ChangeLog
index 70af3b8c011a192a066b9b8accf2daf1b55daf24..73ca5345e5834ce2a1ba4bf7471394cb6ed380fd 100644 (file)
--- a/www-apps/bugport/ChangeLog
+++ b/www-apps/bugport/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/bugport
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugport/ChangeLog,v 1.8 2008/02/17 23:31:18 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugport/ChangeLog,v 1.9 2008/02/18 11:23:48 hollow Exp $
+
+  18 Feb 2008; Benedikt Böhm <hollow@gentoo.org> bugport-1.146.ebuild,
+  bugport-1.147.ebuild:
+  fix stable ebuild too wrt #208584; cleanup
 
   17 Feb 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml:
   fix metadata

diff --git a/www-apps/bugport/Manifest b/www-apps/bugport/Manifest
index 4880ef56bc0a9819f349fdb72fb598d1beac8f11..530f1bdc31288403a8d4830d46c97f9e0f8df7c8 100644 (file)
--- a/www-apps/bugport/Manifest
+++ b/www-apps/bugport/Manifest
@@ -3,14 +3,14 @@ Hash: SHA1
 
 DIST bugport_1.146.tar.gz 937751 RMD160 9668a6d3a9508dbec2cbe5c25a8dc2e63cafbb1e SHA1 fbf8355e62052015dde8cf9a11427565ff2e0fe7 SHA256 6f9c6da82bd19cfbae24d393d249cfb87bf0c7c953b8c049d6c7a933bef4b4eb
 DIST bugport_1.147.tar.gz 937810 RMD160 ff202a1b65b10a5274a6c471fa148d1de4a1110a SHA1 200c951f1884950c89525f790254454499bcb4e1 SHA256 d99a8af2cecfdf2cb276fc3c886efc7bf74e383ea65b23eb350a8e3db529997c
-EBUILD bugport-1.146.ebuild 1735 RMD160 c669bbe23c79a3712497af8c9354aba7aab30418 SHA1 66b943ad096356edf899310dec5eb793bc20a47d SHA256 d281bdf07e7a571d4d6505ecc3454e6ee5a7b9018730f2b63dcfa3e12d359d05
-EBUILD bugport-1.147.ebuild 1954 RMD160 ddcf625ba9ee42688fb2d646c93fd9f6ca943d95 SHA1 00190c760ebc900842c418ad8e10b4a1f29e9263 SHA256 b062f98b686971068d9d742d34e5b9d100dfb09a191c3a7bb090fca79c180d43
-MISC ChangeLog 1783 RMD160 3d65ca529f491a740b728236217c02fbddd5ee7f SHA1 c99985d0fecff7b80a9f39a0c84b2ff4d1ec7e38 SHA256 4a3ffc25cbb23330832ae28962daf218277b1bacc73e33b7beb2e173cd7a8419
+EBUILD bugport-1.146.ebuild 1486 RMD160 f10884d1342b5db0dd424739e6e279cc20c1ef43 SHA1 e6dc9983bacc8a5e15837a37943e93444e95c065 SHA256 a28ce8bdf45897880994bb01552d6d6576aa4eca72a54ec60f68272dbf300727
+EBUILD bugport-1.147.ebuild 1929 RMD160 4565a34413897320f7466ccec616e4b691ad4168 SHA1 7240e77161e62fc9d4d79b35e1d9703e3c50a0b3 SHA256 d424b9fd765dc71db246ac33ee9b84be7f036fed959e95d955142a371080bed6
+MISC ChangeLog 1925 RMD160 9d4b7ed10213a342d8c39e999a21e3f8b52d4561 SHA1 d910c10bbd0e5081b3a9735a7a056534544d6a87 SHA256 325e0b82882d6393204ec2cad40d847adc3102c1a4d23b8b5b28be29da97aade
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAke4w8wACgkQmPFBzbX68WHzpQCfVQtjjd8PaQhdiqet6wbXo8Lx
-8RQAn2dp/mdu0DPcV6u0YlTiGSrU8Hzx
-=EKLw
+iEYEARECAAYFAke5as4ACgkQmPFBzbX68WEl7QCdGH6xEPPRC6df7ovsaA59aEYB
+dsUAnirIqEGmP8rmdj51Nq4Ma9XTbW2E
+=BHP5
 -----END PGP SIGNATURE-----

diff --git a/www-apps/bugport/bugport-1.146.ebuild b/www-apps/bugport/bugport-1.146.ebuild
index b11e58f4e525f81c4119920f861c32833223c76f..38b20b2f55b05dfaa0e6303b0fa00e2989931ba4 100644 (file)
--- a/www-apps/bugport/bugport-1.146.ebuild
+++ b/www-apps/bugport/bugport-1.146.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugport/bugport-1.146.ebuild,v 1.3 2008/02/17 21:00:56 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugport/bugport-1.146.ebuild,v 1.4 2008/02/18 11:23:48 hollow Exp $
 
-inherit webapp
+inherit webapp depend.php
 
 DESCRIPTION="Web-based system for managing tasks and defects throughout the software development process"
 HOMEPAGE="http://www.incogen.com/index.php?type=General&param=bugport"
@@ -10,56 +10,45 @@ SRC_URI="http://www.incogen.com/downloads/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="BSD"
 KEYWORDS="x86 ~ppc"
-
 IUSE=""
-RDEPEND=">=virtual/php-4.3
-       dev-php/adodb"
-DEPEND=""
+
+DEPEND="dev-php/adodb"
+
+need_php_httpd
 
 S=${WORKDIR}/${PN}_${PV}
 
-src_compile() {
-       einfo "Nothing to compile"
+pkg_setup() {
+       webapp_pkg_setup
+       has_php
+       require_php_with_use mysql
 }
 
 src_install() {
-       # prepare ${D} for our arrival
        webapp_src_preinst
 
-       # Fix INSTALL.txt to let the user know where the SQL scripts live
-       sed -i \
-         -e "s|create_tables.sql|${MY_SQLSCRIPTSDIR}/mysql/${PV}_create.sql|" \
-         INSTALL.txt
+       # fix INSTALL.txt to let the user know where the SQL scripts live
+       sed -i -e "s|create_tables.sql|${MY_SQLSCRIPTSDIR}/mysql/${PV}_create.sql|" \
+               INSTALL.txt || die "sed failed in INSTALL.txt"
 
-       # Add the post-installation instructions
-       webapp_postinst_txt en INSTALL.txt
+       webapp_sqlscript mysql create_tables.sql
+       rm -f *.sql
 
-       # Install documents
        dodoc *.txt
-       rm *.txt
        docinto devel-docs
        dodoc devel-docs/*
-       rm -rf devel-docs
-       rm -rf install-gentoo-unsupported
-
-       # Install SQL scripts
-       #webapp_sqlscript mysql add_indices.sql
-       #webapp_sqlscript mysql alter_user_table.sql
-       #webapp_sqlscript mysql create_config_table.sql
-       webapp_sqlscript mysql create_tables.sql
+       rm -rf *.txt devel-docs install-gentoo-unsupported
 
-       # Fix config file to know where to find adodb
-       sed -i \
-         -e 's|^\(# \+\)\?\$adoDir.\+$|$adoDir = "/usr/lib/php/adodb/"; # DO NOT CHANGE!|' \
-         conf/config.php
+       # fix config file to know where to find adodb
+       sed -i -e 's|^\(# \+\)\?\$adoDir.\+$|$adoDir = "/usr/lib/php/adodb/"; # DO NOT CHANGE!|' \
+               conf/config.php || die "failed to fix adodb location in config.php."
 
-       # Install
-       cp -R . "${D}"${MY_HTDOCSDIR}
+       insinto ${MY_HTDOCSDIR}
+       doins -r .
 
-       # Identify the configuration files that this app uses
        webapp_configfile ${MY_HTDOCSDIR}/conf/config.php
        webapp_configfile ${MY_HTDOCSDIR}/conf/configuration.php
 
-       # Let webapp.eclass do the rest
+       webapp_postinst_txt en INSTALL.txt
        webapp_src_install
 }

diff --git a/www-apps/bugport/bugport-1.147.ebuild b/www-apps/bugport/bugport-1.147.ebuild
index 2bb550c08b85fd68ef8c1da780ef6e068b1bbe89..209c8681889023a48186c151d1a0021c88e6a99e 100644 (file)
--- a/www-apps/bugport/bugport-1.147.ebuild
+++ b/www-apps/bugport/bugport-1.147.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugport/bugport-1.147.ebuild,v 1.1 2008/02/17 21:00:56 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugport/bugport-1.147.ebuild,v 1.2 2008/02/18 11:23:48 hollow Exp $
 
 inherit webapp depend.php
 
@@ -21,7 +21,6 @@ S=${WORKDIR}/${PN}_${PV}
 pkg_setup() {
        webapp_pkg_setup
        has_php
-
        if use mysql ; then
                require_php_with_use mysql
        else
@@ -35,14 +34,11 @@ pkg_setup() {
 src_install() {
        webapp_src_preinst
 
-       # Fix INSTALL.txt to let the user know where the SQL scripts live
+       # fix INSTALL.txt to let the user know where the SQL scripts live
        sed -i -e "s|create_tables.sql|${MY_SQLSCRIPTSDIR}/mysql/${PV}_create.sql|" \
                INSTALL.txt || die "sed failed in INSTALL.txt"
 
-       webapp_postinst_txt en INSTALL.txt
-
-       local dbfiles="add_indices.sql alter_user_table.sql create_config_table.sql create_tables.sql"
-       for i in ${dbfiles} ; do
+       for i in add_indices.sql alter_user_table.sql create_config_table.sql create_tables.sql; do
                use mysql && webapp_sqlscript mysql ${i} || dodoc ${i}
        done
        rm -f *.sql
@@ -52,14 +48,16 @@ src_install() {
        dodoc devel-docs/*
        rm -rf *.txt devel-docs install-gentoo-unsupported
 
-       # Fix config file to know where to find adodb
+       # fix config file to know where to find adodb
        sed -i -e 's|^\(# \+\)\?\$adoDir.\+$|$adoDir = "/usr/lib/php/adodb/"; # DO NOT CHANGE!|' \
                conf/config.php || die "failed to fix adodb location in config.php."
 
-       cp -R . "${D}"${MY_HTDOCSDIR}
+       insinto ${MY_HTDOCSDIR}
+       doins -r .
 
        webapp_configfile ${MY_HTDOCSDIR}/conf/config.php
        webapp_configfile ${MY_HTDOCSDIR}/conf/configuration.php
 
+       webapp_postinst_txt en INSTALL.txt
        webapp_src_install
 }