dev-db/xbsql: Add fixes for newer xbase library, use autotools-utils and autoreconf, respect LDFLAGS, #334897

(Portage version: 2.2.0_alpha114/cvs/Linux x86_64)

7 files changed, 158 insertions, 6 deletions

diff --git a/dev-db/xbsql/ChangeLog b/dev-db/xbsql/ChangeLog
index 9bad18531fce..ef6837439764 100644
--- a/dev-db/xbsql/ChangeLog
+++ b/dev-db/xbsql/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-db/xbsql
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/xbsql/ChangeLog,v 1.10 2012/06/16 14:56:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xbsql/ChangeLog,v 1.11 2012/06/30 17:15:51 jlec Exp $
+
+*xbsql-0.11-r1 (30 Jun 2012)
+
+  30 Jun 2012; Justin Lecher <jlec@gentoo.org> xbsql-0.11.ebuild,
+  +xbsql-0.11-r1.ebuild, +files/xbsql-0.11-autotools.patch,
+  +files/xbsql-0.11-ncurses64.patch, +files/xbsql-0.11-xbase64.patch,
+  metadata.xml:
+  Add fixes for newer xbase library, use autotools-utils and autoreconf,
+  respect LDFLAGS, #334897
 
   16 Jun 2012; Pacho Ramos <pacho@gentoo.org> xbsql-0.11.ebuild:
   Be less strict with xbase dependency.
