remove dependency on local mysql daemon, bug #159781

Package-Manager: portage-2.1.2-r4

7 files changed, 30 insertions, 98 deletions

diff --git a/www-apps/b2evolution/ChangeLog b/www-apps/b2evolution/ChangeLog
index 6faa0709cc30..c85b4c5c9203 100644
--- a/www-apps/b2evolution/ChangeLog
+++ b/www-apps/b2evolution/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/b2evolution
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/ChangeLog,v 1.21 2007/01/03 20:26:10 iluxa Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/ChangeLog,v 1.22 2007/01/28 01:35:48 dsd Exp $
+
+  28 Jan 2007; Daniel Drake <dsd@gentoo.org> b2evolution-0.9.1.ebuild,
+  b2evolution-0.9.2.ebuild, -b2evolution-1.8.0.ebuild,
+  b2evolution-1.8.6.ebuild:
+  remove dependency on local mysql daemon, bug #159781
 
 *b2evolution-1.8.6 (03 Jan 2007)
 
diff --git a/www-apps/b2evolution/Manifest b/www-apps/b2evolution/Manifest
index 892bffa2a592..c2cc5260a612 100644
--- a/www-apps/b2evolution/Manifest
+++ b/www-apps/b2evolution/Manifest
@@ -4,28 +4,23 @@ RMD160 41bfb67810c28da6f41ba53e1d26478707682bcb files/postinstall-en.txt 340
 SHA256 894883c46bca9d7184b3a750ae58624578c716a5a1023225ce9989a8fe32665d files/postinstall-en.txt 340
 DIST b2evolution-0.9.1b-2005-09-16.zip 2926356 RMD160 a28bc2e174a7b20a0834558dca7c9e7b76f55656 SHA1 aa5aaf4b5080e780d163983736b0ae0f4e7a8e02 SHA256 31561275fd89a90a9020909309932b775b0c0a197297db10ac908baa089786cb
 DIST b2evolution-0.9.2-2006-05-22.zip 3294584 RMD160 6e04fbe04c8a160b61342391ed553326b69f2b49 SHA1 b218dc992950b56034eb41ad62ef13735ef97cfb SHA256 302b18f9768580750e96a1354a19c401c65d7f11324a208f10b956094b7914fe
-DIST b2evolution-1.8.0-2006-07-09.zip 2188059 RMD160 719a657fe658643f62f87d7dd1a9da7a7b4ebf5a SHA1 8ef8ca7e1b81f0a18c648f8be03c5b55a569e1e3 SHA256 cb195753e7fe8631d22a7653d551b88d0dd7ad46aae5cf3369498d1467ca02d6
 DIST b2evolution-1.8.6-2006-12-01.zip 2219506 RMD160 ba1dcce13d0561032f67339b27475c961b47c2dc SHA1 275a3c43304deaceda31421326533ce545859687 SHA256 2ddc33d8593453f1a8ebd4b85584235c03b9f1ccc2279384d0e21239e7b6aeab
