* [gentoo-commits] dev/ikelos:master commit in: dev-util/libbls/files/, dev-util/libbls/
@ 2011-02-04 11:37 ikelos
0 siblings, 0 replies; 3+ messages in thread
From: ikelos @ 2011-02-04 11:37 UTC (permalink / raw
To: gentoo-commits
commit: bb4c0a9279c138aecd51766a8ac993f100f78fc4
Author: Mike Auty <mike.auty <AT> gmail <DOT> com>
AuthorDate: Fri Jan 14 03:17:24 2011 +0000
Commit: Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Fri Jan 14 03:17:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ikelos.git;a=commit;h=bb4c0a9279c138aecd51766a8ac993f100f78fc4
Add in libbls live ebuild with proper python bindings.
---
dev-util/libbls/Manifest | 5 +-
.../libbls/files/libbls-9999-python-fixes.patch | 74 ++++++++++++++++++++
dev-util/libbls/libbls-0.3.0.ebuild | 25 -------
dev-util/libbls/libbls-9999.ebuild | 22 ++++--
4 files changed, 90 insertions(+), 36 deletions(-)
diff --git a/dev-util/libbls/Manifest b/dev-util/libbls/Manifest
index 3f0a311..6abb300 100644
--- a/dev-util/libbls/Manifest
+++ b/dev-util/libbls/Manifest
@@ -1,3 +1,2 @@
-DIST libbls-0.3.0.tar.gz 102304 RMD160 c6ef188d0f1e7bef95f4fdca18a07eec4d663a7e SHA1 285c479257c260487dca460efc25adfbdea34b34 SHA256 90ec2c5ab826c47e8dce0e8809ea9dc7cce288c50778db6a2abf2326bbb62ed2
-EBUILD libbls-0.3.0.ebuild 534 RMD160 e9e56108f3c0aa9521cbe72ea8b96ac8df62de24 SHA1 370f9e17284e0ff1ba57f4f8aad380a448a91fa1 SHA256 ace5c8369d294fdcc9fd4cef857e8f2a3f4547ee4cda3c3f54a0d0dc265a3f78
-EBUILD libbls-9999.ebuild 539 RMD160 5a72997484818c0dfb82296870cdc26f2f47e49a SHA1 1b3005aed09351a2b5938e29db38c3c7ce85fd6c SHA256 b80c3877a8391bb78aeb1b9d15fb94556515f0d6fa630c7cab4c7de89b475e34
+AUX libbls-9999-python-fixes.patch 2860 RMD160 9e524a76d12eb89bd14f5374b11fcf4f156c691a SHA1 8aa7026a9a080571339d36578feac1533097aab3 SHA256 e9665409ee3edee2f3a1517ad99655683cdbcc6f5965587fc00641615a97b892
+EBUILD libbls-9999.ebuild 644 RMD160 4a5f674befe7b439905f737fdb7982fcac369939 SHA1 a9f846ec4619fa6e16ae20a7b90409bb6dd48dc4 SHA256 be4c8303bca89718175180962d74672f3d604996eb93dc3da29e5a8ddf4f8979
diff --git a/dev-util/libbls/files/libbls-9999-python-fixes.patch b/dev-util/libbls/files/libbls-9999-python-fixes.patch
new file mode 100644
index 0000000..e3f46a7
--- /dev/null
+++ b/dev-util/libbls/files/libbls-9999-python-fixes.patch
@@ -0,0 +1,74 @@
+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..b496758 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
+@@ -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-0.3.0.ebuild b/dev-util/libbls/libbls-0.3.0.ebuild
deleted file mode 100644
index 9f91ed9..0000000
--- a/dev-util/libbls/libbls-0.3.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="Highly efficient, flexible and robust data manipulation library."
-HOMEPAGE="http://libbls.hellug.gr"
-SRC_URI="http://libbls.hellug.gr/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="dev-util/scons"
-RDEPEND=""
-
-src_compile() {
- cd ${S}
- scons || die "Failed to compile"
-}
-
-src_install() {
- cd ${S}
- scons prefix=/usr destdir="${D}" install || die "Failed to install"
-}
diff --git a/dev-util/libbls/libbls-9999.ebuild b/dev-util/libbls/libbls-9999.ebuild
index 4a09f96..1251117 100644
--- a/dev-util/libbls/libbls-9999.ebuild
+++ b/dev-util/libbls/libbls-9999.ebuild
@@ -2,7 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-inherit bzr
+EAPI="3"
+
+inherit eutils waf-utils bzr
EBZR_REPO_URI="lp:libbls"
@@ -15,15 +17,19 @@ SLOT="0"
KEYWORDS="-x86 -amd64"
IUSE=""
-DEPEND="dev-util/scons"
+DEPEND="dev-python/docutils"
RDEPEND=""
-src_compile() {
- cd ${S}
- scons || die "Failed to compile"
+src_prepare() {
+ epatch "${FILESDIR}/libbls-9999-python-fixes.patch"
}
-src_install() {
- cd ${S}
- scons prefix=/usr destdir="${D}" install || die "Failed to install"
+src_configure() {
+ # Dummy function to do nothing
+ ${S}/waf configure --prefix="/usr" --bindings="python"
}
+
+#src_install() {
+# waf-utils_src_install
+# die
+#}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/ikelos:master commit in: dev-util/libbls/files/, dev-util/libbls/
@ 2011-02-04 11:37 ikelos
0 siblings, 0 replies; 3+ messages in thread
From: ikelos @ 2011-02-04 11:37 UTC (permalink / raw
To: gentoo-commits
commit: 254d53a167f551cf1b74bae73c63e38f79afd3c5
Author: Mike Auty <mike.auty <AT> gmail <DOT> com>
AuthorDate: Fri Jan 14 03:52:29 2011 +0000
Commit: Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Fri Jan 14 03:52:29 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ikelos.git;a=commit;h=254d53a167f551cf1b74bae73c63e38f79afd3c5
Ebuild fixes for libbls to allow bindings to be optionally built or not.
---
dev-util/libbls/Manifest | 4 ++--
.../libbls/files/libbls-9999-python-fixes.patch | 11 ++++++++++-
dev-util/libbls/libbls-9999.ebuild | 13 ++++++-------
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/dev-util/libbls/Manifest b/dev-util/libbls/Manifest
index 6abb300..c441868 100644
--- a/dev-util/libbls/Manifest
+++ b/dev-util/libbls/Manifest
@@ -1,2 +1,2 @@
-AUX libbls-9999-python-fixes.patch 2860 RMD160 9e524a76d12eb89bd14f5374b11fcf4f156c691a SHA1 8aa7026a9a080571339d36578feac1533097aab3 SHA256 e9665409ee3edee2f3a1517ad99655683cdbcc6f5965587fc00641615a97b892
-EBUILD libbls-9999.ebuild 644 RMD160 4a5f674befe7b439905f737fdb7982fcac369939 SHA1 a9f846ec4619fa6e16ae20a7b90409bb6dd48dc4 SHA256 be4c8303bca89718175180962d74672f3d604996eb93dc3da29e5a8ddf4f8979
+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
index e3f46a7..c24c86f 100644
--- a/dev-util/libbls/files/libbls-9999-python-fixes.patch
+++ b/dev-util/libbls/files/libbls-9999-python-fixes.patch
@@ -50,7 +50,7 @@ index 17e733a..437ad3e 100644
)
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..b496758 100644
+index 4369638..d451832 100644
--- a/wscript
+++ b/wscript
@@ -31,6 +31,7 @@ def set_options(opt):
@@ -61,6 +61,15 @@ index 4369638..b496758 100644
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)
diff --git a/dev-util/libbls/libbls-9999.ebuild b/dev-util/libbls/libbls-9999.ebuild
index 1251117..30f27a6 100644
--- a/dev-util/libbls/libbls-9999.ebuild
+++ b/dev-util/libbls/libbls-9999.ebuild
@@ -15,7 +15,7 @@ SRC_URI=""
LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="-x86 -amd64"
-IUSE=""
+IUSE="lua +python"
DEPEND="dev-python/docutils"
RDEPEND=""
@@ -26,10 +26,9 @@ src_prepare() {
src_configure() {
# Dummy function to do nothing
- ${S}/waf configure --prefix="/usr" --bindings="python"
+ local bindings=""
+ use lua && bindings="lua"
+ use python && bindings="python"
+ use lua && use python && bindings="lua,python"
+ ${S}/waf configure --prefix="/usr" --bindings="${bindings}"
}
-
-#src_install() {
-# waf-utils_src_install
-# die
-#}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/ikelos:master commit in: dev-util/libbls/files/, dev-util/libbls/
@ 2015-08-22 20:04 Mike Auty
0 siblings, 0 replies; 3+ messages in thread
From: Mike Auty @ 2015-08-22 20:04 UTC (permalink / raw
To: gentoo-commits
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}"
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-08-22 20:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-22 20:04 [gentoo-commits] dev/ikelos:master commit in: dev-util/libbls/files/, dev-util/libbls/ Mike Auty
-- strict thread matches above, loose matches on Subject: below --
2011-02-04 11:37 ikelos
2011-02-04 11:37 ikelos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox