From 87b62c4f768975aff654bea5a71f90e2deb66272 Mon Sep 17 00:00:00 2001 From: geos_one Date: Sat, 5 Mar 2011 09:30:52 +0000 Subject: [PATCH] dev-db/libflaim: move back to unstable version it's better supported by ifolder (Portage version: 2.2.0_alpha26-r1/svn/Linux x86_64) git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@2849 6952d904-891a-0410-993b-d76249ca496b --- dev-db/libflaim/ChangeLog | 7 ++++ dev-db/libflaim/Manifest | 20 ++-------- .../files/libflaim-pic-ldconfig-fortify.patch | 28 +++++++++++++ dev-db/libflaim/libflaim-4.9.1046.ebuild | 39 ------------------- ....9.1052.ebuild => libflaim-4.9.989.ebuild} | 16 +++----- 5 files changed, 45 insertions(+), 65 deletions(-) create mode 100644 dev-db/libflaim/files/libflaim-pic-ldconfig-fortify.patch delete mode 100644 dev-db/libflaim/libflaim-4.9.1046.ebuild rename dev-db/libflaim/{libflaim-4.9.1052.ebuild => libflaim-4.9.989.ebuild} (51%) diff --git a/dev-db/libflaim/ChangeLog b/dev-db/libflaim/ChangeLog index f3cf269..e31a222 100644 --- a/dev-db/libflaim/ChangeLog +++ b/dev-db/libflaim/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*libflaim-4.9.989 (05 Mar 2011) + + 05 Mar 2011; Mario Fetka +libflaim-4.9.989.ebuild, + -libflaim-4.9.1046.ebuild, -libflaim-4.9.1052.ebuild, + +files/libflaim-pic-ldconfig-fortify.patch: + move back to unstable version it's better supported by ifolder + *libflaim-4.10_pre1112 (05 Mar 2011) 05 Mar 2011; Mario Fetka diff --git a/dev-db/libflaim/Manifest b/dev-db/libflaim/Manifest index 930d01d..3e9b2cf 100644 --- a/dev-db/libflaim/Manifest +++ b/dev-db/libflaim/Manifest @@ -1,18 +1,6 @@ -AUX do-not-compile-with-werror.patch 696 RMD160 3fdcac469ff0675f3f477c6125424a52967c4c80 SHA1 64fa14b8d4db58eded94451f1db9269a4aa74476 SHA256 4bcf060945095f56676e4cebd794534bf642f18c1240b3d261652d65a7fef0b5 -AUX fortify-source.patch 1159 RMD160 eaebf509f09a60dbba095b40bc4433a02d4b64e4 SHA1 708abcaa8148baa89db4bd5a71f3387fd18e6f57 SHA256 247509233f5f8998bd4fb584a988d8fe54e831b49fcb5333dc61715f1f20882c -AUX libflaim-4.9.1052-fortify-source.patch 1195 RMD160 0d34115dae5e9716ecc59aae85b6f8e285c67c83 SHA1 159d61b907432c187380fdfc85de5878c34533dd SHA256 8df76f429c891d9665937b6536fd4e94049cecc379a7ad789f9e3ff7e7c00d5a -AUX libflaim-4.9.1052-gcc43.patch 873 RMD160 585fd24212eb2b630aeeca7386639267f35c7b48 SHA1 e08e5b84f2136cf7b53ff6dd5199dd20c215c9ee SHA256 fa4ce1867842a9740aed9834c760fad5e3b0498ad6f43d1326377d3f4873b0cc -AUX libflaim-4.9.1052-gcc44.patch 445 RMD160 0b41b6c456e778448863026db84852966ef97c12 SHA1 36a2e5d191b0ee37c3e4b4a0f25c45fa51f4375d SHA256 ebd9e33a31d3f95fe5dce3382739fdf6842508ad7c9ffcc202c6421df7abe7f9 -AUX libflaim-4.9.1052-no-ldconfig-1.patch 1964 RMD160 4471d32e8e3a5847dc1b47e9a291c278d66b3be6 SHA1 dd3015e0fe93c6cb642178ac24256404c3563015 SHA256 2f6831cbd22ede3e6196d04f345ab7b2905881c2bf26e65b41a916d10953e95e -AUX libflaim-4.9.1052-optflags.patch 420 RMD160 515ebbfa1b117c168ea65751b3626c497971b21d SHA1 12c93c0e98960fe200ccebfe45918145e82e3789 SHA256 3492e75510a638b8adfbdd0576f8973a6cbe59588da6290d070ece636d828bbf -AUX libflaim-fortify.patch 262 RMD160 eff690951020830207c65c369bfce95478cd4913 SHA1 6a44390ef9898b3a45cd2618b464a4c7da828a22 SHA256 b4678dea7c281a429aac9fe0f9aa19416336f4e7ec5574c381762457ed898a7c -AUX libflaim-gcc43.patch 887 RMD160 4ae2a662a0b4f86addb89b56dcb58ed58f6327b5 SHA1 139fd6eb1981e3588bfbb73bb0e56601e6d077fb SHA256 8542bb4640782ed68f1207106eed6f08808ff09f4fde363772a1c7aacab6c5af -AUX libflaim-gcc44.patch 445 RMD160 0b41b6c456e778448863026db84852966ef97c12 SHA1 36a2e5d191b0ee37c3e4b4a0f25c45fa51f4375d SHA256 ebd9e33a31d3f95fe5dce3382739fdf6842508ad7c9ffcc202c6421df7abe7f9 -AUX libflaim-warning.patch 2211 RMD160 f7dced21bfe29b8308b6dec1214e44aca5b3bded SHA1 27b05204217056c21c26c042480b1ac648ab6f54 SHA256 ff0f55ecdf7968be8c6e8e04fdc3d7e3abf10e741927fe463ea85579da2b636c -DIST libflaim-4.9.1046.tar.gz 2255728 RMD160 e7dacc24e9768810a2686e95977b24e0d427e92c SHA1 72dd78c496f43c6c2ea872b6b095024dbf33fd62 SHA256 27a95fc95fb9710d8f20b5cabe6e7072a56d38f8b1e1687f7980d08c19517b50 -DIST libflaim-4.9.1052.tar.gz 2240254 RMD160 fcc1af6586bb829f2d5704e0eb2da9ba19f32750 SHA1 b618e04563be1687d134b0e374297de5575100d4 SHA256 171728bcc055d36f4b5e2cb925bae05cf560c9fdb37c3d8e133aa39e8669b159 +AUX libflaim-pic-ldconfig-fortify.patch 749 RMD160 7a2fd3682697a24d9539c27bcbd45b6d7e3d5710 SHA1 ac8dd96c6dae953e790da1a6c24af8c50a6187f8 SHA256 f04a64a380d137f925b21ec203c08af04335d359e90666d9f13ff02fc0df8ca4 +DIST libflaim-4.9.989.tar.gz 2857194 RMD160 ac940b26ef8a1a647b6508c77177a8a14c89edb9 SHA1 3f219f23cc6fc5371c995ad4084d1e1b6721d382 SHA256 49209a50e0c1e7b5c486c5e6e3ba04ee4c30bcd3f53bff01c134814b7bcf0678 EBUILD libflaim-4.10_pre1112.ebuild 978 RMD160 302ff61dd284b47f226bdcb98a3bf93b6cf7c1aa SHA1 f090031a3530f6e836a825783cefab23472ae1cc SHA256 9105362c08c5433e040f4250bce54717a51d289b802eed56726b1136d342f387 -EBUILD libflaim-4.9.1046.ebuild 1079 RMD160 a69ca309681c36e9d96437266c789656ccf7340b SHA1 3471e6c75397ebc74606a027794976f400d5ce73 SHA256 0df0d79c08f1d90e09672003e9662d240ab6349aa0e9cccf6419b36794be3297 -EBUILD libflaim-4.9.1052.ebuild 1226 RMD160 2eb33fa319383658d41f6abdd2916943493ebda7 SHA1 8aa767dbd5a1dec9c0a40eadb2d950dd2b8e84ea SHA256 e5103fcf10a7da227e7d17068ac221f49b74c9f4ddb5aa2ab91845a242f08a74 -MISC ChangeLog 4056 RMD160 9adb98001cd8f44d920aec14adb176baf297c7d8 SHA1 b87a8b179c4af0d35b21aabbab6b1b6a26699ba5 SHA256 373976066db940f5a775453a1893e2de480714e10406db4f9ae6aac805b2fa20 +EBUILD libflaim-4.9.989.ebuild 1018 RMD160 19d84a368c1d8768bd742352ba506e47f9734ea2 SHA1 0f23ee054540bd6b30c40ca039d824d94384adf8 SHA256 0b1af1b588d7bce827f605a11e7151f815144317e3c90570a5327ad188c6391e +MISC ChangeLog 4334 RMD160 55838bd99a804c831dd92b6975b9cda68ec1ab54 SHA1 01532ac4f8f68dfcc2d94c2bded2f9ffe4b0a062 SHA256 d937c7bde07ce59cc8357741a3ee4747fcd628b93979dc21c2e4ef1187ae9872 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 diff --git a/dev-db/libflaim/files/libflaim-pic-ldconfig-fortify.patch b/dev-db/libflaim/files/libflaim-pic-ldconfig-fortify.patch new file mode 100644 index 0000000..9085f57 --- /dev/null +++ b/dev-db/libflaim/files/libflaim-pic-ldconfig-fortify.patch @@ -0,0 +1,28 @@ +--- libflaim-4.9.966.orig/Makefile ++++ libflaim-4.9.966/Makefile +@@ -841,7 +841,7 @@ + + # Compiler definitions and flags + +-ccflags = ++ccflags = -fPIC + ccdefs = + + ifeq ($(target_word_size),64) +@@ -935,7 +935,7 @@ + static_lib_suffix = .a + shared_lib_suffix = .so.$(shared_lib_version) + +- compiler = g++ ++ compiler = g++ -U_FORTIFY_SOURCE + exe_linker = g++ + shared_linker = g++ + +@@ -1880,7 +1880,6 @@ + cd $(lib_install_dir); ln -fs $(lib_prefix)$(project_name).so.$(so_current).$(so_revision) $(lib_prefix)$(project_name).so.$(so_current) + endif + cd $(lib_install_dir); ln -fs $(lib_prefix)$(project_name).so.$(so_current) $(lib_prefix)$(project_name).so +- -ldconfig $(lib_install_dir) + $(ec)$(gprintf) "Installation complete.\n" + endif + diff --git a/dev-db/libflaim/libflaim-4.9.1046.ebuild b/dev-db/libflaim/libflaim-4.9.1046.ebuild deleted file mode 100644 index c773667..0000000 --- a/dev-db/libflaim/libflaim-4.9.1046.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: -inherit eutils - -DESCRIPTION="FLAIM is an embeddable cross-platform database engine that provides -a rich, powerful, easy-to-use feature set." -HOMEPAGE="http://flaim.sourceforge.net" -SRC_URI="mirror://sourceforge/flaim/files/stable/flaim/source/${P}.tar.gz - http://ftp.disconnected-by-peer.at/flaim/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" -RESTRICT="mirror" - -RDEPEND="!dev-lib/libflaimtk" - -DEPEND="${RDEPEND}" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/fortify-source.patch - epatch ${FILESDIR}/libflaim-gcc43.patch - epatch ${FILESDIR}/libflaim-gcc44.patch - epatch ${FILESDIR}/libflaim-4.9.1052-optflags.patch - epatch ${FILESDIR}/do-not-compile-with-werror.patch -} - -src_compile() { - make DESTDIR=${D} CXXFLAGS="${CXXFLAGS}" OSTYPE=`uname -s` HOSTTYPE=`uname -m` || \ - die "Error compiling ${PN}" -} - -src_install() { - make DESTDIR=${D} install OSTYPE=`uname -s` HOSTTYPE=`uname -m` || \ - die "Error installing ${PN}" -} diff --git a/dev-db/libflaim/libflaim-4.9.1052.ebuild b/dev-db/libflaim/libflaim-4.9.989.ebuild similarity index 51% rename from dev-db/libflaim/libflaim-4.9.1052.ebuild rename to dev-db/libflaim/libflaim-4.9.989.ebuild index 1c62857..21c533c 100644 --- a/dev-db/libflaim/libflaim-4.9.1052.ebuild +++ b/dev-db/libflaim/libflaim-4.9.989.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: @@ -10,7 +10,8 @@ DESCRIPTION="FLAIM is an embeddable cross-platform database engine that provides a rich, powerful, easy-to-use feature set." HOMEPAGE="http://flaim.sourceforge.net" SRC_URI="http://ftp.disconnected-by-peer.at/flaim/${P}.tar.gz - mirror://sourceforge/flaim/files/stable/flaim/source/${P}.tar.gz" + mirror://sourceforge/flaim/stable/flaim/source/${P}.tar.gz + mirror://sourceforge/flaim/unstable/flaim/source/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -24,22 +25,17 @@ DEPEND="${RDEPEND}" # S="${WORKDIR}/${P}/flaim" src_prepare() { - epatch ${FILESDIR}/libflaim-4.9.1052-fortify-source.patch -# epatch ${FILESDIR}/libflaim-4.9.1052-gcc43.patch -# epatch ${FILESDIR}/libflaim-4.9.1052-gcc44.patch - epatch ${FILESDIR}/libflaim-4.9.1052-optflags.patch -# epatch ${FILESDIR}/do-not-compile-with-werror.patch - epatch ${FILESDIR}/libflaim-4.9.1052-no-ldconfig-1.patch + epatch "${FILESDIR}"/libflaim-pic-ldconfig-fortify.patch } src_compile() { cd flaim - make DESTDIR=${D} CXXFLAGS="${CXXFLAGS} -Wno-error" OSTYPE=`uname -s` HOSTTYPE=`uname -m` || \ + 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` || \ + make DESTDIR="${D}" install OSTYPE=`uname -s` HOSTTYPE=`uname -m` || \ die "Error installing ${PN}" }