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

Package-Manager: portage-2.1.4.4

4 files changed, 33 insertions, 25 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/Manifest b/dev-dotnet/mysql-connector-net/Manifest
index a72b3354abc3..8cd085764382 100644
--- a/dev-dotnet/mysql-connector-net/Manifest
+++ b/dev-dotnet/mysql-connector-net/Manifest
@@ -4,7 +4,7 @@ AUX mysql-connector-net-1.0.9.patch 2229 RMD160 005292d7a88f85a3056fdbe22de65573
 AUX mysql-connector-net.pc.in 229 RMD160 e43865e861163be5d1c2f6a3a09155f1f4757169 SHA1 3a4f268a20be991dcf67c654ef44dee034804fe0 SHA256 c3e205e4dc4ec645f542a1703c0f1088696a868a27ff77a6c04a8796451ae959
 DIST mysql-connector-net-1.0.4-noinstall.zip 707521 RMD160 3c78abb591c49f48e84be3315d181ff1be6bfeb4 SHA1 30424baa9324cc0f5d9a9d87f7b413360c8d400c SHA256 1006e865773ce463caf216f59e0129000d83da60070592d8b083d15d265428d0
 DIST mysql-connector-net-1.0.9-noinstall.zip 1297921 RMD160 011e330b8824276f0649a62b5c731abc63af0667 SHA1 95da5660cbdeda8d7cd966e24caff8c0ced056a0 SHA256 cbd08fdc17bcffc493a453ea2df2875023f9d2b13df169db189cddba2d39ad75
-EBUILD mysql-connector-net-1.0.4.ebuild 1776 RMD160 f81c000ccfeed12bfab662c481defa7187c341c2 SHA1 aabd0321840113d1e93a2bf64c10c65dc8395672 SHA256 7ac335e423719daa31d51d787a3bbeebba942017257772bdce2f565682063f56
-EBUILD mysql-connector-net-1.0.9.ebuild 1785 RMD160 de36da8edce94ee7eda530ac62df170a84b462be SHA1 842241b2e99cc8a68690c97eb7b8a2a3a2a21f75 SHA256 ff7413a320d9692512c475afa27201446a1887ad4baac234eb6e3b3aa5b16f27
-MISC ChangeLog 1651 RMD160 2b07eb2640d1350ddc5b1af29738b8c0434cfe8b SHA1 4a9a06d951da6562f4118f0229d2d16f81929fe7 SHA256 6c2452976396e4d1b5d8b9df67671987a0a60bdf82e6c257c1f81a09b4d0686e
+EBUILD mysql-connector-net-1.0.4.ebuild 1825 RMD160 ac7717a3c1779eb57b0d63b783f843fa100e85c3 SHA1 b3a4d84d86603c1bccb47bdf7eaca83d54567369 SHA256 84eb5f1318a0d6d02f30912405b4e4c6c0a994751118a45a1a2c09bdd39b4d02
+EBUILD mysql-connector-net-1.0.9.ebuild 1833 RMD160 7bc1ba8ea9c51cf710feb0142444b329249d92cf SHA1 ccd225641e4fd91b2c0c39ce93a0ffd99e6e05f9 SHA256 c146da31a89770bb41c366431b26a26d3b98a04999c85092d3331d526650638c
+MISC ChangeLog 1850 RMD160 146973d1f5d8906258562a3f98f8777d581812da SHA1 bb59db9e0b3bdd09d86c15545f13ea71d3f9f1a6 SHA256 c9b82e8a399911686daf3890441ea37a8f1efbc533d7992305dc07658d7384e1
 MISC metadata.xml 699 RMD160 e9d89fe0cad159c8e862d4a9ea1902953c95d348 SHA1 ca1883ea0a9a4f34d23725574c397e370f6e0cb4 SHA256 840549014aa9a7eec143dec9b9c4fc2cdce1658fadbb6bf1238757c317596829
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