Apply fedora patch to work with mono-2.8 (bug #346135).

Package-Manager: portage-2.1.9.35/cvs/Linux x86_64

4 files changed, 135 insertions, 3 deletions

diff --git a/app-misc/cdcollect/ChangeLog b/app-misc/cdcollect/ChangeLog
index 070a3f25e731..9cd01e7ce632 100644
--- a/app-misc/cdcollect/ChangeLog
+++ b/app-misc/cdcollect/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/cdcollect
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/cdcollect/ChangeLog,v 1.7 2008/11/22 22:09:24 loki_val Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/cdcollect/ChangeLog,v 1.8 2011/01/26 08:58:52 pacho Exp $
+
+*cdcollect-0.6.0-r1 (26 Jan 2011)
+
+  26 Jan 2011; Pacho Ramos <pacho@gentoo.org> +cdcollect-0.6.0-r1.ebuild,
+  +files/cdcollect-0.6.0-sqlite.patch:
+  Apply fedora patch to work with mono-2.8 (bug #346135).
 
   22 Nov 2008; Peter Alfredsen <loki_val@gentoo.org> cdcollect-0.6.0.ebuild:
   Add support for new gtk-sharp with EAPI-2
diff --git a/app-misc/cdcollect/Manifest b/app-misc/cdcollect/Manifest
index f938a31417fa..f1aa67b48f70 100644
--- a/app-misc/cdcollect/Manifest
+++ b/app-misc/cdcollect/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX cdcollect-0.6.0-sqlite.patch 2605 RMD160 bb2d0b1ac8f0a934a61347ef84c52b5a5d03aefc SHA1 18537d7deb41bc3b190a073582e84fcc93629a3d SHA256 d3630a557f316fccf1a002b8f25f497c9b22c7ca0bcdcb79b17c859924c5dfea
 DIST cdcollect-0.6.0.tar.bz2 364982 RMD160 52ab36660a44372e1878457ee818ef02f40b5544 SHA1 7c7258cf7437807f6ca1bc567676396684a2b1af SHA256 dfadcba64512f9e3037358b5ccfa264aa4db9e91343e8ff84588000a63fa2905
+EBUILD cdcollect-0.6.0-r1.ebuild 1086 RMD160 5f1aa69ebbf2f515bd5e7ec703859a7bc46b840f SHA1 095b32bb666e48dca477cc2953f7350e4fae089a SHA256 65eb37d6fc6d2b1c1b8624a77c27bec27659c58b37c2422ffa79eded26783c6a
 EBUILD cdcollect-0.6.0.ebuild 963 RMD160 c9d01bfa5c101ce9686a48bdd122602acbad2d10 SHA1 41c710987baf30f02a779532d34815de2a07a1c6 SHA256 bf14aa9159dbedfa1c42ddfd896a95e90f839829c9908c915096fac21c04db07
-MISC ChangeLog 1223 RMD160 3b585763a11dfd9237fce71446dea142c0b01b54 SHA1 b0c4861bd325970f2c57bff8237e7a73d40fa70e SHA256 9ed6b714616ffa100302734f821c85d5bd9eeaef3507fac2f77977e4aff64f88
+MISC ChangeLog 1427 RMD160 3a7f35610a96128a394a65a3c7a64abd22e298eb SHA1 977647adc0eedeada75ffeb47a313d42223be12b SHA256 be642552443451f8502375e133ec9abe1ec742808f788c39656ffcafd5196738
 MISC metadata.xml 345 RMD160 bc1618eeaff0c9f46942a78f6a9f8d0c1cefabd2 SHA1 f7751b68326511e4d04702dd3fdff04911bdbe0f SHA256 bdb34619e8b74e8e2a1b09f258230fa2673beb8ff1a2262d1ddd816cab7ce4a6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0/4lIACgkQCaWpQKGI+9QVKQCfS6mhee0y4tVWTwzRlywKbK9s
+atAAn0l15rNwH4jeQpYCToJc3+eTv9/S
+=I1bf
+-----END PGP SIGNATURE-----
diff --git a/app-misc/cdcollect/cdcollect-0.6.0-r1.ebuild b/app-misc/cdcollect/cdcollect-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..6ebcc0816827
--- /dev/null
+++ b/app-misc/cdcollect/cdcollect-0.6.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/cdcollect/cdcollect-0.6.0-r1.ebuild,v 1.1 2011/01/26 08:58:52 pacho Exp $
+
+EAPI=2
+
+inherit gnome2 mono eutils
+
+DESCRIPTION="CDCollect is a CD catalog application for gnome 2. Its functionality is similar to the old gtktalog"
+HOMEPAGE="http://cdcollect.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/mono-1.1.17
+	>=dev-dotnet/gtk-sharp-2.8.0
+	>=x11-libs/gtk+-2.8.0
+	>=dev-db/sqlite-3.3.5
+	>=gnome-base/gconf-2.8.0
+	dev-perl/XML-Parser
+	>=dev-dotnet/gconf-sharp-2.8.0
+	|| ( dev-dotnet/gtk-sharp[glade] >=dev-dotnet/glade-sharp-2.8.0 )
+	>=dev-dotnet/gnome-sharp-2.8.0
+	>=dev-dotnet/gnomevfs-sharp-2.8.0"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig"
+
+USE_DESTDIR="1"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_prepare() {
+	gnome2_src_prepare
+	# Fix build against mono-2.8
+	epatch "${FILESDIR}/${PN}-0.6.0-sqlite.patch"
+}
diff --git a/app-misc/cdcollect/files/cdcollect-0.6.0-sqlite.patch b/app-misc/cdcollect/files/cdcollect-0.6.0-sqlite.patch
new file mode 100644
index 000000000000..3e3eb9990b1c
--- /dev/null
+++ b/app-misc/cdcollect/files/cdcollect-0.6.0-sqlite.patch
@@ -0,0 +1,74 @@
+diff -up cdcollect-0.6.0/src/CDIcon.cs.sqlite cdcollect-0.6.0/src/CDIcon.cs
+--- cdcollect-0.6.0/src/CDIcon.cs.sqlite	2006-11-24 18:12:13.000000000 +0100
++++ cdcollect-0.6.0/src/CDIcon.cs	2011-01-01 12:15:13.000000000 +0100
+@@ -23,7 +23,7 @@ using System.IO;
+ using System.Xml;
+ using Gtk;
+ using Gdk;
+-using Mono.Data.SqliteClient;
++using Mono.Data.Sqlite;
+ using Mono.Unix;
+ 
+ 
+diff -up cdcollect-0.6.0/src/CDItem.cs.sqlite cdcollect-0.6.0/src/CDItem.cs
+--- cdcollect-0.6.0/src/CDItem.cs.sqlite	2006-11-24 18:12:13.000000000 +0100
++++ cdcollect-0.6.0/src/CDItem.cs	2011-01-01 12:15:13.000000000 +0100
+@@ -24,7 +24,7 @@ using System.Xml;
+ using System.Text.RegularExpressions;
+ using Gtk;
+ using Gdk;
+-using Mono.Data.SqliteClient;
++using Mono.Data.Sqlite;
+ using Mono.Unix;
+ 
+ public enum CDItemFind : int {
+diff -up cdcollect-0.6.0/src/DBsql.cs.sqlite cdcollect-0.6.0/src/DBsql.cs
+--- cdcollect-0.6.0/src/DBsql.cs.sqlite	2006-11-24 18:12:13.000000000 +0100
++++ cdcollect-0.6.0/src/DBsql.cs	2011-01-01 12:26:53.000000000 +0100
+@@ -27,7 +27,7 @@ using System.Text;
+ using System.Threading;
+ using System.Text.RegularExpressions;
+ 
+-using Mono.Data.SqliteClient;
++using Mono.Data.Sqlite;
+ using Mono.Unix;
+ 
+ 
+@@ -958,10 +958,10 @@ public class CDDatabaseSql
+ 	private int sql_command_id (string comm)
+ 	{	
+ 		IDbCommand command = sqlite_connection.CreateCommand ();
+-		command.CommandText = comm;
+-		command.ExecuteScalar ();
++		command.CommandText = comm + "; SELECT last_insert_rowid();";
++		int rowid = (int)command.ExecuteScalar ();
+ 		command.Dispose ();
+-		return (((SqliteConnection)sqlite_connection).LastInsertRowId);
++		return (rowid);
+ 	}
+ 	
+ 	private void sql_command (string comm)
+diff -up cdcollect-0.6.0/src/Makefile.am.sqlite cdcollect-0.6.0/src/Makefile.am
+--- cdcollect-0.6.0/src/Makefile.am.sqlite	2011-01-01 12:15:13.000000000 +0100
++++ cdcollect-0.6.0/src/Makefile.am	2011-01-01 12:15:13.000000000 +0100
+@@ -42,7 +42,7 @@ Defines.cs: Defines.cs.in
+ 
+ ASSEMBLIES =                    \
+ 	/r:System.Data				\
+-	/r:Mono.Data.SqliteClient	\
++	/r:Mono.Data.Sqlite	\
+ 	/r:Mono.Posix		        \
+ 	-pkg:gtk-sharp-2.0			\
+ 	-pkg:glade-sharp-2.0		\
+diff -up cdcollect-0.6.0/src/Makefile.in.sqlite cdcollect-0.6.0/src/Makefile.in
+--- cdcollect-0.6.0/src/Makefile.in.sqlite	2011-01-01 12:15:13.000000000 +0100
++++ cdcollect-0.6.0/src/Makefile.in	2011-01-01 12:15:13.000000000 +0100
+@@ -254,7 +254,7 @@ GENERATED_CSFILES = \
+ 
+ ASSEMBLIES = \
+ 	/r:System.Data				\
+-	/r:Mono.Data.SqliteClient	\
++	/r:Mono.Data.Sqlite	\
+ 	/r:Mono.Posix		        \
+ 	-pkg:gtk-sharp-2.0			\
+ 	-pkg:glade-sharp-2.0		\