Remove old.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

7 files changed, 9 insertions, 340 deletions

diff --git a/dev-dotnet/mysql-connector-net/ChangeLog b/dev-dotnet/mysql-connector-net/ChangeLog
index 66a1cc1b9a30..f8f518a98b74 100644
--- a/dev-dotnet/mysql-connector-net/ChangeLog
+++ b/dev-dotnet/mysql-connector-net/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-dotnet/mysql-connector-net
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mysql-connector-net/ChangeLog,v 1.12 2010/07/14 11:28:23 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mysql-connector-net/ChangeLog,v 1.13 2010/10/08 08:39:54 pacho Exp $
+
+  08 Oct 2010; Pacho Ramos <pacho@gentoo.org>
+  -mysql-connector-net-1.0.4.ebuild,
+  -files/mysql-connector-net-1.0.4-assembly.patch,
+  -files/mysql-connector-net-1.0.4-fixes.patch,
+  -mysql-connector-net-1.0.9.ebuild, -files/mysql-connector-net-1.0.9.patch,
+  -files/mysql-connector-net.pc.in:
+  Remove old.
 
 *mysql-connector-net-6.2.3 (14 Jul 2010)
 
diff --git a/dev-dotnet/mysql-connector-net/files/mysql-connector-net-1.0.4-assembly.patch b/dev-dotnet/mysql-connector-net/files/mysql-connector-net-1.0.4-assembly.patch
deleted file mode 100644
index e7437979e15c..000000000000
--- a/dev-dotnet/mysql-connector-net/files/mysql-connector-net-1.0.4-assembly.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mysql-connector-net-1.0.4-old/mysqlclient/AssemblyInfo.cs	2005-01-20 10:30:52.000000000 -0600
-+++ mysql-connector-net-1.0.4/mysqlclient/AssemblyInfo.cs	2005-05-03 17:11:11.000000000 -0500
-@@ -74,7 +74,5 @@
- //       documentation for more information on this.
- //
- [assembly: AssemblyDelaySign(false)]
--#if FINAL
- [assembly: AssemblyKeyFile(@"d:\work\connector-net\cnet.snk")]
--#endif
- [assembly: AssemblyKeyName("")]
diff --git a/dev-dotnet/mysql-connector-net/files/mysql-connector-net-1.0.4-fixes.patch b/dev-dotnet/mysql-connector-net/files/mysql-connector-net-1.0.4-fixes.patch
deleted file mode 100644
index e4c49ce98f73..000000000000
--- a/dev-dotnet/mysql-connector-net/files/mysql-connector-net-1.0.4-fixes.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-diff -aurN mysql-connector-net-1.0.4-old/Client.build mysql-connector-net-1.0.4/Client.build
---- mysql-connector-net-1.0.4-old/Client.build	2005-01-20 10:56:06.000000000 -0600
-+++ mysql-connector-net-1.0.4/Client.build	2005-04-29 08:38:20.000000000 -0500
-@@ -32,11 +32,8 @@
- 

- 	<!-- builds the client on all supported frameworks -->

- 	<target name="allframeworks">

--		<property name="framework" value="net-1.0"/>

--		<call target="client"/>

--		<property name="framework" value="net-1.1"/>

-+		<property name="framework" value="mono-1.0"/>

- 		<call target="client"/>

--		<call target="Docs"/>

- 	</target>

- 

- 	<!-- core managed driver target -->	

-@@ -44,14 +41,18 @@
- 		<property name="nant.settings.currentframework" value="${framework}"/>

- 		<mkdir dir="bin/${framework}/${buildType}" failonerror="false"/>

- 		<csc define="${defines}" output="bin/${framework}/${buildType}/MySql.Data.dll" target="library" 

--			debug="${debug}" optimize="${opt}" 

--			doc="bin/${framework}/${buildType}/MySql.Data.xml">

-+			debug="${debug}" optimize="${opt}" >

- 			<arg value="/nowarn:0679"/>

- 			<references>

- 				<include name="ICSharpCode.SharpZipLib.dll"/>

-+				<include name="System.Data.dll"/>

-+				<include name="System.dll"/>

-+				<include name="Mono.Posix.dll"/>

-+				<include name="System.Drawing.dll"/>

- 			</references>

- 			<sources refid="Source"/>

- 		</csc>

-+		<!--

- 		<csc output="bin/${framework}/${buildType}/MySql.Data.Tests.dll" target="library" debug="${debug}" optimize="${opt}">

- 			<arg value="/nowarn:0679"/>

- 			<sources>

-@@ -61,7 +62,7 @@
- 				<include name="bin/${framework}/${buildType}/MySql.Data.dll"/>

- 				<include name="${nunit}/nunit.framework.dll"/>

- 			</references>

--		</csc>

-+		    </csc> -->

- 	</target>

- 

- 	<!-- core managed driver target 1.0 -->	

-@@ -75,10 +76,14 @@
- 		<property name="framework" value="net-1.1"/>

- 		<call target="client"/>

- 	</target>

--	

-+

-+        <target name="mono-1.0" description="1.0 Mono target">

-+                <property name="framework" value="mono-1.0"/>

-+                <call target="client"/>

-+        </target>

- 

- 	<!-- testing targets -->

--	<target name="alltests" depends="test-net-1.1, test-net-1.0">

-+	<target name="alltests" depends="test-net-1.1, test-net-1.0, test-mono-1.0">

- 	</target>

- 	

- 	<target name="test-net-1.1" depends="net-1.1">

-@@ -90,6 +95,12 @@
- 		<property name="framework" value="net-1.0"/>

- 		<call target="testclient"/>

- 	</target>

-+	

-+	<target name="test-mono-1.0" depends="mono-1.0">

-+		<property name="framework" value="mono-1.0"/>

-+		<call target="testclient"/>

-+	</target>

-+

- 

-     <!-- target to run the test suite -->

- 	<target name="testclient" description="Target to run NUnit tests">

-diff -aurN mysql-connector-net-1.0.4-old/mysqlclient/SharedMemoryStream.cs mysql-connector-net-1.0.4/mysqlclient/SharedMemoryStream.cs
---- mysql-connector-net-1.0.4-old/mysqlclient/SharedMemoryStream.cs	2005-01-14 09:32:08.000000000 -0600
-+++ mysql-connector-net-1.0.4/mysqlclient/SharedMemoryStream.cs	2005-04-28 14:52:45.000000000 -0500
-@@ -43,7 +43,8 @@
- 

- 		private uint	EVENT_ALL_ACCESS = 0x001F0003;

- 		private uint	FILE_MAP_WRITE = 0x2;

--		private int		BUFFERLENGTH = 16004;

-+		private int	BUFFERLENGTH = 16004;

-+		private uint	BUFFERLENGTH_UINT = 16004;

- 

- 		public SharedMemoryStream(string memName)

