summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2010-07-06 18:51:38 +0000
committerJustin Lecher <jlec@gentoo.org>2010-07-06 18:51:38 +0000
commit8dba1df39a9536bdc79953a1345ff9c2275cdabb (patch)
tree59845f2336c6e4929d5ec493265bd2a6ce68a283
parentRevbump to add USE=static-libs support, fixes bug 324999 (diff)
downloadhistorical-8dba1df39a9536bdc79953a1345ff9c2275cdabb.tar.gz
historical-8dba1df39a9536bdc79953a1345ff9c2275cdabb.tar.bz2
historical-8dba1df39a9536bdc79953a1345ff9c2275cdabb.zip
Build against new lib and not installed one
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 RepoMan-Options: --force
-rw-r--r--sci-libs/cbflib/ChangeLog8
-rw-r--r--sci-libs/cbflib/Manifest12
-rw-r--r--sci-libs/cbflib/cbflib-0.9.0-r3.ebuild (renamed from sci-libs/cbflib/cbflib-0.9.0-r2.ebuild)2
-rw-r--r--sci-libs/cbflib/files/0.9.0-python.patch10
4 files changed, 22 insertions, 10 deletions
diff --git a/sci-libs/cbflib/ChangeLog b/sci-libs/cbflib/ChangeLog
index dfdd85980649..642f318b98f1 100644
--- a/sci-libs/cbflib/ChangeLog
+++ b/sci-libs/cbflib/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sci-libs/cbflib
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/ChangeLog,v 1.12 2010/07/05 12:45:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/ChangeLog,v 1.13 2010/07/06 18:51:38 jlec Exp $
+
+*cbflib-0.9.0-r3 (06 Jul 2010)
+
+ 06 Jul 2010; Justin Lecher <jlec@gentoo.org> files/0.9.0-python.patch,
+ -cbflib-0.9.0-r2.ebuild, +cbflib-0.9.0-r3.ebuild:
+ Build against new lib and not installed one
*cbflib-0.9.0-r2 (05 Jul 2010)
diff --git a/sci-libs/cbflib/Manifest b/sci-libs/cbflib/Manifest
index 39af980941c7..7009f6dbf90b 100644
--- a/sci-libs/cbflib/Manifest
+++ b/sci-libs/cbflib/Manifest
@@ -3,17 +3,17 @@ Hash: SHA1
AUX 0.8.1-Makefile.patch 1382 RMD160 79a344ee3654403ade4ddbc1a3bd1133f47e4e79 SHA1 7311cdafc01881555403cafb62e09a4f467f3e22 SHA256 92b3108840d2ccf7392ac24db52bb86fed7a9561cb3db9ccbf29e6c4e9e76cc5
AUX 0.9.0-Makefile.patch 3091 RMD160 d976bb6fab07ffb5fa982b84f0c2d02c940c69ca SHA1 0b14f223cf4af87856acdb053918d5a0484987e3 SHA256 361cd3c6a906f6bfe2761196e459aec2735e4bb539586b5589b1a8d2d35a02b4
-AUX 0.9.0-python.patch 326 RMD160 5c5bc8b6a8d4a4b7e9ec137683778ded86800838 SHA1 ac68d1fe8620389a5f9ff570a31447221ef32224 SHA256 12465e33bcbc10da6bfef03b6be8d5dac97a80b08b62d18d35abf6ebe010afc2
+AUX 0.9.0-python.patch 574 RMD160 ef346c4d28421d1559c6f6d972f0f6b9089740be SHA1 fe142637682924bdd39aadc86b81028babd9c99b SHA256 632e0820b0479a7f267d34ba8709b8bc828c58e3d63b45d6b78c9c86af0f4594
DIST CBFlib-0.8.1.tar.gz 3532726 RMD160 e2b82cabaeb7da07ca547822f7b3ac8871f6f467 SHA1 2b17b7f79c0e32e0a5a22aa43c93c170296e6d02 SHA256 197660197d0f861da26764d67fcf92fd75cfa3ad1da30df02fb33e6d67c6b5e3
DIST CBFlib-0.9.0_14Feb10.tar.gz 4456643 RMD160 a90052a584f982df456a9426d07f2fd506c55ef4 SHA1 b05ab50f6a9f921444f3bb27cbbc72797be4f41f SHA256 7f79d0de9b07b6c544f2da1bf66b83460006fca75a36eacbbc8f839694ff2eba
EBUILD cbflib-0.8.1-r7.ebuild 1677 RMD160 caad43d73d2cf612a149d5fdc971cf65dd425f3b SHA1 82bf6ee604a087f90132612dbc294461645398df SHA256 3408beb2ca2d6e4e9b62a787118faba842ab2b0235cff16540bc0e6fa266cd98
-EBUILD cbflib-0.9.0-r2.ebuild 2235 RMD160 4dedb5c91d68f46822ee67c90c92e294edd72fb2 SHA1 44bd90bdc9ba572671b7a2edea6e0706db6f249b SHA256 1dfdd6f19ce9e819cd181dfc8f7eb9d1698fa78d337f0db110ed5881f22379c6
-MISC ChangeLog 2199 RMD160 0d9495b63cf8977cfb8e8a00400a7ddf6a5770ac SHA1 647efc8ef81080b95514d87bfe95a0410e47facb SHA256 f33e7717a7ec10d4f9ffddd2f4efd433edd96369ef3ad195b18f7702329eb238
+EBUILD cbflib-0.9.0-r3.ebuild 2235 RMD160 7082d85be786464c83efb6945d8e91fef14190e9 SHA1 d84c0ca993a433249168ea7c99b86d97c2db8f0c SHA256 a3c142175b8e722aadef1d890ca84a2cb47d01d0fa835b8bb5d0864e11317480
+MISC ChangeLog 2403 RMD160 8cc610a685e4bba3fbf39f1a6340b3ce03c6ad1d SHA1 0795d00a0a35c54f32e3bc89f10e46d379f53b3f SHA256 566d1956b086b196b96d7f7285dba42dd8f7005c05c6281b9896a041f6caeaab
MISC metadata.xml 872 RMD160 65a3873ad810c058abebf748ebdbc29a0da05e2d SHA1 df579c7f63aff50d1e3877013bf62e6ae9a2a438 SHA256 60351f0290d2947caddf8470468b8891dd63dd00545af8099859bde40eda1f49
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.15 (GNU/Linux)
-iEYEARECAAYFAkwx09gACgkQgAnW8HDreRbg0gCgmvrmx1uF6umiNrNqJG0Yju+9
-xeQAn00f+QP5B5U5PXjIZUkbWcjjnDJy
-=JiMy
+iEYEARECAAYFAkwzez8ACgkQgAnW8HDreRa93wCgwzO5Tqas2id/ZblPAg0iQAvm
+rqkAoJi35pszrrBaw1TDDmK8c0LxQe63
+=vG49
-----END PGP SIGNATURE-----
diff --git a/sci-libs/cbflib/cbflib-0.9.0-r2.ebuild b/sci-libs/cbflib/cbflib-0.9.0-r3.ebuild
index 03bc8d816595..44639279305a 100644
--- a/sci-libs/cbflib/cbflib-0.9.0-r2.ebuild
+++ b/sci-libs/cbflib/cbflib-0.9.0-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/cbflib-0.9.0-r2.ebuild,v 1.1 2010/07/05 12:45:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/cbflib-0.9.0-r3.ebuild,v 1.1 2010/07/06 18:51:38 jlec Exp $
EAPI="3"
diff --git a/sci-libs/cbflib/files/0.9.0-python.patch b/sci-libs/cbflib/files/0.9.0-python.patch
index 972c252bd861..b18d019ff8e2 100644
--- a/sci-libs/cbflib/files/0.9.0-python.patch
+++ b/sci-libs/cbflib/files/0.9.0-python.patch
@@ -1,8 +1,14 @@
diff --git a/pycbf/setup.py b/pycbf/setup.py
-index 0763f06..f55a42f 100644
+index 0763f06..7fe9ccc 100644
--- a/pycbf/setup.py
+++ b/pycbf/setup.py
-@@ -14,4 +14,4 @@ e = Extension('_pycbf',
+@@ -9,9 +9,9 @@ from distutils.core import setup, Extension
+ e = Extension('_pycbf',
+ sources = ["pycbf_wrap.c","../src/cbf_simple.c"],
+ extra_compile_args=["-g"],
+- library_dirs=["../lib/"],
++ library_dirs=["../solib/"],
+ libraries=["cbf"],
include_dirs = ["../include"] )
# Build it