[gentoo-commits] dev/ikelos:master commit in: dev-util/libbls/files/, dev-util/libbls/

[ikelos@gentoo.org]

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
-#}