cleanup. new version thanks to Robert Davis <rdavis@unico.com> (#48611)

8 files changed, 52 insertions, 63 deletions

diff --git a/gnome-extra/libgnomedb/ChangeLog b/gnome-extra/libgnomedb/ChangeLog
index 3c71cc034857..df405849dd0b 100644
--- a/gnome-extra/libgnomedb/ChangeLog
+++ b/gnome-extra/libgnomedb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/libgnomedb
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgnomedb/ChangeLog,v 1.22 2004/06/24 22:08:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgnomedb/ChangeLog,v 1.23 2004/08/05 13:37:46 liquidx Exp $
+
+*libgnomedb-1.0.4 (05 Aug 2004)
+
+  05 Aug 2004; Alastair Tse <liquidx@gentoo.org>
+  +files/libgnomedb-1.0.4-selector.patch, -libgnomedb-1.0.0.ebuild,
+  -libgnomedb-1.0.2.ebuild, +libgnomedb-1.0.4.ebuild:
+  cleanup. new version thanks to Robert Davis <rdavis@unico.com> (#48611)
 
   29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   libgnomedb-0.12.1.ebuild, libgnomedb-1.0.0.ebuild, libgnomedb-1.0.1.ebuild,
diff --git a/gnome-extra/libgnomedb/Manifest b/gnome-extra/libgnomedb/Manifest
index d62b4b3709bc..cdfa9d94ff2c 100644
--- a/gnome-extra/libgnomedb/Manifest
+++ b/gnome-extra/libgnomedb/Manifest
@@ -1,13 +1,12 @@
 MD5 d65098e3a9bb9b1ae8532658be499240 libgnomedb-1.0.1.ebuild 1260
 MD5 627484f87af962b9733e18241794695e libgnomedb-1.0.3.ebuild 1394
 MD5 5338564d27c9ab0fdd3399d19d73edf6 libgnomedb-0.12.1.ebuild 1196
-MD5 0fabadda9b9fbf635f4f90829e4a231a libgnomedb-1.0.0.ebuild 1237
-MD5 899cb5544923f92fbef69cc7f01059f4 libgnomedb-1.0.2.ebuild 1251
+MD5 d9b1c174eba4db481ff27579b2f47032 libgnomedb-1.0.4.ebuild 1478
 MD5 e7da80eabaecd7c8da21d9044118e09b ChangeLog 3634
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 d48a0cec30d90af0c488dc4dbfc3e1a3 files/digest-libgnomedb-0.12.1 70
+MD5 37d21bd238913942c2c2815c0ae80041 files/libgnomedb-1.0.4-selector.patch 803
 MD5 fa2e6e3b60ec75a5aca6665636c10540 files/libgnomedb-1.0.3-gtkdoc_fix.patch 1472
-MD5 22bbed9a12b3896021e6ba4f135702c6 files/digest-libgnomedb-1.0.0 69
 MD5 5cd64f762a82a44123610969ca055ed7 files/digest-libgnomedb-1.0.1 69
-MD5 3ec7f35477495a770c9dee210a18fa6c files/digest-libgnomedb-1.0.2 69
 MD5 d3ea318bdd4fd8f3725f0d9cb1a38b23 files/digest-libgnomedb-1.0.3 69
+MD5 e91ab2cfd3b938f9c09d5587f8653cf6 files/digest-libgnomedb-1.0.4 69
diff --git a/gnome-extra/libgnomedb/files/digest-libgnomedb-1.0.0 b/gnome-extra/libgnomedb/files/digest-libgnomedb-1.0.0
deleted file mode 100644
index 1119df1398b6..000000000000
--- a/gnome-extra/libgnomedb/files/digest-libgnomedb-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e5943ddf8e13cf216deb98433aeb02b7 libgnomedb-1.0.0.tar.bz2 565893
diff --git a/gnome-extra/libgnomedb/files/digest-libgnomedb-1.0.2 b/gnome-extra/libgnomedb/files/digest-libgnomedb-1.0.2
deleted file mode 100644
index 5a037f4acfff..000000000000
--- a/gnome-extra/libgnomedb/files/digest-libgnomedb-1.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 83d4a3c18e3efebde6e748f0c590b898 libgnomedb-1.0.2.tar.bz2 574720
diff --git a/gnome-extra/libgnomedb/files/digest-libgnomedb-1.0.4 b/gnome-extra/libgnomedb/files/digest-libgnomedb-1.0.4
new file mode 100644
index 000000000000..0294fb047cbe
--- /dev/null
+++ b/gnome-extra/libgnomedb/files/digest-libgnomedb-1.0.4
@@ -0,0 +1 @@
+MD5 956ddc8ddb3f4a2594a52b8a1b783f29 libgnomedb-1.0.4.tar.bz2 621983
diff --git a/gnome-extra/libgnomedb/files/libgnomedb-1.0.4-selector.patch b/gnome-extra/libgnomedb/files/libgnomedb-1.0.4-selector.patch
new file mode 100644
index 000000000000..a40df7bbed0c
--- /dev/null
+++ b/gnome-extra/libgnomedb/files/libgnomedb-1.0.4-selector.patch
@@ -0,0 +1,29 @@
+--- libgnomedb/gnome-db-data-source-selector.c.orig	Sun Apr 18 21:41:59 2004
++++ libgnomedb/gnome-db-data-source-selector.c	Sun Apr 18 21:43:20 2004
+@@ -61,8 +61,25 @@
+ 						    dsn_info->name);
+ 		gnome_db_config_free_data_source_info (dsn_info);
+ 	}
+-	else
++	else {
++		GList *dsn_list;
++		GList *l;
++
++		/* load data sources */
++		dsn_list = gnome_db_config_get_data_source_list ();
++		for (l = dsn_list; l != NULL; l = l->next) {
++			GdaDataSourceInfo *dsn_info = (GdaDataSourceInfo *) l->data;
++
++			if (!dsn_info)
++				continue;
++
++			/* add the data source to the option menu */
++			gnome_db_option_menu_add_item (GTK_OPTION_MENU (selector), dsn_info->name);
++		}
++
++		gnome_db_config_free_data_source_list (dsn_list);
+ 		gtk_option_menu_set_history (GTK_OPTION_MENU (selector), 0);
++	}
+ }
+ 
+ /*
diff --git a/gnome-extra/libgnomedb/libgnomedb-1.0.0.ebuild b/gnome-extra/libgnomedb/libgnomedb-1.0.0.ebuild
deleted file mode 100644
index ef0d7eb276e9..000000000000
--- a/gnome-extra/libgnomedb/libgnomedb-1.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgnomedb/libgnomedb-1.0.0.ebuild,v 1.6 2004/06/24 22:08:26 agriffis Exp $
-
-IUSE="doc"
-
-inherit gnome2
-
-DESCRIPTION="Library for writing gnome database programs"
-HOMEPAGE="http://www.gnome-db.org/"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="x86 ppc ~sparc"
-
-RDEPEND=">=gnome-extra/libgda-1.0.0
-	>=x11-libs/gtk+-2.0
-	>=gnome-base/libglade-2.0
-	>=gnome-base/libgnomeui-2.0
-	>=gnome-base/libbonoboui-2.0
-	>=gnome-base/gconf-2"
-# optionally needs gtksourceview, but unmaintained currently
-
-DEPEND=">=dev-util/pkgconfig-0.8
-	>=dev-util/intltool-0.22
-	>=sys-devel/gettext-0.11
-	>=app-text/scrollkeeper-0.3.11
-	doc? ( dev-util/gtk-doc )
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	gnome2_omf_fix ${S}/doc/Makefile.in
-}
-
-src_install() {
-	gnome2_src_install
-
-	# minor cosmetic fix to capplet icon
-	capplet_link=${D}/usr/share/control-center-2.0/capplets/database-properties.desktop
-	if [ -f "${capplet_link}" ]; then
-		mv ${capplet_link} ${capplet_link}.orig && \
-		sed 's,Icon=gnome-db.png,Icon=libgnomedb/gnome-db.png,' ${capplet_link}.orig > ${capplet_link}
-		rm ${capplet_link}.orig
-	fi
-}
diff --git a/gnome-extra/libgnomedb/libgnomedb-1.0.2.ebuild b/gnome-extra/libgnomedb/libgnomedb-1.0.4.ebuild
index d9d6d48ebeb3..9c9ba49bb458 100644
--- a/gnome-extra/libgnomedb/libgnomedb-1.0.2.ebuild
+++ b/gnome-extra/libgnomedb/libgnomedb-1.0.4.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgnomedb/libgnomedb-1.0.2.ebuild,v 1.4 2004/06/24 22:08:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgnomedb/libgnomedb-1.0.4.ebuild,v 1.1 2004/08/05 13:37:46 liquidx Exp $
 
-IUSE="doc"
-
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Library for writing gnome database programs"
 HOMEPAGE="http://www.gnome-db.org/"
-SLOT="0"
+
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~x86 ppc ~sparc"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64"
+IUSE="doc"
 
 RDEPEND=">=gnome-extra/libgda-1.0.0
 	>=x11-libs/gtk+-2.0
@@ -19,7 +19,6 @@ RDEPEND=">=gnome-extra/libgda-1.0.0
 	>=gnome-base/libbonoboui-2.0
 	>=gnome-base/gconf-2"
 # gtksourceview is maintained now, and configure checks it's presence
-
 DEPEND=">=dev-util/pkgconfig-0.8
 	>=dev-util/intltool-0.22
 	>=sys-devel/gettext-0.11
@@ -28,14 +27,16 @@ DEPEND=">=dev-util/pkgconfig-0.8
 	${RDEPEND}"
 
 src_unpack() {
-
 	unpack ${A}
 	gnome2_omf_fix ${S}/doc/Makefile.in
-
+	cd ${S}; intltoolize --force || die
+	# Avoid documentation problems. See bug #46275.
+	epatch ${FILESDIR}/${PN}-1.0.3-gtkdoc_fix.patch
+	# add extra selector #48611
+	epatch ${FILESDIR}/${PN}-1.0.4-selector.patch
 }
 
 src_install() {
-
 	gnome2_src_install
 
 	# minor cosmetic fix to capplet icon
@@ -45,5 +46,4 @@ src_install() {
 		sed 's,Icon=gnome-db.png,Icon=libgnomedb/gnome-db.png,' ${capplet_link}.orig > ${capplet_link}
 		rm ${capplet_link}.orig
 	fi
-
 }