a bunch of quoting fixes and add a pkgconfig dep (bug #206121)

(Portage version: 2.1.4.4)

3 files changed, 30 insertions, 22 deletions

diff --git a/dev-dotnet/mysql-connector-net/ChangeLog b/dev-dotnet/mysql-connector-net/ChangeLog
index 94a4a8f399da..e7fdeee28d05 100644
--- a/dev-dotnet/mysql-connector-net/ChangeLog
+++ b/dev-dotnet/mysql-connector-net/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-dotnet/mysql-connector-net
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mysql-connector-net/ChangeLog,v 1.9 2007/06/25 23:58:22 jurek Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mysql-connector-net/ChangeLog,v 1.10 2008/03/02 09:12:46 compnerd Exp $
+
+  02 Mar 2008; Saleem Abdulrasool <compnerd@gentoo.org>
+  mysql-connector-net-1.0.4.ebuild, mysql-connector-net-1.0.9.ebuild:
+  fix a bunch of quoting issues and add pkgconfig dep (bug #206121)
 
   25 Jun 2007; Jurek Bartuszek <jurek@gentoo.org>
   +files/mysql-connector-net.pc.in, mysql-connector-net-1.0.4.ebuild,
diff --git a/dev-dotnet/mysql-connector-net/mysql-connector-net-1.0.4.ebuild b/dev-dotnet/mysql-connector-net/mysql-connector-net-1.0.4.ebuild
index 721fb52ccdb1..0cdcbb697083 100644
--- a/dev-dotnet/mysql-connector-net/mysql-connector-net-1.0.4.ebuild
+++ b/dev-dotnet/mysql-connector-net/mysql-connector-net-1.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mysql-connector-net/mysql-connector-net-1.0.4.ebuild,v 1.8 2007/06/25 23:58:22 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mysql-connector-net/mysql-connector-net-1.0.4.ebuild,v 1.9 2008/03/02 09:12:46 compnerd Exp $
 
 inherit eutils multilib mono
 
@@ -16,13 +16,14 @@ IUSE="doc"
 RDEPEND=">=dev-lang/mono-1.0
 		dev-dotnet/nant"
 DEPEND="${RDEPEND}
-		app-arch/unzip"
+		app-arch/unzip
+		>=dev-util/pkgconfig-0.20"
 
 src_unpack() {
-	mkdir ${WORKDIR}/${P}; cd ${WORKDIR}/${P};
-	unpack ${A}; cd ${S}
-	epatch ${FILESDIR}/mysql-connector-net-1.0.4-fixes.patch \
-	${FILESDIR}/mysql-connector-net-1.0.4-assembly.patch || die
+	mkdir "${WORKDIR}/${P}"; cd "${WORKDIR}/${P}";
+	unpack ${A}; cd "${S}"
+	epatch "${FILESDIR}/mysql-connector-net-1.0.4-fixes.patch" \
+	"${FILESDIR}/mysql-connector-net-1.0.4-assembly.patch" || die
 	sed -i 's:AssemblyKeyFile.*:AssemblyKeyFile(\@\"'${S}'\/\'${PN}'.key")]:' mysqlclient/AssemblyInfo.cs
 }
 
@@ -39,11 +40,11 @@ src_install() {
 	dodir /usr/$(get_libdir)/pkgconfig
 	sed -e "s:@VERSION@:${PV}:" \
 		-e "s:@LIBDIR@:$(get_libdir):" \
-		${FILESDIR}/${PN}.pc.in > ${D}/usr/$(get_libdir)/pkgconfig/${PN}.pc
+		"${FILESDIR}/${PN}.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/${PN}.pc"
 
 	# Install dll into the GAC
 	ebegin "Installing dlls into the GAC"
-	gacutil -i bin/mono-1.0/release/MySql.Data.dll -root ${D}/usr/$(get_libdir) \
+	gacutil -i bin/mono-1.0/release/MySql.Data.dll -root "${D}/usr/$(get_libdir)" \
 		-gacdir /usr/$(get_libdir) -package ${PN} > /dev/null
 	eend
 
@@ -51,7 +52,7 @@ src_install() {
 
 	if use doc; then
 		dodir /usr/share/doc/${PF}/samples
-		cp -pPR Samples/* ${D}/usr/share/doc/${PF}/samples/
+		cp -pPR Samples/* "${D}/usr/share/doc/${PF}/samples/"
 	fi
 }
 
diff --git a/dev-dotnet/mysql-connector-net/mysql-connector-net-1.0.9.ebuild b/dev-dotnet/mysql-connector-net/mysql-connector-net-1.0.9.ebuild
index 4581f517212a..70719aeea51a 100644
--- a/dev-dotnet/mysql-connector-net/mysql-connector-net-1.0.9.ebuild
+++ b/dev-dotnet/mysql-connector-net/mysql-connector-net-1.0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mysql-connector-net/mysql-connector-net-1.0.9.ebuild,v 1.2 2007/06/25 23:58:22 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mysql-connector-net/mysql-connector-net-1.0.9.ebuild,v 1.3 2008/03/02 09:12:46 compnerd Exp $
 
 inherit eutils multilib mono
 
@@ -13,15 +13,18 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc examples"
 
-DEPEND=">=dev-lang/mono-1.0
+RDEPEND=">=dev-lang/mono-1.0"
+DEPEND="${RDEPEND}
+		app-arch/unzip
 		dev-dotnet/nant
-		app-arch/unzip"
-RDEPEND="${DEPEND}"
+		>=dev-util/pkgconfig-0.20"
 
 src_unpack() {
-	mkdir ${WORKDIR}/${P}; cd ${WORKDIR}/${P};
-	unpack ${A}; cd ${S}
-	epatch ${FILESDIR}/${P}.patch || die
+	mkdir "${WORKDIR}/${P}"; cd "${WORKDIR}/${P}";
+
+	unpack ${A}; cd "${S}"
+
+	epatch "${FILESDIR}/${P}.patch" || die
 
 	sed -i 's:AssemblyKeyFile.*:AssemblyKeyFile(\@\"'${S}'\/\'${PN}'.key")]:' mysqlclient/AssemblyInfo.cs
 }
@@ -40,11 +43,11 @@ src_install() {
 	dodir /usr/$(get_libdir)/pkgconfig
 	sed -e "s:@VERSION@:${PV}:" \
 		-e "s:@LIBDIR@:$(get_libdir):" \
-		${FILESDIR}/${PN}.pc.in > ${D}/usr/$(get_libdir)/pkgconfig/${PN}.pc
+		"${FILESDIR}/${PN}.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/${PN}.pc"
 
 	# Install dll into the GAC
 	ebegin "Installing dlls into the GAC"
-	gacutil -i mysqlclient/bin/mono-1.0/release/MySql.Data.dll -root ${D}/usr/$(get_libdir) \
+	gacutil -i mysqlclient/bin/mono-1.0/release/MySql.Data.dll -root "${D}/usr/$(get_libdir)" \
 		-gacdir /usr/$(get_libdir) -package ${PN} > /dev/null
 	eend