diff options
| author |   Gregory M. Tuner <gmt@be-evil.net> | 2014-01-25 02:32:55 -0800 |
|---|---|---|
| committer | Gregory M. Tuner <gmt@be-evil.net> | 2014-01-25 02:32:55 -0800 |
| commit | 0dd6421dee132a5aacfba8efead9ee618847031f (patch) | |
| tree | 23defc863dd6a18d161b32ecb92ea0cd88eb3e65 /dev-libs | |
| parent | app-accessibility/at-spi2-core: manifest (diff) | |
| download | gmt-0dd6421dee132a5aacfba8efead9ee618847031f.tar.gz gmt-0dd6421dee132a5aacfba8efead9ee618847031f.tar.bz2 gmt-0dd6421dee132a5aacfba8efead9ee618847031f.zip | |
dev-libs/libxslt: multilib-utize
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/libxslt/Manifest | 2 | ||||
| -rw-r--r-- | dev-libs/libxslt/libxslt-1.1.28-r2.ebuild | 36 |
2 files changed, 24 insertions, 14 deletions
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest index 970635f..6d08491 100644 --- a/dev-libs/libxslt/Manifest +++ b/dev-libs/libxslt/Manifest @@ -3,6 +3,6 @@ AUX libxslt-1.1.27-python-config.patch 756 SHA256 d8a457bb106b195dd20e738656aed1 AUX libxslt-1.1.28-manual-python.patch 1180 SHA256 905ac247a14998c0dcc44aacc926e7eb49758482769ae66e14194ae0f5aca354 SHA512 cd84143397223d2e1e70c796346dd8ed4359bc9bc6b1f808d6a47f75c54d0589456382dd13723f42983f41267861e742fde60e9e401ded53f0c3a3f4596dfb36 WHIRLPOOL 159e662add550048f7fee53ef98179afe5aa9858a10d517f2dad1dc3903cca2c34cec7d5f1e9cb370f9ca60104cbb528866294db7da0463b86d74b732342f6e6 AUX libxslt.m4-libxslt-1.1.26.patch 1421 SHA256 c02cd8437064db0921c08e63245c403dad12410d2997715aa7aa36600bfaa895 SHA512 78cfb6bd823805f660c9d07c4f6f83a87cf2385c48fcb11bff82792101f06b36d08f851089497f0c019f5743f31248cbabe341f78f4ca7e7617c86c4e5a8404a WHIRLPOOL 0b4da6d1ce77e653a6c175fc203f5fecd0c831a018a5063e66e5ff0cc19d9a19d8938b06e4318938a35f665f91442290f267bb3fc86b9268c2455ac9616caeff DIST libxslt-1.1.28.tar.gz 3435907 SHA256 5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c SHA512 20b65bdaceaac5bd11d509bf683ce8e344030bc95164639266ae705d41659bcba47b5be1b059d0d67681e6428b0710db675d1749c06aa531bc2212ed3d0511b1 WHIRLPOOL 7f059d7d6b02fc5982c31d3239188ff0a6d211f722635ac3d3cd77bedf54ef9b1a9433ef1c55a9335f353ce618f3dd93a9e1e19c117988358ab31857edff1843 -EBUILD libxslt-1.1.28-r2.ebuild 2666 SHA256 745b3bdd66ff7347101e7cee0aa0723d24e7ecc9fc5387ca7dbaca7bcc140fbd SHA512 66b6f4983b4a323585bdb9372a6cd0b518e41c870e033d45d8ce2b8be64306b95032656e718e31de7c176f61833c0011389d93ac3652cc3f70f661071a0a72f7 WHIRLPOOL 42075d7b9b935674f2caa2231153ec0ed9a3638054ab964c1bdbe926b68e0170e45274682cad108ec7d0a87987dee02494781d66c2b9886bc75cc5ccdb4d36d4 +EBUILD libxslt-1.1.28-r2.ebuild 2987 SHA256 125571cd7719798ab6d10b00c5c5ece980287c137fc17555bde4d583572f22b5 SHA512 11fd2777224796dbf468560efd43c63371dba61980876583506b02f9eacd794f7d1c69f0f7956baef4994629b5ab6f536b1f8ea764986c22dab6e095a4872f63 WHIRLPOOL 3c4003ae84ab2fbb1ad1c548ecc675389b0e833bb30363405ab01d72d017dba26a95c98254e08b8fa1a52298b513de8a43f05b71746207471d96a06ef7069e02 MISC ChangeLog 34410 SHA256 cfdff71ea43ab2d4a4124f99d7a7c35e2ad8ae424ffd7393adc39d2d365fb5d8 SHA512 cd13b21baa6078a41a429965bdd0ac2c7a2ba69c326d32fcdd602a213c07cc09d3deac880c0d1ad00a9058917621714eca4dc56bb6490a7d151b647b93c3af7c WHIRLPOOL 7ab0f039cbb7fb2c2fd3bdbea8b5f21f507b84035bcd91bf4a65db3cc8786c145d16d9740eaaa07c6c12008c058b2dadbdcba738fa269c8a23aa5952d891637a MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83 diff --git a/dev-libs/libxslt/libxslt-1.1.28-r2.ebuild b/dev-libs/libxslt/libxslt-1.1.28-r2.ebuild index fac85ab..c186195 100644 --- a/dev-libs/libxslt/libxslt-1.1.28-r2.ebuild +++ b/dev-libs/libxslt/libxslt-1.1.28-r2.ebuild @@ -24,7 +24,12 @@ RDEPEND=">=dev-libs/libxml2-2.8.0:2[${MULTILIB_USEDEP}] crypt? ( >=dev-libs/libgcrypt-1.1.42:=[${MULTILIB_USEDEP}] ) python? ( ${PYTHON_DEPS} - dev-libs/libxml2:2[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}] )" + dev-libs/libxml2:2[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}] + ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20131008-r8 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + )" DEPEND="${RDEPEND}" src_prepare() { @@ -63,28 +68,31 @@ multilib_src_configure() { $(use_with debug mem-debug) } -src_compile() { - multilib-minimal_src_compile - if use python; then +multilib_src_compile() { + default + if multilib_is_best_abi && use python; then python_copy_sources python_foreach_impl libxslt_py_emake fi } -src_test() { - multilib-minimal_src_test - use python && python_foreach_impl && libxslt_py_emake test +multilib_src_test() { + default + multilib_is_best_abi && use python && python_foreach_impl libxslt_py_emake test } -multilib_src_install_all() { - dodoc FEATURES - einstalldocs - - if use python; then +multilib_src_install() { + default + if multilib_is_best_abi && use python; then python_foreach_impl libxslt_py_emake DESTDIR="${D}" install python_foreach_impl python_optimize mv "${ED}"/usr/share/doc/${PN}-python-${PV} "${ED}"/usr/share/doc/${PF}/python fi +} + +multilib_src_install_all() { + dodoc FEATURES + einstalldocs prune_libtool_files --modules } @@ -94,9 +102,11 @@ libxslt_py_emake() { emake \ PYTHON="${PYTHON}" \ PYTHON_INCLUDES="${EPREFIX}/usr/include/${EPYTHON}" \ + CFLAGS="${CFLAGS} $(python_get_CFLAGS)" \ + CXXFLAGS="${CXXFLAGS} $(python_get_CFLAGS)" \ PYTHON_LIBS="$(python-config --ldflags)" \ PYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)" \ pythondir="${EPREFIX}$(python_get_sitedir)" \ PYTHON_VERSION=${EPYTHON/python} "$@" - popd > /dev/null + popd > /dev/null || die "how?" } |