From: Leonardo Boshell Date: Tue, 13 Feb 2007 22:13:30 +0000 (+0000) Subject: New release: 2.99.5 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1f376beef2ae014845f200e5935cc02d9f84697e;p=gentoo.git New release: 2.99.5 Package-Manager: portage-2.1.2-r9 --- diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog index 261e9b04058a..66acfbcebbf3 100644 --- a/gnome-extra/libgda/ChangeLog +++ b/gnome-extra/libgda/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnome-extra/libgda # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.103 2007/01/29 22:48:43 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.104 2007/02/13 22:08:40 leonardop Exp $ + +*libgda-2.99.5 (13 Feb 2007) + + 13 Feb 2007; Leonardo Boshell + -files/libgda-2.99.3-collisions.patch, +files/libgda-2.99.5-gapi.patch, + -libgda-2.99.3.ebuild, +libgda-2.99.5.ebuild: + New release. Dropped 'mdb' until a new release of mdbtools comes out. *libgda-2.99.3 (29 Jan 2007) diff --git a/gnome-extra/libgda/files/digest-libgda-2.99.3 b/gnome-extra/libgda/files/digest-libgda-2.99.3 deleted file mode 100644 index 9333f4dca281..000000000000 --- a/gnome-extra/libgda/files/digest-libgda-2.99.3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 8d1e5186588c237e76c34065abdd042c libgda-2.99.3.tar.bz2 2683690 -RMD160 efca22053cc6d0d1128a236e6c6b978afba9e2a2 libgda-2.99.3.tar.bz2 2683690 -SHA256 4c9e5ff344afe3912b9b8bc52ecd4072d3567e647e8a02a03bdddc3fc94211b6 libgda-2.99.3.tar.bz2 2683690 diff --git a/gnome-extra/libgda/files/digest-libgda-2.99.5 b/gnome-extra/libgda/files/digest-libgda-2.99.5 new file mode 100644 index 000000000000..f94845fe2bb8 --- /dev/null +++ b/gnome-extra/libgda/files/digest-libgda-2.99.5 @@ -0,0 +1,3 @@ +MD5 10d6c6342756a79cf74628a33cb63bf9 libgda-2.99.5.tar.bz2 2700526 +RMD160 c329cac66158acfd11b86bb6c12514832718fe49 libgda-2.99.5.tar.bz2 2700526 +SHA256 4ac8dac177d5e9d40ef2176e1a3bbd2203b19b7c487e6fbead094c7e560e5cbc libgda-2.99.5.tar.bz2 2700526 diff --git a/gnome-extra/libgda/files/libgda-2.99.3-collisions.patch b/gnome-extra/libgda/files/libgda-2.99.3-collisions.patch deleted file mode 100644 index c3edad732a2f..000000000000 --- a/gnome-extra/libgda/files/libgda-2.99.3-collisions.patch +++ /dev/null @@ -1,385 +0,0 @@ -Index: tools/gda-config.5 -=================================================================== ---- tools/gda-config.5 (revision 2809) -+++ tools/gda-config.5 (working copy) -@@ -4,7 +4,7 @@ - .\" Author: - .\" Gonzalo Paniagua Javier (gonzalo@gnome-db.org) - .\" --.TH gda-config "5" "January 2003" "libgda" "File Formats" -+.TH gda-config-3.0 "5" "January 2003" "libgda" "File Formats" - .SH NAME - $(sysconfdir)/libgda/config \- libgda global configuration file. - $(HOME)/.libgda/config \- libgda user configuration file. -@@ -43,10 +43,10 @@ - .fi - .sp - .RE --You can also use \fBgda-config-tool\fR or \fBmergeant\fR (recommended) to modify -+You can also use \fBgda-config-tool-3.0\fR or \fBmergeant\fR (recommended) to modify - this file. - .SH SEE ALSO - .BR mergeant (1), --.BR gda-config-tool (1) -+.BR gda-config-tool-3.0 (1) - - -Index: tools/gda-config-tool.1 -=================================================================== ---- tools/gda-config-tool.1 (revision 2809) -+++ tools/gda-config-tool.1 (working copy) -@@ -4,14 +4,14 @@ - .\" Author: - .\" Gonzalo Paniagua Javier (gonzalo@gnome-db.org) - .\" --.TH gda-config-tool "1" "October 2002" "gda-config-tool (libgda)" "User Commands" -+.TH gda-config-tool-3.0 "1" "October 2002" "gda-config-tool-3.0 (libgda)" "User Commands" - .SH NAME --gda-config-tool \- Tool for managing libgda configuration file. -+gda-config-tool-3.0 \- Tool for managing libgda configuration file. - .SH SYNOPSIS - .PP --.B gda-config-tool [OPTIONS] -+.B gda-config-tool-3.0 [OPTIONS] - .SH DESCRIPTION --The \fIgda-config-tool\fP program can be used create/edit/remove a libgda -+The \fIgda-config-tool-3.0\fP program can be used create/edit/remove a libgda - provider. It can be used both as a command line program and an interactive - program. - .SH OPTIONS -@@ -58,6 +58,6 @@ - User settings. Override global settings. - .SH SEE ALSO - .BR mergeant(1), --.BR gda-config(5) -+.BR gda-config-3.0(5) - - -Index: tools/Makefile.am -=================================================================== ---- tools/Makefile.am (revision 2809) -+++ tools/Makefile.am (working copy) -@@ -1,18 +1,24 @@ - if BUILD_CONFIG_TOOL --CONFIG_TOOL=gda-config-tool --man_MANS = gda-config-tool.1 \ -- gda-config.5 -+CONFIG_TOOL=gda-config-tool-3.0 -+man_MANS = gda-config-tool-3.0.1 \ -+ gda-config-3.0.5 - else - CONFIG_TOOL= - endif - - if BUILD_RUN_TOOL --RUN_TOOL=gda-run -+RUN_TOOL=gda-run-3.0 - else - RUN_TOOL= - endif - --bin_PROGRAMS = $(RUN_TOOL) $(CONFIG_TOOL) gda-diagnose gda-list-config gda-inspect-dict-file gda-author-dict-file -+bin_PROGRAMS = \ -+ $(RUN_TOOL) \ -+ $(CONFIG_TOOL) \ -+ gda-diagnose-3.0 \ -+ gda-list-config-3.0 \ -+ gda-inspect-dict-file-3.0 \ -+ gda-author-dict-file-3.0 - - AM_CPPFLAGS = \ - -I$(top_srcdir) \ -@@ -20,16 +26,16 @@ - -I. \ - $(LIBGDA_CFLAGS) - --gda_run_SOURCES = gda-run.c --gda_run_LDADD = \ -+gda_run_3_0_SOURCES = gda-run.c -+gda_run_3_0_LDADD = \ - $(top_builddir)/libgda/libgda-3.0.la \ - $(top_builddir)/libgda/graph/libgda_graph-3.0.la \ - $(top_builddir)/libgda/handlers/libgda_handlers-3.0.la \ - $(top_builddir)/libgda/sql-delimiter/libgda_sql_delimiter-3.0.la \ - $(LIBGDA_LIBS) - --gda_config_tool_SOURCES = gda-config-tool.c --gda_config_tool_LDADD = \ -+gda_config_tool_3_0_SOURCES = gda-config-tool.c -+gda_config_tool_3_0_LDADD = \ - $(top_builddir)/libgda/libgda-3.0.la \ - $(top_builddir)/libgda/graph/libgda_graph-3.0.la \ - $(top_builddir)/libgda/handlers/libgda_handlers-3.0.la \ -@@ -39,46 +45,46 @@ - $(POPT_LIB) \ - $(LIBGDA_LIBS) - --gda_diagnose_SOURCES = \ -+gda_diagnose_3_0_SOURCES = \ - html.h \ - html.c \ - gda-diagnose.c - --gda_diagnose_LDADD = \ -+gda_diagnose_3_0_LDADD = \ - $(top_builddir)/libgda/libgda-3.0.la \ - $(top_builddir)/libgda/handlers/libgda_handlers-3.0.la \ - $(top_builddir)/libgda/graph/libgda_graph-3.0.la \ - $(top_builddir)/libgda/sql-delimiter/libgda_sql_delimiter-3.0.la \ - $(LIBGDA_LIBS) - --gda_inspect_dict_file_SOURCES = \ -+gda_inspect_dict_file_3_0_SOURCES = \ - gda-inspect-dict-file.c - --gda_inspect_dict_file_LDADD = \ -+gda_inspect_dict_file_3_0_LDADD = \ - $(top_builddir)/libgda/libgda-3.0.la \ - $(top_builddir)/libgda/handlers/libgda_handlers-3.0.la \ - $(top_builddir)/libgda/graph/libgda_graph-3.0.la \ - $(top_builddir)/libgda/sql-delimiter/libgda_sql_delimiter-3.0.la \ - $(LIBGDA_LIBS) - --gda_author_dict_file_SOURCES = \ -+gda_author_dict_file_3_0_SOURCES = \ - gda-author-dict-file.c - --gda_author_dict_file_LDADD = \ -+gda_author_dict_file_3_0_LDADD = \ - $(top_builddir)/libgda/libgda-3.0.la \ - $(top_builddir)/libgda/handlers/libgda_handlers-3.0.la \ - $(top_builddir)/libgda/graph/libgda_graph-3.0.la \ - $(top_builddir)/libgda/sql-delimiter/libgda_sql_delimiter-3.0.la \ - $(LIBGDA_LIBS) - --gda_list_config_SOURCES = \ -+gda_list_config_3_0_SOURCES = \ - gda-list-config.c - --gda_list_config_LDADD = \ -+gda_list_config_3_0_LDADD = \ - $(top_builddir)/libgda/libgda-3.0.la \ - $(top_builddir)/libgda/handlers/libgda_handlers-3.0.la \ - $(top_builddir)/libgda/graph/libgda_graph-3.0.la \ - $(top_builddir)/libgda/sql-delimiter/libgda_sql_delimiter-3.0.la \ - $(LIBGDA_LIBS) - --EXTRA_DIST = gda-config-tool.1 gda-config.5 -+EXTRA_DIST = $(man_MANS) -Index: tools/gda-config-tool.c -=================================================================== ---- tools/gda-config-tool.c (revision 2809) -+++ tools/gda-config-tool.c (working copy) -@@ -1476,6 +1476,8 @@ - main (int argc, char *argv []) - { - options (argc, (const char **) argv); -+ gda_init ("Gda configuration manager", PACKAGE_VERSION, argc, argv); -+ - if (cmdArgs.actions == ACTION_NONE) { - g_print ("Using configuration file from %s\n", cmdArgs.config_file); - initialize_readline (); -Index: doc/C/installation.xml -=================================================================== ---- doc/C/installation.xml (revision 2809) -+++ doc/C/installation.xml (working copy) -@@ -176,11 +176,11 @@ - Compiling with the library - - To compile you will need to set the C flags and to link the library, so we recommend -- to use the pkg-config command. -+ to use the pkg-config command. - - -- $ gcc -c full_example.c `pkg-config --cflags libgda` -- $ gcc -o full_example `pkg-config --libs libgda` full_example.o -+$ gcc -c full_example.c `pkg-config --cflags libgda-3.0` -+$ gcc -o full_example `pkg-config --libs libgda-3.0` full_example.o - - - Doing this will add to the C compiler command line all needed header files -Index: doc/C/libgda-docs.sgml -=================================================================== ---- doc/C/libgda-docs.sgml (revision 2809) -+++ doc/C/libgda-docs.sgml (working copy) -@@ -29,6 +29,11 @@ - GdaDataModel"> - GdaDataModelArray"> - GdaDataModelHash"> -+gda-author-dict-file-3.0"> -+gda-diagnose-3.0"> -+gda-inspect-dict-file-3.0"> -+gda-list-config-3.0"> -+gda-test-connection-3.0"> - - - -@@ -130,7 +135,7 @@ - - - -- GNOME Data Access manual -+ GNOME Data Access 3.0 manual - - - Michael -@@ -197,7 +202,7 @@ - - 1999 February - -- 1999 - 2006 -+ 1999 - 2007 - The GNOME Foundation - - -@@ -638,15 +643,15 @@ - - - -- gda-list-config -+ &gda-list-config; - -- The gda-list-config tool simply lists all the declared data sources, and all the installed -+ The &gda-list-config; tool simply lists all the declared data sources, and all the installed - providers, giving some other usefull information as well for each. - - - - -- gda-test-connection -+ &gda-test-connection; - - This tool is a 'ping' like tool to test connectivity to databases. Connections can either - be declared as DSN, or described in the command line. -@@ -654,9 +659,9 @@ - - - -- gda-diagnose -+ &gda-diagnose; - -- The gda-diagnose tool is a quite exhaustive and verbose testing program which output -+ The &gda-diagnose; tool is a quite exhaustive and verbose testing program which output - several HTML files - in a specified directory (DIAGNOSE_OUTPUT by default). It can either test a single data source - or all the data sources if none is specified. Running this tool can be time consuming... -@@ -675,9 +680,9 @@ - - - -- gda-author-dict-file -+ &gda-author-dict-file; - -- The gda-author-dict-file tool allows to create a XML dictionary file which can be loaded into a -+ The &gda-author-dict-file; tool allows to create a XML dictionary file which can be loaded into a - #GdaDict object, specifying a data source to use. Specifically it does (depending on command line - options): - -@@ -693,9 +698,9 @@ - - - -- gda-inspect-dict-file -+ &gda-inspect-dict-file; - -- The gda-inspect-dict-file tool tests an existing XML dictionary file and (depending on command line -+ The &gda-inspect-dict-file; tool tests an existing XML dictionary file and (depending on command line - options): - - -Index: doc/C/Makefile.am -=================================================================== ---- doc/C/Makefile.am (revision 2809) -+++ doc/C/Makefile.am (working copy) -@@ -3,7 +3,7 @@ - AUTOMAKE_OPTIONS = 1.6 - - # The name of the module. --DOC_MODULE=libgda -+DOC_MODULE=libgda-3.0 - - # The top-level SGML file. - DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml -@@ -37,7 +37,7 @@ - $(LIBGDA_LIBS) - - # Extra options to supply to gtkdoc-mkdb --MKDB_OPTIONS=--sgml-mode --output-format=xml -+MKDB_OPTIONS=--sgml-mode --output-format=xml --ignore-files="lexer.c" - - # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE) - content_files = fdl-appendix.sgml -Index: report/testing/Makefile.am -=================================================================== ---- report/testing/Makefile.am (revision 2809) -+++ report/testing/Makefile.am (working copy) -@@ -1,19 +1,19 @@ - AM_CPPFLAGS = \ -- -I$(top_srcdir) \ -- -I$(top_builddir) \ -+ -I$(top_srcdir) \ -+ -I$(top_builddir) \ - -I$(top_srcdir)/report \ -- -I$(top_builddir)/report \ -- $(LIBGDA_CFLAGS) -+ -I$(top_builddir)/report \ -+ $(LIBGDA_CFLAGS) - --bin_PROGRAMS = gda-report-test -+bin_PROGRAMS = gda-report-test-3.0 - --gda_report_test_SOURCES = \ -+gda_report_test_3_0_SOURCES = \ - gda-report-test.c - --gda_report_test_LDADD = \ -- $(top_builddir)/libgda/libgda-3.0.la \ -- $(top_builddir)/libgda/graph/libgda_graph-3.0.la \ -+gda_report_test_3_0_LDADD = \ -+ $(top_builddir)/libgda/libgda-3.0.la \ -+ $(top_builddir)/libgda/graph/libgda_graph-3.0.la \ - $(top_builddir)/libgda/handlers/libgda_handlers-3.0.la \ - $(top_builddir)/libgda/sql-delimiter/libgda_sql_delimiter-3.0.la \ -- $(top_builddir)/report/libgda-report/libgda-report-3.0.la \ -- $(LIBGDA_LIBS) -+ $(top_builddir)/report/libgda-report/libgda-report-3.0.la \ -+ $(LIBGDA_LIBS) -Index: testing/Makefile.am -=================================================================== ---- testing/Makefile.am (revision 2809) -+++ testing/Makefile.am (working copy) -@@ -3,7 +3,7 @@ - -I$(top_builddir) \ - $(LIBGDA_CFLAGS) - --bin_PROGRAMS = gda-test-connection -+bin_PROGRAMS = gda-test-connection-3.0 - noinst_PROGRAMS = gda-test-sql gda-test-models gda-test-server-operation gda-test-model-query gda-test-blob - - gda_test_sql_SOURCES = \ -@@ -30,10 +30,10 @@ - $(top_builddir)/libgda/sql-delimiter/libgda_sql_delimiter-3.0.la \ - $(LIBGDA_LIBS) - --gda_test_connection_SOURCES = \ -+gda_test_connection_3_0_SOURCES = \ - gda-test-connection.c - --gda_test_connection_LDADD = \ -+gda_test_connection_3_0_LDADD = \ - $(top_builddir)/libgda/libgda-3.0.la \ - $(top_builddir)/libgda/handlers/libgda_handlers-3.0.la \ - $(top_builddir)/libgda/graph/libgda_graph-3.0.la \ -Index: configure.in -=================================================================== ---- configure.in (revision 2809) -+++ configure.in (working copy) -@@ -988,7 +988,7 @@ - dnl - dnl where to install DTD files - dnl --LIBGDA_DTDDIR=${datadir}/${PACKAGE}/dtd -+LIBGDA_DTDDIR=${datadir}/libgda-3.0/dtd - AC_SUBST(LIBGDA_DTDDIR) - - diff --git a/gnome-extra/libgda/files/libgda-2.99.5-gapi.patch b/gnome-extra/libgda/files/libgda-2.99.5-gapi.patch new file mode 100644 index 000000000000..5a2565a8c1e2 --- /dev/null +++ b/gnome-extra/libgda/files/libgda-2.99.5-gapi.patch @@ -0,0 +1,11 @@ +diff -NurdB libgda-2.99.5/gda-sharp/Gda.metadata libgda-2.99.5-patched/gda-sharp/Gda.metadata +--- libgda-2.99.5/gda-sharp/Gda.metadata 2007-02-12 06:01:51.000000000 -0500 ++++ libgda-2.99.5-patched/gda-sharp/Gda.metadata 2007-02-13 01:09:42.000000000 -0500 +@@ -4,6 +4,7 @@ + 1 + 1 + IGdaDataModel ++ DataReset + IEntity + IXmlStorage + IDataHandler diff --git a/gnome-extra/libgda/libgda-2.99.3.ebuild b/gnome-extra/libgda/libgda-2.99.5.ebuild similarity index 60% rename from gnome-extra/libgda/libgda-2.99.3.ebuild rename to gnome-extra/libgda/libgda-2.99.5.ebuild index 9c97344388bb..486e83c573f1 100644 --- a/gnome-extra/libgda/libgda-2.99.3.ebuild +++ b/gnome-extra/libgda/libgda-2.99.5.ebuild @@ -1,20 +1,18 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-2.99.3.ebuild,v 1.1 2007/01/29 22:48:44 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-2.99.5.ebuild,v 1.1 2007/02/13 22:08:40 leonardop Exp $ # TODO: # * Verify if the parallel compilation problems persist, and if so fix them. -WANT_AUTOMAKE="1.9" -WANT_AUTOCONF="2.5" - -inherit autotools eutils mono gnome2 +inherit eutils mono gnome2 DESCRIPTION="Gnome Database Access Library" HOMEPAGE="http://www.gnome-db.org/" LICENSE="GPL-2 LGPL-2" -IUSE="berkdb doc firebird freetds ldap mdb mono mysql oci8 odbc postgres xbase" +# MDB support currently works with CVS only, so disable it in the meantime +IUSE="berkdb doc firebird freetds ldap mono mysql oci8 odbc postgres xbase" SLOT="3" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" @@ -31,7 +29,7 @@ RDEPEND=">=dev-libs/glib-2.8 freetds? ( >=dev-db/freetds-0.62 ) firebird? ( dev-db/firebird ) xbase? ( dev-db/xbase ) - mdb? ( >=app-office/mdbtools-0.5 ) + mdb? ( >app-office/mdbtools-0.5 ) ldap? ( >=net-nds/openldap-2.0.25 ) mono? ( >=dev-lang/mono-1 @@ -58,8 +56,9 @@ pkg_setup() { $(use_with freetds tds /usr) \ $(use_with firebird firebird /usr) \ $(use_with xbase xbase /usr) \ - $(use_with mdb mdb /usr) \ - $(use_with ldap ldap /usr)" + $(use_with ldap ldap /usr) \ + --without-mdb" +# $(use_with mdb mdb /usr) \ use oci8 || G2CONF="${G2CONF} --without-oracle" @@ -70,19 +69,7 @@ pkg_setup() { src_unpack() { gnome2_src_unpack - # Fix compilation of the mdb provider - epatch "${FILESDIR}/${PN}-1.2.3-mdb_api.patch" - - # Avoid collisions with libgda-1.2.x - epatch "${FILESDIR}/${P}-collisions.patch" - mv -f ${S}/tools/gda-config.5 ${S}/tools/gda-config-3.0.5 - mv -f ${S}/tools/gda-config-tool.1 ${S}/tools/gda-config-tool-3.0.1 - mv -f ${S}/doc/C/libgda-docs.sgml ${S}/doc/C/libgda-3.0-docs.sgml - mv -f ${S}/doc/C/libgda-overrides.txt ${S}/doc/C/libgda-3.0-overrides.txt - mv -f ${S}/doc/C/libgda-sections.txt ${S}/doc/C/libgda-3.0-sections.txt - mv -f ${S}/doc/C/libgda.types ${S}/doc/C/libgda-3.0.types + epatch "${FILESDIR}/${P}-gapi.patch" - sed -n -e '/GTK_DOC_CHECK/,/IT_PROG_INTLTOOL/p' aclocal.m4 > gtk-doc.m4 - intltoolize --automake -c -f || die "intltoolize failed" - AT_M4DIR="." eautoreconf + rm ${S}/gda-sharp/gda-api.raw } diff --git a/gnome-extra/libgnomedb/ChangeLog b/gnome-extra/libgnomedb/ChangeLog index fcb6cf4498a2..a3a82adee2a6 100644 --- a/gnome-extra/libgnomedb/ChangeLog +++ b/gnome-extra/libgnomedb/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnome-extra/libgnomedb # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgnomedb/ChangeLog,v 1.51 2007/01/29 22:53:46 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgnomedb/ChangeLog,v 1.52 2007/02/13 22:13:30 leonardop Exp $ + +*libgnomedb-2.99.5 (13 Feb 2007) + + 13 Feb 2007; Leonardo Boshell + -files/libgnomedb-2.99.3-collisions.patch, -libgnomedb-2.99.3.ebuild, + +libgnomedb-2.99.5.ebuild: + New release. *libgnomedb-2.99.3 (29 Jan 2007) diff --git a/gnome-extra/libgnomedb/files/digest-libgnomedb-2.99.3 b/gnome-extra/libgnomedb/files/digest-libgnomedb-2.99.3 deleted file mode 100644 index 5bcc7a04d8fc..000000000000 --- a/gnome-extra/libgnomedb/files/digest-libgnomedb-2.99.3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 947c1abecda9f6cb58c50046fb591765 libgnomedb-2.99.3.tar.bz2 4117668 -RMD160 879b921cfc6ec8b95371156c1407ff6b94b8d541 libgnomedb-2.99.3.tar.bz2 4117668 -SHA256 809258148122100dc23bd38f9d7c0700f2a2237c0d4002f92a7aeaba6bd5bdcc libgnomedb-2.99.3.tar.bz2 4117668 diff --git a/gnome-extra/libgnomedb/files/digest-libgnomedb-2.99.5 b/gnome-extra/libgnomedb/files/digest-libgnomedb-2.99.5 new file mode 100644 index 000000000000..754b179ae54b --- /dev/null +++ b/gnome-extra/libgnomedb/files/digest-libgnomedb-2.99.5 @@ -0,0 +1,3 @@ +MD5 4bce88b00f5d2741e361f5ccd0b43c7c libgnomedb-2.99.5.tar.bz2 4112896 +RMD160 451692de95cb0c07b2896ecf7ae71928a7113f80 libgnomedb-2.99.5.tar.bz2 4112896 +SHA256 d8ea1f5de14fe8d4aab073d3a5955e6aaa4c4fe8b78eb7a870649b4f29c0ac6a libgnomedb-2.99.5.tar.bz2 4112896 diff --git a/gnome-extra/libgnomedb/files/libgnomedb-2.99.3-collisions.patch b/gnome-extra/libgnomedb/files/libgnomedb-2.99.3-collisions.patch deleted file mode 100644 index 8a0adb650872..000000000000 --- a/gnome-extra/libgnomedb/files/libgnomedb-2.99.3-collisions.patch +++ /dev/null @@ -1,196 +0,0 @@ -diff -NurdpB libgnomedb-2.99.3/Makefile.am libgnomedb-2.99.3-patched/Makefile.am ---- libgnomedb-2.99.3/Makefile.am 2007-01-23 06:34:22.000000000 -0500 -+++ libgnomedb-2.99.3-patched/Makefile.am 2007-01-29 14:00:03.000000000 -0500 -@@ -59,7 +59,7 @@ EXTRA_DIST = \ - intltool-update.in \ - mkinstalldirs - --pixmapdir=$(datadir)/pixmaps/libgnomedb -+pixmapdir=$(datadir)/pixmaps - pixmap_DATA=gnome-db.png - - pkgconfigdir=$(libdir)/pkgconfig -diff -NurdpB libgnomedb-2.99.3/configure.in libgnomedb-2.99.3-patched/configure.in ---- libgnomedb-2.99.3/configure.in 2007-01-27 09:22:54.000000000 -0500 -+++ libgnomedb-2.99.3-patched/configure.in 2007-01-29 13:04:43.000000000 -0500 -@@ -377,13 +377,12 @@ libgnomedb.spec - libgnomedb-3.0.pc - libgnomedb-graph-3.0.pc - control-center/Makefile --control-center/database-properties.desktop - data/Makefile - data/libgnomedb.keys - data/16x16/Makefile - data/22x22/Makefile - doc/Makefile --doc/libgnomedb-C.omf -+doc/libgnomedb-3.0-C.omf - doc/C/Makefile - glade/Makefile - glade3/Makefile -diff -NurdpB libgnomedb-2.99.3/control-center/Makefile.am libgnomedb-2.99.3-patched/control-center/Makefile.am ---- libgnomedb-2.99.3/control-center/Makefile.am 2007-01-23 06:34:19.000000000 -0500 -+++ libgnomedb-2.99.3-patched/control-center/Makefile.am 2007-01-29 14:00:52.000000000 -0500 -@@ -1,4 +1,4 @@ --bin_PROGRAMS=gnome-database-properties -+bin_PROGRAMS=gnome-database-properties-3.0 - - AM_CPPFLAGS = \ - -I$(top_srcdir) \ -@@ -18,7 +18,7 @@ AM_CPPFLAGS = \ - -DDATADIR=\""$(datadir)"\" \ - -DLIBDIR=\""$(libdir)"\" - --gnome_database_properties_SOURCES=\ -+gnome_database_properties_3_0_SOURCES=\ - dsn-config.c \ - dsn-config.h \ - dsn-properties-dialog.c \ -@@ -26,7 +26,7 @@ gnome_database_properties_SOURCES=\ - main.c \ - provider-config.c \ - provider-config.h --gnome_database_properties_LDADD=\ -+gnome_database_properties_3_0_LDADD=\ - $(LIBGNOMEDB_LIBS) \ - $(top_builddir)/libgnomedb/libgnomedb-3.la \ - $(top_builddir)/libgnomedb/data-entries/libgnomedb_handlers-3.la -@@ -34,7 +34,7 @@ gnome_database_properties_LDADD=\ - @INTLTOOL_DESKTOP_RULE@ - - desktopdir=$(datadir)/applications --Desktop_in_files = database-properties.desktop.in -+Desktop_in_files = database-properties-3.0.desktop.in - desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) - - EXTRA_DIST = $(Desktop_in_files) -diff -NurdpB libgnomedb-2.99.3/control-center/database-properties.desktop.in libgnomedb-2.99.3-patched/control-center/database-properties.desktop.in ---- libgnomedb-2.99.3/control-center/database-properties.desktop.in 2007-01-12 17:28:48.000000000 -0500 -+++ libgnomedb-2.99.3-patched/control-center/database-properties.desktop.in 2007-01-29 14:00:17.000000000 -0500 -@@ -1,8 +1,8 @@ - [Desktop Entry] --_Name=Database Access Properties -+_Name=Database Access Properties - _Comment=Configure your database environment --Icon=libgnomedb/gnome-db.png --Exec=gnome-database-properties -+Icon=gnome-db -+Exec=gnome-database-properties-3.0 - Terminal=0 - Type=Application - Categories=Application;Settings;AdvancedSettings; -diff -NurdpB libgnomedb-2.99.3/data/Makefile.am libgnomedb-2.99.3-patched/data/Makefile.am ---- libgnomedb-2.99.3/data/Makefile.am 2007-01-23 06:38:06.000000000 -0500 -+++ libgnomedb-2.99.3-patched/data/Makefile.am 2007-01-29 13:04:43.000000000 -0500 -@@ -16,7 +16,7 @@ SUBDIRS = $(glade3_directory_16) $(glade - - # GConf schemas - schemadir = $(GCONF_SCHEMA_FILE_DIR) --schema_DATA = libgnomedb.schemas -+schema_DATA = libgnomedb-3.0.schemas - - @INTLTOOL_SCHEMAS_RULE@ - -@@ -28,7 +28,7 @@ install-data-local: - endif - - # Pixmaps --pixmapdir=$(datadir)/pixmaps/libgnomedb -+pixmapdir=$(datadir)/pixmaps/libgnomedb-3.0 - pixmap_DATA= \ - gnome-db-aggregates_16x16.png \ - gnome-db-aggregates_24x24.png \ -@@ -65,8 +65,10 @@ pixmap_DATA= \ - gnome-db-console_48x48.png - - # MIME data --Mimedir = $(datadir)/mime-info --Mime_DATA = libgnomedb.keys libgnomedb.mime -+# Don't install these, since they clash with files from libgnomedb-1.2.x and -+# should be replaced by following the new shared-mime-info spec. -+#Mimedir = $(datadir)/mime-info -+#Mime_DATA = libgnomedb.keys libgnomedb.mime - - # other - xmldir = $(datadir)/gnome-db -@@ -77,11 +79,11 @@ keys_files = $(keys_in_files:.keys.in=.k - @INTLTOOL_KEYS_RULE@ - - EXTRA_DIST = \ -- libgnomedb.schemas.in \ -+ libgnomedb-3.0.schemas.in \ - $(pixmap_DATA) \ - libgnomedb.keys.in \ - libgnomedb.mime \ - import_encodings.xml \ - server_operation.glade - --CLEANFILES = libgnomedb.keys libgnomedb.schemas -+CLEANFILES = libgnomedb.keys libgnomedb-3.0.schemas -diff -NurdpB libgnomedb-2.99.3/doc/C/Makefile.am libgnomedb-2.99.3-patched/doc/C/Makefile.am ---- libgnomedb-2.99.3/doc/C/Makefile.am 2007-01-27 09:08:27.000000000 -0500 -+++ libgnomedb-2.99.3-patched/doc/C/Makefile.am 2007-01-29 13:04:43.000000000 -0500 -@@ -3,7 +3,7 @@ - AUTOMAKE_OPTIONS = 1.6 - - # The name of the module. --DOC_MODULE=libgnomedb -+DOC_MODULE=libgnomedb-3.0 - - # The top-level SGML file. - DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml -diff -NurdpB libgnomedb-2.99.3/doc/Makefile.am libgnomedb-2.99.3-patched/doc/Makefile.am ---- libgnomedb-2.99.3/doc/Makefile.am 2007-01-12 17:28:54.000000000 -0500 -+++ libgnomedb-2.99.3-patched/doc/Makefile.am 2007-01-29 13:04:43.000000000 -0500 -@@ -19,4 +19,4 @@ uninstall-local: - -scrollkeeper-update -p $(scrollkeeper_localstate_dir) - - EXTRA_DIST = \ -- libgnomedb-C.omf.in -+ libgnomedb-3.0-C.omf.in -diff -NurdpB libgnomedb-2.99.3/doc/libgnomedb-C.omf.in libgnomedb-2.99.3-patched/doc/libgnomedb-C.omf.in ---- libgnomedb-2.99.3/doc/libgnomedb-C.omf.in 2007-01-12 17:28:54.000000000 -0500 -+++ libgnomedb-2.99.3-patched/doc/libgnomedb-C.omf.in 2007-01-29 13:04:43.000000000 -0500 -@@ -15,7 +15,7 @@ - - user's guide - -- -+ - - - -diff -NurdpB libgnomedb-2.99.3/glade/Makefile.am libgnomedb-2.99.3-patched/glade/Makefile.am ---- libgnomedb-2.99.3/glade/Makefile.am 2007-01-23 06:34:22.000000000 -0500 -+++ libgnomedb-2.99.3-patched/glade/Makefile.am 2007-01-29 13:05:22.000000000 -0500 -@@ -8,14 +8,14 @@ AM_CPPFLAGS = \ - $(LIBGLADE_CFLAGS) - - glademoduledir = $(libdir)/libglade/2.0 --glademodule_LTLIBRARIES = libgnomedb.la -+glademodule_LTLIBRARIES = libgnomedb-3.0.la - --libgnomedb_la_LIBADD = \ -+libgnomedb_3_0_la_LIBADD = \ - $(top_builddir)/libgnomedb/libgnomedb-3.la \ - $(LIBGNOMEDB_LIBS) $(LIBGLADE_LIBS) - --libgnomedb_la_LDFLAGS = \ -+libgnomedb_3_0_la_LDFLAGS = \ - -export-dynamic -module -avoid-version $(NO_UNDEFINED) - --libgnomedb_la_SOURCES = \ -+libgnomedb_3_0_la_SOURCES = \ - glade-gnomedb.c -diff -NurdpB libgnomedb-2.99.3/libgnomedb/Makefile.am libgnomedb-2.99.3-patched/libgnomedb/Makefile.am ---- libgnomedb-2.99.3/libgnomedb/Makefile.am 2007-01-27 09:08:23.000000000 -0500 -+++ libgnomedb-2.99.3-patched/libgnomedb/Makefile.am 2007-01-29 13:04:43.000000000 -0500 -@@ -9,7 +9,7 @@ AM_CPPFLAGS = \ - $(GTKSOURCEVIEW_CFLAGS) \ - $(LIBGLADE_CFLAGS) \ - $(GCONF_CFLAGS) \ -- -DLIBGNOMEDB_ICONSDIR=\""$(datadir)/pixmaps/libgnomedb"\" \ -+ -DLIBGNOMEDB_ICONSDIR=\""$(datadir)/pixmaps/libgnomedb-3.0"\" \ - -DLIBGNOMEDB_DATADIR=\""$(datadir)/gnome-db"\" \ - -DLIBGNOMEDB_LOCALEDIR=\""$(datadir)/locale"\" \ - -DLIBGNOMEDB_UIDIR=\""$(datadir)/gnome-db/ui"\" \ diff --git a/gnome-extra/libgnomedb/libgnomedb-2.99.3.ebuild b/gnome-extra/libgnomedb/libgnomedb-2.99.5.ebuild similarity index 59% rename from gnome-extra/libgnomedb/libgnomedb-2.99.3.ebuild rename to gnome-extra/libgnomedb/libgnomedb-2.99.5.ebuild index 22425663ae83..8af21c18351c 100644 --- a/gnome-extra/libgnomedb/libgnomedb-2.99.3.ebuild +++ b/gnome-extra/libgnomedb/libgnomedb-2.99.5.ebuild @@ -1,11 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgnomedb/libgnomedb-2.99.3.ebuild,v 1.1 2007/01/29 22:53:46 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgnomedb/libgnomedb-2.99.5.ebuild,v 1.1 2007/02/13 22:13:30 leonardop Exp $ -WANT_AUTOCONF="2.5" -WANT_AUTOMAKE="1.9" - -inherit autotools eutils mono gnome2 +inherit mono gnome2 DESCRIPTION="Database widget library from the GNOME-DB project" HOMEPAGE="http://www.gnome-db.org/" @@ -23,7 +20,7 @@ IUSE="doc mono" # There is no evolution-data-server support yet, only a check in configure. RDEPEND=">=x11-libs/gtk+-2.10 >=gnome-base/gconf-2 - >=gnome-extra/libgda-2.99.2 + >=gnome-extra/libgda-2.99.5 >=gnome-base/libgnomecanvas-2 >=gnome-base/libglade-2 >=x11-libs/gtksourceview-1 @@ -50,19 +47,3 @@ pkg_setup() { ewarn "'mono' USE flag. libgnomedb will be built without mono support." fi } - -src_unpack() { - gnome2_src_unpack - - # Avoid file collisions with libgnomedb-1.2.x - epatch "${FILESDIR}/${P}-collisions.patch" - mv -f ${S}/control-center/database-properties.desktop.in ${S}/control-center/database-properties-3.0.desktop.in - mv -f ${S}/data/libgnomedb.schemas.in ${S}/data/libgnomedb-3.0.schemas.in - mv -f ${S}/doc/libgnomedb-C.omf.in ${S}/doc/libgnomedb-3.0-C.omf.in - mv -f ${S}/doc/C/libgnomedb-docs.sgml ${S}/doc/C/libgnomedb-3.0-docs.sgml - mv -f ${S}/doc/C/libgnomedb-overrides.txt ${S}/doc/C/libgnomedb-3.0-overrides.txt - mv -f ${S}/doc/C/libgnomedb-sections.txt ${S}/doc/C/libgnomedb-3.0-sections.txt - mv -f ${S}/doc/C/libgnomedb.types ${S}/doc/C/libgnomedb-3.0.types - - eautoreconf -}