summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-06-30 13:41:45 +0000
committerJustin Lecher <jlec@gentoo.org>2012-06-30 13:41:45 +0000
commit4aeef0126cc74899f8dd20fae66945f9cb208fd1 (patch)
treed67ad2d3355ce6c5097d2d90b06b8083c665d539 /dev-db
parentversion bump (diff)
downloadhistorical-4aeef0126cc74899f8dd20fae66945f9cb208fd1.tar.gz
historical-4aeef0126cc74899f8dd20fae66945f9cb208fd1.tar.bz2
historical-4aeef0126cc74899f8dd20fae66945f9cb208fd1.zip
dev-db/xbase: Version BUmp, add all fixes from fedora including gcc-4.7 compatibility
Package-Manager: portage-2.2.0_alpha114/cvs/Linux x86_64
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/xbase/ChangeLog16
-rw-r--r--dev-db/xbase/Manifest30
-rw-r--r--dev-db/xbase/files/xbase-2.0.0-fixconfig.patch11
-rw-r--r--dev-db/xbase/files/xbase-2.0.0-fixheader.patch11
-rw-r--r--dev-db/xbase/files/xbase-2.0.0-gcc47.patch21
-rw-r--r--dev-db/xbase/files/xbase-2.0.0-ppc.patch20
-rw-r--r--dev-db/xbase/files/xbase-2.0.0-x86_64.patch12
-rw-r--r--dev-db/xbase/files/xbase-3.1.2-fixconfig.patch12
-rw-r--r--dev-db/xbase/files/xbase-3.1.2-gcc-version.patch16
-rw-r--r--dev-db/xbase/files/xbase-3.1.2-gcc44.patch24
-rw-r--r--dev-db/xbase/files/xbase-3.1.2-gcc47.patch21
-rw-r--r--dev-db/xbase/files/xbase-3.1.2-lesserg.patch294
-rw-r--r--dev-db/xbase/files/xbase-3.1.2-outofsource.patch52
-rw-r--r--dev-db/xbase/files/xbase-3.1.2-xbnode.patch9
-rw-r--r--dev-db/xbase/metadata.xml6
-rw-r--r--dev-db/xbase/xbase-2.0.0-r2.ebuild49
-rw-r--r--dev-db/xbase/xbase-2.0.0.ebuild8
-rw-r--r--dev-db/xbase/xbase-3.1.2.ebuild47
18 files changed, 644 insertions, 15 deletions
diff --git a/dev-db/xbase/ChangeLog b/dev-db/xbase/ChangeLog
index 1ccc9d4e195c..320f410aede9 100644
--- a/dev-db/xbase/ChangeLog
+++ b/dev-db/xbase/ChangeLog
@@ -1,6 +1,20 @@
# ChangeLog for dev-db/xbase
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/xbase/ChangeLog,v 1.26 2012/06/29 14:42:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xbase/ChangeLog,v 1.27 2012/06/30 13:41:45 jlec Exp $
+
+*xbase-3.1.2 (30 Jun 2012)
+*xbase-2.0.0-r2 (30 Jun 2012)
+
+ 30 Jun 2012; Justin Lecher <jlec@gentoo.org> xbase-2.0.0.ebuild,
+ +xbase-2.0.0-r2.ebuild, +files/xbase-2.0.0-fixconfig.patch,
+ +files/xbase-2.0.0-fixheader.patch, +files/xbase-2.0.0-gcc47.patch,
+ +files/xbase-2.0.0-ppc.patch, +files/xbase-2.0.0-x86_64.patch,
+ +xbase-3.1.2.ebuild, +files/xbase-3.1.2-fixconfig.patch,
+ +files/xbase-3.1.2-gcc-version.patch, +files/xbase-3.1.2-gcc44.patch,
+ +files/xbase-3.1.2-gcc47.patch, +files/xbase-3.1.2-lesserg.patch,
+ +files/xbase-3.1.2-outofsource.patch, +files/xbase-3.1.2-xbnode.patch,
+ metadata.xml:
+ Version BUmp, add all fixes from fedora including gcc-4.7 compatibility
29 Jun 2012; Jeroen Roovers <jer@gentoo.org> xbase-2.0.0-r1.ebuild:
Stable for HPPA (bug #418673).
diff --git a/dev-db/xbase/Manifest b/dev-db/xbase/Manifest
index 8525b44fba49..fca895fb88c6 100644
--- a/dev-db/xbase/Manifest
+++ b/dev-db/xbase/Manifest
@@ -1,16 +1,32 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
+AUX xbase-2.0.0-fixconfig.patch 356 RMD160 e15e4bf40f335bb96af413993d6fcb4e9764d7ff SHA1 9f1bc25aafa442899c9621bcfe9546d580cce136 SHA256 68397be824aef088bb7ec85425fc79a827f948dfc05c3ff0222b0dbc1858eac0
+AUX xbase-2.0.0-fixheader.patch 402 RMD160 fe8e2229792fa3a4e1f076b5f3ac29aca4cf6c66 SHA1 792221596f1d68efde992ba9e261df1ddd28f6ae SHA256 0160dcf34b007977dacf4a15d261462258acabd0e97a39a55f4a151518db9bdd
AUX xbase-2.0.0-gcc43.patch 16720 RMD160 5a6bb898c79103e7e229030f34d5296b6a988cc6 SHA1 324f275e4f6fb4710dc204af7c8fae7f099d570f SHA256 49367d9986b3032b2dce7c9427c8941b7073d49d358a8b731cabea5460c8e958
+AUX xbase-2.0.0-gcc47.patch 534 RMD160 cd9c2d3c66866efa7ff024c6cc2a1699af6afbe8 SHA1 0b9d9a302a41b5a3dd9ca00d6bd3dd3f4358bdc8 SHA256 c0e122e5034135a4e0a7d6b4f1b1f71bea66fc447d3de3a9f7641ff9c93f5aac
+AUX xbase-2.0.0-ppc.patch 679 RMD160 de9d62a37007f49eee277056a21cffb8eb386e06 SHA1 c7888f96ed3cf5f6a05a262b59d66884b584c83a SHA256 6cd387bc8b248e4fee1c6155d95ab24663daa2923fc4f6645c271fac6d354029
+AUX xbase-2.0.0-x86_64.patch 558 RMD160 6d7b6d21313bba287f2929e214deb9003b10c6a2 SHA1 3e3c9527635fa4345f22dff719b417922268327b SHA256 ab8d5402e64a56a88f362d8ab17f91d246f4963152b8cf4d3c9722d557a1d591
+AUX xbase-3.1.2-fixconfig.patch 467 RMD160 9c8af0366371868c7255cae402e27ae8f2c1e204 SHA1 2920f7231652f7de41b16aeb1a9fcfb4bbd2c223 SHA256 b4e88b097576d7d68c95296400c125c75863aba6d030b2518d2eb6e81237a0a8
+AUX xbase-3.1.2-gcc-version.patch 441 RMD160 8330049920f27351147e240b5420a4ac368dbf25 SHA1 3082b8d0f0d27d7f219d185e29122dea6e50fca4 SHA256 ebe174ede925beabfd9e2f4d0003b6b675cbe791bc33eeb5c4ededa3bea76ae8
+AUX xbase-3.1.2-gcc44.patch 700 RMD160 6dff06854b1b725f266860418ea93006cec6cb93 SHA1 ae7864815c7c94d1557661f4219c2422d8403340 SHA256 5ba9e7b453efad1edb5c05bedfd7e4a2911a4ab1ca380a3a95ef93e35fe918ce
+AUX xbase-3.1.2-gcc47.patch 572 RMD160 b5c1ec2666264b9c0f9435e3486de9f647d73024 SHA1 a2573ff3d3468603cc7505999c56cacd66f1e415 SHA256 d423a868b16f3af3f548698468f7f82c0e72eea61d83e613309437cce6ccecce
+AUX xbase-3.1.2-lesserg.patch 9096 RMD160 1cf14f01b2b7a810246ac9948487a3bd96a10af0 SHA1 6c1bcc67477f4ebb6463dab67ea3bb4b1c196513 SHA256 54b78e10704ae7c1c13f94c7284cdc7f5c1fee93236ff9ba0fb2863737d4f9f6
+AUX xbase-3.1.2-outofsource.patch 1290 RMD160 b371625412efa08250d3e13285a53ec49614d401 SHA1 789ea001f4753b1ad4b39c605816c457a84589ac SHA256 ca7cc25ae2c8acefc41b382e3c01457119f6ffb2dc004cb4dca646844ee86158
+AUX xbase-3.1.2-xbnode.patch 341 RMD160 e5bffec82f4c80599dcab23797a1c96954dd9ed2 SHA1 28fa007bed1a2175f2ee02a620ae4e1efa802222 SHA256 b5cb7d2083f3958a551ec1f817bcf05db1f99bd0ebdc51a4d8b41a2201e16617
DIST xbase-2.0.0.tgz 493106 RMD160 577394ce21abc92df11127216f4199ec47549ce2 SHA1 11188393f2390a6b2765c1bf81faf95a8587e1e0 SHA256 4aa8aad84157422124a99a457863d52e4e9753656614dcdc67a6300a4a14bc90
+DIST xbase64-3.1.2.tar.gz 425650 RMD160 8f2a16fcecd6098b7b3ca47354e33a387a7dc1d9 SHA1 5bd433a4f748a6fa1a7855b6a2325483d4ee7206 SHA256 5920c453e358ef4af8408c1998805af4537d288436dd7f3c31b5561bfe3c489c
EBUILD xbase-2.0.0-r1.ebuild 1067 RMD160 6b140616e917f94e18c27e3f94b188ae572f9f2e SHA1 6a0a79086b105a5bc93b9af032efc4852b4e961b SHA256 2d7fd8dd5e1f8767124096b9e35d1406e29bd8e33fe5e101e30cb9326310cb53
-EBUILD xbase-2.0.0.ebuild 983 RMD160 f87422d1d9eedd3cade3a65ced692d33189a12a3 SHA1 ed61a88d9b69299d11b043969340a4b9a9459656 SHA256 b76a7ce03402a8a62521910615b156fa7e43ef7006351bd660321ee6c8cecbe2
-MISC ChangeLog 2878 RMD160 e961ce203b1d2b4cd8615cde71b1f1d3803d97c1 SHA1 a0bcab68124627541f45c1001de0fb307fe348c2 SHA256 75ac3b5fa2f5b88ff8b69f33f4631482e97b98d969a14e9c0eab43be410fa0b7
-MISC metadata.xml 212 RMD160 f278ca2a473dd949f7d0f359c432cfe4ed026e71 SHA1 b67d9ec2368a50032f536d14dbd7f105b25191cf SHA256 70bbfd181623c884c763902ca127ef24c917b2e55cda0869e6ffaa6c4ebc5757
+EBUILD xbase-2.0.0-r2.ebuild 1202 RMD160 37430094066103d7899702ae6dc3a5e67f6ae1f6 SHA1 ba4fa573b1a5869253f889e56aedcc852f060fa2 SHA256 4fa9333b9daf3e306e8e7c43eb8661dda5fcb1c7a22f6bd65fd4e6d365beebeb
+EBUILD xbase-2.0.0.ebuild 960 RMD160 c812417bcccc66c194d919c40256ac5bda22e273 SHA1 611b24e9b1992593e7d49f18b66c20c9b9ac1b21 SHA256 52a1a7fab51f3c87a7bef0120e00843d9f13354049e845f058db86b65da0df88
+EBUILD xbase-3.1.2.ebuild 1322 RMD160 faf0507d0400a4217365a5e2e965da2a9586a4ac SHA1 0f06fe51e37d7e8586e6e14844df6e24f8800bb2 SHA256 95b39254d710b3bdf27bfad414dc63df7e1f86be34b6d1edcb8f38ec4597af6e
+MISC ChangeLog 3564 RMD160 ca0993184047300cad41d17de5cb8924dabb36cc SHA1 9abf7b7899a63b3594c5cfdb8a0e1a2dbbbf4e59 SHA256 2511a02de13131386820a21c92c821146089affc4d0a4c3e48b13cecfe8112fd
+MISC metadata.xml 214 RMD160 ea476e10a778f79d9273adbbc2403db67d025e10 SHA1 7f156558998e184ab8ea7417fd4739048f012a09 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
-iEYEARECAAYFAk/tvscACgkQVWmRsqeSphPa9ACbBb+R1by1yafs0LLXlIGyx4Q0
-eqkAn0hQIKTuoMpDrSSsWUpuJxenqd5v
-=Jm45
+iEYEAREKAAYFAk/vAh4ACgkQgAnW8HDreRZ/5gCeNtEVOoapNcoaHPuf0gC0CvaX
+8gsAni45jQm+wEgRs1/E1sNn93CDjeoP
+=ZR/2
-----END PGP SIGNATURE-----
diff --git a/dev-db/xbase/files/xbase-2.0.0-fixconfig.patch b/dev-db/xbase/files/xbase-2.0.0-fixconfig.patch
new file mode 100644
index 000000000000..99a023976c6f
--- /dev/null
+++ b/dev-db/xbase/files/xbase-2.0.0-fixconfig.patch
@@ -0,0 +1,11 @@
+--- xbase-2.0.0/xbase-config.in.BAD 2005-07-10 08:38:03.000000000 -0500
++++ xbase-2.0.0/xbase-config.in 2005-07-10 08:37:25.000000000 -0500
+@@ -5,7 +5,7 @@
+ exec_prefix_set=no
+ CC="@CC@"
+ CXX="@CXX@"
+-LD="@SHARED_LD@"
++LD="@LD@"
+
+ usage="\
+ Usage: xbase-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--cc] [--cxx] [--ld]"
diff --git a/dev-db/xbase/files/xbase-2.0.0-fixheader.patch b/dev-db/xbase/files/xbase-2.0.0-fixheader.patch
new file mode 100644
index 000000000000..fad32ac516f8
--- /dev/null
+++ b/dev-db/xbase/files/xbase-2.0.0-fixheader.patch
@@ -0,0 +1,11 @@
+--- xbase-2.0.0/xbase/ntx.h.BAD 2006-06-04 08:36:08.000000000 -0500
++++ xbase-2.0.0/xbase/ntx.h 2006-06-04 08:36:13.000000000 -0500
+@@ -218,7 +218,7 @@
+ xbShort KeyExists( char * Key ) { return FindKey( Key, strlen( Key ), 0 ); }
+ xbShort KeyExists( xbDouble );
+
+- xbShort xbNtx::AllocKeyBufs(void);
++ xbShort AllocKeyBufs(void);
+
+ virtual void GetExpression(char *buf, int len);
+ };
diff --git a/dev-db/xbase/files/xbase-2.0.0-gcc47.patch b/dev-db/xbase/files/xbase-2.0.0-gcc47.patch
new file mode 100644
index 000000000000..74829e2c5d4e
--- /dev/null
+++ b/dev-db/xbase/files/xbase-2.0.0-gcc47.patch
@@ -0,0 +1,21 @@
+ bin/dumprecs.cpp | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/bin/dumprecs.cpp b/bin/dumprecs.cpp
+index 94baab0..b7eaa57 100644
+--- a/bin/dumprecs.cpp
++++ b/bin/dumprecs.cpp
+@@ -80,10 +80,10 @@ int main(int ac,char** av)
+ }
+
+ cout << "\nLoop through forwards...\n";
+- int i = 0;
++ int j = 0;
+ while(i<MyFile.NoOfRecords()) {
+- MyFile.DumpRecord(i+1);
+- i++;
++ MyFile.DumpRecord(j+1);
++ j++;
+ }
+
+ MyFile.CloseDatabase(); /* close database */
diff --git a/dev-db/xbase/files/xbase-2.0.0-ppc.patch b/dev-db/xbase/files/xbase-2.0.0-ppc.patch
new file mode 100644
index 000000000000..3b743a9fd0ae
--- /dev/null
+++ b/dev-db/xbase/files/xbase-2.0.0-ppc.patch
@@ -0,0 +1,20 @@
+--- xbase-2.0.0/ltconfig.foo 2007-05-04 18:14:42.000000000 -0400
++++ xbase-2.0.0/ltconfig 2007-05-04 18:15:39.000000000 -0400
+@@ -1664,16 +1664,7 @@ linux-gnu*)
+ shlibpath_var=LD_LIBRARY_PATH
+ check_shared_deplibs_method='file_magic ELF 32-bit LSB shared object'
+ sys_lib_search_path="/lib /usr/lib /usr/local/lib `echo $LD_LIBRARY_PATH | sed -e 's/:/ /g'`"
+-
+- if test -f /lib/ld.so.1; then
+- dynamic_linker='GNU ld.so'
+- else
+- # Only the GNU ld.so supports shared libraries on MkLinux.
+- case "$host_cpu" in
+- powerpc*) dynamic_linker=no ;;
+- *) dynamic_linker='Linux ld.so' ;;
+- esac
+- fi
++ dynamic_linker='GNU ld.so'
+ ;;
+
+ netbsd* | openbsd*)
diff --git a/dev-db/xbase/files/xbase-2.0.0-x86_64.patch b/dev-db/xbase/files/xbase-2.0.0-x86_64.patch
new file mode 100644
index 000000000000..56f1b7c6bda9
--- /dev/null
+++ b/dev-db/xbase/files/xbase-2.0.0-x86_64.patch
@@ -0,0 +1,12 @@
+diff -up xbase-2.0.0/config.sub.BAD xbase-2.0.0/config.sub
+--- xbase-2.0.0/config.sub.BAD 2008-06-05 15:47:20.000000000 -0400
++++ xbase-2.0.0/config.sub 2008-06-05 15:49:10.000000000 -0400
+@@ -182,7 +182,7 @@ case $basic_machine in
+ | sparc64-* | mips64-* | mipsel-* \
+ | mips64el-* | mips64orion-* | mips64orionel-* \
+ | mipstx39-* | mipstx39el-* \
+- | f301-*)
++ | f301-* | x86_64-* | ppc64-*)
+ ;;
+ # Recognize the various machine names and aliases which stand
+ # for a CPU type and a company and sometimes even an OS.
diff --git a/dev-db/xbase/files/xbase-3.1.2-fixconfig.patch b/dev-db/xbase/files/xbase-3.1.2-fixconfig.patch
new file mode 100644
index 000000000000..2bfe92f8239a
--- /dev/null
+++ b/dev-db/xbase/files/xbase-3.1.2-fixconfig.patch
@@ -0,0 +1,12 @@
+diff -up xbase64-3.1.2/xbase64-config.in.BAD xbase64-3.1.2/xbase64-config.in
+--- xbase64-3.1.2/xbase64-config.in.BAD 2009-08-19 22:58:42.081087534 -0400
++++ xbase64-3.1.2/xbase64-config.in 2009-08-19 22:58:45.604090002 -0400
+@@ -5,7 +5,7 @@ exec_prefix=@exec_prefix@
+ exec_prefix_set=no
+ CC="@CC@"
+ CXX="@CXX@"
+-LD="@SHARED_LD@"
++LD="@LD@"
+
+ usage="\
+ Usage: xbase-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--cc] [--cxx] [--ld]"
diff --git a/dev-db/xbase/files/xbase-3.1.2-gcc-version.patch b/dev-db/xbase/files/xbase-3.1.2-gcc-version.patch
new file mode 100644
index 000000000000..3f0d209eec47
--- /dev/null
+++ b/dev-db/xbase/files/xbase-3.1.2-gcc-version.patch
@@ -0,0 +1,16 @@
+ configure.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 3110c70..5850231 100755
+--- a/configure.in
++++ b/configure.in
+@@ -74,7 +74,7 @@ AC_SUBST(RHREL)
+
+ # get G++ version
+ if test "$GXX" = "yes"; then
+- GXXVER=`${CXX} -v 2>&1 | grep version | cut -d " " -f 3 -`
++ GXXVER=`${CXX} -v 2>&1 | grep " version " | cut -d " " -f 3 -`
+ GXXVER="gcc${GXXVER}"
+ else
+ GXXVER=""
diff --git a/dev-db/xbase/files/xbase-3.1.2-gcc44.patch b/dev-db/xbase/files/xbase-3.1.2-gcc44.patch
new file mode 100644
index 000000000000..d23c9f23d08f
--- /dev/null
+++ b/dev-db/xbase/files/xbase-3.1.2-gcc44.patch
@@ -0,0 +1,24 @@
+diff -up xbase64-3.1.2/xbase64/xbase64.cpp.gcc44 xbase64-3.1.2/xbase64/xbase64.cpp
+--- xbase64-3.1.2/xbase64/xbase64.cpp.gcc44 2006-07-17 12:54:42.000000000 -0400
++++ xbase64-3.1.2/xbase64/xbase64.cpp 2009-08-19 23:08:14.724079392 -0400
+@@ -66,6 +66,8 @@
+ #include <dos.h>
+ #endif
+
++#include <cerrno>
++
+
+ /*! \file xbase64.cpp
+ */
+diff -up xbase64-3.1.2/xbase64/xblock.cpp.gcc44 xbase64-3.1.2/xbase64/xblock.cpp
+--- xbase64-3.1.2/xbase64/xblock.cpp.gcc44 2009-08-19 23:08:59.408186578 -0400
++++ xbase64-3.1.2/xbase64/xblock.cpp 2009-08-19 23:09:11.416184844 -0400
+@@ -65,6 +65,8 @@
+ //#include <stdio.h>
+ //#include <stdlib.h>
+
++#include <cerrno>
++
+ /*! \file xblock.cpp
+ */
+ #ifdef XB_LOCKING_ON
diff --git a/dev-db/xbase/files/xbase-3.1.2-gcc47.patch b/dev-db/xbase/files/xbase-3.1.2-gcc47.patch
new file mode 100644
index 000000000000..7774251ed68d
--- /dev/null
+++ b/dev-db/xbase/files/xbase-3.1.2-gcc47.patch
@@ -0,0 +1,21 @@
+diff -up xbase64-3.1.2/bin/dumprecs.cpp.gcc47 xbase64-3.1.2/bin/dumprecs.cpp
+--- xbase64-3.1.2/bin/dumprecs.cpp.gcc47 2012-01-05 15:36:00.377536998 -0500
++++ xbase64-3.1.2/bin/dumprecs.cpp 2012-01-05 15:36:15.198399295 -0500
+@@ -70,7 +70,7 @@ int main(int ac,char** av)
+ return 1;
+ }
+
+- for(int i=1; i<ac; ++i){
++ for(int i=1; i<ac; ++i){{
+ char* filename = av[i];
+
+ xbDbf MyFile( &x );
+@@ -91,7 +91,7 @@ int main(int ac,char** av)
+ x.DisplayError( rc );
+ }
+ MyFile.CloseDatabase(); /* close database */
+- }
++ }}
+ return 0;
+ }
+
diff --git a/dev-db/xbase/files/xbase-3.1.2-lesserg.patch b/dev-db/xbase/files/xbase-3.1.2-lesserg.patch
new file mode 100644
index 000000000000..b6eb71e0b618
--- /dev/null
+++ b/dev-db/xbase/files/xbase-3.1.2-lesserg.patch
@@ -0,0 +1,294 @@
+diff -up xbase64-3.1.2/xbase64/xbase64.cpp.lesserg xbase64-3.1.2/xbase64/xbase64.cpp
+--- xbase64-3.1.2/xbase64/xbase64.cpp.lesserg 2012-01-05 15:31:01.695312436 -0500
++++ xbase64-3.1.2/xbase64/xbase64.cpp 2012-01-05 15:31:01.717312232 -0500
+@@ -38,7 +38,7 @@
+
+ */
+
+-#ifdef __GNU LesserG__
++#ifdef __GNU_LesserG__
+ #pragma implementation "xbase64.h"
+ #endif
+
+diff -up xbase64-3.1.2/xbase64/xbase64.h.lesserg xbase64-3.1.2/xbase64/xbase64.h
+--- xbase64-3.1.2/xbase64/xbase64.h.lesserg 2006-07-17 12:54:50.000000000 -0400
++++ xbase64-3.1.2/xbase64/xbase64.h 2012-01-05 15:31:01.718312223 -0500
+@@ -42,7 +42,7 @@
+ #ifndef __XB_XBASE_H__
+ #define __XB_XBASE_H__
+
+-#ifdef __GNU LesserG__
++#ifdef __GNU_LesserG__
+ #pragma interface
+ #endif
+
+@@ -60,7 +60,7 @@
+ // ripped from wxWindows
+
+ // _declspec works in BC++ 5 and later, as well as VC++
+-#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__GNU LesserC__)
++#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__GNU_LesserC__)
+ # ifdef XBMAKINGDLL
+ # define XBDLLEXPORT __declspec( dllexport )
+ # define XBDLLEXPORT_DATA(type) __declspec( dllexport ) type
+diff -up xbase64-3.1.2/xbase64/xbcdx.h.lesserg xbase64-3.1.2/xbase64/xbcdx.h
+--- xbase64-3.1.2/xbase64/xbcdx.h.lesserg 2012-01-05 15:32:17.398608985 -0500
++++ xbase64-3.1.2/xbase64/xbcdx.h 2012-01-05 15:32:43.051370614 -0500
+@@ -50,7 +50,7 @@ struct CdxInnerNode: public CdxNode
+ {
+ char keys[500];
+ }
+-#ifdef __GNU LesserC__
++#ifdef __GNU_LesserC__
+ __attribute__((packed))
+ #endif
+ ;
+@@ -67,7 +67,7 @@ struct CdxLeafNode: public CdxNode
+ char byteCount;
+ char keys[488];
+ }
+-#ifdef __GNU LesserC__
++#ifdef __GNU_LesserC__
+ __attribute__((packed))
+ #endif
+ ;
+diff -up xbase64-3.1.2/xbase64/xbdate.cpp.lesserg xbase64-3.1.2/xbase64/xbdate.cpp
+--- xbase64-3.1.2/xbase64/xbdate.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400
++++ xbase64-3.1.2/xbase64/xbdate.cpp 2012-01-05 15:31:01.719312213 -0500
+@@ -40,7 +40,7 @@
+
+ */
+
+-#ifdef __GNU LesserG__
++#ifdef __GNU_LesserG__
+ #pragma implementation "xbdate.h"
+ #endif
+
+diff -up xbase64-3.1.2/xbase64/xbdate.h.lesserg xbase64-3.1.2/xbase64/xbdate.h
+--- xbase64-3.1.2/xbase64/xbdate.h.lesserg 2006-07-17 12:54:50.000000000 -0400
++++ xbase64-3.1.2/xbase64/xbdate.h 2012-01-05 15:31:01.721312195 -0500
+@@ -45,7 +45,7 @@
+ #ifndef __XB_XBDATE_H__
+ #define __XB_XBDATE_H__
+
+-#ifdef __GNU LesserG__
++#ifdef __GNU_LesserG__
+ #pragma interface
+ #endif
+
+diff -up xbase64-3.1.2/xbase64/xbdbf.cpp.lesserg xbase64-3.1.2/xbase64/xbdbf.cpp
+--- xbase64-3.1.2/xbase64/xbdbf.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400
++++ xbase64-3.1.2/xbase64/xbdbf.cpp 2012-01-05 15:31:01.722312185 -0500
+@@ -39,7 +39,7 @@
+
+ */
+
+-#ifdef __GNU LesserG__
++#ifdef __GNU_LesserG__
+ #pragma implementation "xbdbf.h"
+ #endif
+
+diff -up xbase64-3.1.2/xbase64/xbdbf.h.lesserg xbase64-3.1.2/xbase64/xbdbf.h
+--- xbase64-3.1.2/xbase64/xbdbf.h.lesserg 2006-07-17 12:54:50.000000000 -0400
++++ xbase64-3.1.2/xbase64/xbdbf.h 2012-01-05 15:31:01.723312175 -0500
+@@ -41,7 +41,7 @@
+ #ifndef __XB_DBF_H__
+ #define __XB_DBF_H__
+
+-#ifdef __GNU LesserG__
++#ifdef __GNU_LesserG__
+ #pragma interface
+ #endif
+
+diff -up xbase64-3.1.2/xbase64/xbexp.cpp.lesserg xbase64-3.1.2/xbase64/xbexp.cpp
+--- xbase64-3.1.2/xbase64/xbexp.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400
++++ xbase64-3.1.2/xbase64/xbexp.cpp 2012-01-05 15:31:01.725312157 -0500
+@@ -38,7 +38,7 @@
+
+ */
+
+-#ifdef __GNU LesserG__
++#ifdef __GNU_LesserG__
+ #pragma implementation "xbexp.h"
+ #endif
+
+diff -up xbase64-3.1.2/xbase64/xbexp.h.lesserg xbase64-3.1.2/xbase64/xbexp.h
+--- xbase64-3.1.2/xbase64/xbexp.h.lesserg 2006-07-17 12:54:50.000000000 -0400
++++ xbase64-3.1.2/xbase64/xbexp.h 2012-01-05 15:31:01.726312148 -0500
+@@ -42,7 +42,7 @@
+ #ifndef __XB_EXP_H__
+ #define __XB_EXP_H__
+
+-#ifdef __GNU LesserG__
++#ifdef __GNU_LesserG__
+ #pragma interface
+ #endif
+
+diff -up xbase64-3.1.2/xbase64/xbfile.cpp.lesserg xbase64-3.1.2/xbase64/xbfile.cpp
+--- xbase64-3.1.2/xbase64/xbfile.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400
++++ xbase64-3.1.2/xbase64/xbfile.cpp 2012-01-05 15:31:01.727312139 -0500
+@@ -39,7 +39,7 @@
+
+ */
+
+-#ifdef __GNU LesserG__
++#ifdef __GNU_LesserG__
+ #pragma implementation "xbfile.h"
+ #endif
+
+diff -up xbase64-3.1.2/xbase64/xbfile.h.lesserg xbase64-3.1.2/xbase64/xbfile.h
+--- xbase64-3.1.2/xbase64/xbfile.h.lesserg 2006-07-17 12:54:50.000000000 -0400
++++ xbase64-3.1.2/xbase64/xbfile.h 2012-01-05 15:31:01.728312130 -0500
+@@ -45,7 +45,7 @@
+ #ifndef __XB_FILE_H__
+ #define __XB_FILE_H__
+
+-#ifdef __GNU LesserG__
++#ifdef __GNU_LesserG__
+ #pragma interface
+ #endif
+
+diff -up xbase64-3.1.2/xbase64/xbfilter.cpp.lesserg xbase64-3.1.2/xbase64/xbfilter.cpp
+--- xbase64-3.1.2/xbase64/xbfilter.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400
++++ xbase64-3.1.2/xbase64/xbfilter.cpp 2012-01-05 15:31:01.729312120 -0500
+@@ -38,7 +38,7 @@
+
+ */
+
+-#ifdef __GNU LesserG__
++#ifdef __GNU_LesserG__
+ #pragma implementation "xbfilter.h"
+ #endif
+
+diff -up xbase64-3.1.2/xbase64/xbfilter.h.lesserg xbase64-3.1.2/xbase64/xbfilter.h
+--- xbase64-3.1.2/xbase64/xbfilter.h.lesserg 2006-07-17 12:54:50.000000000 -0400
++++ xbase64-3.1.2/xbase64/xbfilter.h 2012-01-05 15:31:01.731312101 -0500
+@@ -44,7 +44,7 @@
+ #ifndef __XB_FILTER_H__
+ #define __XB_FILTER_H__
+
+-#ifdef __GNU LesserG__
++#ifdef __GNU_LesserG__
+ #pragma interface
+ #endif
+
+diff -up xbase64-3.1.2/xbase64/xbindex.cpp.lesserg xbase64-3.1.2/xbase64/xbindex.cpp
+--- xbase64-3.1.2/xbase64/xbindex.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400
++++ xbase64-3.1.2/xbase64/xbindex.cpp 2012-01-05 15:31:01.732312092 -0500
+@@ -37,7 +37,7 @@
+ USA
+ */
+
+-#ifdef __GNU LesserG__
++#ifdef __GNU_LesserG__
+ #pragma implementation "xbindex.h"
+ #endif
+
+diff -up xbase64-3.1.2/xbase64/xbindex.h.lesserg xbase64-3.1.2/xbase64/xbindex.h
+--- xbase64-3.1.2/xbase64/xbindex.h.lesserg 2006-07-17 12:54:50.000000000 -0400
++++ xbase64-3.1.2/xbase64/xbindex.h 2012-01-05 15:31:01.733312083 -0500
+@@ -43,7 +43,7 @@
+ #ifndef __XB_INDEX_H__
+ #define __XB_INDEX_H__
+
+-#ifdef __GNU LesserG__
++#ifdef __GNU_LesserG__
+ #pragma interface
+ #endif
+
+diff -up xbase64-3.1.2/xbase64/xblock.cpp.lesserg xbase64-3.1.2/xbase64/xblock.cpp
+--- xbase64-3.1.2/xbase64/xblock.cpp.lesserg 2012-01-05 15:31:01.696312427 -0500
++++ xbase64-3.1.2/xbase64/xblock.cpp 2012-01-05 15:31:01.734312074 -0500
+@@ -42,7 +42,7 @@
+ USA
+ */
+
+-#ifdef __GNU LesserG__
++#ifdef __GNU_LesserG__
+ #pragma implementation "xblock.h"
+ #endif
+
+diff -up xbase64-3.1.2/xbase64/xblock.h.lesserg xbase64-3.1.2/xbase64/xblock.h
+--- xbase64-3.1.2/xbase64/xblock.h.lesserg 2006-07-17 12:54:50.000000000 -0400
++++ xbase64-3.1.2/xbase64/xblock.h 2012-01-05 15:31:01.735312065 -0500
+@@ -44,7 +44,7 @@
+ #ifndef __XB_XBLOCK_H__
+ #define __XB_XBLOCK_H__
+
+-#ifdef __GNU LesserG__
++#ifdef __GNU_LesserG__
+ #pragma interface
+ #endif
+
+diff -up xbase64-3.1.2/xbase64/xbndx.cpp.lesserg xbase64-3.1.2/xbase64/xbndx.cpp
+--- xbase64-3.1.2/xbase64/xbndx.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400
++++ xbase64-3.1.2/xbase64/xbndx.cpp 2012-01-05 15:31:01.737312045 -0500
+@@ -36,7 +36,7 @@
+
+ */
+
+-#ifdef __GNU LesserG__
++#ifdef __GNU_LesserG__
+ #pragma implementation "xbndx.h"
+ #endif
+
+diff -up xbase64-3.1.2/xbase64/xbndx.h.lesserg xbase64-3.1.2/xbase64/xbndx.h
+--- xbase64-3.1.2/xbase64/xbndx.h.lesserg 2006-07-17 12:54:50.000000000 -0400
++++ xbase64-3.1.2/xbase64/xbndx.h 2012-01-05 15:31:01.738312036 -0500
+@@ -41,7 +41,7 @@
+ #ifndef __XB_NDX_H__
+ #define __XB_NDX_H__
+
+-#ifdef __GNU LesserG__
++#ifdef __GNU_LesserG__
+ #pragma interface
+ #endif
+
+diff -up xbase64-3.1.2/xbase64/xbntx.cpp.lesserg xbase64-3.1.2/xbase64/xbntx.cpp
+--- xbase64-3.1.2/xbase64/xbntx.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400
++++ xbase64-3.1.2/xbase64/xbntx.cpp 2012-01-05 15:31:01.740312018 -0500
+@@ -40,7 +40,7 @@
+ USA
+ */
+
+-#ifdef __GNU LesserG__
++#ifdef __GNU_LesserG__
+ #pragma implementation "xbntx.h"
+ #endif
+
+diff -up xbase64-3.1.2/xbase64/xbntx.h.lesserg xbase64-3.1.2/xbase64/xbntx.h
+--- xbase64-3.1.2/xbase64/xbntx.h.lesserg 2006-07-17 12:54:50.000000000 -0400
++++ xbase64-3.1.2/xbase64/xbntx.h 2012-01-05 15:31:01.741312009 -0500
+@@ -42,7 +42,7 @@
+ #ifndef __XB_NTX_H__
+ #define __XB_NTX_H__
+
+-#ifdef __GNU LesserG__
++#ifdef __GNU_LesserG__
+ #pragma interface
+ #endif
+
+diff -up xbase64-3.1.2/xbase64/xbstring.cpp.lesserg xbase64-3.1.2/xbase64/xbstring.cpp
+--- xbase64-3.1.2/xbase64/xbstring.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400
++++ xbase64-3.1.2/xbase64/xbstring.cpp 2012-01-05 15:31:01.742312000 -0500
+@@ -38,7 +38,7 @@
+
+ */
+
+-#ifdef __GNU LesserG__
++#ifdef __GNU_LesserG__
+ #pragma implementation "xbstring.h"
+ #endif
+
+diff -up xbase64-3.1.2/xbase64/xbstring.h.lesserg xbase64-3.1.2/xbase64/xbstring.h
+--- xbase64-3.1.2/xbase64/xbstring.h.lesserg 2006-07-17 12:54:50.000000000 -0400
++++ xbase64-3.1.2/xbase64/xbstring.h 2012-01-05 15:31:01.743311990 -0500
+@@ -41,7 +41,7 @@
+ #ifndef __XBSTRING_H__
+ #define __XBSTRING_H__
+
+-#ifdef __GNU LesserG__
++#ifdef __GNU_LesserG__
+ #pragma interface
+ #endif
+
diff --git a/dev-db/xbase/files/xbase-3.1.2-outofsource.patch b/dev-db/xbase/files/xbase-3.1.2-outofsource.patch
new file mode 100644
index 000000000000..87094a8b429a
--- /dev/null
+++ b/dev-db/xbase/files/xbase-3.1.2-outofsource.patch
@@ -0,0 +1,52 @@
+ bin/Makefile.am | 2 +-
+ examples/Makefile.am | 2 +-
+ libtest/Makefile.am | 2 +-
+ xbase64/Makefile.am | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/bin/Makefile.am b/bin/Makefile.am
+index 43c8333..ca49ca1 100755
+--- a/bin/Makefile.am
++++ b/bin/Makefile.am
+@@ -1,5 +1,5 @@
+
+-INCLUDES= -I$(topdir)
++INCLUDES= -I$(top_srcdir)
+ LDADD = -L$(topdir)/xbase64 -lxbase64
+
+ INSTALL_PROGRAM = @INSTALL@
+diff --git a/examples/Makefile.am b/examples/Makefile.am
+index 248b1ec..85adbf3 100755
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -1,5 +1,5 @@
+
+-INCLUDES= -I$(topdir) $(all_includes)
++INCLUDES= -I$(top_srcdir) $(all_includes)
+ LDADD = -L$(topdir)/xbase64 -lxbase64
+
+ # for shadow passwords override the value
+diff --git a/libtest/Makefile.am b/libtest/Makefile.am
+index 9e84830..1b73af1 100755
+--- a/libtest/Makefile.am
++++ b/libtest/Makefile.am
+@@ -1,5 +1,5 @@
+
+-INCLUDES= -I$(topdir)
++INCLUDES= -I$(top_srcdir)
+ LDADD = -L$(topdir)/xbase64 -lxbase64
+
+ INSTALL_PROGRAM = @INSTALL@
+diff --git a/xbase64/Makefile.am b/xbase64/Makefile.am
+index b0dff24..857aa82 100755
+--- a/xbase64/Makefile.am
++++ b/xbase64/Makefile.am
+@@ -25,7 +25,7 @@
+ #
+ #
+
+-INCLUDES = -I$(topdir)
++INCLUDES = -I$(top_srcdir)
+
+ lib_LTLIBRARIES = libxbase64.la
+
diff --git a/dev-db/xbase/files/xbase-3.1.2-xbnode.patch b/dev-db/xbase/files/xbase-3.1.2-xbnode.patch
new file mode 100644
index 000000000000..98488453cc84
--- /dev/null
+++ b/dev-db/xbase/files/xbase-3.1.2-xbnode.patch
@@ -0,0 +1,9 @@
+diff -up xbase64-3.1.2/xbase64/xbnode.cpp.BAD xbase64-3.1.2/xbase64/xbnode.cpp
+--- xbase64-3.1.2/xbase64/xbnode.cpp.BAD 2009-08-19 23:10:38.444059289 -0400
++++ xbase64-3.1.2/xbase64/xbnode.cpp 2009-08-19 23:10:47.348202984 -0400
+@@ -1,4 +1,4 @@
+-#include "xbNode.h"
++#include "xbnode.h"
+
+ void xbNodeLink::AddNode(xbNodeLink* node)
+ {
diff --git a/dev-db/xbase/metadata.xml b/dev-db/xbase/metadata.xml
index ff62877c67ae..91f4e72fb544 100644
--- a/dev-db/xbase/metadata.xml
+++ b/dev-db/xbase/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/xbase/xbase-2.0.0-r2.ebuild b/dev-db/xbase/xbase-2.0.0-r2.ebuild
new file mode 100644
index 000000000000..f29103107842
--- /dev/null
+++ b/dev-db/xbase/xbase-2.0.0-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xbase/xbase-2.0.0-r2.ebuild,v 1.1 2012/06/30 13:41:45 jlec Exp $
+
+EAPI=4
+
+inherit autotools-utils
+
+DESCRIPTION="xbase (i.e. dBase, FoxPro, etc.) compatible C++ class library"
+HOMEPAGE="http://www.rekallrevealed.org/"
+SRC_URI="http://www.rekallrevealed.org/packages/${P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc static-libs"
+
+RDEPEND=""
+DEPEND="${DEPEND}
+ sys-devel/automake
+ sys-devel/libtool"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc43.patch
+ "${FILESDIR}"/${P}-gcc47.patch
+ "${FILESDIR}"/${P}-fixconfig.patch
+ "${FILESDIR}"/${P}-x86_64.patch
+ "${FILESDIR}"/${P}-ldflags.patch
+)
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_compile() {
+ autotools-utils_src_compile \
+ CC="$(tc-getCC)" \
+ CXX="$(tc-getCXX)"
+}
+
+src_install() {
+ autotools-utils_src_install
+ # media-tv/linuxtv-dvb-apps collision, bug #208596
+ mv "${ED}/usr/bin/zap" "${ED}/usr/bin/xbase-zap" || die
+
+ if use doc; then
+ dohtml html/*
+ insinto /usr/share/doc/${PF}/examples
+ doins examples/{*.cpp,examples.ide,makefile.g95}
+ fi
+}
diff --git a/dev-db/xbase/xbase-2.0.0.ebuild b/dev-db/xbase/xbase-2.0.0.ebuild
index 7678080b39e4..84b9fd57252b 100644
--- a/dev-db/xbase/xbase-2.0.0.ebuild
+++ b/dev-db/xbase/xbase-2.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/xbase/xbase-2.0.0.ebuild,v 1.18 2009/01/10 19:04:23 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xbase/xbase-2.0.0.ebuild,v 1.19 2012/06/30 13:41:44 jlec Exp $
inherit base eutils
-DESCRIPTION="XBase is an xbase (i.e. dBase, FoxPro, etc.) compatible C++ class library"
+DESCRIPTION="xbase (i.e. dBase, FoxPro, etc.) compatible C++ class library"
HOMEPAGE="http://www.rekallrevealed.org/"
SRC_URI="http://www.rekallrevealed.org/packages/${P}.tgz"
@@ -28,7 +28,7 @@ src_unpack() {
src_install() {
base_src_install
- dodoc AUTHORS COPYING Changelog INSTALL NEWS README TODO
+ dodoc AUTHORS Changelog INSTALL NEWS README TODO
if use doc; then
rm html/Makefile*
dohtml html/*
diff --git a/dev-db/xbase/xbase-3.1.2.ebuild b/dev-db/xbase/xbase-3.1.2.ebuild
new file mode 100644
index 000000000000..6ff9cf33784b
--- /dev/null
+++ b/dev-db/xbase/xbase-3.1.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xbase/xbase-3.1.2.ebuild,v 1.1 2012/06/30 13:41:45 jlec Exp ${PN}/${PN}-2.0.0-r1.ebuild,v 1.6 2012/06/29 14:42:09 jer Exp $
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=no
+
+inherit autotools-utils
+
+DESCRIPTION="xbase (i.e. dBase, FoxPro, etc.) compatible C++ class library"
+HOMEPAGE="http://linux.techass.com/projects/xdb/"
+SRC_URI="mirror://sourceforge/xdb/${PN}64-${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc static-libs"
+
+RDEPEND=""
+DEPEND="${DEPEND}
+ sys-devel/automake
+ sys-devel/libtool"
+
+S="${WORKDIR}"/${PN}64-${PV}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fixconfig.patch
+ "${FILESDIR}"/${P}-gcc44.patch
+ "${FILESDIR}"/${PN}-2.0.0-ppc.patch
+ "${FILESDIR}"/${P}-xbnode.patch
+ "${FILESDIR}"/${P}-lesserg.patch
+ "${FILESDIR}"/${P}-outofsource.patch
+ "${FILESDIR}"/${P}-gcc47.patch
+ "${FILESDIR}"/${P}-gcc-version.patch )
+
+src_install() {
+ autotools-utils_src_install
+ # media-tv/linuxtv-dvb-apps collision, bug #208596
+ mv "${ED}/usr/bin/zap" "${ED}/usr/bin/${PN}-zap" || die
+
+ if use doc; then
+ dohtml html/*
+ insinto /usr/share/doc/${PF}/examples
+ doins examples/{*.cpp,examples.ide,makefile.g95}
+ fi
+}