Bump to svn snapshot

Package-Manager: portage-2.2.0_alpha188
RepoMan-Options: --force
This commit is contained in:
Mario Fetka 2013-11-20 04:52:06 +01:00
parent 8a7f817e37
commit a4a6bb7979
6 changed files with 308 additions and 3 deletions

View File

@ -1,7 +1,14 @@
# ChangeLog for dev-db/libflaim
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*libflaim-4.9.1046 (20 Nov 2013)
20 Nov 2013; Mario Fetka <mario.fetka@gmail.com> +files/libflaim-arm.patch,
+files/libflaim-hppa.patch, +files/libflaim-warning.patch,
+libflaim-4.9.1046.ebuild:
Bump to svn snapshot
05 Mar 2011; Mario Fetka <mario.fetka@gmail.com> libflaim-4.9.989.ebuild:
repoman cleanup
@ -132,4 +139,3 @@
21 Feb 2009; Mario Fetka <mario.fetka@gmail.com> +metadata.xml:
Initial checkin

View File

@ -1,6 +1,11 @@
AUX libflaim-arm.patch 2156 SHA256 e0d74b14bcd0d9d8ce6eff124d5cef075ede245b379739a1ae60fb204537a151 SHA512 427a51fc321e34d18c909d870d1f04e768930751978e694729817e4de90a3162f4c0d4864652b5aaf21ee45352747fa4eccf20f459ea7836036bdebe38ecb2ab WHIRLPOOL 842dc15a9502d021bf3c3ebe4fb75d1056fec87b3944630c155d1922a0be3b8fa4eed4e80587e35922ec0bd43871b26bd0ecbb452ed033edddef4be205de1b8b
AUX libflaim-hppa.patch 1957 SHA256 6e8628565e0de7bda4123798f1fd5f3dbc64200ca0f79caa4ce831f11cfcc0e2 SHA512 01dbe5dac5d6cbfc5206b3a25ec402634297fa6779d70a56687c5d469c1b978fce006b6ba00096e6965eb06a9665231adec364a437005746e8fa540ac2263f2f WHIRLPOOL 1dc83444c6cd8c942a88f0496fe3a06836c5a418c353c4aeb56d5d5b656056a974849d06bc6cfd4fd74290730ba54887bac315dce6edca4271f6cc7a6576621a
AUX libflaim-pic-ldconfig-fortify.patch 749 SHA256 f04a64a380d137f925b21ec203c08af04335d359e90666d9f13ff02fc0df8ca4 SHA512 b696cfff4940d0093586a8515ebf58f657e34b8926cfa6986e9adfb8bda364a2d7535c3000cb3f103f905de8f1938df9d6ad7f49c7335bf4ccf11287d07d4087 WHIRLPOOL 9c96543db81d8a30b8a35cbaeaa9fec9a020447baf8f02fdb3766659b31c6ab1f010ee2e5c0804b0c6c5d3ea9b7020d616b4eb6f1cbbdb2de7b3f8846fbbbac5
AUX libflaim-warning.patch 3423 SHA256 8f0f8f5144526411dccdbf116e15b042e93e9e1cc668efa24c0efd853bdaae64 SHA512 5d2c6323d1a3176da7b294816caaa4aaa975a48015c61274684db67ce54d31d458210d7279fedde2dfc93e5306390daab818f528d7df9ee0dee110faa0cae600 WHIRLPOOL d3ebba0b22a56471ba11df896867a30b2dcc3ab4cdfd96f06004b20ed8b4b605340ccdf2c19755253fb5c9431c4a8d032f7b13fc454a5bfda293bfb03a984e7d
DIST libflaim-4.9.1046.tar.gz 2255728 SHA256 27a95fc95fb9710d8f20b5cabe6e7072a56d38f8b1e1687f7980d08c19517b50 SHA512 9b1c0dc3bd7a5a7e5fddbc7467538ccf91fbdd5a6909e92a8f8c2f8c638c5c96ed73c516c7594e48981dbb88da1fabee9e5131df2f92dea0978312c2d441f105 WHIRLPOOL e9ded9a2dee873b6ea189b0b037f426533216d4735de5762d7b7df50c335b42f5091d194874be3d177dfd0b1d002419a9fdae0ab13ae3483393e267d681c5dd8
DIST libflaim-4.9.989.tar.gz 2857194 SHA256 49209a50e0c1e7b5c486c5e6e3ba04ee4c30bcd3f53bff01c134814b7bcf0678 SHA512 1ee53ee1b22f865406ce5513067a2c62fecb8447c1325305317cee96b9a96a2b9cd782e41388454130807496cb821a55ce5ba78b2d9522ff2a315487f5d32c68 WHIRLPOOL 0967a9e69106c3fdf92690c408985ccc980e2c8c74482b97d96f6350c99176d15d04536705e93b984b88d124acacb8099f130e7897df7e2246c5c41fbce8c5dc
EBUILD libflaim-4.10_pre1112.ebuild 978 SHA256 9105362c08c5433e040f4250bce54717a51d289b802eed56726b1136d342f387 SHA512 0262a46388dfbad40086114c3e0b3b46c426526dd575e034c10a1fc53303c028cc14bdc920ffe6e086257f47d4824f81be179ad46e917431081e20e2d4878937 WHIRLPOOL 66156dbd32ac7a4353c4fa900a69ccbe57995c52492b916838d139e9b97dae81e00ac815d6005b25a15d0f44313a9848a96c79298113fbc6ef1960bbb727a149
EBUILD libflaim-4.9.1046.ebuild 1014 SHA256 59458192b7d3124f906574d84554621ec3a4f20b3b245b79b43cbecd6c9ac7ff SHA512 c2dffbfd2572ecebc768496059ea4fa90618a4a9c270906b291f872eb3ac332bfd557d708da09e988bbdc082444fbd9cba426f2453e559c531d9dfa3bda32d36 WHIRLPOOL f6dd993d20fd74ce042ce5f182336b400f5fd527da978742cbe98c217f08f2f53b5b4dd429990bec90d8adba975482b84312decc97ab8bd635f9a8dfcc432fa7
EBUILD libflaim-4.9.989.ebuild 1007 SHA256 78acd574f5d4b577f601d98d9b4ffe150a02af19a6870adb2f1ea85b5887fc9a SHA512 aaf9868a2c0b8f98219edc25b677fbb90b97cb2245e3c0619d2d5ba2c8bce77b4f53bf7ca285058f2976810e86ff3ef73fb85e282485ab7d0841ae2048bdfdf8 WHIRLPOOL 4543b62094f42c18741f5dc330892052a6a64d8baf38702803bd8c40b38ef9c294d12aa00cf9fd142b1ccabca8f7f8074b622ed2d3b0a9d6e5537f8414709f2f
MISC ChangeLog 4429 SHA256 a1bfd0915e705c9b532203e59ce8bc7de9f3c9f04f38845086811d6c04695474 SHA512 3f0b7c29e8944dcd57d4d98ef661c6ef573bc216ae494d29964f95f53cf94f51b4cfc86c1f75e0f028eaa41e3d86b7a0d6dad2dcaaa49d9673e66fafdc6bed63 WHIRLPOOL 2c6c00a12f0bdb1ae8ba37fe871a206350c86202f6e5226069e578498077fa2413ef0866bc952f840daf7e27b60ba0848b2a232803d5721b9a3b1b2f1b7f8ac5
MISC ChangeLog 4654 SHA256 4c1061c3dcb27307d0b51df06f87756146854b9e3d122fa6dad69a16e3ffb51c SHA512 87a9c85c90325f28802b4c6e0fe4ec888e049ecce5e6aad4432890fa626cdbf8768e65a01c1987c1c5430944dffd1283ee321c7687aac4691abf148aeedd8d23 WHIRLPOOL 133f61ac58dd6f82c0762e68d340136fb87354e8a51446371003da7e6c1c7c161434072ec37f0dd2caa3c55ce92eaa538cf1384d3f29e8f507461a0f273be429
MISC metadata.xml 1238 SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 SHA512 d94394e853ce7bd9109322f37ab5d3526e2bbc4a59ac02d0b66e9d952d221a06ae1c38b6de5cdb142b2b09ac602a57ff03f0525efbbc7b8f33f9662ca42a5dd5 WHIRLPOOL 482453b974eaca6506c4503f49c5c55195790e9b47f19a885d551fa535445104fbb7bc93dc4f30f7faf545f619594fa04d9a8071c21eb55995fef4f7380f55b9

