From: Fabian Groffen Date: Wed, 4 Mar 2015 19:57:52 +0000 (+0000) Subject: Fix handlers seemingly ignoring their config X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=09abc68d6d65aef1f3b1f7cade8d5c4473667273;p=gentoo.git Fix handlers seemingly ignoring their config Package-Manager: portage-2.2.14-prefix/cvs/SunOS i386 Manifest-Sign-Key: 0x5F75F607C5C74E89 --- diff --git a/app-admin/diamond/ChangeLog b/app-admin/diamond/ChangeLog index cee98ee3678b..f6fa40035031 100644 --- a/app-admin/diamond/ChangeLog +++ b/app-admin/diamond/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-admin/diamond # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/diamond/ChangeLog,v 1.4 2015/03/02 13:19:23 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/diamond/ChangeLog,v 1.5 2015/03/04 19:57:48 grobian Exp $ + +*diamond-4.0-r1 (04 Mar 2015) + + 04 Mar 2015; Fabian Groffen +diamond-4.0-r1.ebuild, + -diamond-4.0.ebuild: + Fix handlers seemingly ignoring their config 02 Mar 2015; Fabian Groffen diamond-4.0.ebuild, diamond-9999.ebuild: diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest index e33802f19d02..017e93ca1880 100644 --- a/app-admin/diamond/Manifest +++ b/app-admin/diamond/Manifest @@ -4,14 +4,14 @@ Hash: SHA256 AUX diamond.confd 57 SHA256 41941d406f48b5eca55d9146928eee185820fe27a3708d3fcaa71c3f78bf4adc SHA512 51b037902394b22f957a15ad1479ebdae5ac29384f2b7a5053ea8200bad05dc9c9060cc5c6c1a931e341e99b95327e55b06aaa9a828950533265f9c96a8dff55 WHIRLPOOL 80165d5cf5347dd3abeeec53f4df64d51f7f78445363574b2bc1b8f2fec9f1a0798c4986319dabe6d6a4b6b499c577fc8679b2fc65554107e48e3e13dac4e68b AUX diamond.initd 568 SHA256 99184d76c9967c1edfe12b555e7759ca8b6106d7890359e5c1e0a1c3e7016777 SHA512 e7edb84928460bcfe4ab26218b1e367c05fac08f7c0dd13ef1ff33fc627b3684b0a1d0768601968c20fd43edbea8df8917a6aede76902bd3e6e71d23f8980ca1 WHIRLPOOL 7cc69ae79165dd91943a50c1bd56ebd0e07bb71212a35488e71e91041c577991e60c9c65d145894e49914897ab6e10ee9684d418d089f73bd42ae284b45f5dfc DIST python-diamond-4.0.tar.gz 491433 SHA256 e84dd3c87b230d524306a07c3fc7c1db1d9796e3748025e8345a4fa18b162256 SHA512 c4a6e63bdc55f9e0ac2fbf3b644be91662635c08ecc864dfaaebf2fe62fb45609c099da63efd93ed498d2dc9e95bbcb64be09f715e21d59b30bce958a96dc56b WHIRLPOOL 2b1f6124001183058cf282d6e9c51bba0878f26308731266f2c31c549bb42db945c579b49b5a34666e0c05ccbda0163135662a11e59a482f8ef031c49c6005ba -EBUILD diamond-4.0.ebuild 1671 SHA256 1a3d0fdaa38b69fed1164390bfc289605aa61c9097b557c994c8d391d6505fdc SHA512 b9a49e5ece3863b417bb8bcd7551a5fb5c95ca1699f26200b64ea37e10afe6ba0085c8489bc88604770e5dde6026d2c3777cf95d36c340fced0faa2f0e128be9 WHIRLPOOL 479d53b4e281334a0c5dd0e29cff4d77279e65e2f90dbcceca034a0a19806d5f86ac953967ade9071746362db81d8e08df1e1b725562ec3a516696e7a4c257ba +EBUILD diamond-4.0-r1.ebuild 1959 SHA256 bb5857052e159630680fd79f6fbf2426f4d346e374f7716f8ca299197619ba4e SHA512 d2221224eebf6accaf1b82a23fa6911aed596acddd6fcd73b689708c516d80cb81e1024f65f2a6a2a5101dc7a071fa24700949078814d2fc6531dfdc637455c5 WHIRLPOOL 9d3cf8c9fb180363513b3dbbdfef9eb242357c9b9d989106dab40aba0b411edded14808842f83fe050bffad2f4d5a6418737f5cfed8d3b53c30b100ded5cc96b EBUILD diamond-9999.ebuild 1672 SHA256 ed1be637b9a35e743011c756306f810b18337a80af6f9fb27d5f24c8a8556f1d SHA512 2f816fefdcc400afffaa315786e3597b267e44649e5b4213d12b2cd99c67617e6f1a7cd4ee37cf7342d56c0a85d9881d1fb3e220f82136e3c284f392778d2105 WHIRLPOOL d85f7ba8d5d92350eaad83a2c74cb65a3ee41c0c2134cd653fe3344a58f98cda5ecc230d31710607d2c3d83357e5cbc4fce9974ae4568c20f6870c72cecd015c -MISC ChangeLog 844 SHA256 801192db5a56a25893ab36d7a63ef166751befc3a0739e0ebf2b975c1934d572 SHA512 8875b349e1ce022cd02a660ab674fbcd2cdb23273c771921ad4f72d312c7b81403b38e2cd9ca02ea955f67f7a99e6f1e6209c69933cb8e8a835baaa4f2e17a4f WHIRLPOOL 605f07184ff0c9f82cc797c3234868f7c695acf82c2d1f6d9a768b284012c04d5e02f11b7a2bc7e22ea4e487599ef7aa9fdbf4114a4c46757926b183a85802e7 +MISC ChangeLog 1021 SHA256 2f9ac35acac2e18f9d485ba0c28bbefb1afc06877881f66757e7a9e33dcee6bc SHA512 83419cff01f39f590e553d000848a151713ef3e31df2f51ea6d532977ab8cb5df92479bce53a66915a8c99f92252ce1d11d54f6eafe5e2a0720e13a3b2b3a8d4 WHIRLPOOL 5f6290927d9719957bf127539f1af1fdad7a5ef1a305f38b08293f5d916cf4d10e445d5c1f57d305ff744e7ef72680382d28a61113820a3bce4643fd6613f2ba MISC metadata.xml 586 SHA256 d167f488ef5b8f3b813586538e8e355dc4a0a92bd8cf1ff21ffacbc04a292de7 SHA512 97a0367b6b759a8d79427763d2fe1c37c9038406653821a83d7669a39d059170ff6d122e9f7baa31c2c8ce6d7b7c3478dcebfae55a6a6a7403816b2a6fc451a8 WHIRLPOOL 410db9ae30c5a7516b252e92abbc8a9dbb62c885034c8ee3fabe4e005e373c721927bd7d8f1723a559f9d8b29d57927074011dc449442e8fb7f40e1d4ff32629 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlT0Y1wACgkQX3X2B8XHTol6PwCgmUxcMPo/EiXIlMTFo307YxyR -9BoAnA64JvACapF/hsi2G9kFGBl4KbqX -=RqlY +iEYEAREIAAYFAlT3Y70ACgkQX3X2B8XHTonfuACdHCuup/mvzktBHnCzTJZFpn1/ +Nv0AoI6CJyo9XxBo9wgYDujHLBrkYNEY +=YlaS -----END PGP SIGNATURE----- diff --git a/app-admin/diamond/diamond-4.0.ebuild b/app-admin/diamond/diamond-4.0-r1.ebuild similarity index 82% rename from app-admin/diamond/diamond-4.0.ebuild rename to app-admin/diamond/diamond-4.0-r1.ebuild index 0932104c387f..1433e10bbc0a 100644 --- a/app-admin/diamond/diamond-4.0.ebuild +++ b/app-admin/diamond/diamond-4.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/diamond/diamond-4.0.ebuild,v 1.4 2015/03/02 13:19:23 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/diamond/diamond-4.0-r1.ebuild,v 1.1 2015/03/04 19:57:48 grobian Exp $ EAPI=5 @@ -41,6 +41,14 @@ src_prepare() { bin/diamond* \ || die + # fix necessary to make handlers honour their config, simple sed + # doing the same as upstream + # https://github.com/python-diamond/Diamond/commit/3cb29eedd117d2e4146823a5c5811d16cc77206a.patch + sed -i \ + -e '/cls_name =/s/\.__class__//' \ + src/diamond/utils/classes.py \ + || die + distutils-r1_src_prepare }