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

Package-Manager: portage-2.2.0_alpha114/cvs/Linux x86_64

8 files changed, 171 insertions, 14 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/Manifest b/dev-db/xbsql/Manifest
index 5daf6c0db10d..58f0ac88e5cf 100644
--- a/dev-db/xbsql/Manifest
+++ b/dev-db/xbsql/Manifest
@@ -1,14 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
+AUX xbsql-0.11-autotools.patch 495 RMD160 e1832fc14b2bd1f8cb1a74e277d69e0ec0e0e981 SHA1 075b04e9ce6d2dbd03e5e78d54bfc42fe1a76e3e SHA256 412a86d55b35be897e64443b2d74edecdc453f6d4ce76c933bafc2eda813e583
+AUX xbsql-0.11-ncurses64.patch 542 RMD160 94bc113393ae648cd061c728c92175f0e0861f74 SHA1 82e99f7e9539ca48899fcec89c937d8c8cd4c697 SHA256 405c0b239a8b2c5cea8157b5f1dd050df786d55e14fb7092cda36038efb3aab7
+AUX xbsql-0.11-xbase64.patch 2076 RMD160 5099fb1b7ea8e885e7b66baa481871240898ae56 SHA1 71e13c693504c8ca7f9d82c759544e3d603e4968 SHA256 4da0e870a1ea1f400e752afe4d97a5cb725058244fc197398b0d48c2e08910d6
 DIST xbsql-0.11.tgz 307392 RMD160 ff72a1bf45afb8ee59a7549d6f7734305c394342 SHA1 4c011ce4776ae6d8fb473efb8c0421720aaf3d06 SHA256 c91836a4c3f138b6e211d4427dce840cd6b30853f0dffaa3bc36d05f8751606a
-EBUILD xbsql-0.11.ebuild 671 RMD160 ae1a31bd831bed13e3b7229bbfba95a7f68c7bf9 SHA1 2e8c8f70cb217261b21a2706ca01153b79a743e2 SHA256 606055248514d298dd0d887bffd1459a77deaf22dce03e24a612bb2f8f672a40
-MISC ChangeLog 1062 RMD160 412c13b2866782b40cc909ede54dd51c28b3655b SHA1 928f2004d013d9005b22758fa97dd3bce6b7fe84 SHA256 4e2fca32f67e843e4a860858642e9fa288b494142b115fa09c9af235d13ace66
-MISC metadata.xml 212 RMD160 f278ca2a473dd949f7d0f359c432cfe4ed026e71 SHA1 b67d9ec2368a50032f536d14dbd7f105b25191cf SHA256 70bbfd181623c884c763902ca127ef24c917b2e55cda0869e6ffaa6c4ebc5757
+EBUILD xbsql-0.11-r1.ebuild 891 RMD160 ad8e68117d86524ca99bc153a00d51f6e2477b1f SHA1 ef8d9f1d3842c3b31feaef52c8a350bbfe19d350 SHA256 3956d886c8928db5681e5ebd61d2f7ce4f1ac3c8bc9d489ca3eed624f231edc8
+EBUILD xbsql-0.11.ebuild 664 RMD160 59afb7fffee065733ac3b13df83854673dbe595b SHA1 c58715f8c385507b85c023acc70837083ec5fe22 SHA256 18e70a6623340d97903cab91b1f1db66c6870a488aca642f97c00ca6221e4910
+MISC ChangeLog 1404 RMD160 ac6d3511ca1d941a77ed5a092560d30e6d4437ba SHA1 132a70eb76792b49b4f6bf8d3720eae319331b7d SHA256 2ebfd9a174c6ae762e306d170e985faf23ff1aaa9fc4742016411e2b3584c6ae
+MISC metadata.xml 214 RMD160 ea476e10a778f79d9273adbbc2403db67d025e10 SHA1 7f156558998e184ab8ea7417fd4739048f012a09 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEARECAAYFAk/cnpUACgkQCaWpQKGI+9Tt7QCdHQTVIWqypmJgIwODau160FzS
-P98An2e1mraaoG+QngA0Wo2loRarQZWm
-=eZBQ
+iEYEAREKAAYFAk/vNE0ACgkQgAnW8HDreRbBcwCfW0NSOun3fDcQHacVqhA76KJd
+pUAAn3f22eNqRXRP066VCy1zB1oR9ajM
+=Hg1n
 -----END PGP SIGNATURE-----
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"