View File

@ -0,0 +1,84 @@
Index: Makefile
===================================================================
--- Makefile.orig
+++ Makefile
@@ -462,6 +462,14 @@ ifndef host_native_word_size
endif
ifndef host_native_word_size
+ ifneq (,$(findstring arm,$(HOSTTYPE)))
+ host_processor_family = arm
+ host_native_word_size = 32
+ host_supported_word_sizes = 32
+ endif
+endif
+
+ifndef host_native_word_size
$(error Unable to determine host word size. $(HOSTTYPE))
endif
@@ -1019,7 +1027,9 @@ ifdef unix_target
ifeq ($(compiler),g++)
ccflags += -Wall -fPIC
ifneq ($(target_processor_family),ia64)
- ccflags += -m$(target_word_size)
+ ifneq ($(target_processor_family),arm)
+ ccflags += -m$(target_word_size)
+ endif
endif
endif
@@ -1133,9 +1143,11 @@ ifdef unix_target
ifeq ($(compiler),g++)
ifneq ($(target_processor_family),ia64)
+ ifneq ($(target_processor_family),arm)
shared_link_flags += -m$(target_word_size)
link_flags += -m$(target_word_size)
endif
+ endif
endif
lib_link_libs = -lpthread
Index: src/flaimtk.h
===================================================================
--- src/flaimtk.h.orig
+++ src/flaimtk.h
@@ -54,6 +54,7 @@
#undef FLM_GNUC
#undef FLM_HAS_ASYNC_IO
#undef FLM_HAS_DIRECT_IO
+ #undef FLM_ARM
#if defined( __GNUC__)
#define FLM_GNUC
@@ -149,6 +150,8 @@
#endif
#elif defined( __x86__) || defined( __i386__) || defined( __x86_64__)
#define FLM_X86
+ #elif defined( __arm__) || defined( __thumb__)
+ #define FLM_ARM
#else
#error Platform architecture not supported
#endif
Index: ftk/src/ftk.h
===================================================================
--- ftk/src/ftk.h.orig
+++ ftk/src/ftk.h
@@ -54,6 +54,7 @@
#undef FLM_GNUC
#undef FLM_HAS_ASYNC_IO
#undef FLM_HAS_DIRECT_IO
+ #undef FLM_ARM
#if defined( __GNUC__)
#define FLM_GNUC
@@ -149,6 +150,8 @@
#endif
#elif defined( __x86__) || defined( __i386__) || defined( __x86_64__)
#define FLM_X86
+ #elif defined( __arm__) || defined( __thumb__)
+ #define FLM_ARM
#else
#error Platform architecture not supported
#endif

