Allow the scripting extensions to build, add comment about the second sed.

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

3 files changed, 53 insertions, 20 deletions

diff --git a/dev-libs/libsolv/ChangeLog b/dev-libs/libsolv/ChangeLog
index c4ef3a18116e..d0665698aa5f 100644
--- a/dev-libs/libsolv/ChangeLog
+++ b/dev-libs/libsolv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/libsolv
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsolv/ChangeLog,v 1.2 2013/07/22 04:25:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsolv/ChangeLog,v 1.3 2013/07/23 17:43:11 scarabeus Exp $
+
+  23 Jul 2013; Tomáš Chvátal <scarabeus@gentoo.org> libsolv-0.3.0.ebuild:
+  Allow the scripting extensions to build, add comment about the second sed.
 
   22 Jul 2013; Tomáš Chvátal <scarabeus@gentoo.org> libsolv-0.3.0.ebuild:
   Respect ldflags.
diff --git a/dev-libs/libsolv/Manifest b/dev-libs/libsolv/Manifest
index 4a90605336e6..6a3e2ce0892c 100644
--- a/dev-libs/libsolv/Manifest
+++ b/dev-libs/libsolv/Manifest
@@ -2,23 +2,23 @@
 Hash: SHA256
 
 DIST libsolv-0.3.0.tar.bz2 395784 SHA256 b0e7ad666a16e183ecd340b41d50a5e989b118e90274e767d3453aee5ad8215a SHA512 795ddc3f7d52b770805e695ef72a63b8aaa4601bd7b5ca6d1c69c86fdc76bbe682507bc9efd2e4f7e453760474ff83a4172f4f7a59a4e1cd0583e9ed82934a14 WHIRLPOOL f6b0469450d15428454bd93b33d64ddce58e10c7007e4c98189d7052a23bc41d3bf4cb9160706217002043ba2f038648316d3fb5d9b4fbfa5ed12a4a514dd0e7
-EBUILD libsolv-0.3.0.ebuild 1308 SHA256 e6895e2498b76984b70f343e4967841faf7a547a1cdbdb8ecb387c1b8fb44807 SHA512 7f701b9801ec1c358cb773f4a670867e800ef6d77855cde1ea05cbbb6faa3beaad9f04786883cf77c1b0e97dba9993e62b6945d798b5dfd772f9c51695c8fed7 WHIRLPOOL 695664e434c914b02ebf9a70738ce0f4dc776de3173ea95a74e55ca71f2dbc27309765cc386dad785b5491a2c610219abcfef2c87a4049933e9a518c3fb137c9
-MISC ChangeLog 485 SHA256 2edcbd23c5be65704450b661da34c96fba64e58755ce3f015326b083fd661c43 SHA512 0bc3082f454feb5d6d93e08dda9fbc570d83ef449657b41d119c600ec76a3a0562a7345bf4fe1babc7862caaa44fdc73c973238ac6b95756c6162b518a77da0d WHIRLPOOL aca032fa183206d6be6cd87ce7ffa24e9a4087ed6de1814e23e63ad1beef58f27ddab7464c7bfd1fa9c59e9d4058431ed9e7c111f644a390649beb71755bface
+EBUILD libsolv-0.3.0.ebuild 1910 SHA256 cd02e4ce0c2c50d008faad308926192b8814b767764fe7f7f4adbf13786c47a6 SHA512 54a741311f145850e1f4176ece7b92054b7d4680daac10f0ecdaa983921b3e305a55e46ecacdf3e781e44f0e1c3cbf2691c0be675189d72efbe63f3dbae7cdef WHIRLPOOL ece135296000b4104ae79225b31fa382a420368cbb022a3b8b67c448283b76bc83e307b6f122eca335edbed084a011e058ba7e19b8c54db9560999d678b68087
+MISC ChangeLog 640 SHA256 48e717fea2636b1db1fda97529ba93ad8562a28d20ea03132261f00244e62361 SHA512 02118c6ed5e0eb93b9f1feef38a207030b2dc124d14d00be5bd2dc0d467649ff8167895a4d0572c2bbd7f92311e3e31a885b16a0ea1f2abd2fddd130ecab9e0b WHIRLPOOL 80d246fda2da19d4ca587b2eda865ad769daf4543775ba008a2b68bb8ffe3831b79d62b5ad00226ca15b9c6d4e4260247ecd077879aa2d89748786ed42e49c87
 MISC metadata.xml 158 SHA256 f302ea658f702146c504c9b7c01f6276027361238ae07a50a9179448bfc2af07 SHA512 29516333cf374b2bc21cf1a55e82b6d133903db8f6e999ad70924db09f8b61d292d2d063ada01202db42d617104128f3ba8442f94821aaea4606cd6f8e22bd7b WHIRLPOOL 2684af75fa88045aca14f3428ecbaf89e5902fce58bf3c5bfd00a4a60088ea2a1a58e3f41a7a5cffab9d584854401e5fa72a929a6ee37bb0854218de3161bf99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJR7LRCAAoJEOSiRoyO7jvoLzoP/jJJulI6ftfr/NAQX0MwXtBD