-EBUILD b2evolution-0.9.1.ebuild 1411 RMD160 171bf99c5904673a9a96f7d1f247662fb95e6919 SHA1 236c3e088483007b6abebd71cdc69c75efc17822 SHA256 368e70f9972d32efc6c1af2a2c8876be2084b7e116665b565c268fee4958f8a0
-MD5 2296c7cb41d1a0bf3e7d13f25190a1fa b2evolution-0.9.1.ebuild 1411
-RMD160 171bf99c5904673a9a96f7d1f247662fb95e6919 b2evolution-0.9.1.ebuild 1411
-SHA256 368e70f9972d32efc6c1af2a2c8876be2084b7e116665b565c268fee4958f8a0 b2evolution-0.9.1.ebuild 1411
-EBUILD b2evolution-0.9.2.ebuild 1403 RMD160 373f2043e5503875cd9da939ffd148331d3e2816 SHA1 76863e8dfeec8cdbd3efaced2f51a99a133f3edc SHA256 f4b6c627d6a8c1abacc938b6ca1ec8d2d5efb34bce44b56e91b6f6798fe6a169
-MD5 27d3f568dfe684ef890a92fad456f98b b2evolution-0.9.2.ebuild 1403
-RMD160 373f2043e5503875cd9da939ffd148331d3e2816 b2evolution-0.9.2.ebuild 1403
-SHA256 f4b6c627d6a8c1abacc938b6ca1ec8d2d5efb34bce44b56e91b6f6798fe6a169 b2evolution-0.9.2.ebuild 1403
-EBUILD b2evolution-1.8.0.ebuild 1542 RMD160 3ad2072b006e4ec7ef9ea22a1169d180fe350c9b SHA1 ff5facba46a9c9297d5006a285b4a0a4913970f5 SHA256 90a3f2e1316950e12c319980fd9ed504e847c3acbc125e71eb6aef6cf1b2a157
-MD5 ba63ffa13363b538729d0747ed90db8c b2evolution-1.8.0.ebuild 1542
-RMD160 3ad2072b006e4ec7ef9ea22a1169d180fe350c9b b2evolution-1.8.0.ebuild 1542
-SHA256 90a3f2e1316950e12c319980fd9ed504e847c3acbc125e71eb6aef6cf1b2a157 b2evolution-1.8.0.ebuild 1542
-EBUILD b2evolution-1.8.6.ebuild 1543 RMD160 5c77769e681c79d478db671677f2d08e92ebefba SHA1 ed62d2b5e757e821dd6daa1d194ff87f6b300b69 SHA256 41a33b5d7c3e35e98bf99f30d29e0dbc5fc8596fa6e8ddb3d6a706970a3b4c3d
-MD5 afb34ac8755624e06d5f19d3bf5435d5 b2evolution-1.8.6.ebuild 1543
-RMD160 5c77769e681c79d478db671677f2d08e92ebefba b2evolution-1.8.6.ebuild 1543
-SHA256 41a33b5d7c3e35e98bf99f30d29e0dbc5fc8596fa6e8ddb3d6a706970a3b4c3d b2evolution-1.8.6.ebuild 1543
-MISC ChangeLog 3617 RMD160 b0eaa3fd7a431cdcde3d62e8d0ae5f9e222b8548 SHA1 1f942f787b05122df053577c07562645ba8ef8ac SHA256 1ed114417944828179a4da52cd4b5d7dd847c8fae048f6baea85844c0db2505e
-MD5 1dbf2eedea07c9f6e7b9389374126790 ChangeLog 3617
-RMD160 b0eaa3fd7a431cdcde3d62e8d0ae5f9e222b8548 ChangeLog 3617
-SHA256 1ed114417944828179a4da52cd4b5d7dd847c8fae048f6baea85844c0db2505e ChangeLog 3617
+EBUILD b2evolution-0.9.1.ebuild 1395 RMD160 da2518d55e5cd93f515460bc62b19ed7a7010774 SHA1 4428991e042f9f7af5d71c166ff0987484cc32f0 SHA256 cb866c26ebf04a7486c682d9ed67c56c8d55fd396250b63084f76b813e560928
+MD5 b541936515645a321c3a763a40e81fd3 b2evolution-0.9.1.ebuild 1395
+RMD160 da2518d55e5cd93f515460bc62b19ed7a7010774 b2evolution-0.9.1.ebuild 1395
+SHA256 cb866c26ebf04a7486c682d9ed67c56c8d55fd396250b63084f76b813e560928 b2evolution-0.9.1.ebuild 1395
+EBUILD b2evolution-0.9.2.ebuild 1386 RMD160 676a21bb602414961748fa1d3224e18f125348a6 SHA1 bc35055bebc1b60ab575ec3b1523d98b159e11ad SHA256 4ae24da1653031d842d336a3c63d66d2d412e19845796dd266a50cfa02c49e3f
+MD5 dc402625c08d074912387122727bcbd2 b2evolution-0.9.2.ebuild 1386
+RMD160 676a21bb602414961748fa1d3224e18f125348a6 b2evolution-0.9.2.ebuild 1386
+SHA256 4ae24da1653031d842d336a3c63d66d2d412e19845796dd266a50cfa02c49e3f b2evolution-0.9.2.ebuild 1386
+EBUILD b2evolution-1.8.6.ebuild 1525 RMD160 122bcdfea03f7b2d0cc59c850aa015a5a709bfc8 SHA1 1a0d86d209f64869ac7c06a3878615ac008de7e3 SHA256 fc0c9029866bd2c131e41fb1d424e8fa278b3555f98d544834ca927c9957e6c7
+MD5 822e2013c61eccd051bd01876c24da5b b2evolution-1.8.6.ebuild 1525
+RMD160 122bcdfea03f7b2d0cc59c850aa015a5a709bfc8 b2evolution-1.8.6.ebuild 1525
+SHA256 fc0c9029866bd2c131e41fb1d424e8fa278b3555f98d544834ca927c9957e6c7 b2evolution-1.8.6.ebuild 1525
+MISC ChangeLog 3825 RMD160 6d3a1600add85c115e883e4f556188ee52486c5f SHA1 2415154b65f6658b007b2e57a318c285a5768128 SHA256 0a9e721f1a12fdae2910aa1f447569df56895d5375b7ebd2fd4bccd932c39b8d
+MD5 bb60eaf1206dacba0c1f78bbab5020a6 ChangeLog 3825
+RMD160 6d3a1600add85c115e883e4f556188ee52486c5f ChangeLog 3825
+SHA256 0a9e721f1a12fdae2910aa1f447569df56895d5375b7ebd2fd4bccd932c39b8d ChangeLog 3825
 MISC metadata.xml 247 RMD160 d614869009a6c5c10b1675ae724b30b9a40ee9e6 SHA1 8f019e8217ba1c85346608c369b94f190af1eac6 SHA256 51d7089e9b7fc2bab9592df63ddbcb8e28ec1cfe575a5b77c6bd63381079776e
 MD5 a87207b3b148a8e1057c02dad9d02af8 metadata.xml 247
 RMD160 d614869009a6c5c10b1675ae724b30b9a40ee9e6 metadata.xml 247
