commit: eee53a856ba6a8560e7f7351817575e886080429
Author: layman <layman <AT> localhost>
AuthorDate: Sat Aug 22 20:01:16 2015 +0000
Commit: Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 20:01:16 2015 +0000
URL: https://gitweb.gentoo.org/dev/ikelos.git/commit/?id=eee53a85
Remove old libbls.
dev-util/libbls/Manifest | 2 -
.../libbls/files/libbls-9999-python-fixes.patch | 83 ----------------------
dev-util/libbls/libbls-9999.ebuild | 34 ---------
3 files changed, 119 deletions(-)
diff --git a/dev-util/libbls/Manifest b/dev-util/libbls/Manifest
deleted file mode 100644
index c441868..0000000
--- a/dev-util/libbls/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-AUX libbls-9999-python-fixes.patch 3231 RMD160
8468bdf254f70d9e4e336aac444b19b4d12027d2 SHA1
517e015391325a393cbcea179528186f316f5804 SHA256
e8e7114fe2f2daa558b0b2d62d22560abfd4262f123ce09e492f98bf0e1f9b66
-EBUILD libbls-9999.ebuild 736 RMD160 e914940a1be47fc2ac661164f54a5545132790e2
SHA1 e546ef81deb8d1200d9c887a0fe1f4097a02e436 SHA256
6e4f33994f1cbeeab590bba19e5a276e317a1cd82892a0ec15285039a7c610e5
diff --git a/dev-util/libbls/files/libbls-9999-python-fixes.patch
b/dev-util/libbls/files/libbls-9999-python-fixes.patch
deleted file mode 100644
index c24c86f..0000000
--- a/dev-util/libbls/files/libbls-9999-python-fixes.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff --git a/bindings/wscript_build b/bindings/wscript_build
-index 36de9c9..1084c2b 100644
---- a/bindings/wscript_build
-+++ b/bindings/wscript_build
-@@ -4,24 +4,27 @@ import Build
-
- bld.use_the_magic()
-
--Task.simple_task_type('swig_python', '${SWIG} -o ${TGT} -python ${SRC}',
before = 'cc')
-+Task.simple_task_type('swig_python', '${SWIG} -o ${TGT} -python ${SRC}',
before = 'cc', ext_out = ['.c', '.py'])
-
- @TaskGen.extension('.i')
- def process_swig(self, node):
- cc_node = node.change_ext('.c')
-- self.create_task('swig_python', node, cc_node)
-+ py_node = node.change_ext('.py')
-+ task = self.create_task('swig_python', node, cc_node)
- self.allnodes.append(cc_node)
--
-+ self.allnodes.append(py_node)
-+
- if 'python' in bld.env.bindings:
- if 'SWIG' not in bld.env:
- raise Build.BuildError('Swig is needed to build python
bindings')
- py_bindings = bld(
-- features = ['cc', 'cshlib'],
-+ features = ['py', 'cc', 'cshlib'],
- source = 'libbls.i',
-- includes = ['/usr/include/python2.6'],
-+ includes = bld.env.CPPPATH_PYEXT,
- uselib_local = 'bls-%s' %
bld.env.LIBBLS_VERSION_NO_PATCH,
- target = '_libbls',
-- env = bld.env_of_name('visibility-public').copy()
-+ env = bld.env_of_name('visibility-public').copy(),
-+ install_path = bld.env.PYTHONDIR
- )
- py_bindings.env.shlib_PATTERN =
py_bindings.env.shlib_PATTERN.replace('lib%s', '%s')
-
-diff --git a/doc/user/wscript_build b/doc/user/wscript_build
-index 17e733a..437ad3e 100644
---- a/doc/user/wscript_build
-+++ b/doc/user/wscript_build
-@@ -3,7 +3,7 @@ import Options
- user_doc = bld(
- target = 'user_guide.html',
- source = ['user_guide.txt', 'user_guide.css'],
-- rule = 'rst2html --initial-header-level 2 --stylesheet-path
${SRC[1].abspath()} ${SRC[0].abspath()} > ${TGT}',
-+ rule = 'rst2html.py --initial-header-level 2 --stylesheet-path
${SRC[1].abspath()} ${SRC[0].abspath()} > ${TGT}',
- install_path = '${PREFIX}/share/doc/libbls-%s' %
bld.env.LIBBLS_VERSION_NO_PATCH
- )
- bld.install_files('${PREFIX}/share/doc/libbls-${LIBBLS_VERSION_NO_PATCH}',
['user_guide.txt', 'user_guide.css'])
-diff --git a/wscript b/wscript
-index 4369638..d451832 100644
---- a/wscript
-+++ b/wscript
-@@ -31,6 +31,7 @@ def set_options(opt):
-
- def configure(conf):
- conf.check_tool('compiler_cc')
-+ conf.check_tool('python')
- conf.check_tool('misc')
-
- # Check required headers
-@@ -57,7 +58,7 @@ def configure(conf):
- conf.env.append_unique('CCDEFINES', ('HAVE_%s' %
func).upper())
-
- # Check optional packages
-- opt_pkgs = [('lua5.1', 'lua')]
-+ opt_pkgs = [('lua', 'lua5.1')]
- for pkg, uselib in opt_pkgs:
- conf.check_cfg(package = pkg, uselib_store = uselib, args =
'--cflags --libs',
- mandatory = 'lua' in Options.options.bindings)
-@@ -89,6 +90,10 @@ def configure(conf):
- (conf.env.LIBBLS_VERSION_MAJOR, conf.env.LIBBLS_VERSION_MINOR,
conf.env.LIBBLS_VERSION_PATCH) = VERSION.split('.')
- conf.env.LIBBLS_VERSION_NO_PATCH = '%s.%s' %
(conf.env.LIBBLS_VERSION_MAJOR, conf.env.LIBBLS_VERSION_MINOR)
-
-+ # Check for python
-+ conf.check_python_version((2,6,0))
-+ conf.check_python_headers()
-+
- # Create a environment with default (public) symbol visibility
- env = conf.env.copy()
- env.append_unique('CCFLAGS', '-fvisibility=default'.split())
diff --git a/dev-util/libbls/libbls-9999.ebuild
b/dev-util/libbls/libbls-9999.ebuild
deleted file mode 100644
index 30f27a6..0000000
--- a/dev-util/libbls/libbls-9999.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit eutils waf-utils bzr
-
-EBZR_REPO_URI="lp:libbls"
-
-DESCRIPTION="Highly efficient, flexible and robust data manipulation library."
-HOMEPAGE="http://libbls.hellug.gr";
-SRC_URI=""
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="-x86 -amd64"
-IUSE="lua +python"
-
-DEPEND="dev-python/docutils"
-RDEPEND=""
-
-src_prepare() {
- epatch "${FILESDIR}/libbls-9999-python-fixes.patch"
-}
-
-src_configure() {
- # Dummy function to do nothing
- local bindings=""
- use lua && bindings="lua"
- use python && bindings="python"
- use lua && use python && bindings="lua,python"
- ${S}/waf configure --prefix="/usr" --bindings="${bindings}"
-}
