summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2014-10-15 14:48:57 +0000
committerDavide Pesavento <pesa@gentoo.org>2014-10-15 14:48:57 +0000
commit42bf71b34fb15e0e8ece5720b3709dc4ae59c115 (patch)
treeec9dcb6871c80ccf105d6bba068e6753624c4aa2
parentVersion bump (diff)
downloadhistorical-42bf71b34fb15e0e8ece5720b3709dc4ae59c115.tar.gz
historical-42bf71b34fb15e0e8ece5720b3709dc4ae59c115.tar.bz2
historical-42bf71b34fb15e0e8ece5720b3709dc4ae59c115.zip
Fix bug #525392.
Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64 Manifest-Sign-Key: 0xDADED6B2671CB57D!
-rw-r--r--dev-python/PyQt4/ChangeLog5
-rw-r--r--dev-python/PyQt4/Manifest32
-rw-r--r--dev-python/PyQt4/PyQt4-4.11.2-r1.ebuild3
3 files changed, 22 insertions, 18 deletions
diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 9f940db86041..7a1b51b0341c 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/PyQt4
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.273 2014/10/14 02:49:02 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.274 2014/10/15 14:48:47 pesa Exp $
+
+ 15 Oct 2014; Davide Pesavento <pesa@gentoo.org> PyQt4-4.11.2-r1.ebuild:
+ Fix bug #525392.
14 Oct 2014; Davide Pesavento <pesa@gentoo.org>
+files/PyQt4-4.11.2-phonon.patch, PyQt4-4.11.2-r1.ebuild:
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 37f27a885c92..6fe6d79694d0 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -8,26 +8,26 @@ DIST PyQt-x11-gpl-4.11.1.tar.gz 11118850 SHA256 df9d7358d70748efa5b84fa3fe9e182a
DIST PyQt-x11-gpl-4.11.2.tar.gz 11120742 SHA256 05dfc4060d25f81e5d45fb020ad59d21af7dc4c01ace4d2b37f3b49493d03f6e SHA512 c849a28070aed1ab55a407da7b3386d5c899e5ada3c8b21b50f8182193a9f6fb53c7ef9ad02b2b261fd3ce901fb2a0189fe4266dd20cf6036bc2c8047f47ba79 WHIRLPOOL 0106a5c4f1f91e79280da3ff834ef61285cf6b8a18cb3d48df7ab969c28b35f76fbdfa648401f8d1e128feee139fcd7eb74edc0fd9ee17ff7a04f28855563eaf
EBUILD PyQt4-4.10.3-r2.ebuild 5661 SHA256 b71c877ca0b824dabb9ac99ab1c0e27b5b1686be20a642ef278e344c33413238 SHA512 67195e69490050607741915966ecd3cf4b4be2a7036feb731ce8535aa7fc82c9fc932d6a2e1eb1d301204971d53d6901bf01731bcdbdcaa500916e3cf91b24fe WHIRLPOOL 70db74ec457deae5ff938067882c2bf48973f15e625a2214450e04db8a6ef04219a64894e7993df71ad1fe78e521404bde003a6800fd9153007c18d347381a00
EBUILD PyQt4-4.11.1.ebuild 5614 SHA256 86dc8dc29ff7ada0ae44147b441440db712476150e21c43247952e513ec1d9f2 SHA512 558c0948e9e3dc2519cba5e6955685fcfdcb7e19913d95e074d1b79671b8672c5054feca10a3d0f6bbe1454bf106a0fdccfd3820d9677fccb2dadf29679bdaf0 WHIRLPOOL 3d66b972e6f61e466de8eab842e2d171d4d32baaffd7de52d82fd5adb69dee377239d21224689219ff6c643b3c55345a88e0eca4b6aa5be0b50619f596d1f695
-EBUILD PyQt4-4.11.2-r1.ebuild 4550 SHA256 ac63340690e66c021786f7636d18b1c83f65f56caae96857bd023924020ba861 SHA512 a871d5c7b0c2f0c89f1aa4ea97f0f7eb1c10920e86b5647035058b5bfab59617b0f6c4cc98291b1a5b0d3088bdccdc5493f215d7e999d3c165002f45bafe1c59 WHIRLPOOL 32812af179293415838d22a4ae49dec94ad6f00daff3ace079eb719d17192824f0a4ddae39afc91a99c83e50af2259f81e95c3fa21d1d40f1a2630b1895c417e
+EBUILD PyQt4-4.11.2-r1.ebuild 4585 SHA256 d08d805da3b39e6bf28aca5aea89d610cf16f29bb36bc4b2055f1eaabb606faf SHA512 29cf3ab36f2fbfb40785870bcb7228a02c2f9fb8de6df041678aa6615a5c278968a428dc4ca78b5b92c08c31a80d6d0251d12369a086c72d66ece84b7d207ceb WHIRLPOOL 14b94d080f2c8590315bda12b5f775377edd7b1fe345e2b18767d14b2e8e3581917e871a8f0af7402943e9c458de1d72cbe11db9a3d34e234bab19e4dc9b1242
EBUILD PyQt4-4.11.2.ebuild 5615 SHA256 6f3b0b50cde02e9fa9507c0d1bab42f8514c029d8e5c110382547b56ed8611f5 SHA512 e10ec78547a1fe49701d8ce73f3dbe4f4e3adec055f32209af55c8ec7da43b5f5bf7f4ce7bf14b42241878626f21b2803f5535cea90fde40f73211b6683ac2eb WHIRLPOOL 416cdce1aee0a233acbbeb1d8adc63344c69538c7c513154167cf23b4aea1efedf4166fb51385d7795939d02a0286bd2558f0cb591a20c70387521cbde6861f3
-MISC ChangeLog 37591 SHA256 73b6f2540bcfdc9abecbb58c3b0d372aa7a1156e5d8139c7c62a4f512ef1e892 SHA512 3320a71f7bf301a3b4b6c371406c3c1124522c73010edf870df20a6a788b64574acc831d1f7b044658e1bc92ac578a754dae56cf3e01d2fc244eed7a80c45863 WHIRLPOOL 9e5f5b92b8ee9325319b0a9076bdb284acd6947a06845382d6b96ea93f143497fbcb1c650592fd85354eef57fb10268ec99de58aa6fc033b256bf5775e79d5e9
+MISC ChangeLog 37685 SHA256 6464563dc8b83f3acda2d3e93a49bc9d995a6e961145a3d8d7c41667eb52c283 SHA512 2d52dc4210b72513dd378c507f3e3471a90933830644c2ddb731cfad5ade0e08d0192de8a90b84210766457c6e5f36203ca1df40f1f82ee4bb45ff74c62c1347 WHIRLPOOL ec6cda9b113e68e67ac36b36866657253d9b6fd20630182109822c5b2837af717c0280e5a28f092a646f8b532d6f24084cde9aa4435128712723935d98fbfcea
MISC metadata.xml 1577 SHA256 166e2a7e692d873540177609fc64de3b423048895c919b0e092d0e99e2b6476a SHA512 7ed844b5f4d2e9355aab4672448eab120f9914dc96ff29ca1197df5fa3ee657a00444f3c5ff11135eaced730664738b3f43205ab1d61a54a656166046beef203 WHIRLPOOL 108e531296bfa72819d5a1364b021c2587bf1c023b498ccb0a3fb75385b26f458c95eaec3d4392377e3bdae901aaa4b6a4486c9e30f61a0b8e2b264c13f1d76e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0
-iQJ8BAEBCABmBQJUPI8nXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUPolZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9T9MQAI+wZZxjY8sKNcEINPk8jD8S
-v6Xk/Cple/WsjNFCtikvQUHGji6+iNoZH/u+u3yftk0waSYHdYViGUsKsZ9sg7KG
-yUu6WsX8e/HOGbLzdgFDThiL23/rg1MuI9lU2TbNWEp3tLGhp1uzK6jfSoi2cEB0
-rqt537qGfFFZQ1vc9eWMikshWzkie6AKYnNqpP0pGKxlrVl3yoa1wqUDR39lNHCE
-7lY6M/tHHiTkmXASoY4zr5GgWN7O5gHgZkkgHWjSF1mf6hn+ES1CNpcotgdb6jt6
-x7RLGWDmuvc4K0MReOWC4n/2aO34hKoqHOXReYt5b9iQstw6+xbKDWNCsinjhUsO
-PiUH36iiSQyfRRUMI+uhx4f9qH4T36WI2RtsOPOZ4j5i3/hLff1ZaEYF7wSKAckf
-7dPU2HjDqLIUk/PXHS0H6IZUPiq8C2ywIrkGpeKf7+8VlIuRhaPs5Qf1QjBptIC9
-6dewG4PZW6v2NU7HH/lITzmaJou6rvgc9By8Kv+gjZYWeuk/btgMsD/hxVrHugWw
-OYyJqL9z65tBClZuQWtNKTGUSF6Zbnggwo+5iBYNGzn7+nClr9+5eu0aB1FtWX09
-/IMDdNvR7G0Sg6B66NMWCWKmY4CmSNuIG2sqysUYkXOm/tIJPyHMItbNGyFXKSXS
-4HZeNmoqz7+f/ohkO9iu
-=Khk+
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9NaAP/025i1yfQiWwvI9lq1GFHg+i
+4BlXyYJHX07PC4iMysK1blvksJDlQhevqkdL0wXVFi4JpzR+pI8nTjVz/uiEfyuI
+b0oUpXCVw8VzFPeZuP3gp0snCREXofStpq8XLJvcwoLlhAkVZalCgPfzW1ip4iUP
+hKX9rtsTo7N9M72HlmUaSd4HVnQyTLkveyfN7K+jh/R9DNIwkZBplcwWfQN5uvW3
+YgG/SvM7G/NOtra4jxMLXPf4rLrIU4vOFuvH/4KrHw0xsMoT+HZEqUVRLHy54GC5
+jdDpcUXkp3N1Ooog16zCf3PINCcNN1p09o8bgXvTAbyhTkhWIoyqGrLXCgSsWR1r
+vMikNk5PHHdAylbPu7kOcJipw0cz/LTJWK1yg1CQ2K7Z0jaCS2QqqA1aOajtz80X
+Xu/WEWChy51iqQ4Wzg3oWbjOInbo3rrnt63MzKBRLDoEwbb1zsbybm0c0+mMyUz2
+iMw21KEzwRuuUO2ywAhU1Dh+Cokk7uPr+FeqVog3g1N5x0om60YL+z61f6Q2pRKW
+XQmqz/g0L8R6vZzQX4L8oosy7sbN0qzUsxHOMHUOKNTZF9y/K4p/h/Ibd8hXqx8X
+qO/bS5Sp4mJRV2nHZgNhJFnW09WbYBMDP8X2muF6z8MR6FH9TasGjQusdNW5dAmf
++8G4NQogROPC2ClXYi03
+=opwB
-----END PGP SIGNATURE-----
diff --git a/dev-python/PyQt4/PyQt4-4.11.2-r1.ebuild b/dev-python/PyQt4/PyQt4-4.11.2-r1.ebuild
index 9a8a273845df..983d69044c06 100644
--- a/dev-python/PyQt4/PyQt4-4.11.2-r1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.11.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.11.2-r1.ebuild,v 1.2 2014/10/14 02:49:02 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.11.2-r1.ebuild,v 1.3 2014/10/15 14:48:47 pesa Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -130,6 +130,7 @@ src_configure() {
# We need to specify the .pro file name when it doesn't follow
# the subdirs naming convention or recursive qmake won't work.
sed -i -e '/^SUBDIRS/ {
+ s:designer:designer/python.pro:
s:pylupdate:pylupdate/pylupdate4.pro:
s:pyrcc:pyrcc/pyrcc4.pro:
}' ${PN}.pro || die