- 		{

-@@ -91,7 +92,7 @@
- 			string dataMemoryName = memoryName + "_" + connectNumber;

- 			dataMap = OpenFileMapping( FILE_MAP_WRITE, false, 

- 				dataMemoryName + "_DATA" );

--			dataView = MapViewOfFile( dataMap, FILE_MAP_WRITE, 0, 0, (UIntPtr)BUFFERLENGTH );

-+			dataView = MapViewOfFile( dataMap, FILE_MAP_WRITE, 0, 0, (UIntPtr)BUFFERLENGTH_UINT );

- 

- 			serverWrote = new AutoResetEvent(false);

- 			serverWrote.Handle = OpenEvent( EVENT_ALL_ACCESS, false, 

-@@ -151,7 +152,7 @@
- 		{

- 			try 

- 			{

--				dataView = MapViewOfFile( dataMap, FILE_MAP_WRITE, 0, 0, (UIntPtr)BUFFERLENGTH );

-+				dataView = MapViewOfFile( dataMap, FILE_MAP_WRITE, 0, 0, (UIntPtr)BUFFERLENGTH_UINT );

- 				if (dataView == IntPtr.Zero) return true;

- 				return false;

- 			}

-diff -aurN mysql-connector-net-1.0.4-old/mysqlclient/common/StreamCreator.cs mysql-connector-net-1.0.4/mysqlclient/common/StreamCreator.cs
---- mysql-connector-net-1.0.4-old/mysqlclient/common/StreamCreator.cs	2005-01-12 17:09:34.000000000 -0600
-+++ mysql-connector-net-1.0.4/mysqlclient/common/StreamCreator.cs	2005-04-29 11:45:43.000000000 -0500
-@@ -103,7 +103,7 @@
- 
- 			try
- 			{
--				UnixEndPoint endPoint = new UnixEndPoint (hostList[0]);
-+				UnixEndPoint endPoint = new UnixEndPoint (hostList);
- 				socket.Connect (endPoint);
- 				return new NetworkStream (socket, true);
- 			}
diff --git a/dev-dotnet/mysql-connector-net/files/mysql-connector-net-1.0.9.patch b/dev-dotnet/mysql-connector-net/files/mysql-connector-net-1.0.9.patch
deleted file mode 100644
index 2a258f7a18f9..000000000000
--- a/dev-dotnet/mysql-connector-net/files/mysql-connector-net-1.0.9.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -aurN connector-net-old/Client.build connector-net/Client.build
---- connector-net-old/Client.build	2007-01-11 16:00:24.000000000 +0100
-+++ connector-net/Client.build	2007-02-27 18:25:22.000000000 +0100
-@@ -7,7 +7,7 @@
- 	<!-- filesets -->

- 	<fileset id="Source">

- 		<include name="mysqlclient/common/*.cs"/>

--		<include name="mysqlclient/Types/*.cs"/>

-+		<include name="mysqlclient/types/*.cs"/>

- 		<include name="mysqlclient/zlib/*.cs"/>

- 		<include name="mysqlclient/*.cs"/>

- 	</fileset>

-@@ -34,8 +34,7 @@
- 	</if>

- 

- 	<!-- builds the client on all supported frameworks -->

--	<target name="allframeworks" depends="net-1.1">

--		<call target="Docs"/>

-+	<target name="allframeworks" depends="mono-1.0">

- 	</target>

- 

- 	<!-- core managed driver target -->	

-@@ -73,6 +72,7 @@
- 			</references>

- 			<sources refid="Source"/>

- 		</csc>

-+<!--

- 		<csc output="${outdir}/MySql.Data.Tests.dll" target="library" 

- 			debug="${debug}" define="${defines}" optimize="${opt}"> <arg value="/nowarn:0679"/>

- 			<sources>

-@@ -85,6 +85,7 @@
- 				<include name="${nunit-lib}/nunit.framework.dll"/>

- 			</references>

- 		</csc>

-+//-->

- 	</target>

- 

- 	<!-- core managed driver target 1.0 -->	

-@@ -123,7 +124,7 @@
- 	</target>

- 

- 	<!-- testing targets -->

--	<target name="alltests" depends="test-net-1.1">

-+	<target name="alltests" depends="test-mono-1.0">

- 	</target>

- 	

- 	<target name="test-net-1.1" depends="net-1.1">

-@@ -250,7 +251,7 @@
- 	<target name="clean" description="Remove all generated files">

- 		<delete failonerror="false">

- 			<fileset>

--				<include name="bin/**" />

-+				<include name="mysqlclient/bin/**" />

-             </fileset>

-         </delete>

-     </target>

-diff -aurN connector-net-old/mysqlclient/AssemblyInfo.cs connector-net/mysqlclient/AssemblyInfo.cs
---- connector-net-old/mysqlclient/AssemblyInfo.cs	2007-02-01 15:14:58.000000000 +0100
-+++ connector-net/mysqlclient/AssemblyInfo.cs	2007-02-27 19:24:27.000000000 +0100
-@@ -78,7 +78,5 @@
- //       documentation for more information on this.

- //

- [assembly: AssemblyDelaySign(false)]

--#if FINAL

- [assembly: AssemblyKeyFile("")]

--[assembly: AssemblyKeyName("ConnectorNet")]

--#endif

-+[assembly: AssemblyKeyName("")]

diff --git a/dev-dotnet/mysql-connector-net/files/mysql-connector-net.pc.in b/dev-dotnet/mysql-connector-net/files/mysql-connector-net.pc.in
deleted file mode 100644
index 2e3f15ad7a28..000000000000
--- a/dev-dotnet/mysql-connector-net/files/mysql-connector-net.pc.in
+++ /dev/null
@@ -1,8 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/@LIBDIR@
-
-Name: mysql-connector-net
-Description: mysql-connector-net - MySql ADO.NET connector
-Version: @VERSION@
-Libs: -r:${libdir}/mono/mysql-connector-net/MySql.Data.dll
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
deleted file mode 100644
index 0cdcbb697083..000000000000
--- a/dev-dotnet/mysql-connector-net/mysql-connector-net-1.0.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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.9 2008/03/02 09:12:46 compnerd Exp $
-
-inherit eutils multilib mono
-
-DESCRIPTION="MySql ADO.NET connector"
-HOMEPAGE="http://www.mysql.com/products/connector/net/"
-SRC_URI="mirror://mysql/Downloads/Connector-Net/${P}-noinstall.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-lang/mono-1.0
-		dev-dotnet/nant"
-DEPEND="${RDEPEND}
-		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
-	sed -i 's:AssemblyKeyFile.*:AssemblyKeyFile(\@\"'${S}'\/\'${PN}'.key")]:' mysqlclient/AssemblyInfo.cs
-}
-
-src_compile() {
-	# Generate signing key
-	ebegin "Generating a signed key"
-	sn -k ${PN}.key > /dev/null
-	eend
-	# Make dll
-	nant -t:mono-1.0 || die
-}
-
-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"
-
-	# 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)" \
-		-gacdir /usr/$(get_libdir) -package ${PN} > /dev/null
-	eend
-
-	dodoc CHANGES README EXCEPTIONS
-
-	if use doc; then
-		dodir /usr/share/doc/${PF}/samples
-		cp -pPR Samples/* "${D}/usr/share/doc/${PF}/samples/"
-	fi
-}
-
-pkg_postinst() {
-	elog "Adding the path for this connector in your mod_mono"
-	elog "configuration may be needed:"
-	elog "MonoPath \"/usr/$(get_libdir)/mono/mysql-connector-net/\""
-}
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
deleted file mode 100644
index 70719aeea51a..000000000000
--- a/dev-dotnet/mysql-connector-net/mysql-connector-net-1.0.9.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.3 2008/03/02 09:12:46 compnerd Exp $
-
-inherit eutils multilib mono
-
-DESCRIPTION="MySql ADO.NET connector"
-HOMEPAGE="http://www.mysql.com/products/connector/net/"
-SRC_URI="mirror://mysql/Downloads/Connector-Net/${P}-noinstall.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc examples"
-
-RDEPEND=">=dev-lang/mono-1.0"
-DEPEND="${RDEPEND}
-		app-arch/unzip
-		dev-dotnet/nant
-		>=dev-util/pkgconfig-0.20"
-
-src_unpack() {
-	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
-}
-
-src_compile() {
-	# Generate signing key
-	ebegin "Generating a signed key"
-		/usr/bin/sn -k ${PN}.key > /dev/null
-	eend
-
-	# Make dll
-	/usr/bin/nant -t:mono-1.0 || die "build failed"
-}
-
-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"
-
-	# 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)" \
-		-gacdir /usr/$(get_libdir) -package ${PN} > /dev/null
-	eend
-
-	dodoc CHANGES README EXCEPTIONS
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins doc/MySql.Data.chm
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r Samples
-	fi
-}
-
-pkg_postinst() {
-	elog "Adding the path for this connector in your mod_mono"
-	elog "configuration may be needed:"
-	elog "MonoPath \"/usr/$(get_libdir)/mono/${PN}/\""
-}