Use python-any-r1 for the Python dep.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 457a5e7ccd56d41d7130bc67f68ab664fc6bff82..3a0b66c71825b891f1a8beffda623d2dfad28700 100644 (file)
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.213 2014/11/27 10:09:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.214 2014/11/30 10:16:14 mgorny Exp $
+
+  30 Nov 2014; Michał Górny <mgorny@gentoo.org>
+  networkmanager-0.9.10.1_pre20141101.ebuild:
+  Use python-any-r1 for the Python dep.
 
   27 Nov 2014; Pacho Ramos <pacho@gentoo.org>
   networkmanager-0.9.10.1_pre20141101.ebuild:

diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index f00c5b97a350579fa42af850c091cf9f5c8053f7..0e17149da79ac1e230fcc448051e0565017c24d8 100644 (file)
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -31,15 +31,27 @@ DIST NetworkManager-0.9.6.4.tar.xz 1968564 SHA256 511b411e055d187bc8f26c519fdb3e
 DIST NetworkManager-0.9.8.10.tar.xz 2015492 SHA256 064d27223d3824859df12e1fb25b787fec1c68bbc864dc52a0289b9211c4c972 SHA512 8688b8dceadf87d26b76bdda76ecb0b383ecaa7991487e6f6ddc150cf311f2f0cb3487afd91f19ecde2925585e8d53c8761fd45743f25c488eff6a7811ca4200 WHIRLPOOL 29c4f2189eb812c23e8c1cfbce728c525282ad3f04d3c9c25b3a80a043c95f2a9419fa71ac6f8a59d7abde8a30275e68e3ef615b74f78c07846757d92f114e1c
 EBUILD networkmanager-0.9.10.0-r1.ebuild 9947 SHA256 9a25aa761b1ac77856ed6bd098e005cab93965f5b36129e1d68f569f36399256 SHA512 99dc2f7e115efbd7c6c41bd55c352625bae32d894ea285419f7a2265f12dc418ea28b012b1e28a23a174969329ae3f9b62598596ea69bbf271c09b1c6b828544 WHIRLPOOL 9681a41a72a9148d549c7078a670195da12a0e8c209780e6f8c9f143af930aad042ece586668f220c4eae8ee8257ed1b9ac368fad66c4debb5461fb37c459ecf
 EBUILD networkmanager-0.9.10.0.ebuild 8612 SHA256 432cbf6ebe66364faa5a33ff4f83c6f83b053d6a5268d32ad347d97354203fe5 SHA512 8138d203d07feaff1b30a09b6fc9c48256b41c6e2cec2e2ca4fcf70c23f6a7cbe7954c950ba3d11cb4fde4765322131f06ec3413d1f4b40f07c55f1507cda069 WHIRLPOOL 9608a2bf71f76dc3e98e6f067fc7f623b4c660bc7a6107093c0d6e3fb11638447df3e59a1ed61d974a0fb3669a304b06ee4d3ad60fe6c10f64ff85aac1dbc24e