View File

@ -0,0 +1,72 @@
--- Makefile.orig 2010-07-06 08:43:35.000000000 +0200
+++ Makefile 2010-07-06 08:45:27.000000000 +0200
@@ -462,6 +462,14 @@
endif
ifndef host_native_word_size
+ ifneq (,$(findstring parisc,$(HOSTTYPE)))
+ host_processor_family = hppa
+ host_native_word_size = 32
+ host_supported_word_sizes = 32
+ endif
+endif
+
+ifndef host_native_word_size
$(error Unable to determine host word size. $(HOSTTYPE))
endif
--- Makefile 2010-07-06 08:53:52.000000000 +0200
+++ Makefile 2010-07-06 08:53:45.000000000 +0200
@@ -1027,7 +1027,9 @@
ifeq ($(compiler),g++)
ccflags += -Wall -Werror -fPIC
ifneq ($(target_processor_family),ia64)
- ccflags += -m$(target_word_size)
+ ifneq ($(HOSTTYPE),parisc)
+ ccflags += -m$(target_word_size)
+ endif
endif
endif
--- src/flaimtk.h.orig 2010-07-06 08:59:48.000000000 +0200
+++ src/flaimtk.h 2010-07-06 09:02:19.000000000 +0200
@@ -54,6 +54,7 @@
#undef FLM_GNUC
#undef FLM_HAS_ASYNC_IO
#undef FLM_HAS_DIRECT_IO
+ #undef FLM_PARISC
#if defined( __GNUC__)
#define FLM_GNUC
@@ -149,6 +150,10 @@
#endif
#elif defined( __x86__) || defined( __i386__) || defined( __x86_64__)
#define FLM_X86
+ #elif defined( __hppa )
+ #define FLM_PARISC
+ #define FLM_BIG_ENDIAN
+ #define FML_STRICT_ALIGNMENT
#else
#error Platform architecture not supported
#endif
--- ftk/src/ftk.h.orig 2010-07-06 09:06:25.000000000 +0200
+++ ftk/src/ftk.h 2010-07-06 09:07:44.000000000 +0200
@@ -54,6 +54,7 @@
#undef FLM_GNUC
#undef FLM_HAS_ASYNC_IO
#undef FLM_HAS_DIRECT_IO
+ #undef FLM_PARISC
#if defined( __GNUC__)
#define FLM_GNUC
@@ -149,6 +150,10 @@
#endif
#elif defined( __x86__) || defined( __i386__) || defined( __x86_64__)
#define FLM_X86
+ #elif defined( __hppa )
+ #define FLM_PARISC
+ #define FLM_BIG_ENDIAN
+ #define FML_STRICT_ALIGNMENT
#else
#error Platform architecture not supported
#endif

