Fix py-compile idiom for automake-1.11.2 compatibility (bug #396585).

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 2eb7127542b81ec795b6ba030da197d762963189..29abcb90f6ba44c4f7e917542e29d0f2e81752a0 100644 (file)
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.495 2011/12/29 17:24:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.496 2011/12/31 21:26:59 tetromino Exp $
+
+  31 Dec 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  glib-2.30.1-r2.ebuild, glib-2.30.2.ebuild:
+  Fix py-compile idiom for automake-1.11.2 compatibility (bug #396585).
 
   29 Dec 2011; Pacho Ramos <pacho@gentoo.org> glib-2.30.2.ebuild:
   amd64 stable, bug 393007

diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 299cefdb8ce30e99f111f1a47fad900603bb284f..350563d8953d090751af3ae226cfc45ee26365c2 100644 (file)
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX glib-1.2.10-automake.patch 827 RMD160 3b1485f89a157b60f31f5ae8ffe2333ab842d217 SHA1 cd40e4dc579190a89e09fad9ac7b209f24b231b3 SHA256 db6d22caf4054c09467b50b6d85566eec7479a29169460950e423c083332ef67
 AUX glib-1.2.10-configure-LANG.patch 1464 RMD160 91481ba6b3f7a1d6e22a4ab7003fcee17450f3c1 SHA1 d98cc2f4ac6cc4aae55270ad0e5705af4de9b3ad SHA256 32377819896297caf9628f382c7bba09ee0a049bd977e9ea927314c0c2e669b4
@@ -25,14 +25,14 @@ DIST glib-2.30.2.tar.xz 5818860 RMD160 d8fc7c876bd15ea3a9255d4d0a67d745e3790488
 DIST pkg-config-0.26.tar.gz 396399 RMD160 face3d16ec338b9b1ab41d56d6e4d1a5624b52d0 SHA1 fd71a70b023b9087c8a7bb76a0dc135a61059652 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af
 EBUILD glib-1.2.10-r5.ebuild 1777 RMD160 eaf01d9d6f1ba55edb93e46f46110b9e9c2fb778 SHA1 dbedf2bc146dcbec47ad308621bf1077c9f735cb SHA256 9d9dd1ea44c25087918148c2ba1203f3b38be09996bd7e48a26f9b4f93405d36
 EBUILD glib-2.28.8.ebuild 7404 RMD160 df5a5f4ee06e7620b6b75a43ea6764e20626b022 SHA1 7a1418dbd1df2b8a6a511e781532a19ebdef6b63 SHA256 e21a8482d3ece513afb5620df8838f25e4b5adbd2c7e6d006e864e755d69d702
-EBUILD glib-2.30.1-r2.ebuild 8500 RMD160 cdd21e95f08c66519e465d1256a06598336ddce8 SHA1 6f5e61fe6db1bdee51ac41064a12595e97b7c863 SHA256 4f726a1fa65ba97ead4dad236729feaa78e14514de5c75d35cae0adc81af1e20
-EBUILD glib-2.30.2.ebuild 8505 RMD160 40bf5ee284f996debefea10b5ea7936beb04f779 SHA1 3d5230b1662f7011f0318029dad7ebe5b205b8e6 SHA256 1c39f8dd6691020061089584d3336734b6f9fc8b2cf4e433f3e14586a22529ec
-MISC ChangeLog 66219 RMD160 90fcf2c7e78abc31136fb4ad3a925e635eaa3e03 SHA1 9879a23f29c77d2d13a80b6c3a283042e1aaccb4 SHA256 0bbdf353460fcdeaefce124e4ac020431b9cc11ba91d456bda41784035aa0deb
+EBUILD glib-2.30.1-r2.ebuild 8495 RMD160 af0d12e4d79adb1ce31bbdca515de5fbb04fd714 SHA1 a2105fef9ab37b35fdd90fcdee8b6fa80fcfc71d SHA256 31374346b2d69d74980edda42b75c136bf9c5a157cf55bb8b25485a5224c4382
+EBUILD glib-2.30.2.ebuild 8504 RMD160 7996e900feb09f2860edae98e9b5ec3e11335cae SHA1 638f88102c1e66b72fa60750e67cb528af4fe04f SHA256 3f8ace46fc8b58975c911c5b79c66d61a6e5f3305ea837a474fab3fd59c4b9c7
+MISC ChangeLog 66400 RMD160 99a519b0b065f8e9da3303657e3c9d6d47e7acf0 SHA1 2f5676954c67f4a07dca191ed5a0934b4734bd61 SHA256 c2fec8a770c353286c72d95986503ec2e10e6fc9f028deb5ce6d9c1e58e97b1b
 MISC metadata.xml 497 RMD160 447ae0d07ac529dbe1830e383d2ef4eae7359ea7 SHA1 4cb36fafa32d53a0dbeec978b0d75f4e7acb3fa0 SHA256 a1840f7e6af57edc9fe5b54deae9e2083858d27792fda3f4e1e8e04624b17d0d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk78olkACgkQCaWpQKGI+9SvsgCeJBOacyYb4Dxt8BsaHb3IXhpc
-H4UAn1VQgR8q1a5pH0aplRyWe7gZFcv4
-=vjiL
+iF4EAREIAAYFAk7/fikACgkQdjK8w9WeBnAAoAEAj29VeTFthcTBmb47jjRmFw+d
+YjrNL/2pnfdmz+PklCsBAJE4mMHmhyQOEY8VIELZ0pNejgKHbMv3wkbtOH8xn5rm
+=3kEq
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/glib/glib-2.30.1-r2.ebuild b/dev-libs/glib/glib-2.30.1-r2.ebuild
index 82c944c308922c76cd770dcd22782bf91a3599c8..6eaa8d5f9716983fa70d46385b8d68770e6ffc5e 100644 (file)
--- a/dev-libs/glib/glib-2.30.1-r2.ebuild
+++ b/dev-libs/glib/glib-2.30.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.1-r2.ebuild,v 1.1 2011/11/11 17:35:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.1-r2.ebuild,v 1.2 2011/12/31 21:26:59 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="utils? 2"
@@ -115,7 +115,7 @@ src_prepare() {
        sed -i -e '/g_file_get_contents/s:/var/lib/dbus/machine-id:/etc/machine-id:' gio/gdbusprivate.c || die
 
        # disable pyc compiling
-       ln -sfn $(type -P true) py-compile
+       echo '#!/bin/sh' > py-compile
 
        # Needed for the punt-python-check patch, disabling timeout test
        # Also needed to prevent croscompile failures, see bug #267603

diff --git a/dev-libs/glib/glib-2.30.2.ebuild b/dev-libs/glib/glib-2.30.2.ebuild
index 1cb555cd30c1aded26b9bf9eba20d5ac6c2858df..dba2984f18943f5098e02e2c0c5a86b2e5951c30 100644 (file)
--- a/dev-libs/glib/glib-2.30.2.ebuild
+++ b/dev-libs/glib/glib-2.30.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild,v 1.4 2011/12/29 17:24:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild,v 1.5 2011/12/31 21:26:59 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="utils? 2"
@@ -116,7 +116,7 @@ src_prepare() {
        epatch "${FILESDIR}/${PN}-2.30.2-machine-id.patch"
 
        # disable pyc compiling
-       ln -sfn $(type -P true) py-compile
+       echo '#!/bin/sh' > py-compile
 
        # Needed for the punt-python-check patch, disabling timeout test
        # Also needed to prevent croscompile failures, see bug #267603