-EBUILD networkmanager-0.9.10.1_pre20141101.ebuild 10366 SHA256 6a258afd6bdd0d2c54ceebd1bd8e6876c64990d56a90e05d34aa7c36fb9ba850 SHA512 e8a1f6de8ff51d27f147df836d0e65bbd4277a209286547ba2f374d00be83fa6a8e5f571e51b950d1f50fe8674174f060c6432f24d37fd87e14bfe7b1ac8e0d0 WHIRLPOOL 0c1c7e69d44ea48ffbb1ea587273628aa44e8236837eed098644d36bc2e1fe8177beb33d58909847383b6eeea798d0e136c35fab7f52613fa4780448160d229c
+EBUILD networkmanager-0.9.10.1_pre20141101.ebuild 10288 SHA256 a9ef69dff8f4cc8d592f47ce0a2f51eb1875f6d1fff1cf2e3ddc624a1c825220 SHA512 469d169e40d99df47d4883b992cce61bad39fe8a1ba49552e230b9ea66a8ba8311a09d3e17a2f2ebfe7d2151850a91080147cf6fd5c21908398e9bd26c3ada99 WHIRLPOOL e91244d1ed007c4dc7c4bd0aa7af663f2d4114fd9eb265b3fee4d5d5fe3088241b1621c3568aeec9730ef2f71b3e559ee1860308c8b034fde699999d12a69a32
 EBUILD networkmanager-0.9.6.4.ebuild 7539 SHA256 eb79f3dba76cd9efa4920358166aad907dd18a12c0ef7fdfc2e4ace25d6e98b9 SHA512 b0835ef38289c740f694468e2ba261e94a148041ca0256a26061283f1219d1fd476cfda89745d5b3a9c6b73013062c1848a05ba5bd80c8a207be2abe605d40b0 WHIRLPOOL 1a4fda18bea548ad9615639ed8c7e55d5bd6572072abd234bdaefbde90aa54a76f69eb1b19d5ad6ae45af82ff7da6f1f02f447f24c524391416b6ed1336ed37d
 EBUILD networkmanager-0.9.8.10-r1.ebuild 8440 SHA256 580948a52d8f47ab225af2e221b04d25ac1a4cc14f9c352dad3ef066e996635c SHA512 182fa0697cbfd27b4d502e318b77b2271c9e746e13bd6ad6c88f83ecba2ccc7cd9b1b182e14eb7974460e61ee82b1280a00aba70b7e9baf36f27e515b4a70ee7 WHIRLPOOL a9bdeae4e4eb7fc08ac26f6e6318e79921f18f5679b75d5670aca3085b9aaa46363c49e06df0e319d129ae58cc9990b903603ee64ef05c34a7e9f4fb9bc0ee5a
-MISC ChangeLog 51519 SHA256 ae80113d9cac960c735a84aa9916d6322e63c2e2d54abd36a9fae27dd329c470 SHA512 c19596b106948876964f1da99ff9fbc4736b0a3698d1310a082cae835f81c6fd3ae93e0f524d0e98404fc9c263f2bbb866f7f61159ae268c8cecc82a12883b41 WHIRLPOOL 4dbe9e5154e870b63f002b22cbdc5246f8cf8065aebf7f003061d62e487b1cdd7632bd0aca87f25615972f513e3d5b669b1849fce8878bcc65537d343ae4cc6a
+MISC ChangeLog 51657 SHA256 bae5fb1d7a137f1d95ef5ac659a46c1bdb16de41f14f49146bac3744a5fba870 SHA512 3e60fb2f3995ff924f64e82719d24adfce920db7a81a2a8453586053e375b340709783dd0ce9933d09b3d6762000a91ce45ffda1e1020b295a6d0c9bc0255ad2 WHIRLPOOL 9c7e1e3e248697afc0eae3e379cb984a52c758d6991b47d9cefa381156af7f659757c412636fad71705c4ad88bb6a910b54a56097f725204ba8da3120c125875
 MISC metadata.xml 1489 SHA256 c8ebe531a40ce36414b0ea2e101c3d5bc7b6810c14f433731d532ac6ebaf34bf SHA512 f25d96afe7d6f793309a5e2b1cb0a9ca89df375e4cc55ca48caabf0bb40a672fd75b4c06083d6976220f08af205aba717bde17454e750a08182b4ec4aa412326 WHIRLPOOL d4188a7ec2a52520f684ab847565b110168899c9e7e73429e781694f53cd2cbd4f39746f6d9cc355d0f9bf82960c05951c7d3b78151cd2bc9d2aab568f00f063
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlR2+GQACgkQCaWpQKGI+9RFDACeLGE2FQZfX/0Bsp58f6Cy37UX
-XUsAnikixHJtbOoyhh3U4OOddmZnqNX2
-=W5pX
+iQJ8BAEBCABmBQJUeu5wXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZObt4P/13g1L/A+0KRnY5WuuN6Vgyb
+Kb/rgPUrV0BrFgmMBMJolVlHgApEcIDLcaJLR+COH4W1N/9yi9DTmjp+yPNIHXNT
+VensLbEkgVv7gP0iJtCo4NHc+XBwBWOCNdlymqI7bKZwLjsH8bH+4vQ1PX7PqJTL
+rofzfiQeTvJjBkQMU4Htcd4vK9VaqsgDogDUcEDrBfhJWsy9yTjp5N9/QnL9pq8q
+olKNVPhTgoOYn06A04i59IH4FNe9vxytz2lufakCEKvH+n7gFNqQIcTDi5qoBzX+
+4hhjxHIRD8Zu8eWlBF7HddKcYusTu5YBV/XcCM4iFlG6sJeb/9AYRA/nsepgOqQt
+jRe1XLZ6zAn504dcyqUpm2ZUxlrzIhge8dv0itZYAHWIWp1JtfOt30s3RUPciBEc
+0QNPCo9JvQ9o/7MKDKaESdaV45C9LdiJrtxcAjeGDfGOhs5mD9QOXNPv15SZMGN9
+bAvMIYOvD5P3jyy0dGKb2DVVk8VSFmNEfW+E6ZxFeyfce//lM7jvP6Mh3JkaQVJR
+Nn5DSiTDgGTW+Pz5A2BE2gJzMkxnwgTgGhLMW3PNl5h27qaQFVqN9hn2kYvIrGB5
+q8/nBWxqKd4ma7CjWmkVwSnVKkpZcSe5s/GIhjrsqbI/aeC4ErGl9jjDcy7Qe6DQ
+9dcQvV+LpUhYnB3vNILh
+=vDVa
 -----END PGP SIGNATURE-----

