ppc64 stable wrt #301306

(Portage version: 2.2_rc67/cvs/Linux x86_64)

6 files changed, 7 insertions, 581 deletions

diff --git a/dev-libs/redland/ChangeLog b/dev-libs/redland/ChangeLog
index 27b44c48f132..d8e730e54369 100644
--- a/dev-libs/redland/ChangeLog
+++ b/dev-libs/redland/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/redland
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/ChangeLog,v 1.71 2010/06/17 20:13:41 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/ChangeLog,v 1.72 2010/07/03 23:10:50 ssuominen Exp $
+
+  03 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  redland-1.0.10-r1.ebuild:
+  ppc64 stable wrt #301306
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org> redland-1.0.9-r1.ebuild,
   redland-1.0.10-r1.ebuild, redland-1.0.10-r2.ebuild:
diff --git a/dev-libs/redland/files/redland-1.0.9-ldflags.patch b/dev-libs/redland/files/redland-1.0.9-ldflags.patch
deleted file mode 100644
index 504fe3e1f93d..000000000000
--- a/dev-libs/redland/files/redland-1.0.9-ldflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur redland-1.0.9.orig/configure.ac redland-1.0.9/configure.ac
---- redland-1.0.9.orig/configure.ac	2009-04-13 04:01:30.000000000 +0300
-+++ redland-1.0.9/configure.ac	2009-06-06 15:38:38.000000000 +0300
-@@ -952,7 +952,7 @@
- 
- LIBS=
- CPPFLAGS=
--LDFLAGS=
-+LDFLAGS="$LDFLAGS"
- 
- LIBRDF_LIBTOOLLIBS=librdf.la
- 
diff --git a/dev-libs/redland/files/redland-1.0.9-librdf_storage_register_factory.patch b/dev-libs/redland/files/redland-1.0.9-librdf_storage_register_factory.patch
deleted file mode 100644
index 60a851e26321..000000000000
--- a/dev-libs/redland/files/redland-1.0.9-librdf_storage_register_factory.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -ur redland-1.0.9.orig/src/Makefile.am redland-1.0.9/src/Makefile.am
---- redland-1.0.9.orig/src/Makefile.am	2009-04-13 04:01:30.000000000 +0300
-+++ redland-1.0.9/src/Makefile.am	2009-08-18 17:13:24.000000000 +0300
-@@ -119,7 +119,7 @@
- plugin_LTLIBRARIES += librdf_storage_tstore.la
- librdf_storage_tstore_la_SOURCES = rdf_storage_tstore.c
- librdf_storage_tstore_la_CPPFLAGS = @TSTORE_CPPFLAGS@
--librdf_storage_tstore_la_LIBADD = @TSTORE_LIBS@
-+librdf_storage_tstore_la_LIBADD = @TSTORE_LIBS@ librdf.la
- librdf_storage_tstore_la_LDFLAGS = -module -avoid-version
- endif
- 
-@@ -127,7 +127,7 @@
- plugin_LTLIBRARIES += librdf_storage_mysql.la
- librdf_storage_mysql_la_SOURCES = rdf_storage_mysql.c
- librdf_storage_mysql_la_CPPFLAGS = @MYSQL_CPPFLAGS@
--librdf_storage_mysql_la_LIBADD = @MYSQL_LIBS@
-+librdf_storage_mysql_la_LIBADD = @MYSQL_LIBS@ librdf.la
- librdf_storage_mysql_la_LDFLAGS = -module -avoid-version
- endif
- 
-@@ -135,7 +135,7 @@
- plugin_LTLIBRARIES += librdf_storage_sqlite.la
- librdf_storage_sqlite_la_SOURCES = rdf_storage_sqlite.c
- librdf_storage_sqlite_la_CPPFLAGS = @SQLITE_CPPFLAGS@
--librdf_storage_sqlite_la_LIBADD = @SQLITE_LIBS@
-+librdf_storage_sqlite_la_LIBADD = @SQLITE_LIBS@ librdf.la
- librdf_storage_sqlite_la_LDFLAGS = -module -avoid-version
- endif
- 
-@@ -143,7 +143,7 @@
- plugin_LTLIBRARIES += librdf_storage_postgresql.la
- librdf_storage_postgresql_la_SOURCES = rdf_storage_postgresql.c
- librdf_storage_postgresql_la_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
--librdf_storage_postgresql_la_LIBADD = @POSTGRESQL_LIBS@
-+librdf_storage_postgresql_la_LIBADD = @POSTGRESQL_LIBS@ librdf.la
- librdf_storage_postgresql_la_LDFLAGS = -module -avoid-version
- endif
- 
-@@ -202,7 +202,8 @@
- rdf_query_test rdf_serializer_test rdf_stream_test rdf_iterator_test \
- rdf_init_test rdf_cache_test
- 
--TESTS_ENVIRONMENT=REDLAND_MODULE_PATH=
-+# Set the place to find storage modules for testing
-+TESTS_ENVIRONMENT=REDLAND_MODULE_PATH=$(abs_builddir)/.libs
- 
- CLEANFILES=$(TESTS) $(local_tests) test test*.db test.rdf
- 
-diff -ur redland-1.0.9.orig/src/Makefile.in redland-1.0.9/src/Makefile.in
---- redland-1.0.9.orig/src/Makefile.in	2009-04-13 04:04:20.000000000 +0300
-+++ redland-1.0.9/src/Makefile.in	2009-08-18 17:13:24.000000000 +0300
-@@ -141,7 +141,8 @@
- librdf_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(librdf_la_LDFLAGS) $(LDFLAGS) -o $@
--librdf_storage_mysql_la_DEPENDENCIES =
-+@MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@librdf_storage_mysql_la_DEPENDENCIES =  \
-+@MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@	librdf.la
- am__librdf_storage_mysql_la_SOURCES_DIST = rdf_storage_mysql.c
- @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@am_librdf_storage_mysql_la_OBJECTS = librdf_storage_mysql_la-rdf_storage_mysql.lo
- librdf_storage_mysql_la_OBJECTS =  \
-@@ -151,7 +152,8 @@
- 	$(librdf_storage_mysql_la_LDFLAGS) $(LDFLAGS) -o $@
- @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@am_librdf_storage_mysql_la_rpath =  \
- @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@	-rpath $(plugindir)
--librdf_storage_postgresql_la_DEPENDENCIES =
-+@MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@librdf_storage_postgresql_la_DEPENDENCIES =  \
-+@MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@	librdf.la
- am__librdf_storage_postgresql_la_SOURCES_DIST =  \
- 	rdf_storage_postgresql.c
- @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@am_librdf_storage_postgresql_la_OBJECTS = librdf_storage_postgresql_la-rdf_storage_postgresql.lo
-@@ -164,7 +166,8 @@
- @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@am_librdf_storage_postgresql_la_rpath =  \
- @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@	-rpath \
- @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@	$(plugindir)
--librdf_storage_sqlite_la_DEPENDENCIES =
-+@MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@librdf_storage_sqlite_la_DEPENDENCIES =  \
-+@MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@	librdf.la
- am__librdf_storage_sqlite_la_SOURCES_DIST = rdf_storage_sqlite.c
- @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@am_librdf_storage_sqlite_la_OBJECTS = librdf_storage_sqlite_la-rdf_storage_sqlite.lo
- librdf_storage_sqlite_la_OBJECTS =  \
-@@ -174,7 +177,8 @@
- 	$(librdf_storage_sqlite_la_LDFLAGS) $(LDFLAGS) -o $@
- @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@am_librdf_storage_sqlite_la_rpath =  \
- @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@	-rpath $(plugindir)
--librdf_storage_tstore_la_DEPENDENCIES =
-+@MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@librdf_storage_tstore_la_DEPENDENCIES =  \
-+@MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@	librdf.la
- am__librdf_storage_tstore_la_SOURCES_DIST = rdf_storage_tstore.c
- @MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@am_librdf_storage_tstore_la_OBJECTS = librdf_storage_tstore_la-rdf_storage_tstore.lo
- librdf_storage_tstore_la_OBJECTS =  \
-@@ -463,19 +467,19 @@
- @MODULAR_LIBRDF_TRUE@	$(am__append_6)
- @MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@librdf_storage_tstore_la_SOURCES = rdf_storage_tstore.c
- @MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@librdf_storage_tstore_la_CPPFLAGS = @TSTORE_CPPFLAGS@
--@MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@librdf_storage_tstore_la_LIBADD = @TSTORE_LIBS@
-+@MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@librdf_storage_tstore_la_LIBADD = @TSTORE_LIBS@ librdf.la
- @MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@librdf_storage_tstore_la_LDFLAGS = -module -avoid-version
- @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@librdf_storage_mysql_la_SOURCES = rdf_storage_mysql.c
- @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@librdf_storage_mysql_la_CPPFLAGS = @MYSQL_CPPFLAGS@
--@MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@librdf_storage_mysql_la_LIBADD = @MYSQL_LIBS@
-+@MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@librdf_storage_mysql_la_LIBADD = @MYSQL_LIBS@ librdf.la
- @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@librdf_storage_mysql_la_LDFLAGS = -module -avoid-version
- @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@librdf_storage_sqlite_la_SOURCES = rdf_storage_sqlite.c
- @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@librdf_storage_sqlite_la_CPPFLAGS = @SQLITE_CPPFLAGS@
--@MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@librdf_storage_sqlite_la_LIBADD = @SQLITE_LIBS@
-+@MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@librdf_storage_sqlite_la_LIBADD = @SQLITE_LIBS@ librdf.la
- @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@librdf_storage_sqlite_la_LDFLAGS = -module -avoid-version
- @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@librdf_storage_postgresql_la_SOURCES = rdf_storage_postgresql.c
- @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@librdf_storage_postgresql_la_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
--@MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@librdf_storage_postgresql_la_LIBADD = @POSTGRESQL_LIBS@
-+@MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@librdf_storage_postgresql_la_LIBADD = @POSTGRESQL_LIBS@ librdf.la
- @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@librdf_storage_postgresql_la_LDFLAGS = -module -avoid-version
- librdf_la_LIBADD = \
- @LTLIBOBJS@ @DIGEST_OBJS@ @HASH_OBJS@ \
-@@ -502,7 +506,9 @@
- rdf_query_test rdf_serializer_test rdf_stream_test rdf_iterator_test \
- rdf_init_test rdf_cache_test
- 
--TESTS_ENVIRONMENT = REDLAND_MODULE_PATH=
-+
-+# Set the place to find storage modules for testing
-+TESTS_ENVIRONMENT = REDLAND_MODULE_PATH=$(abs_builddir)/.libs
- CLEANFILES = $(TESTS) $(local_tests) test test*.db test.rdf
- AM_CPPFLAGS = @LIBRDF_INTERNAL_CPPFLAGS@ @LIBRDF_CPPFLAGS@ \
- 	@LIBRDF_EXTERNAL_CPPFLAGS@ -DPKGDATADIR="\"$(pkgdatadir)\""
diff --git a/dev-libs/redland/files/redland-1.0.9-sqlite.patch b/dev-libs/redland/files/redland-1.0.9-sqlite.patch
deleted file mode 100644
index ee3878027419..000000000000
--- a/dev-libs/redland/files/redland-1.0.9-sqlite.patch
+++ /dev/null
@@ -1,365 +0,0 @@
-diff -ur redland-1.0.9.orig/configure.ac redland-1.0.9/configure.ac
---- redland-1.0.9.orig/configure.ac	2009-04-13 04:01:30.000000000 +0300
-+++ redland-1.0.9/configure.ac	2009-08-12 20:23:18.000000000 +0300
-@@ -675,7 +675,7 @@
-     SQLITE_CONFIG="$PKG_CONFIG sqlite"
-   fi
-   sqlite_version=`$SQLITE_CONFIG --modversion 2>/dev/null`
--  AC_DEFINE_UNQUOTED(SQLITE_API, $sqlite_api_version, [SQLite API version])
-+  AC_DEFINE_UNQUOTED(REDLAND_SQLITE_API, $sqlite_api_version, [SQLite API version])
- 
-   storages_available="$storages_available sqlite($sqlite_version)"
-   sqlite_storage_available=yes
-diff -ur redland-1.0.9.orig/src/rdf_config.h.in redland-1.0.9/src/rdf_config.h.in
---- redland-1.0.9.orig/src/rdf_config.h.in	2009-04-13 04:04:50.000000000 +0300
-+++ redland-1.0.9/src/rdf_config.h.in	2009-08-12 20:23:14.000000000 +0300
-@@ -313,7 +313,7 @@
- #undef SIZEOF_UNSIGNED_LONG_LONG
- 
- /* SQLite API version */
--#undef SQLITE_API
-+#undef REDLAND_SQLITE_API
- 
- /* Define to 1 if you have the ANSI C header files. */
- #undef STDC_HEADERS
-diff -ur redland-1.0.9.orig/src/rdf_storage_sqlite.c redland-1.0.9/src/rdf_storage_sqlite.c
---- redland-1.0.9.orig/src/rdf_storage_sqlite.c	2009-04-13 02:59:01.000000000 +0300
-+++ redland-1.0.9/src/rdf_storage_sqlite.c	2009-08-12 20:22:54.000000000 +0300
-@@ -45,7 +45,7 @@
- #include <rdf_storage.h>
- 
- 
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
- #include <sqlite3.h>
- #define sqlite_DB sqlite3
- #define sqlite_STATEMENT sqlite3_stmt
-@@ -57,7 +57,7 @@
- #define sqlite_last_insert_rowid sqlite3_last_insert_rowid
- #endif
- 
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
- #include <sqlite.h>
- #define sqlite_DB sqlite
- #define sqlite_STATEMENT sqlite_vm
-@@ -68,11 +68,11 @@
- #endif
- 
- 
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-   #define GET_COLUMN_VALUE_TEXT(vm, col) sqlite3_column_text(vm, col)
-   #define GET_COLUMN_VALUE_INT(vm, col) sqlite3_column_int(vm, col)
- #endif
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-   #define GET_COLUMN_VALUE_TEXT(vm, col) (unsigned char*)pazValue[col]
-   #define GET_COLUMN_VALUE_INT(vm, col) atoi(pazValue[col])
- #endif
-@@ -791,7 +791,7 @@
-   librdf_storage_sqlite_instance* context=(librdf_storage_sqlite_instance*)storage->instance;
-   int rc=SQLITE_OK;
-   char *errmsg=NULL;
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-   int mode=0;
- #endif
-   int db_file_exists=0;
-@@ -804,13 +804,13 @@
-   if(context->is_new && db_file_exists)
-     unlink(context->name);
- 
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-   context->db=NULL;
-   rc=sqlite3_open(context->name, &context->db);
-   if(rc != SQLITE_OK)
-     errmsg=(char*)sqlite3_errmsg(context->db);
- #endif
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-   context->db=sqlite_open(context->name, mode, &errmsg);
-   if(context->db == NULL)
-     rc=SQLITE_ERROR;
-@@ -819,7 +819,7 @@
-     librdf_log(storage->world, 0, LIBRDF_LOG_ERROR, LIBRDF_FROM_STORAGE, NULL,
-                "SQLite database %s open failed - %s", 
-                context->name, errmsg);
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-     sqlite_FREE(errmsg);
- #endif
-     librdf_storage_sqlite_close(storage);
-@@ -1279,7 +1279,7 @@
- 
-   LIBRDF_DEBUG2("SQLite prepare '%s'\n", request);
- 
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-   status=sqlite3_prepare(context->db,
-                          (const char*)request,
-                          raptor_stringbuffer_length(sb),
-@@ -1288,7 +1288,7 @@
-   if(status != SQLITE_OK)
-     errmsg=(char*)sqlite3_errmsg(context->db);
- #endif
--#if SQLITE_API == 2  
-+#if REDLAND_SQLITE_API == 2  
-   status=sqlite_compile(context->db,
-                         (const char*)request,
-                         &scontext->zTail,
-@@ -1328,7 +1328,7 @@
-                                       librdf_statement **statement,
-                                       librdf_node **context_node) {
-   int status=SQLITE_BUSY;
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-   int pN;
-   const char **pazValue;   /* Column data */
-   const char **pazColName; /* Column names and datatypes */
-@@ -1342,10 +1342,10 @@
-    * SQLITE_MISUSE.
-   */
-   do {
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-     status=sqlite3_step(vm);
- #endif
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-     status=sqlite_step(vm, &pN, &pazValue, &pazColName);
- #endif
-     if(status == SQLITE_BUSY) {
-@@ -1479,12 +1479,12 @@
-   if(status == SQLITE_ERROR) {
-     char *errmsg=NULL;
- 
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-     status=sqlite3_finalize(vm);
-     if(status != SQLITE_OK)
-       errmsg=(char*)sqlite3_errmsg(scontext->db);
- #endif
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-     status=sqlite_finalize(vm, &errmsg);
- #endif
-     if(status != SQLITE_OK) {
-@@ -1492,7 +1492,7 @@
-                  0, LIBRDF_LOG_ERROR, LIBRDF_FROM_STORAGE, NULL,
-                  "SQLite database %s finalize failed - %s (%d)", 
-                  scontext->name, errmsg, status);
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-       sqlite_FREE(errmsg);
- #endif
-     }
-@@ -1583,12 +1583,12 @@
-     char *errmsg=NULL;
-     int status;
-     
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-     status=sqlite3_finalize(scontext->vm);
-     if(status != SQLITE_OK)
-       errmsg=(char*)sqlite3_errmsg(scontext->sqlite_context->db);
- #endif
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-     status=sqlite_finalize(scontext->vm, &errmsg);
- #endif
-     if(status != SQLITE_OK) {
-@@ -1596,7 +1596,7 @@
-                  0, LIBRDF_LOG_ERROR, LIBRDF_FROM_STORAGE, NULL,
-                  "SQLite database %s finalize failed - %s (%d)", 
-                  scontext->sqlite_context->name, errmsg, status);
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-       sqlite_FREE(errmsg);
- #endif
-     }
-@@ -1734,7 +1734,7 @@
- 
-   LIBRDF_DEBUG2("SQLite prepare '%s'\n", request);
- 
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-   status=sqlite3_prepare(context->db,
-                          (const char*)request,
-                          raptor_stringbuffer_length(sb),
-@@ -1743,7 +1743,7 @@
-   if(status != SQLITE_OK)
-     errmsg=(char*)sqlite3_errmsg(context->db);
- #endif
--#if SQLITE_API == 2  
-+#if REDLAND_SQLITE_API == 2  
-   status=sqlite_compile(context->db,
-                         (const char*)request,
-                         &scontext->zTail, 
-@@ -1856,12 +1856,12 @@
-     char *errmsg=NULL;
-     int status;
-     
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-     status=sqlite3_finalize(scontext->vm);
-     if(status != SQLITE_OK)
-       errmsg=(char*)sqlite3_errmsg(scontext->sqlite_context->db);
- #endif
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-     status=sqlite_finalize(scontext->vm, &errmsg);
- #endif
-     if(status != SQLITE_OK) {
-@@ -1869,7 +1869,7 @@
-                  0, LIBRDF_LOG_ERROR, LIBRDF_FROM_STORAGE, NULL,
-                  "SQLite database %s finalize failed - %s (%d)", 
-                  scontext->sqlite_context->name, errmsg, status);
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-       sqlite_FREE(errmsg);
- #endif
-     }
-@@ -2180,7 +2180,7 @@
- 
-   LIBRDF_DEBUG2("SQLite prepare '%s'\n", request);
- 
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-   status=sqlite3_prepare(context->db,
-                          (const char*)request,
-                          raptor_stringbuffer_length(sb),
-@@ -2189,7 +2189,7 @@
-   if(status != SQLITE_OK)
-     errmsg=(char*)sqlite3_errmsg(context->db);
- #endif
--#if SQLITE_API == 2  
-+#if REDLAND_SQLITE_API == 2  
-   status=sqlite_compile(context->db,
-                         (const char*)request,
-                         &scontext->zTail,
-@@ -2303,12 +2303,12 @@
-     char *errmsg=NULL;
-     int status;
-     
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-     status=sqlite3_finalize(scontext->vm);
-     if(status != SQLITE_OK)
-       errmsg=(char*)sqlite3_errmsg(scontext->sqlite_context->db);
- #endif
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-     status=sqlite_finalize(scontext->vm, &errmsg);
- #endif
-     if(status != SQLITE_OK) {
-@@ -2316,7 +2316,7 @@
-                  0, LIBRDF_LOG_ERROR, LIBRDF_FROM_STORAGE, NULL,
-                  "SQLite database %s finalize failed - %s (%d)", 
-                  scontext->sqlite_context->name, errmsg, status);
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-       sqlite_FREE(errmsg);
- #endif
-     }
-@@ -2360,7 +2360,7 @@
-                                               sqlite_STATEMENT *vm,
-                                               librdf_node **context_node) {
-   int status=SQLITE_BUSY;
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-   int pN;
-   const char **pazValue;   /* Column data */
-   const char **pazColName; /* Column names and datatypes */
-@@ -2374,10 +2374,10 @@
-    * SQLITE_MISUSE.
-   */
-   do {
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-     status=sqlite3_step(vm);
- #endif
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-     status=sqlite_step(vm, &pN, &pazValue, &pazColName);
- #endif
-     if(status == SQLITE_BUSY) {
-@@ -2429,12 +2429,12 @@
-   if(status == SQLITE_ERROR) {
-     char *errmsg=NULL;
- 
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-     status=sqlite3_finalize(vm);
-     if(status != SQLITE_OK)
-       errmsg=(char*)sqlite3_errmsg(scontext->db);
- #endif
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-     status=sqlite_finalize(vm, &errmsg);
- #endif
-     if(status != SQLITE_OK) {
-@@ -2442,7 +2442,7 @@
-                  0, LIBRDF_LOG_ERROR, LIBRDF_FROM_STORAGE, NULL,
-                  "SQLite database %s finalize failed - %s (%d)", 
-                  scontext->name, errmsg, status);
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-       sqlite_FREE(errmsg);
- #endif
-     }
-@@ -2541,12 +2541,12 @@
-     char *errmsg=NULL;
-     int status;
-     
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-     status=sqlite3_finalize(icontext->vm);
-     if(status != SQLITE_OK)
-       errmsg=(char*)sqlite3_errmsg(icontext->sqlite_context->db);
- #endif
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-     status=sqlite_finalize(icontext->vm, &errmsg);
- #endif
-     if(status != SQLITE_OK) {
-@@ -2554,7 +2554,7 @@
-                  0, LIBRDF_LOG_ERROR, LIBRDF_FROM_STORAGE, NULL,
-                  "SQLite database %s finalize failed - %s (%d)", 
-                  icontext->sqlite_context->name, errmsg, status);
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-       sqlite_FREE(errmsg);
- #endif
-     }
-@@ -2619,7 +2619,7 @@
- 
-   LIBRDF_DEBUG2("SQLite prepare '%s'\n", request);
- 
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-   status=sqlite3_prepare(context->db,
-                          (const char*)request,
-                          raptor_stringbuffer_length(sb),
-@@ -2628,7 +2628,7 @@
-   if(status != SQLITE_OK)
-     errmsg=(char*)sqlite3_errmsg(context->db);
- #endif
--#if SQLITE_API == 2  
-+#if REDLAND_SQLITE_API == 2  
-   status=sqlite_compile(context->db,
-                         (const char*)request,
-                         &icontext->zTail,
-diff -ur redland-1.0.9.orig/src/win32_rdf_config.h redland-1.0.9/src/win32_rdf_config.h
---- redland-1.0.9.orig/src/win32_rdf_config.h	2009-04-08 07:31:14.000000000 +0300
-+++ redland-1.0.9/src/win32_rdf_config.h	2009-08-12 20:23:06.000000000 +0300
-@@ -249,7 +249,7 @@
- #define SIZEOF_UNSIGNED_LONG_LONG 8
- 
- /* SQLite API version */
--#define SQLITE_API 3
-+#define REDLAND_SQLITE_API 3
- 
- /* Define to 1 if you have the ANSI C header files. */
- #define STDC_HEADERS 1
diff --git a/dev-libs/redland/redland-1.0.10-r1.ebuild b/dev-libs/redland/redland-1.0.10-r1.ebuild
index 904e753e21a6..1e091e1347de 100644
--- a/dev-libs/redland/redland-1.0.10-r1.ebuild
+++ b/dev-libs/redland/redland-1.0.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/redland-1.0.10-r1.ebuild,v 1.12 2010/06/17 20:13:41 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/redland-1.0.10-r1.ebuild,v 1.13 2010/07/03 23:10:50 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="berkdb iodbc mysql odbc postgres sqlite ssl xml"
 
 RDEPEND="mysql? ( virtual/mysql )
diff --git a/dev-libs/redland/redland-1.0.9-r1.ebuild b/dev-libs/redland/redland-1.0.9-r1.ebuild
deleted file mode 100644
index baaf785ac301..000000000000
--- a/dev-libs/redland/redland-1.0.9-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/redland-1.0.9-r1.ebuild,v 1.10 2010/06/17 20:13:41 patrick Exp $
-
-EAPI=2
-inherit autotools eutils libtool
-
-DESCRIPTION="High-level interface for the Resource Description Framework"
-HOMEPAGE="http://librdf.org"
-SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="berkdb mysql postgres sqlite ssl threads xml"
-
-RDEPEND="mysql? ( virtual/mysql )
-	sqlite? ( =dev-db/sqlite-3* )
-	berkdb? ( sys-libs/db )
-	xml? ( dev-libs/libxml2 )
-	!xml? ( dev-libs/expat )
-	ssl? ( dev-libs/openssl )
-	>=media-libs/raptor-1.4.16
-	>=dev-libs/rasqal-0.9.16
-	postgres? ( dev-db/postgresql-base )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/gtk-doc-am
-	>=sys-devel/libtool-2"
-
-# Please, remove this RESTRICT from next version. See bug #285110.
-RESTRICT="test"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-sqlite.patch \
-		"${FILESDIR}"/${P}-librdf_storage_register_factory.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use xml; then
-		myconf="${myconf} --with-xml-parser=libxml"
-	else
-		myconf="${myconf} --with-xml-parser=expat"
-	fi
-
-	econf --with-raptor=system \
-		--with-rasqal=system \
-		$(use_with berkdb bdb) \
-		$(use_with ssl openssl-digests) \
-		$(use_with mysql) \
-		$(use_with threads) \
-		$(use_with sqlite) \
-		$(use_with postgres postgresql) \
-		${myconf}
-}
-
-src_test() {
-	if ! use berkdb; then
-		export REDLAND_TEST_CLONING_STORAGE_TYPE=hashes
-		export REDLAND_TEST_CLONING_STORAGE_NAME=test
-		export REDLAND_TEST_CLONING_STORAGE_OPTIONS="hash-type='memory',dir='.',write='yes',new='yes',contexts='yes'"
-	fi
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog* NEWS NOTICE README TODO
-	dohtml {FAQS,NEWS,README,RELEASE,TODO}.html
-}