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
commit8b17444ceff1d7f0da034a5460176b251e608c2a (patch)
treef0d7dd19a493c0ddbb50f936a4b200bb011727f5 /sci-libs/cbflib
parentRevbump to add USE=static-libs support, fixes bug 324999 (diff)
downloadgentoo-2-8b17444ceff1d7f0da034a5460176b251e608c2a.tar.gz
gentoo-2-8b17444ceff1d7f0da034a5460176b251e608c2a.tar.bz2
gentoo-2-8b17444ceff1d7f0da034a5460176b251e608c2a.zip
Build against new lib and not installed one
(Portage version: 2.2_rc67/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'sci-libs/cbflib')
-rw-r--r--sci-libs/cbflib/ChangeLog8
-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
3 files changed, 16 insertions, 4 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/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