Depend on virtual/mysql and use proper webapp-config installation instructions, thanks Jared B. in bug #466544

Package-Manager: portage-2.2.01.21890-prefix/cvs/SunOS i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

4 files changed, 19 insertions, 15 deletions

diff --git a/www-apps/baikal/ChangeLog b/www-apps/baikal/ChangeLog
index c1ce6c4798be..85b4b6e00c18 100644
--- a/www-apps/baikal/ChangeLog
+++ b/www-apps/baikal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/baikal
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/baikal/ChangeLog,v 1.1 2013/03/12 18:43:40 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/baikal/ChangeLog,v 1.2 2013/04/20 15:23:34 grobian Exp $
+
+  20 Apr 2013; Fabian Groffen <grobian@gentoo.org> +files/postinstall-en.txt,
+  baikal-0.2.4.ebuild:
+  Depend on virtual/mysql and use proper webapp-config installation
+  instructions, thanks Jared B. in bug #466544
 
 *baikal-0.2.4 (12 Mar 2013)
 
diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index ee26929fc966..8158bd35f7af 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX postinstall-en.txt 144 SHA256 cd1c37eb55843b269e4d018bbea4af24d0815e0961624783e6a529fe169d7c51 SHA512 50efdbfcefecdcfe6c47c25bba960af1556cf1d4b2a8feaff7e8af9a68c0a8d123ce0467430e29ff887c19e9384cdc9ce63eb31811af0d8ea7a1f2002fdcf776 WHIRLPOOL 60ecc35715278de8b3df42fc14540977c2757aeb8d55f13734a9114d7e11191e92246eb06e30f69738afd50e3ee9a03302216b0641f96682ec4532472e0fa3ca
 DIST baikal-regular-0.2.4.tgz 868606 SHA256 5a8a57323d3662e167c8b45b5d10748139be94f54d4cc440aca8aff0159f9678 SHA512 84ac92a9fc0da108a7a56972a6ec4f08bdd5223c4052589db2cbe030093eeb250e5df769a02cd86b74e92c6c56601e1df1f1d422e3a9bc1fc958931f93a0d6ba WHIRLPOOL 010f4da3c1bb3cf08c1567f80843c44877f2a46a2d0a86258cb903bfc9e7c08da7afeae69e93c524a178ebf2cb89ab35579485349e06e52619b34ca163e09b05
-EBUILD baikal-0.2.4.ebuild 1530 SHA256 c26a05e9a9507b3296712318aef6873f27e3dd8d8b44908e722692a7c6f6e92a SHA512 de47747a1668194942379140ce9391e2882bb344db05ea62c5cfc494d872b2067e86a1ec56f18cfa307ead987172daa38c44f2cdb80503a7204e3fb395b77392 WHIRLPOOL 598bfde10e2682db26365f12038b601483081362afcc627446ba776c307519f1330ee92753b679cdf4994f2759303ea22e0adb4ee31124608bdb42dc483ef2cc
-MISC ChangeLog 355 SHA256 873875299ae73d2baf2be02b59a2a13d1d18e1148b1801ed6a29a4a14358422b SHA512 f1e751dc91aab6415126c1273ca93d962f9ab0bfd7236fbb74edbc0562715a2bd6dd850c84e058dfaf2940d032e8d9d17aa985988318289afc2fbc0bae3ebabc WHIRLPOOL 4fbbaecb7973df4a5c750adf9ccb12348efaba971bc69957881b585c0d8892e962bb288291246b0641f1928b38f319a849a5e1065702e5f8d2c7f949a7881986
+EBUILD baikal-0.2.4.ebuild 1397 SHA256 81fd9676da75c19303db96680a51a1a36131f28fe92208b4810ebac1532e1f20 SHA512 7f9f08c0a66cb159337dae87d011b6067148b0e1903f8e242d9b9ed2e20faab8389ffbb62d4c4ecf3390da78b15cf1637abef9af2138e0490f8aae0c4c673d97 WHIRLPOOL fda6c2a688e5ea14c9ac071bf62cc6b63a76f61f6df17182b1d1d3658c2528ba3f8f5381cce80a475378de92e97484304333df7de9d09bc124e105175adb57b4
+MISC ChangeLog 572 SHA256 b5b92c89dbe36f7084938a63099c908602f0218779367351104389c7d0ad76fa SHA512 69baf806cc57d4587ce69aeff98500deefe30227d1b7dd93a09dff29844fc92acdb4d2477c3692a48378b498fec8195aefe55e66988f99a3f9b43b6ce7a3c76c WHIRLPOOL 229c251eee6196f1bffc1a3d3aec4d84625ec6c0700b6dc6a42af5685f49db920926227b810c5de3dc544c1a70923f5328d32a6df8c658cb721afcba6a57d913
 MISC metadata.xml 234 SHA256 1decd69feb1804dfd01fda996933fd2cd426eb16851b72f40b30b73f5cca7762 SHA512 7af21366d273b8166d7d20a7061e5fb19bad4ece55e2631d28196fa8dd35c16fdac21e5dde36c2f71f215d6e21774d078da9ce27f7d398ec37e5bf7950b385ee WHIRLPOOL 22f8437821a129afd883769051cb4cfdd3a56590e45281f032044bfc5eb641f272f2a08f6d0c6d0b477078c1aeef506857d6ed78352a57e09862c2f04ef33709
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (Darwin)
+Version: GnuPG v2.0.19 (SunOS)
 
