diff options
| -rw-r--r-- | dev-python/pycairo/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/pycairo/Manifest | 23 | ||||
| -rw-r--r-- | dev-python/pycairo/files/py2cairo-1.10.0-ppc-darwin.patch | 18 | ||||
| -rw-r--r-- | dev-python/pycairo/pycairo-1.10.0-r3.ebuild | 21 |
4 files changed, 49 insertions, 19 deletions
diff --git a/dev-python/pycairo/ChangeLog b/dev-python/pycairo/ChangeLog index 2c5ccaf0e76a..029b481f7d95 100644 --- a/dev-python/pycairo/ChangeLog +++ b/dev-python/pycairo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/pycairo # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.119 2012/11/22 12:50:05 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.120 2012/12/05 13:12:14 grobian Exp $ + + 05 Dec 2012; Fabian Groffen <grobian@gentoo.org> + +files/py2cairo-1.10.0-ppc-darwin.patch, pycairo-1.10.0-r3.ebuild: + Fix for Darwin/Prefix, added *-macos keywords, bug #442934 22 Nov 2012; Anthony G. Basile <blueness@gentoo.org> pycairo-1.10.0-r3.ebuild: keyword mips, bug #442934 diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest index 12daaedbd643..63a0a4c29606 100644 --- a/dev-python/pycairo/Manifest +++ b/dev-python/pycairo/Manifest @@ -1,6 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX py2cairo-1.10.0-ppc-darwin.patch 446 SHA256 c957cd14eb2c3fce0169a54b13665522fe1ada1af61a865903aad595afa309b1 SHA512 003e3266542242d349baa522552392aa448738f91a37ef0e6c8dedc3e0c179ca98167ab2ea7d75bd7d708f24f286099440a7a6a784767530eca161486403b033 WHIRLPOOL 0695123f4c9b3e82c22f1ba632243226d1dfe50442ea515abe440632221984c10aff233b8407a0e8dd4f594a1464c4fb7f121e43cfd0d03a2529ed1163e1a649 AUX py2cairo-1.10.0-svg_check.patch 2912 SHA256 c35d96be5be571c2f4c3415e4016a7e70a5edd6164818af80d16855e4e4efe72 SHA512 e0069738659db0fa3c0532efa7e53fed5f088ee4ce276fd6ddcfcd0ee1e8b4861a09330afe8a30bb45b912c7a93cf6e42dd6057ad7f5adabfdddeb58bc10bbe8 WHIRLPOOL 90ccae77f2641c1f9f4ad6f6497fd7912a952b7b948fe64845e8c60629d4f70c590fd33dd276c54cbc8251d45e8bd201841d7bc3fa04a37a314f1f375b8250c7 AUX py2cairo-1.10.0-xpyb.patch 952 SHA256 d6809bf00608d007f866040025392174e0cf3efe3ac03277436e00bacdcef54a SHA512 45fa1d32a8a4fc79b10e9221af286eef3f9d2c2b4991c066b1e18bd329feb764d07c4ebc58e1926ae86c4cb4a2ed0fd172f75f7479cec0be51ec5c5da6d4f13d WHIRLPOOL f8818581d471735748b546ffa0f4ac42bc5f623ae0ab383a70cf5977727ba933509497d3071aeb572e764c5e164680c16f8d476b0d8f1b7659dda7190b226cda AUX pycairo-1.10.0-svg_check.patch 2924 SHA256 f9d2bac70bcca57c523e69403cb7332bf4ade0427998b6a3dc16730bcc17b6c7 SHA512 a05fc725c9c8ac48b262795c6c6e56b3a432f73d69657565763292f74cbd8b3d4eaabc1a5dd5db0b74cad297cc330caed271c40fbb16d459019b4c75ab33ccef WHIRLPOOL ceaf8bf26f9783bd017fbfb6b81f00ece0122d1f57ad6ae3d87f40b39d7a4bbb47bab89891f3f12357f44f26039a6c63bf46b25765fac2412bd079c6e17dd6cf @@ -11,24 +12,14 @@ DIST py2cairo-1.10.0.tar.bz2 402070 SHA256 d30439f06c2ec1a39e27464c6c828b6eface3 DIST py2cairo-1.8.10.tar.gz 588459 SHA256 b15f71019e42e06d86f7e8fe5587f07c3de5a59a6c3a071b25fe100796dbcd56 SHA512 d08cf2fa03034fea8a3abad6fd60c9ca5b717bfd8322a3b584e8bb4003925516a6259d317986d2ff14b8e9356ccdb887a5ff7a50f2c341f120e8643c958bccd4 WHIRLPOOL 2261d70c63d9b6d1935cf5f5adac2a03adaac016a6cf41a4974b0ad1a481f060fb0ec5ee6f6d05c219f097caad40c5df8117750404f45740c52ebccb5d16b223 DIST pycairo-1.10.0.tar.bz2 246556 SHA256 9aa4078e7eb5be583aeabbe8d87172797717f95e8c4338f0d4a17b683a7253be SHA512 a03db6f04cea504985f390b0734042390f491f32ae2bee1299dabbafd369fde36bb506ebb941d22bbc11b0d008c4f758baeacf309a7336880529455092db829f WHIRLPOOL e779d56d67ef18bbd052d81acb38d8b610ca4bbf787f4b0e3982633de55ff54d6dfa3e5ce1957321fba09f0ec2d12ce12057335de9d5ff3f84c2bc0530415e76 EBUILD pycairo-1.10.0-r2.ebuild 3384 SHA256 19035d0dbde8c82fd1e75b12811e758159b3fde619882559012b1a8dd96447a1 SHA512 43f6b5bc7d896506da111759a5a0c235f5528fa80c217fafd98451cd9544fc697d6ed3deff144113faf214711702fbcfee478677d8c4928326a9f0d1d367f5c2 WHIRLPOOL 7a8ca48f4ac75976f2a915530df8e7e6652d0913c7a9f6fc1654b1ce6fea4a331002995474bbc75a100c44b905002e96a75b0a7603f820bf7e269ee8edd73470 -EBUILD pycairo-1.10.0-r3.ebuild 3442 SHA256 d25c16fdd16ef2797471c5521102708424ed07baf51fed08a2b6deebfce5b315 SHA512 df26df945434876af852a9ab3db2e338d82184a335d018e1a10a3078b59f3968a7cb5db126c54eb0a5324707d69377d256015c374d5784c15763c676ec0208c1 WHIRLPOOL 95fbef0ede272ae05983ded7f94ca78e69f144f532cb9829dc3f8f1e443e9cd50b3ce01681d7e49d01fed2c3372ca9e28922f6617210ddb043eed0f53ef5f9f3 +EBUILD pycairo-1.10.0-r3.ebuild 4239 SHA256 4b766b739a512713ff07dda301c732a8c6cb405d219aae296b500d7300dd4d97 SHA512 93ff1f840ad1f7b7400aee78df50c1fc3491ba2fe0405d0fe0fafdb6bbd742436886910f947d2ecd76dc3cf44469094059e89ba61588262a9c493f4009672568 WHIRLPOOL 79bc0fabb9be1cbafd1d8f5567d538f8832626cbc6c5835051f32a9e43d967844297689e21a67b5a1a0127668bbeed316938a3d3311064c520f3dd4b1cf2ce0a EBUILD pycairo-1.8.10.ebuild 2245 SHA256 5d0dce859b216113d97a65875b13e2a2346e6ae0aa2f2f08d3f46d5438bfa90d SHA512 f39c3170add58e0bbac59ee33fe1c0ee30f1d34314dc68d9311ea5559d5a34a13e2ab85b58adc611cfde971ac8e24408e4df5dfc5d1d19dc19aa65f8a0fc54d0 WHIRLPOOL d763f2e72f24408636906822ce0b701554ac581851be15fe1832412d7ac531fbb3a36a60cccc3aa724c06548b623823fce8cec89f655682a67c4aa646b5a4c50 -MISC ChangeLog 15861 SHA256 6000a26af4cc3ede93708fed98527ebd2028b1c379d3801427a97e60e12c52a5 SHA512 31988af7bfe7fadd2476b682ae4924b1d9ba14693ee261ff967af3aeb1a4faa41cd22af798413b59fa4e4494933735e1d4745d35a1c0e3e4679f5721cb710fa7 WHIRLPOOL 803e4eaa3ce4b3b0db932c995df0ae11dd18d74195685aeae47619c2a30916fa7595814b3664f242782151651ca5237ff898a9c4d1f7fe72b5084fc8725a64c0 +MISC ChangeLog 16042 SHA256 f83e7b730af2704e71c1dcc0f358e2ce8072b8e88ac663ae44b26a1c629bad1a SHA512 73f1faccb523fd1fcef34e9d1b294518e8fd0baef9a34d672e5dc504350ff97a385d439ca1b7a43e4c808b7d27c7dac21fa810f6a6802362c74e7dc9a2504d4e WHIRLPOOL 3feaaa1054cc9c7cfed55161831fd36a5a588d3c71d8b9ebb10effe16437c6a84f5fe3b4678b6d1dddeb13c4032c243e581d9c07856fc86acd8fb29281cc7475 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.19 (Darwin) -iQIcBAEBCAAGBQJQrh93AAoJEJOE+m71LUu6+l0QAJdC4MRyA7hKXDOx7R4kDtD/ -9m3jX8ycKVN41y7jcxavG6kW91N6pcPAy4vbmJ2LwvepkEDjefWxIDqVlzGsF8JR -gYBwI0dAppOz5QrlgUzGRrUa48/Kryo7mS8qo3fdK58G+pD2mnHq03dGrJXAiSxd -Z7Aq8kfX6romSiON6DOXGMGqQYTtLXMWfxEsI/LpPBXigBPuqRO4tygMEe9HETmk -OtzEQa4yJkF9RV7b9Rgg6cKP6lBvzud3eO/Dr1KszQn6p3Ls7PwShainKCxcN13V -6gcx1GgbtMyKJ1lkqSkFfRHPYmpgsYKhbmw6F15bfJGMC6jGxBLKmclHJp+aiVjs -H9Tceoval7UOfNfQAM9+YQxsZxvU+nE/AFN/dSxqTXXXPDeFCMRNkB1CeNne6KhW -zQFlSgth/kH2W5rXRyOv3HnosKezEQYTz3VdVSfnZB56hpbuaa7k77PqCidO4GX+ -VzteZ/Guw6F/zs/aaNrTuS9zw1sC08oJMQ/yUDU30v1Z+0Bw63jlEr/b3kZ7O9Hc -h4PtjPFOa999ilxOvapjQGV9HpoweV5iElkGyArdq+AFzh/kC1kqp4pX/VexPyXM -8TCb+R1ow3T0a57xKZXWdQchgPaSdTzR0NcFiylPqxIVpk+RWno87NQMav4TZOiz -ESv179INI4pprNmPLeeE -=wm32 +iEYEAREIAAYFAlC/SDAACgkQX3X2B8XHTomMtQCgg5U50siTfD/rCGhxsZXlSyZ+ +kgIAn16FvoHghTfLLkejF2/QtFIdsVao +=lJni -----END PGP SIGNATURE----- diff --git a/dev-python/pycairo/files/py2cairo-1.10.0-ppc-darwin.patch b/dev-python/pycairo/files/py2cairo-1.10.0-ppc-darwin.patch new file mode 100644 index 000000000000..e921ac34acd2 --- /dev/null +++ b/dev-python/pycairo/files/py2cairo-1.10.0-ppc-darwin.patch @@ -0,0 +1,18 @@ +inspired by: +http://groups.google.com/group/waf-users/browse_thread/thread/2bd6774056c850bc/ +27bfdcac2fb9ec05?lnk=gst#27bfdcac2fb9ec05 + +we cannot "fix" the buildsystem, since it's bzip2-tarred *sigh* + + +--- waf ++++ waf +@@ -154,6 +154,8 @@ + + wafdir = find_lib() + sys.path.insert(0, wafdir) ++from waflib.Tools.c_config import MACRO_TO_DESTOS ++MACRO_TO_DESTOS['__POWERPC__'] = 'darwin' + + if __name__ == '__main__': + import waflib.extras.compat15 diff --git a/dev-python/pycairo/pycairo-1.10.0-r3.ebuild b/dev-python/pycairo/pycairo-1.10.0-r3.ebuild index d07717f48727..c69900f170c6 100644 --- a/dev-python/pycairo/pycairo-1.10.0-r3.ebuild +++ b/dev-python/pycairo/pycairo-1.10.0-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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-r3.ebuild,v 1.8 2012/11/22 12:50:05 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.10.0-r3.ebuild,v 1.9 2012/12/05 13:12:14 grobian Exp $ EAPI="4" PYTHON_DEPEND="2:2.6 3:3.1" @@ -21,7 +21,7 @@ SRC_URI="http://cairographics.org/releases/py2cairo-${PYCAIRO_PYTHON2_VERSION}.t # || ( LGPL-2.1 MPL-1.1 ) for pycairo 1.8.10. LICENSE="LGPL-3 || ( LGPL-2.1 MPL-1.1 )" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos" IUSE="doc examples +svg test xcb" RDEPEND=">=x11-libs/cairo-1.10.0[svg?,xcb?] @@ -38,12 +38,14 @@ src_prepare() { rm -f src/config.h || die epatch "${FILESDIR}/${PN}-1.10.0-svg_check.patch" epatch "${FILESDIR}/${PN}-1.10.0-xpyb.patch" + epatch "${FILESDIR}"/py2cairo-1.10.0-ppc-darwin.patch popd > /dev/null pushd "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" > /dev/null rm -f src/config.h || die epatch "${FILESDIR}/py2cairo-1.10.0-svg_check.patch" epatch "${FILESDIR}/py2cairo-1.10.0-xpyb.patch" + epatch "${FILESDIR}"/py2cairo-1.10.0-ppc-darwin.patch popd > /dev/null preparation() { @@ -65,6 +67,10 @@ src_configure() { export PYCAIRO_DISABLE_XPYB=1 fi + # If WAF_BINARY is an absolute path, the configure is different and fails to + # find Python.h due to a compiler misconfiguration. If WAF_BINARY is just + # ./waf or python waf, it works fine. Hooray for reinvented buildsystems + WAF_BINARY="./waf" python_execute_function -s waf-utils_src_configure --nopyc --nopyo } @@ -111,6 +117,17 @@ src_install() { insinto /usr/share/doc/${PF}/examples doins -r examples/* || die "Installation of examples failed" fi + + if [[ ${CHOST} == *-darwin* ]] ; then + # fix install_names; next to waf producing dylibs (not bundles) and + # calling them .bundle, it also has no idea what it should do to create + # proper ones (dylibs) + fix_darwin_install_names() { + local x=$(python_get_sitedir)/cairo/_cairo.bundle + install_name_tool -id "${EPREFIX}${x}" "${ED}${x}" + } + python_execute_function fix_darwin_install_names + fi } pkg_postinst() { |