New release: 2.99.5

Package-Manager: portage-2.1.2-r9

5 files changed, 14 insertions, 222 deletions

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 <leonardop@gentoo.org>
+  -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 @@
-     </description>
-     <type>user's guide</type>
-     <format mime="text/html"/>
--    <identifier url="file:/@prefix@/share/gtk-doc/html/libgnomedb/index.html"/>
-+    <identifier url="file:/@prefix@/share/gtk-doc/html/libgnomedb-3.0/index.html"/>
-     <language code="C"/>
-     <relation seriesid="0c3a2de2-d4ca-11d6-8994-cd3caececda4"/>
-     <rights type="GNU FDL" license.version="1.1"/>
-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
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
-}