@@ -36,9 +31,6 @@ SHA256 030643f6c501883ea567ffdc9e93fc1cb987b79e1a95fb2ed6080d77289c9c49 files/di
 MD5 6c9d7cfc433bf3c61ce48d28fcdc29e7 files/digest-b2evolution-0.9.2 280
 RMD160 d7cf2588aecb39c4a1be2682e1c77523848d5a63 files/digest-b2evolution-0.9.2 280
 SHA256 799efc79f5cfb5d768c16769eebd6cac5262e44a7f98ce21eea6f7db83d2f8f7 files/digest-b2evolution-0.9.2 280
-MD5 b49284b18d0b49a6a2ca66a928c9054b files/digest-b2evolution-1.8.0 280
-RMD160 e1c9c2fec83eef3047f92ba862a34b7ea8bcc6d2 files/digest-b2evolution-1.8.0 280
-SHA256 9738f09a6e6d95756c8eb6498868c366b66ac1de70194fc6d3d0bfec8b58afa3 files/digest-b2evolution-1.8.0 280
 MD5 597210b52d515b05c949291b7e16c853 files/digest-b2evolution-1.8.6 280
 RMD160 aadbf44723afbcf66cae01ce86e336eddc2be71d files/digest-b2evolution-1.8.6 280
 SHA256 e889f7aee23372521ad1d7ecd594ce3459cbb44403c6d67448a76ac626f8b586 files/digest-b2evolution-1.8.6 280
diff --git a/www-apps/b2evolution/b2evolution-0.9.1.ebuild b/www-apps/b2evolution/b2evolution-0.9.1.ebuild
index 90b656056003..47ce33d96eae 100644
--- a/www-apps/b2evolution/b2evolution-0.9.1.ebuild
+++ b/www-apps/b2evolution/b2evolution-0.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-0.9.1.ebuild,v 1.9 2006/11/23 16:23:46 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-0.9.1.ebuild,v 1.10 2007/01/28 01:35:48 dsd Exp $
 
 inherit depend.php eutils webapp
 
@@ -12,8 +12,7 @@ SRC_URI="mirror://sourceforge/evocms/${P}${MY_EXT}.zip"
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 ppc x86"
 IUSE=""
-RDEPEND="virtual/httpd-php
-	 virtual/mysql"
+RDEPEND="virtual/httpd-php"
 
 DEPEND="${DEPEND} ${RDEPEND}
 	app-arch/unzip"
diff --git a/www-apps/b2evolution/b2evolution-0.9.2.ebuild b/www-apps/b2evolution/b2evolution-0.9.2.ebuild
index 08dbe8b69e3d..7744ef5c8b8d 100644
--- a/www-apps/b2evolution/b2evolution-0.9.2.ebuild
+++ b/www-apps/b2evolution/b2evolution-0.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-0.9.2.ebuild,v 1.4 2006/11/23 16:23:46 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-0.9.2.ebuild,v 1.5 2007/01/28 01:35:48 dsd Exp $
 
 inherit webapp eutils
 
