From 3ecdd6a7f603ddc0034c17fbbb19c2efb663642d Mon Sep 17 00:00:00 2001 From: Leonardo Boshell Date: Mon, 29 Jan 2007 22:53:46 +0000 Subject: [PATCH] Release 2.99.3 for testing Package-Manager: portage-2.1.2-r3 --- gnome-extra/libgnomedb/ChangeLog | 11 +- gnome-extra/libgnomedb/Manifest | 20 +- .../libgnomedb/files/digest-libgnomedb-2.99.3 | 3 + .../files/libgnomedb-2.99.3-collisions.patch | 196 ++++++++++++++++++ .../libgnomedb/libgnomedb-2.99.3.ebuild | 68 ++++++ 5 files changed, 292 insertions(+), 6 deletions(-) create mode 100644 gnome-extra/libgnomedb/files/digest-libgnomedb-2.99.3 create mode 100644 gnome-extra/libgnomedb/files/libgnomedb-2.99.3-collisions.patch create mode 100644 gnome-extra/libgnomedb/libgnomedb-2.99.3.ebuild diff --git a/gnome-extra/libgnomedb/ChangeLog b/gnome-extra/libgnomedb/ChangeLog index dc2cf0f66036..fcb6cf4498a2 100644 --- a/gnome-extra/libgnomedb/ChangeLog +++ b/gnome-extra/libgnomedb/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnome-extra/libgnomedb -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgnomedb/ChangeLog,v 1.50 2006/08/17 18:26:12 jer Exp $ +# 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 $ + +*libgnomedb-2.99.3 (29 Jan 2007) + + 29 Jan 2007; Leonardo Boshell + +files/libgnomedb-2.99.3-collisions.patch, +libgnomedb-2.99.3.ebuild: + Adding 3.0 beta for testing. Updated dependencies. Changed SLOT. Added + 'mono' USE flag. Dropped 'static' USE flag. 17 Aug 2006; Jeroen Roovers libgnomedb-1.2.2.ebuild: Stable for HPPA (bug #144120). diff --git a/gnome-extra/libgnomedb/Manifest b/gnome-extra/libgnomedb/Manifest index bb46378f1733..7a283ca26dc2 100644 --- a/gnome-extra/libgnomedb/Manifest +++ b/gnome-extra/libgnomedb/Manifest @@ -1,12 +1,21 @@ +AUX libgnomedb-2.99.3-collisions.patch 7491 RMD160 6445afd10419906c74bb9cb545a8cbe30ab97363 SHA1 76181e93e23cff414407d85cba19c4a2e02427d9 SHA256 822e3dd260b83dff13f77b9145d9e9ff5fb7fb30cb28edd70091a3270829469f +MD5 74a098865fa665382470cb30b613dc74 files/libgnomedb-2.99.3-collisions.patch 7491 +RMD160 6445afd10419906c74bb9cb545a8cbe30ab97363 files/libgnomedb-2.99.3-collisions.patch 7491 +SHA256 822e3dd260b83dff13f77b9145d9e9ff5fb7fb30cb28edd70091a3270829469f files/libgnomedb-2.99.3-collisions.patch 7491 DIST libgnomedb-1.2.2.tar.bz2 654823 RMD160 9b5f2c6b684f583467de7cd4be00b6bb93cefeb3 SHA1 11de10b525051a901ba177f4324acfd1fe1ad4c8 SHA256 1dc3967ac3ff9407268ad0b36dc93eef680b5a2a088929c2a52597223d4b4d96 +DIST libgnomedb-2.99.3.tar.bz2 4117668 RMD160 879b921cfc6ec8b95371156c1407ff6b94b8d541 SHA1 b131888a723966b1849abcb90934531899b9c180 SHA256 809258148122100dc23bd38f9d7c0700f2a2237c0d4002f92a7aeaba6bd5bdcc EBUILD libgnomedb-1.2.2.ebuild 1103 RMD160 b97eb549c2eb1211fa272535a931382f60d3b6db SHA1 82d3f759155bc9536b04652fa61847e781632585 SHA256 0fa318380e700ecf586444af3205e4dff367e20968f158e5339ef330ecb8be2b MD5 340a9c5b33cb5a421a8f28a2bf439c1d libgnomedb-1.2.2.ebuild 1103 RMD160 b97eb549c2eb1211fa272535a931382f60d3b6db libgnomedb-1.2.2.ebuild 1103 SHA256 0fa318380e700ecf586444af3205e4dff367e20968f158e5339ef330ecb8be2b libgnomedb-1.2.2.ebuild 1103 -MISC ChangeLog 7447 RMD160 1f9b3e6aa7107ba8682b5ff9b2518e2b67ab1c0f SHA1 e0585ba411ade1044c7927e37583e4a1f3ba954d SHA256 10f0e9278d5886db7e6dbdd28f88c3651906f88c33d3b4925149466931e63d64 -MD5 0fd8691de6f576fb31d997c4fde2f2d5 ChangeLog 7447 -RMD160 1f9b3e6aa7107ba8682b5ff9b2518e2b67ab1c0f ChangeLog 7447 -SHA256 10f0e9278d5886db7e6dbdd28f88c3651906f88c33d3b4925149466931e63d64 ChangeLog 7447 +EBUILD libgnomedb-2.99.3.ebuild 2171 RMD160 97b5226d7f4f0f3ebf082ce87c5a386deb94a024 SHA1 c954d2be7cf3f08f0d4c79375103633d23eb0a3c SHA256 2c629dbab9696d08363a62187091e54a40cedb0dc9dfad20319f0a668c39a094 +MD5 434f4559896ab13315c8f533a9da2631 libgnomedb-2.99.3.ebuild 2171 +RMD160 97b5226d7f4f0f3ebf082ce87c5a386deb94a024 libgnomedb-2.99.3.ebuild 2171 +SHA256 2c629dbab9696d08363a62187091e54a40cedb0dc9dfad20319f0a668c39a094 libgnomedb-2.99.3.ebuild 2171 +MISC ChangeLog 7734 RMD160 18fa23c8f755edbb4fa19f0a6b6fbb49f3d539d0 SHA1 9b369a8c563afe810a6ea739c0a1085855f12fec SHA256 9390f6039c70ecfe9dc49f2a053a9269c9fbf8176be1242857e4285c876639cb +MD5 26f1750d81b776885ef29d885d5ee0eb ChangeLog 7734 +RMD160 18fa23c8f755edbb4fa19f0a6b6fbb49f3d539d0 ChangeLog 7734 +SHA256 9390f6039c70ecfe9dc49f2a053a9269c9fbf8176be1242857e4285c876639cb ChangeLog 7734 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158 @@ -14,3 +23,6 @@ SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata MD5 ac2d1f6f21444311e478f7ff49cae2a3 files/digest-libgnomedb-1.2.2 253 RMD160 773ec512028e41f824b46093ec5bcee0a2738d5f files/digest-libgnomedb-1.2.2 253 SHA256 cd13795706c9569c27570358c266fd1e9e3378a578c064e45ac3fd1737ed1730 files/digest-libgnomedb-1.2.2 253 +MD5 daeef97710bed58446ac40ff36934292 files/digest-libgnomedb-2.99.3 259 +RMD160 baaded724662d575315fbcba5fbee0cd1986b317 files/digest-libgnomedb-2.99.3 259 +SHA256 b4148459d6577766e0533eb3916e15016a3a26baa32c33f5dd7e6a4af9b8fa42 files/digest-libgnomedb-2.99.3 259 diff --git a/gnome-extra/libgnomedb/files/digest-libgnomedb-2.99.3 b/gnome-extra/libgnomedb/files/digest-libgnomedb-2.99.3 new file mode 100644 index 000000000000..5bcc7a04d8fc --- /dev/null +++ b/gnome-extra/libgnomedb/files/digest-libgnomedb-2.99.3 @@ -0,0 +1,3 @@ +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/libgnomedb-2.99.3-collisions.patch b/gnome-extra/libgnomedb/files/libgnomedb-2.99.3-collisions.patch new file mode 100644 index 000000000000..8a0adb650872 --- /dev/null +++ b/gnome-extra/libgnomedb/files/libgnomedb-2.99.3-collisions.patch @@ -0,0 +1,196 @@ +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.3.ebuild new file mode 100644 index 000000000000..22425663ae83 --- /dev/null +++ b/gnome-extra/libgnomedb/libgnomedb-2.99.3.ebuild @@ -0,0 +1,68 @@ +# 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 $ + +WANT_AUTOCONF="2.5" +WANT_AUTOMAKE="1.9" + +inherit autotools eutils mono gnome2 + +DESCRIPTION="Database widget library from the GNOME-DB project" +HOMEPAGE="http://www.gnome-db.org/" + +LICENSE="GPL-2" +SLOT="3" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +IUSE="doc mono" + +# Dependencies here are set looking to obtain the most functionality, given that +# they are not unreasonable (e.g. gtk+'s version, gconf even if it's optional, +# etc.). +# +# 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-base/libgnomecanvas-2 + >=gnome-base/libglade-2 + >=x11-libs/gtksourceview-1 + mono? ( + >=dev-lang/mono-1 + >=dev-dotnet/glade-sharp-2 + >=dev-dotnet/gnome-sharp-2 + >=dev-dotnet/gtk-sharp-2.3.90 )" + +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.9 + >=dev-util/intltool-0.28 + app-text/scrollkeeper + doc? ( >=dev-util/gtk-doc-1 )" + +DOCS="AUTHORS ChangeLog NEWS" + + +pkg_setup() { + G2CONF="$(use_enable mono csharp)" + + if use mono && ! built_with_use libgda mono; then + ewarn "The package gnome-extra/libgda has been installed without the" + 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 +} -- 2.26.2