-EQDlVK+09LVuXqQXWNM6jNKCwkasbBVPviYQCtPuZv6N2oGsd/0Vx8ycCdsiHoyZ
-f+T6kSEDATSCsPPp2Ag5Svu1udcrZg5aO7bGG8MsNBEsgNAI6QrVWvKWIOrh9y/R
-LNyNsAcmuGc4fNgATkbsxTJyqgqhxvdaUKOVk8TNfvePhAsG7h34gz5asZSejAz8
-YJ7JwyarUjmz5/lVQIRS8KZTIcsWawmDdOFAnxoDSnl7PBGHL2XPv22wlCqdoL+c
-KA92E/42YZzK35GOiFLBowoAmiOD74HY5AHRiCBgLh0YzC8MT9mKZ+DLuZaBSmHH
-NzWiB2Ne04TQzLuydM/zLtY0BM6kAq5Y2ea0cFhYtGBjInYD0rKQe2LNgsy0+CFg
-WJd8JztI1m+OjH93tIjeENXGAj04TZFchpjouShQJlbwOPA8J5DYLKPJH02/GWyG
-jFTxjFuI2kPn5suTDJkZ9U1Zu77D2IYYExrtEw9bGmBO+yTtGdCc2rM4jpr59jsA
-Z0tZRv/aG3r5BHhQC+TqE8c9LA8dqAV9+Jfu4qv+9hW8ZOiZIdaajYGKReIHMCbZ
-bhzn8HOFgeaTjjLIhSWLJKODBeEaT9aaGN2R8HeZZ3FKhEafNspZSl/co1KqGlQX
-P7Am1d01RjLU9j6Vp5i2
-=iyzA
+iQIcBAEBCAAGBQJR7sDsAAoJEOSiRoyO7jvoVPsP/R91YBANWWWahnqkpKI9NtLo
+u6DLttrSyyYoVqFf4Fxhy1fxen5ZPeK6zCGt249FWqUBauGK43nAZiV2lKCPOmzK
+0EqIKXxljidiDJFgXCMjO9l05nfdFolAF9j4hIeUTvYDQ6WXK7s3+SNE2i8MefB4
+e7lLHl8AH2Ohd2/J0dy3vwJ8gJ1Gzq1PMkTCRKGN6gZzwp1W4OJHJWu8SG53YEq/
+u+hIUa0j9cgLbJtxCXD66ear7r75d82sjihmJxcDRHlHOPdxS0DGof3yzlCaz22Q
+gJtgHsi+x704qssaQpwNL9mj3IqesbxBCqAw9B5TFgT3cOrCymF0bBtHhW/2tC9T
+6+LqTtrzHEvcawnieqVGz5nV++Kfvtjl7fOADT7JK58jTD1+mIPgsWX8PW7etgGT
+Bn6RSUtWtKq0NtLFtH7sVTdSC9MUk2qinnKRzdXmDF2O+64ORddS87cg0GHfnuZf
+s1oqw0RbEiy4nhpD/tkqVR76wndZdEyBK7PmneqyBrfBe7Gq6wn3ZuWY32gCHeVU
+jie+rUsToMX7gebmJ9vCqQjqSCQy3LEr081RV7tPL0ftAF5oVXk1iq4k/UhKoxMH
+rO4fQ7rcinajpWG4xjVFjCp215Ng4L44O3F4RHrynMbOgJXiQEBkuHVcp8OpHZDI
+frsVbm9FxgExwLdfpPkE
+=7Gw3
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libsolv/libsolv-0.3.0.ebuild b/dev-libs/libsolv/libsolv-0.3.0.ebuild
index 58fc78e6a9d4..771c7f8dcaca 100644
--- a/dev-libs/libsolv/libsolv-0.3.0.ebuild
+++ b/dev-libs/libsolv/libsolv-0.3.0.ebuild
@@ -1,10 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsolv/libsolv-0.3.0.ebuild,v 1.2 2013/07/22 04:25:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsolv/libsolv-0.3.0.ebuild,v 1.3 2013/07/23 17:43:11 scarabeus Exp $
 
 EAPI=5
 