-iEYEAREIAAYFAlE/d7QACgkQX3X2B8XHTomJQgCfdkErq4GH9ScuZauwZgJ0Gfa7
-L5cAn3oNxb5AToxSA9YdxMkAJ7bLNfGm
-=mRkI
+iEYEAREIAAYFAlFysvcACgkQX3X2B8XHTokL+wCghc6MoxUjLOgTtxSDv4Yge9Gn
+U5YAoIdMc6Ds9m/j7rYCZjBtqF01MLhB
+=p1z5
 -----END PGP SIGNATURE-----
diff --git a/www-apps/baikal/baikal-0.2.4.ebuild b/www-apps/baikal/baikal-0.2.4.ebuild
index 8f80f4cd0a73..9df91759af39 100644
--- a/www-apps/baikal/baikal-0.2.4.ebuild
+++ b/www-apps/baikal/baikal-0.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/baikal/baikal-0.2.4.ebuild,v 1.1 2013/03/12 18:43:40 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/baikal/baikal-0.2.4.ebuild,v 1.2 2013/04/20 15:23:34 grobian Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ IUSE="+mysql sqlite"
 REQUIRED_USE="|| ( mysql sqlite )"
 
 RDEPEND=">=dev-lang/php-5.3[pdo,xml,mysql?,sqlite?]
-	mysql? ( dev-db/mysql )
+	mysql? ( virtual/mysql )
 	sqlite? ( dev-db/sqlite )
 	virtual/httpd-php"
 
@@ -48,13 +48,8 @@ src_install() {
 	dosym /etc/${PN} "${MY_HTDOCSDIR}"/Specific
 	dosym . "${MY_HTDOCSDIR}"/html
 
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
 	webapp_src_install
 
 	fowners -R apache:apache /etc/${PN}
 }
-
-pkg_postinst() {
-	einfo "In order to setup baïkal:"
-	einfo "- create /etc/${PN}/ENABLE_INSTALL owner apache:apache"
-	einfo "- point your browser at the instal's URL and follow the setup"
-}
diff --git a/www-apps/baikal/files/postinstall-en.txt b/www-apps/baikal/files/postinstall-en.txt
new file mode 100644
index 000000000000..5115d56cba49
--- /dev/null
+++ b/www-apps/baikal/files/postinstall-en.txt
@@ -0,0 +1,3 @@
+In order to setup baïkal:
+- create /etc/${PN}/ENABLE_INSTALL owner apache:apache
+- point your browser at the instal's URL and follow the setup