Fix patch; added sed in src_unpack to automatically update the postinst-en.txt that gets installed.

(Portage version: 2.0.51.18)

4 files changed, 19 insertions, 30 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 048b7222007f..468c280457c8 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.88 2005/03/02 14:48:45 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.89 2005/03/02 17:58:13 ka0ttic Exp $
+
+  02 Mar 2005; Aaron Walker <ka0ttic@gentoo.org>
+  files/2.6.1_p2-no-wildcard-privs-for-you.patch,
+  phpmyadmin-2.6.1_p2-r1.ebuild:
+  Fix patch; added sed in src_unpack to automatically update the
+  postinst-en.txt that gets installed.
 
 *phpmyadmin-2.6.1_p2-r1 (02 Mar 2005)
 
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index b166501d42df..0f61ff7679b6 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,11 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 8953a4dca66a41467a427449f47ea16e phpmyadmin-2.6.1_p2.ebuild 2599
 MD5 3a33dda459f41b062d86576003c1e0ec phpmyadmin-2.6.1.ebuild 2595
 MD5 d0ac5e24e09567b4888c6ee2fbd88b3e phpmyadmin-2.6.1_rc1.ebuild 2593
-MD5 5acca5606c3977de31b3354b8bde71db phpmyadmin-2.6.1_p2-r1.ebuild 2689
-MD5 a3bb02b835c52238836bf26e80a73c0a ChangeLog 12341
+MD5 f98a587392366010d68cf708efc7972d phpmyadmin-2.6.1_p2-r1.ebuild 2837
+MD5 585ca3b0e32ccba50db90a9a236fd195 ChangeLog 12578
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
 MD5 22a63a92c01eef5a268311e15594367b files/digest-phpmyadmin-2.6.1_p2 74
 MD5 4badbcc4cd669e6f934d5c993ff9ae4e files/digest-phpmyadmin-2.6.1_rc1 74
@@ -13,14 +10,7 @@ MD5 c4e16f440d397574f36ec04130d54ba0 files/digest-phpmyadmin-2.6.1 70
 MD5 56dcb2efb84915a521c18a004f96d37c files/postinstall-en.txt 506
 MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525
 MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857
-MD5 d9af224e58ad88f8a9fc159694ccf98e files/2.6.1_p2-no-wildcard-privs-for-you.patch 4047
+MD5 4c95d31af8becb428be471fcedf664a4 files/2.6.1_p2-no-wildcard-privs-for-you.patch 3731
 MD5 22a63a92c01eef5a268311e15594367b files/digest-phpmyadmin-2.6.1_p2-r1 74
 MD5 396133c1da8d8b716ad2da23aa0a5a30 files/phpmyadmin-mysql-setup.sql.in 2712
 MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCJdJWEZCkKN40op4RAijbAKCft9//X15w4L91szVRvNQDyT+yMQCeOOF1
-OWwfPcTQmuT98+GGK4KInlU=
-=P+2w
------END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/files/2.6.1_p2-no-wildcard-privs-for-you.patch b/dev-db/phpmyadmin/files/2.6.1_p2-no-wildcard-privs-for-you.patch
index 4828337d7447..fafe170fb488 100644
--- a/dev-db/phpmyadmin/files/2.6.1_p2-no-wildcard-privs-for-you.patch
+++ b/dev-db/phpmyadmin/files/2.6.1_p2-no-wildcard-privs-for-you.patch
@@ -1,17 +1,6 @@
-===================================================================
-RCS file: /cvsroot/phpmyadmin/phpMyAdmin/server_privileges.php,v
-retrieving revision 2.40
-retrieving revision 2.42
-diff -u -r2.40 -r2.42
---- phpmyadmin/phpMyAdmin/server_privileges.php	2004/11/21 13:11:26	2.40
-+++ phpmyadmin/phpMyAdmin/server_privileges.php	2005/02/18 02:57:30	2.42
-@@ -1,5 +1,5 @@
- <?php
--/* $Id: 2.6.1_p2-no-wildcard-privs-for-you.patch,v 1.1 2005/03/02 14:48:45 ka0ttic Exp $ */
-+/* $Id: 2.6.1_p2-no-wildcard-privs-for-you.patch,v 1.1 2005/03/02 14:48:45 ka0ttic Exp $ */
- // vim: expandtab sw=4 ts=4 sts=4:
- 
- /**
+diff --exclude='*~' -urN phpMyAdmin-2.6.1-pl2.orig/server_privileges.php phpMyAdmin-2.6.1-pl2/server_privileges.php
+--- phpMyAdmin-2.6.1-pl2.orig/server_privileges.php	2005-03-02 12:54:10.528575299 -0500
++++ phpMyAdmin-2.6.1-pl2/server_privileges.php	2005-03-02 12:55:47.977465714 -0500
 @@ -490,6 +490,22 @@
         . (empty($thishost) ? '' : 'else if (this.value == \'thishost\') { hostname.value = \'' . addslashes(htmlspecialchars($thishost)) . '\'; } ')
         . 'else if (this.value == \'hosttable\') { hostname.value = \'\'; } else if (this.value == \'userdefined\') { hostname.focus(); hostname.select(); }">' . "\n";
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.6.1_p2-r1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.6.1_p2-r1.ebuild
index d3805ef210d0..294255b5aeab 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.6.1_p2-r1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.6.1_p2-r1.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/dev-db/phpmyadmin/phpmyadmin-2.6.1_p2-r1.ebuild,v 1.1 2005/03/02 14:48:45 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.6.1_p2-r1.ebuild,v 1.2 2005/03/02 17:58:13 ka0ttic Exp $
 
 inherit eutils webapp
 
@@ -30,6 +30,10 @@ src_unpack() {
 
 	# Remove .cvs* files and CVS directories
 	find ${S} -name .cvs\* -or \( -type d -name CVS -prune \) | xargs rm -rf
+
+	sed -e "s:\${MY_SQLSCRIPTSDIR}:${MY_SQLSCRIPTSDIR}:" \
+		-e "s:\${PVR}:${PVR}:" \
+		${FILESDIR}/postinstall-en.txt > ${WORKDIR}/postinstall-en.txt
 }
 
 src_compile() {
@@ -88,7 +92,7 @@ src_install() {
 
 	# add the post-installation instructions
 
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+	webapp_postinst_txt en ${WORKDIR}/postinstall-en.txt
 
 	# all done
 	#