Clean up pkg_config. Fix #71289

(Portage version: 2.0.51.22-r1)

3 files changed, 18 insertions, 30 deletions

diff --git a/www-apps/mambo/ChangeLog b/www-apps/mambo/ChangeLog
index 9320031bccb9..bbb57dc5c4b4 100644
--- a/www-apps/mambo/ChangeLog
+++ b/www-apps/mambo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/mambo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/ChangeLog,v 1.12 2005/06/16 12:29:11 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/ChangeLog,v 1.13 2005/07/03 18:11:11 rl03 Exp $
+
+  03 Jul 2005; Renat Lumpau <rl03@gentoo.org> mambo-4.5.2.3.ebuild:
+  Clean up pkg_config. Fix #71289
 
   16 Jun 2005; Renat Lumpau <rl03@gentoo.org> -mambo-4.5-r1.ebuild,
   -mambo-4.5.2.ebuild, -mambo-4.5.2.2.ebuild:
diff --git a/www-apps/mambo/Manifest b/www-apps/mambo/Manifest
index bdb9e360b583..11492723e9f2 100644
--- a/www-apps/mambo/Manifest
+++ b/www-apps/mambo/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b21548f077a6a8dd1de97472ae9a961d mambo-4.5.2.3.ebuild 3256
-MD5 857ed40837ce1d76fef06150b96ee072 ChangeLog 1919
+MD5 79c657a578b217aa3254c69fbbb0953e mambo-4.5.2.3.ebuild 2934
+MD5 8c7a2b8b9066236c3d532253efd8208b ChangeLog 2022
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
 MD5 e061f7e080ca70cc58815179056d3313 files/postinstall-en.txt 925
 MD5 6c941a8ae21f670067d3ce092d91b9cc files/digest-mambo-4.5.2.3 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCsXCtEzitwsaoONoRAsB0AJ4qTwRlNKP+hfgOQ6oGfNhLfziYuwCfZ0NF
-1xRSQpAVo1jtfNDTRwCi4e4=
-=SH0+
------END PGP SIGNATURE-----
diff --git a/www-apps/mambo/mambo-4.5.2.3.ebuild b/www-apps/mambo/mambo-4.5.2.3.ebuild
index fb107ba6011c..dec6801d216c 100644
--- a/www-apps/mambo/mambo-4.5.2.3.ebuild
+++ b/www-apps/mambo/mambo-4.5.2.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/mambo/mambo-4.5.2.3.ebuild,v 1.1 2005/06/16 12:26:25 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/mambo-4.5.2.3.ebuild,v 1.2 2005/07/03 18:11:11 rl03 Exp $
 
 inherit webapp eutils
 
@@ -62,36 +62,31 @@ pkg_config() {
 	/etc/init.d/mysql restart || die "mysql needs to be running"
 
 	echo -n "mysql db name [${D_DB}]: "; read MY_DB
-	if (test -z ${MY_DB}) ; then MY_DB=${D_DB} ; fi
+	[[ -z ${MY_DB} ]] && MY_DB=${D_DB}
 
 	echo -n "mysql db host [${D_HOST}]: "; read MY_HOST
-	if (test -z ${MY_HOST}) ; then MY_HOST=${D_HOST}; fi
+	[[ -z ${MY_HOST} ]] && MY_HOST=${D_HOST}
 
 	echo -n "mysql dbuser name [${D_USER}]: "; read MY_USER
-	if (test -z ${MY_USER}) ; then MY_USER=${D_USER} ; fi
+	[[ -z ${MY_USER} ]] && MY_USER=${D_USER}
 
 	echo -n "mysql dbuser password: "; read mypwd
-	if (test -z ${mypwd}) ; then die "Error: no dbuser password" ; fi
+	[[ -z ${mypwd} ]] && die "Error: no dbuser password"
 
 	# privileges
 	echo -n "Please enter login info for user who has grant privileges on ${MY_HOST} [$USER]: "; read adminuser
-	if (test -z ${adminuser}) ; then adminuser="$USER" ; fi
+	[[ -z ${adminuser} ]] && adminuser="$USER"
 	if [ "${MY_HOST}" != "localhost" ]; then
 		echo -n "Client address (at db side) [$(hostname -f)]: "; read clientaddr
-		if (test -z ${clientaddr}) ; then clientaddr="$(hostname -f)" ; fi
+		[[ -z ${clientaddr} ]] && clientaddr="$(hostname -f)"
 	fi
 	# this will be default for localhost
-	if (test -z ${clientaddr}) ; then clientaddr="${MY_HOST}" ; fi
+	[[ -z ${clientaddr} ]] && clientaddr="${MY_HOST}"
 
 	# if $MY_HOST == localhost, don't specify -h argument, so local socket can be used.
 	host=${MY_HOST/localhost}
-	mysqladmin -u ${MY_USER} ${host:+-h ${host}} -p create ${MY_DB} || die "Error creating database"
-	mysql -u ${adminuser} ${host:+-h ${host}} -p mysql --exec="GRANT SELECT,INSERT,UPDATE,DELETE,INDEX, ALTER,CREATE,DROP,REFERENCES ON ${MY_DB}.* TO ${MY_USER}@${clientaddr} IDENTIFIED BY '${mypwd}'; FLUSH PRIVILEGES;"  || {
-	echo "Error running query!"
-	echo
-	echo "Please run it manually on ${host}."
-	echo
-	echo "   \$ mysql -u ${adminuser} -p mysql --exec=\"GRANT SELECT,INSERT,UPDATE,DELETE,INDEX, ALTER,CREATE,DROP,REFERENCES ON ${MY_DB}.* TO ${MY_USER}@${clientaddr} IDENTIFIED BY '${mypwd}'; FLUSH PRIVILEGES;\""
-	echo
-	}
+	mysqladmin -u ${adminuser} ${host:+-h ${host}} -p create ${MY_DB} || die "Error creating database"
+	mysql -u "${adminuser}" "${host:+-h ${host}}" -p \
+		-e "GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP,REFERENCES
+		ON ${MY_DB}.* TO '${MY_USER}'@'${clientaddr}' IDENTIFIED BY '${mypwd}'; FLUSH PRIVILEGES;"  || die "Error initializing database. Please grant permissions manually."
 }