From: Mike Gilbert Date: Wed, 21 Dec 2011 08:16:22 +0000 (+0000) Subject: Fix tests with python 3; bug 377459. Patch by Arfrever, tested by Ian Delaney. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=eddd4bb6fd3a7c0de4189a77288b5303a671d4b3;p=gentoo.git Fix tests with python 3; bug 377459. Patch by Arfrever, tested by Ian Delaney. Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64 --- diff --git a/sys-apps/hwdata-redhat/ChangeLog b/sys-apps/hwdata-redhat/ChangeLog index b52ab80d136b..5701069b0d45 100644 --- a/sys-apps/hwdata-redhat/ChangeLog +++ b/sys-apps/hwdata-redhat/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/hwdata-redhat -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-redhat/ChangeLog,v 1.5 2009/01/31 07:46:18 dberkholz Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-redhat/ChangeLog,v 1.6 2011/12/21 08:16:22 floppym Exp $ + + 21 Dec 2011; Mike Gilbert + +files/hwdata-redhat-0.217-python-3.patch, hwdata-redhat-0.217.ebuild: + Fix tests with python 3; bug 377459. Patch by Arfrever, tested by Ian Delaney. 31 Jan 2009; Donnie Berkholz ; metadata.xml: Give up maintainership; reassign to maintainer-needed. diff --git a/sys-apps/hwdata-redhat/Manifest b/sys-apps/hwdata-redhat/Manifest index 490eab1fdf43..b57bc7d76621 100644 --- a/sys-apps/hwdata-redhat/Manifest +++ b/sys-apps/hwdata-redhat/Manifest @@ -1,18 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX hwdata-redhat-0.217-python-3.patch 227 RMD160 e8eccbdc36e73946907a0eb504adc81cdb42a405 SHA1 5d8c61b6b7e923ee6d100f4a86de444e0b7873d6 SHA256 84ccc9f1f8e5dfe4c4f6035d427c9987b247305e27006b6230a821b1fe45bfb6 DIST hwdata-0.187-1.src.rpm 271670 RMD160 bb77490cf6fd5209f5c04ba123f52c35f61aac03 SHA1 3b5e7d425bff0e50191ca22403e991baee4cbee3 SHA256 81a224d49589596bc95aa2672be37d320e971e3510ab73e45795c994b2281fbb DIST hwdata-0.217-1.fc9.src.rpm 735079 RMD160 e1369170e3cf76e201eb893c7b0e7b52d50ab3fd SHA1 7f3e6e15ba4d8bba623ac23ebea55bc09c11769b SHA256 f2b6f3223cb388b9ff261ca84ed93b9e5eba95be62b7377ff685708351d377ad EBUILD hwdata-redhat-0.187.ebuild 841 RMD160 f124b68b25a5d8d7329e8d8a4d6c6cee679866f2 SHA1 d26bae8166102404b7304210667ae1ff82c1937a SHA256 6471a728992c84e4afe4ee1d1366f5c38b2f76d20eafba12ac8a4ef6bf9c4fd0 -EBUILD hwdata-redhat-0.217.ebuild 1146 RMD160 50c99ef580ab66732665bb4020c0487bc10c7006 SHA1 888dbd1afa28508617f1840e4341b5178214e541 SHA256 01c9784196d3811c8c556362399321b2585616d153e30a6184e4ad804cea2dab -MISC ChangeLog 1080 RMD160 4108dd91ee141f4d1b928c755eaf965ffd456f0c SHA1 6f160bf4cb5b3d88d007d994c948932989aef5fc SHA256 35ddd8ae316342deb7a4d9b86ec1a7b8ae34bf688947c6f54ee510a93bc16b12 +EBUILD hwdata-redhat-0.217.ebuild 1194 RMD160 2df5fd82d22a3a368196163e509cf10fd89e434c SHA1 fcc6a7ee7b1f4db81ba9f9e3fabf6eeeb277e4da SHA256 94c8edbc28901ce2fe3ca97146e25c472a141bf17b165eb9db95fc54879684d1 +MISC ChangeLog 1282 RMD160 690e70cf4b7e59a120ee5a0d372342b7a51f7da6 SHA1 dac63e922704b74aefc529565d905a565f8a89e7 SHA256 9e6e5e75f9ae33bc2ac4f6fa7c46beb08c025cfffd6a276eb5541b4cd7534804 MISC metadata.xml 268 RMD160 01696164cd82ae0617304a419940adecf5a9d222 SHA1 b52a9b90dd049bc8749bc0d25cdfddebd447860f SHA256 2089ca59285b2836a6ec1d5aef27f83d580e922212301f0b1eadb04400eb45eb -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iJwEAQEIAAYFAk59sb4ACgkQfXuS5UK5QB0XnQP/bi8AKELSJNXIf0RKMkVx5Enq -l76a+bTJnRHSU6QyVonBokvp9VpQKhX6pw5HlFrVV+hEiILDQ0nNSWykjmIa3Ec9 -2l+UXRApy3T4I0IyJ2AcOTpu4aJQhvy+qxsXE+4R0WBJIrPkleDvqRwEUlx6i1xW -N877xmh6/Bi0apZss8Y= -=r25t +iF4EAREIAAYFAk7xldwACgkQC77qH+pIQ6QzKwEAn2ns358PsakCN6vcjOWwGpjW +Gj781bm+PdP87hbj71YBAK6PGtHIUp3xG8RiIYwJhlDJ7xd5gBg5mAmteYSVu7qL +=xgeI -----END PGP SIGNATURE----- diff --git a/sys-apps/hwdata-redhat/files/hwdata-redhat-0.217-python-3.patch b/sys-apps/hwdata-redhat/files/hwdata-redhat-0.217-python-3.patch new file mode 100644 index 000000000000..f16fddd992c4 --- /dev/null +++ b/sys-apps/hwdata-redhat/files/hwdata-redhat-0.217-python-3.patch @@ -0,0 +1,13 @@ +--- check-pci-ids.py ++++ check-pci-ids.py +@@ -5,8 +5,8 @@ + + # Check that the sorting order is preserved in pci.ids + +-vendor_id = None +-device_id = None ++vendor_id = -1 ++device_id = -1 + lineno = 1 + + file = open("pci.ids") diff --git a/sys-apps/hwdata-redhat/hwdata-redhat-0.217.ebuild b/sys-apps/hwdata-redhat/hwdata-redhat-0.217.ebuild index bb0b48762889..ff3edd25b963 100644 --- a/sys-apps/hwdata-redhat/hwdata-redhat-0.217.ebuild +++ b/sys-apps/hwdata-redhat/hwdata-redhat-0.217.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-redhat/hwdata-redhat-0.217.ebuild,v 1.1 2008/07/15 17:05:57 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-redhat/hwdata-redhat-0.217.ebuild,v 1.2 2011/12/21 08:16:22 floppym Exp $ -inherit flag-o-matic rpm +inherit eutils flag-o-matic rpm # Tag for which Fedora Core version it's from FCVER="9" @@ -29,6 +29,7 @@ src_unpack() { cd "${S}" sed -i -e "s:\(/sbin\/lspci\):/usr\1:g" Makefile || die + epatch "${FILESDIR}/${P}-python-3.patch" } src_install() {