diff --git a/dev-db/xbsql/files/xbsql-0.11-autotools.patch b/dev-db/xbsql/files/xbsql-0.11-autotools.patch
new file mode 100644
index 000000000000..b1e72562b397
--- /dev/null
+++ b/dev-db/xbsql/files/xbsql-0.11-autotools.patch
@@ -0,0 +1,18 @@
+ xbsql/Makefile.am |    7 +------
+ 1 files changed, 1 insertions(+), 6 deletions(-)
+
+diff --git a/xbsql/Makefile.am b/xbsql/Makefile.am
+index c281358..5a09198 100644
+--- a/xbsql/Makefile.am
++++ b/xbsql/Makefile.am
+@@ -1,9 +1,4 @@
+-DEBUG			= -g
+-CC			= g++
+-CFLAGS			= -UNO_READLINE -I/usr/local/include $(DEBUG)
+-CXXFLAGS		= -UNO_READLINE -I/usr/local/include $(DEBUG)
+-LDFLAGS			= $(DEBUG)
+-INCLUDE			= -I/usr/local/include
++CC			= $(CXX)
+ 
+ lib_LTLIBRARIES		= libxbsql.la
+ bin_PROGRAMS		= xql
diff --git a/dev-db/xbsql/files/xbsql-0.11-ncurses64.patch b/dev-db/xbsql/files/xbsql-0.11-ncurses64.patch
new file mode 100644
index 000000000000..4c04d2736b0b
--- /dev/null
+++ b/dev-db/xbsql/files/xbsql-0.11-ncurses64.patch
@@ -0,0 +1,19 @@
+--- xbsql-0.11/configure.BAD	2005-08-18 10:34:49.000000000 -0500
++++ xbsql-0.11/configure	2005-08-18 10:36:22.000000000 -0500
+@@ -6977,10 +6977,15 @@
+ 	if      test -f /usr/lib/libncurses.so
+ 	then
+ 		curses=ncurses
+-
++	elif    test -f /usr/lib64/libncurses.so
++	then
++		curses=ncurses
+ 	elif    test -f /usr/lib/libcurses.so
+ 	then
+ 		curses=curses
++	elif    test -f /usr/lib64/libcurses.so
++	then
++		curses=curses
+ 	else
+ 		{ { echo "$as_me:6985: error: No (n)curses installation" >&5
+ echo "$as_me: error: No (n)curses installation" >&2;}
diff --git a/dev-db/xbsql/files/xbsql-0.11-xbase64.patch b/dev-db/xbsql/files/xbsql-0.11-xbase64.patch
new file mode 100644
index 000000000000..6d51cbaf06fc
--- /dev/null
+++ b/dev-db/xbsql/files/xbsql-0.11-xbase64.patch
@@ -0,0 +1,66 @@
+diff -up xbsql-0.11/xbsql/Makefile.am.BAD xbsql-0.11/xbsql/Makefile.am
+--- xbsql-0.11/xbsql/Makefile.am.BAD	2009-08-19 23:32:27.481185284 -0400
++++ xbsql-0.11/xbsql/Makefile.am	2009-08-19 23:32:47.157206308 -0400
+@@ -17,10 +17,10 @@ libxbsql_la_SOURCES	= xb_value.cpp xb_el
+ 			  xb_assignlist.cpp xb_create.cpp \
+ 			  xbsql.tab.c xb_datetime.cpp
+ 
+-libxbsql_la_LDFLAGS	= -lxbase $(DEBUG)
++libxbsql_la_LIBADD	= -lxbase64
+ 
+ xql_SOURCES		= xql.cpp
+-xql_LDADD		= -lxbase -lreadline -l$(CURSES) ./libxbsql.la
++xql_LDADD		= -lxbase64 -lreadline -l$(CURSES) ./libxbsql.la
+ 
+ #
+ #
+diff -up xbsql-0.11/xbsql/Makefile.in.BAD xbsql-0.11/xbsql/Makefile.in
+--- xbsql-0.11/xbsql/Makefile.in.BAD	2009-08-19 23:32:54.384058775 -0400
++++ xbsql-0.11/xbsql/Makefile.in	2009-08-19 23:33:03.928059382 -0400
+@@ -108,10 +108,10 @@ libxbsql_la_SOURCES = xb_value.cpp xb_el
+ 			  xbsql.tab.c xb_datetime.cpp
+ 
+ 
+-libxbsql_la_LDFLAGS = -lxbase $(DEBUG)
++libxbsql_la_LIBADD = -lxbase64
+ 
+ xql_SOURCES = xql.cpp
+-xql_LDADD = -lxbase -lreadline -l$(CURSES) ./libxbsql.la
++xql_LDADD = -lxbase64 -lreadline -l$(CURSES) ./libxbsql.la
+ 
+ 
+ #install-data-hook:
+diff -up xbsql-0.11/xbsql/xbsql.cpp.BAD xbsql-0.11/xbsql/xbsql.cpp
+--- xbsql-0.11/xbsql/xbsql.cpp.BAD	2009-08-19 23:34:23.880063863 -0400
++++ xbsql-0.11/xbsql/xbsql.cpp	2009-08-19 23:34:47.393184432 -0400
+@@ -207,7 +207,7 @@ void	XBaseSQL::setError
+ 			break	;
+ 
+ 		default	:
+-			e	= xbStrError (rc) ;
++			e	= GetErrorMessage (rc) ;
+ 			break	;
+ 	}
+ 
+@@ -230,7 +230,7 @@ void	XBaseSQL::setError
+ 	char	t[1024]	;
+ 	va_list	aptr	;
+ 
+-	strcpy	  (t, xbStrError (rc)) ;
++	strcpy	  (t, GetErrorMessage (rc)) ;
+ 	strcat	  (t, ": ") ;
+ 	int	  l = strlen(t) ;
+ 
+diff -up xbsql-0.11/xbsql/xbsql.h.BAD xbsql-0.11/xbsql/xbsql.h
+--- xbsql-0.11/xbsql/xbsql.h.BAD	2009-08-19 23:35:45.087088919 -0400
++++ xbsql-0.11/xbsql/xbsql.h	2009-08-19 23:34:06.949184421 -0400
+@@ -43,8 +43,7 @@ XBSQL_API int	strncasecmp (const char *s
+ 
+ #endif
+ 
+-#include	<xbase/xbase.h>
+-#include	<xbase/xbexcept.h>
++#include	<xbase64/xbase64.h>
+ 
+ class	XBaseSQL	;
+ class	XBSQLTable	;
diff --git a/dev-db/xbsql/metadata.xml b/dev-db/xbsql/metadata.xml
index ff62877c67ae..91f4e72fb544 100644
--- a/dev-db/xbsql/metadata.xml
+++ b/dev-db/xbsql/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-db/xbsql/xbsql-0.11-r1.ebuild b/dev-db/xbsql/xbsql-0.11-r1.ebuild
new file mode 100644
index 000000000000..ce282dcd7e3a
--- /dev/null
+++ b/dev-db/xbsql/xbsql-0.11-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xbsql/xbsql-0.11-r1.ebuild,v 1.1 2012/06/30 17:15:51 jlec Exp $
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils
+
+DESCRIPTION="An SQL Wrapper for the XBase library"
+HOMEPAGE="http://www.rekallrevealed.org/"
+SRC_URI="http://www.rekallrevealed.org/packages/${P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+	>=dev-db/xbase-3.1.2
+	sys-libs/readline"
+DEPEND="${RDEPEND}
+	sys-devel/automake
+	sys-devel/libtool"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ncurses64.patch
+	"${FILESDIR}"/${P}-xbase64.patch
+	"${FILESDIR}"/${P}-autotools.patch
+)
+
+DOCS=( AUTHORS Announce ChangeLog INSTALL README TODO )
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_install() {
+	autotools-utils_src_install
+	use doc && dohtml doc/*
+}
diff --git a/dev-db/xbsql/xbsql-0.11.ebuild b/dev-db/xbsql/xbsql-0.11.ebuild
index 225c6bde5f7a..7dd72aff4a6f 100644
--- a/dev-db/xbsql/xbsql-0.11.ebuild
+++ b/dev-db/xbsql/xbsql-0.11.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/xbsql/xbsql-0.11.ebuild,v 1.9 2012/06/16 14:56:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xbsql/xbsql-0.11.ebuild,v 1.10 2012/06/30 17:15:51 jlec Exp $
 
 inherit base
 
-DESCRIPTION="XBSQL: An SQL Wrapper for the XBase library"
+DESCRIPTION="An SQL Wrapper for the XBase library"
 HOMEPAGE="http://www.rekallrevealed.org/"
 SRC_URI="http://www.rekallrevealed.org/packages/${P}.tgz"