Improve db configuration. Thanks to Ruslan Zakirov for initial patch.

Package-Manager: portage-2.1_pre9-r5

3 files changed, 36 insertions, 16 deletions

diff --git a/www-apps/rt/ChangeLog b/www-apps/rt/ChangeLog
index 26e8be64274c..8f8a50e1ad38 100644
--- a/www-apps/rt/ChangeLog
+++ b/www-apps/rt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/rt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.35 2006/04/24 15:57:33 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.36 2006/04/29 20:15:51 rl03 Exp $
+
+  29 Apr 2006; Renat Lumpau <rl03@gentoo.org> rt-3.4.5.ebuild:
+  Improve db configuration. Thanks to Ruslan Zakirov for initial patch.
 
   24 Apr 2006; Renat Lumpau <rl03@gentoo.org> rt-3.4.5.ebuild:
   Fix dep logic
diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest
index 471597f77dc4..2dc3dcfb273b 100644
--- a/www-apps/rt/Manifest
+++ b/www-apps/rt/Manifest
@@ -51,14 +51,14 @@ EBUILD rt-3.2.1.ebuild 4362 RMD160 9762ad63416c1d1b40fa3bb458dfd8df23869905 SHA1
 MD5 939107934a799efb520c62c057341273 rt-3.2.1.ebuild 4362
 RMD160 9762ad63416c1d1b40fa3bb458dfd8df23869905 rt-3.2.1.ebuild 4362
 SHA256 a54d76fd63e036ef880857b543c3b769ac3866272199cad19aa6ec6b4084a769 rt-3.2.1.ebuild 4362
-EBUILD rt-3.4.5.ebuild 5963 RMD160 df80bcfc81da5d377c7195df073e4386bc0e9103 SHA1 c1be2dc36cd218f24a531bf4f267f143790b868f SHA256 e33f8e699c39c149d11110ef4a7de03f64610f21d544932170093e2dfe2f0d4e size 5963
-MD5 4c7c07b373bac671a38f63b547cc1224 rt-3.4.5.ebuild 5963
-RMD160 df80bcfc81da5d377c7195df073e4386bc0e9103 rt-3.4.5.ebuild 5963
-SHA256 e33f8e699c39c149d11110ef4a7de03f64610f21d544932170093e2dfe2f0d4e rt-3.4.5.ebuild 5963
-MISC ChangeLog 5759 RMD160 6f667632108737083e3023e9b1fba83189fb4909 SHA1 21e556ec785242e53c5858316298b29a2e5dfd99 SHA256 8ea4569a29ac1f9798ae62a2a7ed6408577ec4c2aac276ed3001a1f9747fcb9d size 5759
-MD5 25437800154ffb68723c951dc9154e08 ChangeLog 5759
-RMD160 6f667632108737083e3023e9b1fba83189fb4909 ChangeLog 5759
-SHA256 8ea4569a29ac1f9798ae62a2a7ed6408577ec4c2aac276ed3001a1f9747fcb9d ChangeLog 5759
+EBUILD rt-3.4.5.ebuild 6421 RMD160 169e1dd8fc611f446d00b815321506c66b9574bc SHA1 dceebf4fc632ce9fa35ef9eedce1000970d9565f SHA256 be3737bd380ea03a3857a42919b0d7b7d965074f8c9597649181fb40309e0ae2 size 6421
+MD5 f2f777474730949eeaeb2feda02409cf rt-3.4.5.ebuild 6421
+RMD160 169e1dd8fc611f446d00b815321506c66b9574bc rt-3.4.5.ebuild 6421
+SHA256 be3737bd380ea03a3857a42919b0d7b7d965074f8c9597649181fb40309e0ae2 rt-3.4.5.ebuild 6421
+MISC ChangeLog 5895 RMD160 f8e6d0d68a1b60985072e684f0e09e7c5b1c5ad8 SHA1 0a73a0c9a66ec59f96958caf100792c56e411b01 SHA256 7f4db17cc2421e7100e77511cc9135530c48c28570539dcbd72224fb9b9cc1f0 size 5895
+MD5 001b41809b4e0b6a3a2e58d1fb58c0fa ChangeLog 5895
+RMD160 f8e6d0d68a1b60985072e684f0e09e7c5b1c5ad8 ChangeLog 5895
+SHA256 7f4db17cc2421e7100e77511cc9135530c48c28570539dcbd72224fb9b9cc1f0 ChangeLog 5895
 MISC metadata.xml 221 RMD160 cb776d24349e87dce7784e24e35d9d84f91da1f7 SHA1 0f301c536f2b097bd3ff21cc1dd05fe6d8f4713e SHA256 e9d20baa1edc4def48ad57c9620d3d0ee361888408261619ff9ea9edb47ce67a size 221
 MD5 224c312cc23d02aa06c26a4da3cc1f90 metadata.xml 221
 RMD160 cb776d24349e87dce7784e24e35d9d84f91da1f7 metadata.xml 221
@@ -72,7 +72,7 @@ SHA256 f8d66759e366aa8d9a0a629072bd4f0557474da2110540cd45390fc62e38d510 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFETPV1EzitwsaoONoRAr9GAJ4nwTzdyBRg0s+KWVkLNDUC5WTr0gCfVu7+
-wYJT/MAPVTcNoPgkVh+jrII=
-=ZfRG
+iD8DBQFEU8l/EzitwsaoONoRAmJMAKCUQAsZNd7R1v+CW64pUPsxx1vPWwCePGWA
+leUYsWzOVAKz4NJ9XZYbIcc=
+=m0n3
 -----END PGP SIGNATURE-----
diff --git a/www-apps/rt/rt-3.4.5.ebuild b/www-apps/rt/rt-3.4.5.ebuild
index 74f5a4d1fd2d..7974fddc8fbd 100644
--- a/www-apps/rt/rt-3.4.5.ebuild
+++ b/www-apps/rt/rt-3.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.8 2006/04/24 15:57:33 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.4.5.ebuild,v 1.9 2006/04/29 20:15:51 rl03 Exp $
 
 inherit webapp eutils
 
@@ -166,8 +166,24 @@ src_unpack() {
 src_compile() {
 
 	local web="apache"
-	if useq lighttpd; then
-		web="lighttpd"
+	useq lighttpd && web="lighttpd"
+
+	local dbtype=""
+	local dba=""
+
+	if useq mysql; then
+		dbtype="--with-db-type=mysql"
+		dba="--with-db-dba=root"
+	fi
+	if useq postgres;then
+		dbtype="--with-db-type=Pg"
+		dba="--with-db-dba=postgres"
+	fi
+	if useq postgres && useq 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"
+		dba="--with-db-dba=root"
 	fi
 
 	./configure --enable-layout=Gentoo \
@@ -176,7 +192,8 @@ src_compile() {
 		--with-libs-group=rt \
 		--with-rt-group=rt \
 		--with-web-user=${web} \
-		--with-web-group=${web}
+		--with-web-group=${web} \
+		${dbtype} ${dba}
 
 	# check for missing deps and ask to report if something is broken
 	local myconf="--verbose $(use_with mysql) \