diff options
| author |   Victor Ostorga <vostorga@gentoo.org> | 2014-02-01 20:50:20 +0000 |
|---|---|---|
| committer | Victor Ostorga <vostorga@gentoo.org> | 2014-02-01 20:50:20 +0000 |
| commit | 0cb4810ac76e96613c01a9650d8df95a94cac3b7 (patch) | |
| tree | e10313e1ec9ae7c852bb78b287bba7b1ae838a98 /sys-libs | |
| parent | Use PV, not PF, for VERSION (diff) | |
| download | historical-0cb4810ac76e96613c01a9650d8df95a94cac3b7.tar.gz historical-0cb4810ac76e96613c01a9650d8df95a94cac3b7.tar.bz2 historical-0cb4810ac76e96613c01a9650d8df95a94cac3b7.zip | |
Adding multilib support, bug #491222 , patch thanks to Kenneth Graunke <kenneth@whitecape.org>
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xE25EE336
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/talloc/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-libs/talloc/Manifest | 20 | ||||
| -rw-r--r-- | sys-libs/talloc/talloc-2.1.0.ebuild | 15 |
3 files changed, 21 insertions, 22 deletions
diff --git a/sys-libs/talloc/ChangeLog b/sys-libs/talloc/ChangeLog index 677d2a61af32..796679ec8043 100644 --- a/sys-libs/talloc/ChangeLog +++ b/sys-libs/talloc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/talloc -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/ChangeLog,v 1.61 2013/12/11 02:03:57 jmbsvicetto Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/ChangeLog,v 1.62 2014/02/01 20:50:03 vostorga Exp $ + + 01 Feb 2014; Victor Ostorga talloc-2.1.0.ebuild: + Adding multilib support, bug #491222 , patch thanks to Kenneth Graunke + <kenneth@whitecape.org> 11 Dec 2013; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> talloc-2.0.8.ebuild, talloc-2.1.0.ebuild: diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest index 229cdfce2a99..52e98bef515e 100644 --- a/sys-libs/talloc/Manifest +++ b/sys-libs/talloc/Manifest @@ -5,23 +5,13 @@ DIST talloc-2.0.8.tar.gz 433489 SHA256 1ec11e635e0318dbbb014db38ff96e8dba3ce5f61 DIST talloc-2.1.0.tar.gz 416097 SHA256 0701393882647f823503e3aa075bc67d75c194b376822377dae2d20f9130f08f SHA512 7bdc448c91211299edf16502d263362ac660d5123d8ea7bb2ed58af2231537e4f29da5384b8d5be10254a02b193520890e95a73d697c40eba09728a9b6d56d57 WHIRLPOOL d8593cba27f5d971acb39acacdbea70df5b80ed31288cf440a2ebeaca266e070deeea8322f4ba5682580f66044128f18dd6d76b735aa0670aed46f13f5a4e857 EBUILD talloc-2.0.8-r1.ebuild 2008 SHA256 36055a03405c512ee0ca00dfac8eda8d6a68c10a92ee974f5533c1c49da95cd1 SHA512 ac9b3b668506f60a8a288bfeafb51ce89765fc92650194ebb2160055d0626473f3a067d598fed90546ff3493c96f83214caeb3e100f9f6fe22281b34e4e945a4 WHIRLPOOL 8e3c4230b373bcf54cab800d25da15acc93d70f00182302135be6184fcc3288f8a6672fc3da4cebcb91f7fe985e2f9d8812cd0901db5278617925f598faf2e01 EBUILD talloc-2.0.8.ebuild 2072 SHA256 4647ff80009ef0d81e5e29f0dddcedf328757c7498e6ae4df20f82de73a5e87f SHA512 f889a204b1df0eea7e4d0c196b21f48e0584ed74f9dc76078b5cb596b93b8ff9799cfa601cabf3fe4c8bb552abdd2cd3cad6583c6bbd2b6b97357218c26f9532 WHIRLPOOL e8c7bbbb1926f5d09d2962e51da154c9fc65313b98ce41900e127295bc1ea5d307db5a7f05d0b4dba90c3da670b5c3a5be24f3730d5aa885843d73e3ebffe33f -EBUILD talloc-2.1.0.ebuild 2011 SHA256 29f0b851c208735b978a5422c4e0035ab0e0523b581a9cea492b7e649906ede2 SHA512 cd1212360ff6ad488b5d971462f0d00cc4811def458813bf77e027538bdce49b98f63c93d74aad407a4392744b912b769ce708f34eb3b1efeb0e78177a2d833f WHIRLPOOL 33dfa8f3a6bd2e6c5924c645c5a9e4a4e2df37bbed188c15375cb531e9c8e0c901299f815aa9fc8c711ba14f07ec6710131df48f7d73573f5d2251ecdb75c834 -MISC ChangeLog 8346 SHA256 44c03adb262fc6c6f949d11c9519b0793be577487ec77ca889f605b196bb3208 SHA512 1ed8a19007784cb8f3fef65a927fdcb91a340f7c312ff98a59d15c624dfb046f032726d5ebf22f86fdaedb15f2ee6d762d6c960ab8327201f91e188447d5ac21 WHIRLPOOL abe783f7d1c2b2a8b4a2894cb1bc7c594834b28c4adbbb0a28976cd748277fc298471248ec924dad4f05e685baf85d113521bc5f929fd6922467ad9ef1aba7c5 +EBUILD talloc-2.1.0.ebuild 2155 SHA256 685bbcf39dd47adb28913ab67ebbb2a4505dab4fb16f5e279cb2f3764687f041 SHA512 43c5a53424030f9c0bff5a4dd08d6a2156a1a7b3954dc8047d1e4c165714e723d914552272d0f0d50a05b68581cc8d34141c40b531ece6fd7bc6c10d55b016cd WHIRLPOOL 8d353261359427f86232d9f7f1097b6c81b79eff538b6f886608420a580813017153c97047abb3b1dd0d84faadc313caac6f440990526a28d287ac01b9f6ab3a +MISC ChangeLog 8494 SHA256 fca54597dc4d6e627110b42dee9fa0e1d315d6fe3654c5bca757cf097e1dbdcc SHA512 195d9cd9f25c2092b7ee761c0f35df5f604094f72e0c5845e98ae56a454795a5c878a0c94badbe028fb8200c8c805afb766a5917aadab28ceffa53d9fc34ca05 WHIRLPOOL 70ec4db59d4cdfdf5964652976a6ed75451ac0da18047dd2422caeb3cf6339e862d226fcdbd22d4bb70165cb99b8dc359988c4804954ed958dcaa68ec4afb162 MISC metadata.xml 341 SHA256 f12826bad0472c46c8bd1ee18e7ab0acdc4cf26dd8b1322b1a93ff7c95b14a7e SHA512 dd141022832b17bc47f40cc940c2165c849b5ad786df5cbba7685da4543a8969ed992fb9dda3a136d045418f6de731c83909f3d02fd3ad2dee4d0ab4689b0c44 WHIRLPOOL 1fff0d00542a6e5b3f64edb985e53fe978a9d91dde0b0118cf790dc113a1a3e3fd01632f2f19517af9b47fef51902de579e43c30eaedf3fa298230848cb125a3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJSp8bpAAoJEC8ZTXQF1qEPKQ0QAL6plhetDypxAOzpC6o5+/pI -C4kYTwVYxZUBaDeGTTp8QQdiP8phhl53N6eIFdtmxwF4EbBmJQ4PbRNWOmqsoSxC -LD6ZnBVlCOki6Di5JS6Pwr34F670A8dOQDvfj5uLNY+IsWSLQe2HpIphbp8bv3M/ -lr7z8KaBCuGwKLNSGYetMD35FDO6uq1GApUqq6wpP6AznMlnY9YHi0yYL3u1zMfQ -FCk2FAKk0GpMXgid1t29ymVm/sA/x6cbDs5T6oN5NCLhHUTbDfZEAt8tmUBK0o8S -UwAN50weSqYMTh596Po2hGmIVF32ZAkDWyNIsMNaJq96k9JFRb630tku1FnVYSLy -kBYtgE+I9UjYD+XAuEJOu4BQ06+n3Fje860w78g7yPnl+GKS59NfnTx3gOX7SRo+ -85WpmIO38u1EpC3QKvxnYhYMig6h3SXYeb/2ohDad/pmbRGkXdfJ7JbmYDBWoQYJ -ue514jZTZJxZxhG0JWpTKazOmAlOjVUtVy8kHWxEMK+Hw3wv03Ujgm5TIbyc5JvT -qxOIOauhdqPHAN5CFRtUChBNMrnnte6vttEfOG/xztmZC7VYa8ffMI+LBMrI5Lhp -HiXeF1VkSGsuss5qfBtmzb/E7taMvSP8jTB2Ol8g1e3zoLnmMHI4fiagJDKd2nYK -HQe+kfSfzeBaqlXekqBQ -=OxQJ +iEYEAREIAAYFAlLtXqsACgkQKQaZ7OJe4zYL5wCgnxHUWGmDXo3S6mpUb+SQfAIs +yq8AniVhA1sUTOKjNib4gRuCDofNIn68 +=zJ0p -----END PGP SIGNATURE----- diff --git a/sys-libs/talloc/talloc-2.1.0.ebuild b/sys-libs/talloc/talloc-2.1.0.ebuild index c61998caef27..d9707129656c 100644 --- a/sys-libs/talloc/talloc-2.1.0.ebuild +++ b/sys-libs/talloc/talloc-2.1.0.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/talloc-2.1.0.ebuild,v 1.2 2013/12/11 02:03:57 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/talloc-2.1.0.ebuild,v 1.3 2014/02/01 20:50:03 vostorga Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) PYTHON_REQ_USE="threads" -inherit waf-utils python-single-r1 multilib +inherit waf-utils python-single-r1 multilib multilib-minimal DESCRIPTION="Samba talloc library" HOMEPAGE="http://talloc.samba.org/" @@ -21,6 +21,7 @@ IUSE="compat +python" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} + abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 ) !!<sys-libs/talloc-2.0.5" DEPEND="${RDEPEND} dev-libs/libxslt @@ -28,7 +29,11 @@ DEPEND="${RDEPEND} WAF_BINARY="${S}/buildtools/bin/waf" -src_configure() { +src_prepare() { + multilib_copy_sources +} + +multilib_src_configure() { local extra_opts="" use compat && extra_opts+=" --enable-talloc-compat1" @@ -37,7 +42,7 @@ src_configure() { ${extra_opts} } -src_install() { +multilib_src_install() { waf-utils_src_install # waf is stupid, and no, we can't fix the build-system, since it's provided |