Fix sed and move it to src_unpack.

Package-Manager: portage-2.1.2.3

3 files changed, 21 insertions, 14 deletions

diff --git a/dev-db/mysql-gui-tools/ChangeLog b/dev-db/mysql-gui-tools/ChangeLog
index 81ffa81ab777..ca0922fac3bb 100644
--- a/dev-db/mysql-gui-tools/ChangeLog
+++ b/dev-db/mysql-gui-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/mysql-gui-tools
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog,v 1.11 2007/04/03 19:41:39 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog,v 1.12 2007/04/14 23:34:21 swegener Exp $
+
+  14 Apr 2007; Sven Wegener <swegener@gentoo.org>
+  mysql-gui-tools-5.0_p11.ebuild:
+  Fix sed and move it to src_unpack.
 
 *mysql-gui-tools-5.0_p11 (03 Apr 2007)
 
diff --git a/dev-db/mysql-gui-tools/Manifest b/dev-db/mysql-gui-tools/Manifest
index 0fb3e36e0294..5e41f7b4fa85 100644
--- a/dev-db/mysql-gui-tools/Manifest
+++ b/dev-db/mysql-gui-tools/Manifest
@@ -30,10 +30,10 @@ EBUILD mysql-gui-tools-5.0_p10.ebuild 1714 RMD160 85daf40777c5accb7e7ab461157d62
 MD5 44be74ff387139af68b5e19b984b95ca mysql-gui-tools-5.0_p10.ebuild 1714
 RMD160 85daf40777c5accb7e7ab461157d62812096476d mysql-gui-tools-5.0_p10.ebuild 1714
 SHA256 bf0ebe9b81bf9b9b421b9f1a138bfd880ecb90800d15e176647a7bcb1a60777e mysql-gui-tools-5.0_p10.ebuild 1714
-EBUILD mysql-gui-tools-5.0_p11.ebuild 2843 RMD160 61596e844fa020a035c83a135c18b57909d09f04 SHA1 95f3ce409254342812ea1bf39f09083c247eeabf SHA256 9d09aff2970646224768dca01723c5dd22ad6897dcc6bad228ee7e63aeb683d9
-MD5 3721940970c1ac558765843eb9fcef23 mysql-gui-tools-5.0_p11.ebuild 2843
-RMD160 61596e844fa020a035c83a135c18b57909d09f04 mysql-gui-tools-5.0_p11.ebuild 2843
-SHA256 9d09aff2970646224768dca01723c5dd22ad6897dcc6bad228ee7e63aeb683d9 mysql-gui-tools-5.0_p11.ebuild 2843
+EBUILD mysql-gui-tools-5.0_p11.ebuild 2896 RMD160 ec69f9ed3dd84c08863ee8d7b288408993db4847 SHA1 08ce23d20cb63b1afbbb75645349350c58d50cb5 SHA256 9b2f5a9920ab2338d4954ebd85e214ef1a2267adf51fd81e32ffe2236294df2b
+MD5 ff491d3574f6516f78226c8321686ccd mysql-gui-tools-5.0_p11.ebuild 2896
+RMD160 ec69f9ed3dd84c08863ee8d7b288408993db4847 mysql-gui-tools-5.0_p11.ebuild 2896
+SHA256 9b2f5a9920ab2338d4954ebd85e214ef1a2267adf51fd81e32ffe2236294df2b mysql-gui-tools-5.0_p11.ebuild 2896
 EBUILD mysql-gui-tools-5.0_p6.ebuild 1670 RMD160 586057b1e7088ba513ece3ae72eac85227d00e0f SHA1 92d3b18898ff1b5c2d8140c0acbb7f68dd1dce53 SHA256 7fa0fab2164d50c417afa76deb8e76961aaf1dff3cdbad17a5a70aaadca0e359
 MD5 dfe9e5a204a428f53d1dfdad4e783e4a mysql-gui-tools-5.0_p6.ebuild 1670
 RMD160 586057b1e7088ba513ece3ae72eac85227d00e0f mysql-gui-tools-5.0_p6.ebuild 1670