-inherit cmake-utils
+PYTHON_COMPAT=( python2_6 python2_7 )
+USE_RUBY=( ruby19 )
+RUBY_OPTIONAL=yes
+inherit python-single-r1 ruby-ng perl-module cmake-utils
 
 DESCRIPTION="Library for solving packages and reading repositories"
 HOMEPAGE="http://doc.opensuse.org/projects/libzypp/HEAD/"
@@ -13,7 +16,7 @@ SRC_URI="https://build.opensuse.org/package/rawsourcefile/openSUSE:Factory/${PN}
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="bzip2 lzma" # perl python ruby"
+IUSE="bzip2 lzma perl python ruby"
 
 RDEPEND="
 	app-arch/rpm
@@ -23,17 +26,35 @@ RDEPEND="
 	virtual/udev
 	bzip2? ( app-arch/bzip2 )
 	lzma? ( app-arch/xz-utils )
+	python? (
+		${PYTHON_DEPS}
+		dev-lang/swig:0
+	)
+	perl? (
+		dev-lang/perl
+		dev-lang/swig:0
+	)
+	ruby? (
+		$(ruby_implementations_depend)
+		dev-lang/swig:0
+	)
 "
 DEPEND="${DEPEND}
 	sys-devel/gettext
 "
 
+pkg_setup() {
+	use python && python-any-r1_pkg_setup
+	use perl && perl-module_pkg_setup
+	use ruby && ruby-ng_pkg_setup
+}
+
 src_prepare() {
 	# enabling suse features also mess up headers detection
 	sed -i \
 		-e "s:include <rpm/db.h>:include <db.h>:g" \
 		ext/repo_rpmdb.c || die
-	# respect ldflags
+	# respect ldflags ; fixed in next release
 	sed -i \
 		-e 's:LINK_FLAGS}:LINK_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS}:g' \
 		src/CMakeLists.txt || die
@@ -47,7 +68,16 @@ src_configure() {
 		"-DUSE_VENDORDIRS=1"
 		$(cmake-utils_use_enable bzip2 ENABLE_BZIP2_COMPRESSION)
 		$(cmake-utils_use_enable lzma ENABLE_LZMA_COMPRESSION)
+		$(cmake-utils_use_enable perl PERL)
+		$(cmake-utils_use_enable python PYTHON)
+		$(cmake-utils_use_enable ruby RUBY)
 	)
 
 	cmake-utils_src_configure
 }
+
+src_install() {
+	cmake-utils_src_install
+
+	use perl && fixlocalpod
+}