diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2013-01-13 13:07:39 +0000 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2013-01-13 13:07:39 +0000 |
commit | 5e337e9ada21d520d5013a8aa78735ab97a09f7b (patch) | |
tree | f9ec258fd2065aae91e81b2fb34ef947143c30c8 /dev-python/pycairo | |
parent | arm stable, bug #441004 (diff) | |
download | historical-5e337e9ada21d520d5013a8aa78735ab97a09f7b.tar.gz historical-5e337e9ada21d520d5013a8aa78735ab97a09f7b.tar.bz2 historical-5e337e9ada21d520d5013a8aa78735ab97a09f7b.zip |
Fix ebuild per mgorny's comment.
Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806
Diffstat (limited to 'dev-python/pycairo')
-rw-r--r-- | dev-python/pycairo/ChangeLog | 5 | ||||
-rw-r--r-- | dev-python/pycairo/Manifest | 10 | ||||
-rw-r--r-- | dev-python/pycairo/pycairo-1.10.0-r4.ebuild | 21 |
3 files changed, 19 insertions, 17 deletions
diff --git a/dev-python/pycairo/ChangeLog b/dev-python/pycairo/ChangeLog index 339f2ebcae20..734e1d0c5f0a 100644 --- a/dev-python/pycairo/ChangeLog +++ b/dev-python/pycairo/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-python/pycairo # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.127 2013/01/13 12:54:24 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.128 2013/01/13 13:07:35 eva Exp $ + + 13 Jan 2013; Gilles Dartiguelongue <eva@gentoo.org> pycairo-1.10.0-r4.ebuild: + Fix ebuild per mgorny's comment. *pycairo-1.10.0-r4 (13 Jan 2013) diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest index 36c82916e747..ecec365622c2 100644 --- a/dev-python/pycairo/Manifest +++ b/dev-python/pycairo/Manifest @@ -13,14 +13,14 @@ DIST py2cairo-1.8.10.tar.gz 588459 SHA256 b15f71019e42e06d86f7e8fe5587f07c3de5a5 DIST pycairo-1.10.0.tar.bz2 246556 SHA256 9aa4078e7eb5be583aeabbe8d87172797717f95e8c4338f0d4a17b683a7253be SHA512 a03db6f04cea504985f390b0734042390f491f32ae2bee1299dabbafd369fde36bb506ebb941d22bbc11b0d008c4f758baeacf309a7336880529455092db829f WHIRLPOOL e779d56d67ef18bbd052d81acb38d8b610ca4bbf787f4b0e3982633de55ff54d6dfa3e5ce1957321fba09f0ec2d12ce12057335de9d5ff3f84c2bc0530415e76 EBUILD pycairo-1.10.0-r2.ebuild 2862 SHA256 2aaaf0d61d3203565f9939ac23f0fdd18f290c25c8c86ac755bccb16c6b575c2 SHA512 99b98caf3918236ceeb2641abdcbaa576bcb1d1e85422c84ac70658b65571fe2d6012f7c2b92727f7b4c9a5e364a4460980306da95cf2b983179c53a340a3893 WHIRLPOOL 5df3aca125808c9fba41938702d51dae662513fbb86069b3e8cca697b6d21bf943d0cb9ff6e25f99d956383b10c6c0d84487ee210dd71763c51b3cb151303a5d EBUILD pycairo-1.10.0-r3.ebuild 3838 SHA256 062e693f425647d1b1e1e821cfd114cad0e02541cf7147658d1292092aa64d79 SHA512 e850ac825110eebc13c739032a6c2d424f3ac76b09cd5c63b0aa485c3139f0b3179181ceffceb03002c87a412715f9fff34de78c1a36b1fcecb3db9d7cc6d6a1 WHIRLPOOL 01c6bdc022d131c85e00a19b178b64d254d795caf407680a48d2f7982fea6538ab28838b0b70c029951ccee3af0992a541f0f7ba070728a38587f665a7ab969e -EBUILD pycairo-1.10.0-r4.ebuild 3645 SHA256 0cfda98e996111b8c997cf614ecf38a89bb6704f4891f276dd389152f9080fd0 SHA512 c1e45e205cc2c8e41de1215a36801d46fe4be49606ba9f9cef39990819dc6762d954f8e0dd00e1e3e99c3cb000245e08846d2089e5fa63c59b3a214f0aae54f4 WHIRLPOOL c9a221de65fd93462b76ab940c8c67f8f08aa42daa865206bedda8cedeb83b3cb7c1f4aee750bfcb410ad301f55892be905fea28aff569275d186115b43f1ee1 +EBUILD pycairo-1.10.0-r4.ebuild 3625 SHA256 2f2f60fc6717cbca6d85aef67b90f7fa771e444134289e50d74c23f50f669d9b SHA512 456c9a1ba112a261014ecc60df07be57765997abd99ec523112ed1ba8a436121bba68dcbf9df15e8c724ea46bc7a184ba076860342ab9d59e0c1a1f32056800c WHIRLPOOL 6aab5d7d99c1b824b0371f15a19b80fb3b827831529687384e8c0cf1fb008a2c76487804ca67b525c52c1f9d48417a2fc29c0d9902221c502c86f47ab595582f EBUILD pycairo-1.8.10.ebuild 2245 SHA256 5d0dce859b216113d97a65875b13e2a2346e6ae0aa2f2f08d3f46d5438bfa90d SHA512 f39c3170add58e0bbac59ee33fe1c0ee30f1d34314dc68d9311ea5559d5a34a13e2ab85b58adc611cfde971ac8e24408e4df5dfc5d1d19dc19aa65f8a0fc54d0 WHIRLPOOL d763f2e72f24408636906822ce0b701554ac581851be15fe1832412d7ac531fbb3a36a60cccc3aa724c06548b623823fce8cec89f655682a67c4aa646b5a4c50 -MISC ChangeLog 16977 SHA256 191fd6d52569488327720cfd44ed55dd12c6adbac49e1cee4537187c09003e6d SHA512 7196449e37fcda3f2c591c0a18ab81c7fb991ef6569230c1320d989eee063d7f9ad43757583c12f333662c6f9c6b873d67381e96ade25af39cfe9691a8812177 WHIRLPOOL 76fbc6b000dd5644ee580dd2206f9a2fac05afdb38d088fa0bc55a154396b0091c9b8acd8cf48196ebb2bc8dea1917c8f29ce0992df40e2d7fb392257043f7dd +MISC ChangeLog 17093 SHA256 0d26772219a51bb4d1653d3474b807ed210f979be877fe0da7dafd08ae079fad SHA512 4d5108da2be0c2e95d1afe7ae5bd1520b2e772b2264922516a38b6ecf34272a5326506420b7bbde18018fdaaa719f0ddb7bffb273306972f4f31d576bf85b662 WHIRLPOOL 59038b430dd58c105ffdaa3481cfe95bd2859a08fc243ec856d71cd536af2ef15f4f98dc52c8df20ac16016f643d6232e44181f5603495a811dae32e4db813f5 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlDyroEACgkQ1fmVwcYIWAYcKACgkKmPZQezu+/LZDpqmta4FZ9+ -YY0AnjfDR7n/BJgZ/yQr3UIBZw1p70rW -=maK2 +iEYEAREIAAYFAlDysZgACgkQ1fmVwcYIWAZhKwCgtCt4X1BeWEA7Buy5Q/YmDUmc +tj0AoMLHXjeKtT93u/crrp/Gi20OrSFi +=LfF3 -----END PGP SIGNATURE----- diff --git a/dev-python/pycairo/pycairo-1.10.0-r4.ebuild b/dev-python/pycairo/pycairo-1.10.0-r4.ebuild index 1f7301fa33dc..b7df1ee59500 100644 --- a/dev-python/pycairo/pycairo-1.10.0-r4.ebuild +++ b/dev-python/pycairo/pycairo-1.10.0-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.10.0-r4.ebuild,v 1.1 2013/01/13 12:54:24 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.10.0-r4.ebuild,v 1.2 2013/01/13 13:07:35 eva Exp $ EAPI="5" PYTHON_COMPAT=( python2_{6,7} python3_{1,2} ) @@ -49,9 +49,9 @@ src_prepare() { preparation() { if [[ ${EPYTHON} == python3.* ]]; then - cp -r "${WORKDIR}/pycairo-${PYCAIRO_PYTHON3_VERSION}" "${BUILD_DIR}" || die + cp -r -l "${WORKDIR}/pycairo-${PYCAIRO_PYTHON3_VERSION}" "${BUILD_DIR}" || die else - cp -r "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" "${BUILD_DIR}" || die + cp -r -l "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" "${BUILD_DIR}" || die fi } python_foreach_impl preparation @@ -84,7 +84,7 @@ src_compile() { src_test() { test_installation() { ./waf install --destdir="${T}/tests/${BUILD_DIR}" - PYTHONPATH="${T}/tests/${BUILD_DIR}${EPREFIX}${PYTHON_SITEDIR}" py.test -v + PYTHONPATH="${T}/tests/${BUILD_DIR}$(python_get_sitedir)" py.test -v } python_foreach_impl run_in_build_dir test_installation } @@ -95,10 +95,9 @@ src_install() { dodoc AUTHORS NEWS README if use doc; then - pushd doc/_build/html > /dev/null - insinto /usr/share/doc/${PF}/html - doins -r [a-z]* _static - popd > /dev/null + pushd doc/_build/html > /dev/null || die + dohtml -r [a-z]* _static + popd > /dev/null || die fi if use examples; then @@ -111,8 +110,8 @@ src_install() { # calling them .bundle, it also has no idea what it should do to create # proper ones (dylibs) fix_darwin_install_names() { - local x="${PYTHON_SITEDIR}/cairo/_cairo.bundle" - install_name_tool -id "${EPREFIX}${x}" "${ED}${x}" + local x="$(python_get_sitedir)/cairo/_cairo.bundle" + install_name_tool -id "${x}" "${ED}${x}" } python_foreach_impl fix_darwin_install_names fi @@ -121,5 +120,5 @@ src_install() { run_in_build_dir() { pushd "${BUILD_DIR}" > /dev/null || die "$@" - popd > /dev/null + popd > /dev/null || die } |