View File

@ -0,0 +1,96 @@
Index: ftk/src/ftk.h
===================================================================
--- ftk/src/ftk.h.orig 2007-03-29 16:09:57.000000000 +0200
+++ ftk/src/ftk.h 2011-06-02 15:45:22.283023559 +0200
@@ -330,8 +330,10 @@
#endif
#if defined( FLM_WIN) || defined( FLM_NLM)
+ #define FLMATOMIC_RET long
#define FLMATOMIC volatile long
#else
+ #define FLMATOMIC_RET int
#define FLMATOMIC volatile int
#endif
@@ -3943,7 +3945,7 @@
} F_TMSTAMP;
#define f_timeIsLeapYear(year) \
- ((((year) & 0x03) == 0) && (((year) % 100) != 0) || (((year) % 400) == 0))
+ (((((year) & 0x03) == 0) && (((year) % 100) != 0)) || (((year) % 400) == 0))
void f_timeGetSeconds(
FLMUINT * puiSeconds);
Index: ftk/src/ftksys.h
===================================================================
--- ftk/src/ftksys.h.orig 2007-03-29 16:09:57.000000000 +0200
+++ ftk/src/ftksys.h 2011-06-02 15:45:22.284023465 +0200
@@ -218,7 +218,7 @@
Desc:
**********************************************************************/
#if defined( FLM_PPC) && defined( FLM_GNUC) && defined( FLM_LINUX)
- extern "C" FLMATOMIC ppc_atomic_add(
+ extern "C" FLMATOMIC_RET ppc_atomic_add(
FLMATOMIC * piTarget,
FLMINT32 iDelta);
#endif
@@ -227,7 +227,7 @@
Desc:
**********************************************************************/
#if defined( FLM_PPC) && defined( FLM_GNUC) && defined( FLM_LINUX)
- extern "C" FLMATOMIC ppc_atomic_xchg(
+ extern "C" FLMATOMIC_RET ppc_atomic_xchg(
FLMATOMIC * piTarget,
FLMATOMIC iNewValue);
#endif
Index: ftk/src/ftkunix.cpp
===================================================================
--- ftk/src/ftkunix.cpp.orig 2007-03-29 16:09:57.000000000 +0200
+++ ftk/src/ftkunix.cpp 2011-06-02 15:45:22.284023465 +0200
@@ -1356,7 +1356,7 @@ extern "C" void sparc_atomic_code( void)
Desc:
****************************************************************************/
#if defined( FLM_PPC) && defined( FLM_GNUC)
-FLMATOMIC ppc_atomic_add(
+FLMATOMIC_RET ppc_atomic_add(
FLMATOMIC * piTarget,
FLMINT32 iDelta)
{
@@ -1381,7 +1381,7 @@ FLMATOMIC ppc_atomic_add(
Desc:
****************************************************************************/
#if defined( FLM_PPC) && defined( FLM_GNUC)
-FLMATOMIC ppc_atomic_xchg(
+FLMATOMIC_RET ppc_atomic_xchg(
FLMATOMIC * piTarget,
FLMATOMIC iNewValue)
{
Index: src/kybuild.cpp
===================================================================
--- src/kybuild.cpp.orig 2007-03-29 16:09:57.000000000 +0200
+++ src/kybuild.cpp 2011-06-02 15:45:22.286023277 +0200
@@ -534,8 +534,8 @@ FSTATIC RCODE flmProcessIndexedFld(
if (pIxd->uiFlags & IXD_OFFLINE)
{
if (uiContainerNum > pIxd->uiLastContainerIndexed ||
- uiContainerNum == pIxd->uiLastContainerIndexed &&
- uiDrn > pIxd->uiLastDrnIndexed)
+ ( uiContainerNum == pIxd->uiLastContainerIndexed &&
+ uiDrn > pIxd->uiLastDrnIndexed ) )
{
continue;
}
Index: Makefile
===================================================================
--- Makefile.orig 2007-03-29 16:09:57.000000000 +0200
+++ Makefile 2011-06-02 15:46:24.264179045 +0200
@@ -1017,7 +1017,7 @@ ifdef unix_target
# Compiler defines and flags
ifeq ($(compiler),g++)
- ccflags += -Wall -Werror -fPIC
+ ccflags += -Wall -fPIC
ifneq ($(target_processor_family),ia64)
ccflags += -m$(target_word_size)
endif

View File

@ -0,0 +1,42 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit eutils
DESCRIPTION="Flaim is an embeddable database engine that provides a rich, powerful feature set."
HOMEPAGE="http://flaim.sourceforge.net"
SRC_URI="http://ftp.disconnected-by-peer.at/flaim/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~x86"
RESTRICT="mirror"
IUSE="static"
RDEPEND="!dev-lib/libflaimtk"
DEPEND="${RDEPEND}"
# S="${WORKDIR}/${P}/flaim"
src_prepare() {
epatch "${FILESDIR}"/libflaim-pic-ldconfig-fortify.patch
epatch "${FILESDIR}"/libflaim-warning.patch
# epatch "${FILESDIR}"/libflaim-hppa.patch
epatch "${FILESDIR}"/libflaim-arm.patch
}
src_compile() {
cd flaim
make DESTDIR="${D}" CXXFLAGS="${CXXFLAGS} -Wno-error" OSTYPE=`uname -s` HOSTTYPE=`uname -m` || \
die "Error compiling ${PN}"
}
src_install() {
cd flaim
make DESTDIR="${D}" install OSTYPE=`uname -s` HOSTTYPE=`uname -m` || \
die "Error installing ${PN}"
}