diff options
| -rw-r--r-- | dev-python/pycairo/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/pycairo/Manifest | 5 | ||||
| -rw-r--r-- | dev-python/pycairo/files/pycairo-1.8.8-pkgconfig_dir.patch | 17 | ||||
| -rw-r--r-- | dev-python/pycairo/pycairo-1.8.8.ebuild | 8 |
4 files changed, 30 insertions, 6 deletions
diff --git a/dev-python/pycairo/ChangeLog b/dev-python/pycairo/ChangeLog index 2b95e6d66d03..d47cc6a400ab 100644 --- a/dev-python/pycairo/ChangeLog +++ b/dev-python/pycairo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/pycairo # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.73 2009/09/14 02:21:29 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.74 2009/09/16 05:09:23 arfrever Exp $ + + 16 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + pycairo-1.8.8.ebuild, +files/pycairo-1.8.8-pkgconfig_dir.patch: + Install pycairo.pc in correct directory (bug #283360). 14 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> pycairo-1.8.8.ebuild: diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest index e0f6055e8c5c..b8c1efcbe9e6 100644 --- a/dev-python/pycairo/Manifest +++ b/dev-python/pycairo/Manifest @@ -1,3 +1,4 @@ +AUX pycairo-1.8.8-pkgconfig_dir.patch 456 RMD160 c7fea264be6026a03098d75d90e3ffc2ba9f11ce SHA1 a5c2f16fbd0b9d2522dd1cf0e2a5d0a1cd2672e3 SHA256 42b3df1d890aae80a9b59ec47e1b84442b6b49f39decec0901c7d70761281dd7 DIST pycairo-1.4.12.tar.gz 490053 RMD160 f44bb6bcc6b366568e0297689164537dc891b278 SHA1 580255db6f3ab4c44ac44dfe0a9f7d1f598c2ab3 SHA256 318308cdff7fa5ff7587ecf39ee302292f93193506af06e176d228cd47c9012e DIST pycairo-1.8.2.tar.gz 519064 RMD160 ce48a6b71b802f07d0e0d3cfa140fd39ab5fe4d7 SHA1 b457949ccfa3af82afcffae8a396a1c840a9428a SHA256 77a8cbe388fd66825056744f2fc5c58b3afc247748bc2c777751cc0c2eb30a2f DIST pycairo-1.8.4.tar.gz 521136 RMD160 1be18a8516d797694d370f0d02273cad18115320 SHA1 450b59376ffea41910f60a0dfc9fd01d277e3950 SHA256 98ad99680850af767ba3bcc0cf65500ebf3f991872b859ab9a00a0b064fdecc1 @@ -7,6 +8,6 @@ EBUILD pycairo-1.4.12.ebuild 1162 RMD160 dc5761691510a4b9f7367833995f5ed59f5f36a EBUILD pycairo-1.8.2.ebuild 1160 RMD160 00692b37885fd4f3d72acf9690f4ebda758c3d44 SHA1 8bea2c3b09dfe0287c8d4cb5134a1db64c1739cd SHA256 fa493cd7ce52f867a50f92382cc3f6edb4bbc6e7b3494ca62d438f72e5349f92 EBUILD pycairo-1.8.4.ebuild 1176 RMD160 d2d3358f4f2249d86917ef96fa702c1d098bad4d SHA1 00f6a7f487accd6c45e72d1c11980b47ac3c7ecf SHA256 28a03fed3ee7aeb61ee42c884f860b00e503a31c62dc09655078e72271ceedac EBUILD pycairo-1.8.6.ebuild 1594 RMD160 3678ee67e114c1189753e2b06cb164e018536e71 SHA1 99c0beb8b037548eec0c4cf96a212ae9b5c01c20 SHA256 d756ba09327a634137a88f13d9ad9df0b967457ba70a790a56f9e716a01b387d -EBUILD pycairo-1.8.8.ebuild 1871 RMD160 be8a9af9a0a7e630b983630f7496f9eba7882df5 SHA1 4b7bc9877c9ae985d9c037a11cd790c68c277543 SHA256 106d1ccaa903f1cb3f5222f43a6aacccecb149a33307c254a24a00cb0d297e65 -MISC ChangeLog 9463 RMD160 dcf8bc79e5b9572c5972b4940297e84ecffcfac0 SHA1 4d17a043195402e9cc8cbc939ab2439e4b065673 SHA256 6fd3ba123bc200b7a621bde494508862748bf62d2a2e80a48fbb50988d67d31e +EBUILD pycairo-1.8.8.ebuild 1973 RMD160 c5b4c31045720c81a6bd7f801b23b0c774347848 SHA1 8c80402b6ebb4aafa5494f3ed4180f9f98c9e1b9 SHA256 2905a9e87d6333fa7fcf9bff9f20727e9f7ca3e662b66254bac718c968f4e33e +MISC ChangeLog 9660 RMD160 710d19f7c3e62d42867ba1b7a476c76600a96e2a SHA1 e794db4b1b85a0b2b577893508eb5bef04d7f6cf SHA256 0e677dd1fb93303759789caf02e08ba18bc685b5b140ccfbed4430d56aa54475 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a diff --git a/dev-python/pycairo/files/pycairo-1.8.8-pkgconfig_dir.patch b/dev-python/pycairo/files/pycairo-1.8.8-pkgconfig_dir.patch new file mode 100644 index 000000000000..27c24a89402e --- /dev/null +++ b/dev-python/pycairo/files/pycairo-1.8.8-pkgconfig_dir.patch @@ -0,0 +1,17 @@ +--- setup.py ++++ setup.py +@@ -4,6 +4,7 @@ + import distutils.dir_util as dut + import distutils.file_util as fut + import io ++import os + import subprocess + import sys + +@@ -106,5 +107,5 @@ + description = "python interface for cairo", + ext_modules = [cairo], + data_files=[('include/pycairo',['src/pycairo.h']), +- ('lib/pkgconfig',[pkgconfig_file])], ++ (os.environ.get('PKGCONFIG_DIR', 'lib/pkgconfig'),[pkgconfig_file])], + ) diff --git a/dev-python/pycairo/pycairo-1.8.8.ebuild b/dev-python/pycairo/pycairo-1.8.8.ebuild index 7416893ac0d2..0d0d3f46ea11 100644 --- a/dev-python/pycairo/pycairo-1.8.8.ebuild +++ b/dev-python/pycairo/pycairo-1.8.8.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.8.8.ebuild,v 1.3 2009/09/14 02:21:29 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.8.8.ebuild,v 1.4 2009/09/16 05:09:23 arfrever Exp $ EAPI="2" NEED_PYTHON="2.6" SUPPORT_PYTHON_ABIS="1" -inherit distutils +inherit distutils multilib DESCRIPTION="Python wrapper for cairo vector graphics library" HOMEPAGE="http://cairographics.org/pycairo/" @@ -33,6 +33,8 @@ src_prepare() { sed -i \ -e '/if test -n "$$dlist"; then/,/else :; fi/d' \ src/Makefile.in || die "sed in src/Makefile.in failed" + + epatch "${FILESDIR}/${P}-pkgconfig_dir.patch" } src_configure() { @@ -59,7 +61,7 @@ src_test() { } src_install() { - distutils_src_install + PKGCONFIG_DIR="/usr/$(get_libdir)/pkgconfig" distutils_src_install if use doc; then dohtml -r doc/.build/html/ || die "dohtml -r doc/.build/html/ failed" |