From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PlJzH-0001Eg-Rb for garchives@archives.gentoo.org; Fri, 04 Feb 2011 11:38:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BAB64E08D2; Fri, 4 Feb 2011 11:37:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 79C44E08D2 for ; Fri, 4 Feb 2011 11:37:56 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C12741B4105 for ; Fri, 4 Feb 2011 11:37:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2CB6E8006E for ; Fri, 4 Feb 2011 11:37:55 +0000 (UTC) To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, "Mike Auty" Content-type: text/plain; charset=UTF-8 Message-ID: <254d53a167f551cf1b74bae73c63e38f79afd3c5.ikelos@gentoo> Subject: [gentoo-commits] dev/ikelos:master commit in: dev-util/libbls/files/, dev-util/libbls/ X-VCS-Repository: dev/ikelos X-VCS-Files: dev-util/libbls/Manifest dev-util/libbls/files/libbls-9999-python-fixes.patch dev-util/libbls/libbls-9999.ebuild X-VCS-Directories: dev-util/libbls/files/ dev-util/libbls/ X-VCS-Committer: ikelos X-VCS-Committer-Name: Mike Auty X-VCS-Revision: 254d53a167f551cf1b74bae73c63e38f79afd3c5 Date: Fri, 4 Feb 2011 11:37:55 +0000 (UTC) From: ikelos@gentoo.org Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 47686f1981f1ecd00534b080e017d1d0 commit: 254d53a167f551cf1b74bae73c63e38f79afd3c5 Author: Mike Auty gmail com> AuthorDate: Fri Jan 14 03:52:29 2011 +0000 Commit: Mike Auty gentoo org> CommitDate: Fri Jan 14 03:52:29 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/ikelos.git;a=3D= commit;h=3D254d53a167f551cf1b74bae73c63e38f79afd3c5 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 9e524a76d12eb89bd14f5374b= 11fcf4f156c691a SHA1 8aa7026a9a080571339d36578feac1533097aab3 SHA256 e966= 5409ee3edee2f3a1517ad99655683cdbcc6f5965587fc00641615a97b892 -EBUILD libbls-9999.ebuild 644 RMD160 4a5f674befe7b439905f737fdb7982fcac3= 69939 SHA1 a9f846ec4619fa6e16ae20a7b90409bb6dd48dc4 SHA256 be4c8303bca897= 18175180962d74672f3d604996eb93dc3da29e5a8ddf4f8979 +AUX libbls-9999-python-fixes.patch 3231 RMD160 8468bdf254f70d9e4e336aac4= 44b19b4d12027d2 SHA1 517e015391325a393cbcea179528186f316f5804 SHA256 e8e7= 114fe2f2daa558b0b2d62d22560abfd4262f123ce09e492f98bf0e1f9b66 +EBUILD libbls-9999.ebuild 736 RMD160 e914940a1be47fc2ac661164f54a5545132= 790e2 SHA1 e546ef81deb8d1200d9c887a0fe1f4097a02e436 SHA256 6e4f33994f1cbe= eab590bba19e5a276e317a1cd82892a0ec15285039a7c610e5 diff --git a/dev-util/libbls/files/libbls-9999-python-fixes.patch b/dev-u= til/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') =09 # Check required headers +@@ -57,7 +58,7 @@ def configure(conf): + conf.env.append_unique('CCDEFINES', ('HAVE_%s' % func).upper()) + =09 + # Check optional packages +- opt_pkgs =3D [('lua5.1', 'lua')] ++ opt_pkgs =3D [('lua', 'lua5.1')] + for pkg, uselib in opt_pkgs: + conf.check_cfg(package =3D pkg, uselib_store =3D uselib, args =3D '--= cflags --libs', + mandatory =3D 'lua' in Options.options.bindings) @@ -89,6 +90,10 @@ def configure(conf): (conf.env.LIBBLS_VERSION_MAJOR, conf.env.LIBBLS_VERSION_MINOR, conf.en= v.LIBBLS_VERSION_PATCH) =3D VERSION.split('.') conf.env.LIBBLS_VERSION_NO_PATCH =3D '%s.%s' % (conf.env.LIBBLS_VERSIO= N_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=3D"" LICENSE=3D"LGPL-3" SLOT=3D"0" KEYWORDS=3D"-x86 -amd64" -IUSE=3D"" +IUSE=3D"lua +python" =20 DEPEND=3D"dev-python/docutils" RDEPEND=3D"" @@ -26,10 +26,9 @@ src_prepare() { =20 src_configure() { # Dummy function to do nothing - ${S}/waf configure --prefix=3D"/usr" --bindings=3D"python" + local bindings=3D"" + use lua && bindings=3D"lua" + use python && bindings=3D"python" + use lua && use python && bindings=3D"lua,python" + ${S}/waf configure --prefix=3D"/usr" --bindings=3D"${bindings}" } - -#src_install() { -# waf-utils_src_install -# die -#}