diff options
| -rw-r--r-- | dev-python/pygobject/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-python/pygobject/Manifest | 15 | ||||
| -rw-r--r-- | dev-python/pygobject/files/pygobject-2.20.0-tmpdir-makefile.patch | 50 | ||||
| -rw-r--r-- | dev-python/pygobject/pygobject-2.20.0.ebuild | 5 |
4 files changed, 73 insertions, 4 deletions
diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog index c299e1ef013b..a6ff20012956 100644 --- a/dev-python/pygobject/ChangeLog +++ b/dev-python/pygobject/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-python/pygobject # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.88 2010/01/11 16:56:25 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.89 2010/03/19 17:04:42 pacho Exp $ + + 19 Mar 2010; Pacho Ramos <pacho@gentoo.org> pygobject-2.20.0.ebuild, + +files/pygobject-2.20.0-tmpdir-makefile.patch: + Fix bug 299680 with upstream commited patch. Thanks to Kevin Pyle for the + report and the patch 11 Jan 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> pygobject-2.18.0-r2.ebuild, pygobject-2.20.0.ebuild: diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest index 32889b1e9f36..be2a404c49b4 100644 --- a/dev-python/pygobject/Manifest +++ b/dev-python/pygobject/Manifest @@ -1,11 +1,22 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX pygobject-2.15.4-fix-codegen-location.patch 1519 RMD160 e4721ae2d9a2d05e3b129627c762acf177521974 SHA1 02e9446db952de3b934a264ce77648d2cd5c6d97 SHA256 6ab22def2c57a4dd44dedc787cb660dc326a62b518c3dc747fbe600ca2c20b8c AUX pygobject-2.18.0-automake111.patch 323 RMD160 182ea96cbb8fe28a93add0ef3dfd7710777615d8 SHA1 96c22e5bb8f07ea117248f4c8ca580474938c7af SHA256 4a94e9ca2a421a923c522ad4132c8988f22e74949f0361e231b6ba0ca813bc57 AUX pygobject-2.18.0-make_check.patch 1589 RMD160 a2657fb299055620a745cb704ea3de289cdf8d63 SHA1 64ada13e6ac91845353855ed694ed951f63f583b SHA256 df43cef258567f824753caa0ba3a8d2820f729dac5ecba0d9fbf39a6f4861c4a AUX pygobject-2.18.0-support_multiple_python_versions.patch 2349 RMD160 054080d2a62b466ffe2ba9e182e5e796c652161f SHA1 d1ac7d308cb82caab4a5c56256ebd53b13cb9a3b SHA256 d66bcf31acf8b310ad346b9803d5e41d9840cfbca3c62d19b5c99f605c58066d +AUX pygobject-2.20.0-tmpdir-makefile.patch 1817 RMD160 6e2032012f65a74ed140f777e0e7d5addfbc5c1f SHA1 ea47d992fed96f2cea63543232cc3b9ed9e160a9 SHA256 88245480666f05f302a6abd3ef52d8e3a581a2842774f52a484a02d2ea389699 DIST pygobject-2.18.0.tar.bz2 639205 RMD160 db454107949b0e797c6c151aa426368ef0f59317 SHA1 f800eda7978fe9813600cfdda973da15c3178bb0 SHA256 b11b840ae31e6e644986806ee3400f4528b803d07b6cee26add45e0f2e5e622b DIST pygobject-2.20.0.tar.bz2 666287 RMD160 5e3a8c976b3047b0dd9c492c8344ccd0ca77d3fd SHA1 a5954262051f376983bef6cc0e3fd1b0ca1824f7 SHA256 41e923a3f4426a3e19f6d154c424e3dac6f39defca77af602ac6272ce270fa81 EBUILD pygobject-2.18.0-r2.ebuild 3145 RMD160 7bb41c69b2e7162a6d59f05616c59056af137ea3 SHA1 1620b8b3f448eea09bdfdd52ed6651b16f376e40 SHA256 f14ff14b98379823ee21b4b1b7f477bbbd082684dc9b999110b07d5721b0e710 EBUILD pygobject-2.18.0.ebuild 2470 RMD160 c353299d365aea86d15b93ff849ac5cba7633929 SHA1 2f5493ddfd678a84c34897625b8e1127fb11728a SHA256 aae65791cd99ac96a76e7310705d603fb50e615f5b75ad5c6c3bc54ea72ebb1b -EBUILD pygobject-2.20.0.ebuild 3105 RMD160 47fc57abd9e35612c581048bb78e992e913157db SHA1 1a91c003e7ffb58c364995eb933584fd8f5f0e9f SHA256 21a091066f0e0d7ecc3f7c90d585147f19050e783ffdd83e03656be66b35e0ad -MISC ChangeLog 12577 RMD160 a92c5cf0a6a80c7cbf6d5c9c12827f5ae512fd8e SHA1 1c6f43f353621e226bde56ed5cd37e0611c5c9f8 SHA256 fbc162950d83aae7964b4aa6d37d878e061e580d91c3e70e4c79556798df6036 +EBUILD pygobject-2.20.0.ebuild 3204 RMD160 30f656d7b28f2afb431d84ebfa67bfd997702c0e SHA1 7aac445b9150ac5a95cfac48a79e2bb286577bf5 SHA256 78e368f199b4e0763b016b8e3a588cf672e9e7774e1583449af693e3332cb25b +MISC ChangeLog 12794 RMD160 f6f3bba6797664e892fa793c797862759fc7a7a4 SHA1 cc61501ef3fca236fab5d4eb2708b553bd260aff SHA256 0600ab012eb47b8041e2457619ccfb96a2004b7f3e40a6733f9ebc1f013480e4 MISC metadata.xml 282 RMD160 32fd779b50e24af15b5d30862d362cef786e2930 SHA1 6603342ce4d848c26dd1a585eeebc1b84198f2fa SHA256 116a6827697ff69c8f1971077502e9fa2b0d2fd23e57c97d4b54b3d1495597ca +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAkujrrAACgkQCaWpQKGI+9S/rgCeMo54j2WRawIms9D3vUGUyvef +Qv4AnRpGvHtEqN7IlCVf7zEq+kkPicVW +=0wI4 +-----END PGP SIGNATURE----- diff --git a/dev-python/pygobject/files/pygobject-2.20.0-tmpdir-makefile.patch b/dev-python/pygobject/files/pygobject-2.20.0-tmpdir-makefile.patch new file mode 100644 index 000000000000..11d326e97359 --- /dev/null +++ b/dev-python/pygobject/files/pygobject-2.20.0-tmpdir-makefile.patch @@ -0,0 +1,50 @@ +From 4e2efa91d101bf755739e1cca8eee41eb0ad20fd Mon Sep 17 00:00:00 2001 +From: Gian Mario Tagliaretti <gianmt@gnome.org> +Date: Mon, 04 Jan 2010 07:35:14 +0000 +Subject: Bug 605937 - pygobject: Makefile.am sets $TMPDIR, disrupting distcc + +Committed a patch from Kevin Pyle +--- +diff --git a/Makefile.am b/Makefile.am +index 93442af..580b489 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -55,23 +55,22 @@ uninstall-local: + rm -f $(DESTDIR)$(pythondir)/pygtk.pth $(DESTDIR)$(pyexecdir)/pygtk.pth + + EGG_NAME = $(PACKAGE)-$(PACKAGE_VERSION)-py$(PYTHON_VERSION)-$(PLATFORM).egg +-TMPDIR = `pwd`/$(PACKAGE)-$(PACKAGE_VERSION) + ++egg: EGG_TMPDIR:=$(TMPDIR)/$(PACKAGE)-$(PACKAGE_VERSION) + egg: $(top_srcdir)/gobject/gobject.la PKG-INFO +- rm -fr $(TMPDIR) ++ rm -fr $(EGG_TMPDIR) + echo $(EGG_NAME) +- mkdir -p $(TMPDIR) +- mkdir -p $(TMPDIR)/EGG-INFO +- make -C gobject install-pkgpyexecLTLIBRARIES pkgpyexecdir=$(TMPDIR) +- $(INSTALL) dsextras.py $(TMPDIR) +- rm -fr $(TMPDIR)/gobject.la +- $(INSTALL) PKG-INFO $(TMPDIR)/EGG-INFO +- echo "gobject.so" >> $(TMPDIR)/EGG-INFO/native_libs.txt +- echo "gobject" >> $(TMPDIR)/EGG-INFO/top_level.txt +- echo "dsextras.py" >> $(TMPDIR)/EGG-INFO/top_level.txt +- cd $(TMPDIR) && zip -rq $(EGG_NAME) . +- mv $(TMPDIR)/$(EGG_NAME) . +- rm -fr $(TMPDIR) ++ $(MKDIR_P) $(EGG_TMPDIR) ++ $(MKDIR_P) $(EGG_TMPDIR)/EGG-INFO ++ $(MAKE) -C gobject install-pkgpyexecLTLIBRARIES pkgpyexecdir=$(EGG_TMPDIR) ++ $(INSTALL) dsextras.py $(EGG_TMPDIR) ++ rm -fr $(EGG_TMPDIR)/gobject.la ++ $(INSTALL) PKG-INFO $(EGG_TMPDIR)/EGG-INFO ++ echo "gobject.so" >> $(EGG_TMPDIR)/EGG-INFO/native_libs.txt ++ ( echo "gobject" ; echo "dsextras.py" ) >> $(EGG_TMPDIR)/EGG-INFO/top_level.txt ++ cd $(EGG_TMPDIR) && zip -rq $(EGG_NAME) . ++ mv $(EGG_TMPDIR)/$(EGG_NAME) . ++ rm -fr $(EGG_TMPDIR) + + doc-dist: + mkdir pygobject +-- +cgit v0.8.3.1 diff --git a/dev-python/pygobject/pygobject-2.20.0.ebuild b/dev-python/pygobject/pygobject-2.20.0.ebuild index b87bb26340ac..385c9b87a7ad 100644 --- a/dev-python/pygobject/pygobject-2.20.0.ebuild +++ b/dev-python/pygobject/pygobject-2.20.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.20.0.ebuild,v 1.4 2010/01/11 16:56:25 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.20.0.ebuild,v 1.5 2010/03/19 17:04:42 pacho Exp $ EAPI="2" SUPPORT_PYTHON_ABIS="1" @@ -48,6 +48,9 @@ src_prepare() { # Support installation for multiple Python versions epatch "${FILESDIR}/${PN}-2.18.0-support_multiple_python_versions.patch" + # Fix compilation with distcc, bug #299680 + epatch "${FILESDIR}/${PN}-2.20.0-tmpdir-makefile.patch" + # needed to build on a libtool-1 system, bug #255542 rm m4/lt* m4/libtool.m4 ltmain.sh |