@@ -12,8 +12,7 @@ SRC_URI="mirror://sourceforge/evocms/${P}${MY_EXT}.zip"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE=""
-RDEPEND="virtual/httpd-php
-	 virtual/mysql"
+RDEPEND="virtual/httpd-php"
 
 DEPEND="${DEPEND} ${RDEPEND}
 	app-arch/unzip"
diff --git a/www-apps/b2evolution/b2evolution-1.8.0.ebuild b/www-apps/b2evolution/b2evolution-1.8.0.ebuild
deleted file mode 100644
index 55e8ab3bacb0..000000000000
--- a/www-apps/b2evolution/b2evolution-1.8.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-1.8.0.ebuild,v 1.3 2006/11/23 16:23:46 vivo Exp $
-
-inherit webapp eutils
-
-MY_EXT="-2006-07-09"
-
-DESCRIPTION="Multilingual multiuser multi-blog engine"
-HOMEPAGE="http://www.b2evolution.net"
-SRC_URI="mirror://sourceforge/evocms/${P}${MY_EXT}.zip"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE=""
-RDEPEND="virtual/httpd-php
-	 virtual/mysql"
-
-DEPEND="${DEPEND} ${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	webapp_pkg_setup
-	has_php
-	if [[ ${PHP_VERSION} == "4" ]]; then
-		require_php_with_use expat
-	else
-		require_php_with_use xml
-	fi
-}
-
-pkg_setup() {
-	webapp_pkg_setup
-	require_php_with_use tokenizer mysql
-}
-
-src_install() {
-	webapp_src_preinst
-
-	einfo "Installing main files"
-	cp -r blogs/* ${D}${MY_HTDOCSDIR}
-	einfo "Done"
-
-	dodoc doc/license.txt doc/install_new.html doc/upgradefrom_b2evo.html doc/upgradefrom_b2.html \
-		doc/upgradefrom_gl.html doc/upgradefrom_miniblog.html doc/upgradefrom_mt.html
-
-	# Identify the configuration files that this app uses
-	# User can want to make changes to these!
-	webapp_serverowned ${MY_HTDOCSDIR}
-	webapp_serverowned ${MY_HTDOCSDIR}/conf/_basic_config.php
-	webapp_configfile ${MY_HTDOCSDIR}/conf/_{basic_config,advanced,locales,formatting,admin,stats,application}.php
-
-	# post-install instructions
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	# now strut stuff
-	webapp_src_install
-}
diff --git a/www-apps/b2evolution/b2evolution-1.8.6.ebuild b/www-apps/b2evolution/b2evolution-1.8.6.ebuild
index bf15b8e20f65..14c113c07ab3 100644
--- a/www-apps/b2evolution/b2evolution-1.8.6.ebuild
+++ b/www-apps/b2evolution/b2evolution-1.8.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-1.8.6.ebuild,v 1.1 2007/01/03 20:26:10 iluxa Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-1.8.6.ebuild,v 1.2 2007/01/28 01:35:48 dsd Exp $
 
 inherit webapp eutils
 
@@ -12,8 +12,7 @@ SRC_URI="mirror://sourceforge/evocms/${P}${MY_EXT}.zip"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE=""
-RDEPEND="virtual/httpd-php
-	 virtual/mysql"
+RDEPEND="virtual/httpd-php"
 
 DEPEND="${DEPEND} ${RDEPEND}
 	app-arch/unzip"
diff --git a/www-apps/b2evolution/files/digest-b2evolution-1.8.0 b/www-apps/b2evolution/files/digest-b2evolution-1.8.0
deleted file mode 100644
index a861d47b97f1..000000000000
--- a/www-apps/b2evolution/files/digest-b2evolution-1.8.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d8d679294e6b3e6970884ca55f2d88a0 b2evolution-1.8.0-2006-07-09.zip 2188059
-RMD160 719a657fe658643f62f87d7dd1a9da7a7b4ebf5a b2evolution-1.8.0-2006-07-09.zip 2188059
-SHA256 cb195753e7fe8631d22a7653d551b88d0dd7ad46aae5cf3369498d1467ca02d6 b2evolution-1.8.0-2006-07-09.zip 2188059