@@ -46,10 +46,10 @@ EBUILD mysql-gui-tools-5.0_p9.ebuild 1713 RMD160 2990b34742bc2e676ea6394ae855edf
 MD5 59312591c0292c4bcc57822f3f0afb6b mysql-gui-tools-5.0_p9.ebuild 1713
 RMD160 2990b34742bc2e676ea6394ae855edf10c5b3519 mysql-gui-tools-5.0_p9.ebuild 1713
 SHA256 51e3748056a106b63d6661a5218b6dcc6435de25575fd78f6abb469979937a50 mysql-gui-tools-5.0_p9.ebuild 1713
-MISC ChangeLog 2279 RMD160 02195fa023dd34899faeab5ddbdb5e39c35849bf SHA1 235085026f0950e1821bc0b91d7f285d2851fc17 SHA256 bb564b2535e0021ef336003be00241052127e142befb55f11eb377b7bc239fac
-MD5 fdffbe5728a926e15485a4798b54591a ChangeLog 2279
-RMD160 02195fa023dd34899faeab5ddbdb5e39c35849bf ChangeLog 2279
-SHA256 bb564b2535e0021ef336003be00241052127e142befb55f11eb377b7bc239fac ChangeLog 2279
+MISC ChangeLog 2401 RMD160 2084eaeb35758408b5823c10af83a29791e27231 SHA1 7b628349bf784552cbeccb4e633a8e98cec5201d SHA256 51cef2a884c14888bc1656c797115bce966d6a82e6922f6967ac49ced8b5d4d7
+MD5 295e010aeb340d2fe30e848d7144bf97 ChangeLog 2401
+RMD160 2084eaeb35758408b5823c10af83a29791e27231 ChangeLog 2401
+SHA256 51cef2a884c14888bc1656c797115bce966d6a82e6922f6967ac49ced8b5d4d7 ChangeLog 2401
 MISC metadata.xml 272 RMD160 a64205312656df8afaa21bdbf37e15aaec949ced SHA1 7701e9d8d21b6250ae0664d90bebabaa231e908e SHA256 6968e5eb7b4a6b2de487f8942f82c8941a8714f6220f36c72082374ae66baeb4
 MD5 a7f4f1fdfeaf295779bf8da23d2732b7 metadata.xml 272
 RMD160 a64205312656df8afaa21bdbf37e15aaec949ced metadata.xml 272
@@ -75,7 +75,7 @@ SHA256 4889c2278e89882e1ff8fa6998897db3dce204484c48a93d8cd3e8f7f825769a files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGEseyI1lqEGTUzyQRAnFDAKCi4AGESnDVekLcLTgdqwOmlNGtLQCgwp7u
-L0h5tLQOcWdIh+6CPquM0Cg=
-=Doie
+iD8DBQFGIWUfI1lqEGTUzyQRAuu0AJ93zHLVbCPwqKSsvTEHGEaB3tCEZwCdHhPP
+xHH/o7G4Hx17guVoKhqIY8M=
+=a6JW
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p11.ebuild b/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p11.ebuild
index f5e3f0535cc6..deb2c621c3eb 100644
--- a/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p11.ebuild
+++ b/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p11.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/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p11.ebuild,v 1.2 2007/04/03 21:31:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p11.ebuild,v 1.3 2007/04/14 23:34:21 swegener Exp $
 
 GCONF_DEBUG="no"
 
@@ -57,6 +57,10 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/mysql-gui-tools-5.0_p8-i18n-fix.patch
 	epatch "${FILESDIR}"/mysql-gui-tools-5.0_p8-lua-modules.patch
+
+	sed -i \
+		-e "s/\\(^\\|[[:space:]]\\)-ltermcap\\($\\|[[:space:]]\\)//g" \
+		mysql-gui-common/tools/grtsh/Makefile.{am,in}
 }
 
 src_compile() {
@@ -64,7 +68,6 @@ src_compile() {
 	append-flags -fexceptions
 
 	cd "${S}"/mysql-gui-common
-	sed -i -e "s/\\b-ltermcap\\b//g" tools/{grtsh,grtsh3}/Makefile.{am,in}
 	use nls || sed -i -e "/^SUBDIRS = / s/\\bpo\\b//" Makefile.{am,in}
 	gnome2_src_compile \
 		--disable-java-modules \