diff --git a/net-misc/networkmanager/networkmanager-0.9.10.1_pre20141101.ebuild b/net-misc/networkmanager/networkmanager-0.9.10.1_pre20141101.ebuild
index 0e8a2e52e7e20ddc2a567750c5f8e540852ac836..9c9468f73d088574716de066e0fc5400667876e4 100644 (file)
--- a/net-misc/networkmanager/networkmanager-0.9.10.1_pre20141101.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.9.10.1_pre20141101.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/net-misc/networkmanager/networkmanager-0.9.10.1_pre20141101.ebuild,v 1.3 2014/11/27 10:09:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.10.1_pre20141101.ebuild,v 1.4 2014/11/30 10:16:14 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -9,7 +9,9 @@ GNOME2_LA_PUNT="yes"
 VALA_MIN_API_VERSION="0.18"
 VALA_USE_DEPEND="vapigen"
 
-inherit bash-completion-r1 eutils gnome2 linux-info multilib systemd user readme.gentoo toolchain-funcs vala versionator virtualx udev
+PYTHON_COMPAT=( python2_7 )
+
+inherit bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 systemd user readme.gentoo toolchain-funcs vala versionator virtualx udev
 
 DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
 HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
@@ -84,9 +86,10 @@ DEPEND="${COMMON_DEPEND}
        virtual/pkgconfig
        vala? ( $(vala_depend) )
        test? (
-               dev-lang/python:2.7
-               dev-python/dbus-python[python_targets_python2_7]
-               dev-python/pygobject:2[python_targets_python2_7] )
+               $(python_gen_any_dep '
+                       dev-python/dbus-python[${PYTHON_USEDEP}]
+                       dev-python/pygobject:2[${PYTHON_USEDEP}]')
+       )
 "
 
 sysfs_deprecated_check() {
@@ -126,10 +129,6 @@ src_prepare() {
        # Find arping at proper place, bug #523632
        epatch "${FILESDIR}/${PN}-0.9.10.0-arpingpath.patch"
 
-       # Use python2.7 shebangs for test scripts, upstream bug #739448
-       sed -e 's@\(^#!.*python\)@\12.7@' \
-               -i */tests/*.py || die
-
        # Force use of /run, avoid eautoreconf, upstream bug #737139
        sed -e 's:$localstatedir/run/:/run/:' -i configure || die
 
@@ -193,6 +192,7 @@ src_configure() {
 }
 
 src_test() {
+       python_setup
        Xemake check
 }