bumping and fixing the python shebangs for bug 544344

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

diff --git a/net-misc/openvswitch/ChangeLog b/net-misc/openvswitch/ChangeLog
index 0d452949d4d1de05f1d4c0895623370cd5b7e299..8676b4df64bf67cac3545cc4054412af9b9e4de2 100644 (file)
--- a/net-misc/openvswitch/ChangeLog
+++ b/net-misc/openvswitch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/openvswitch
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/ChangeLog,v 1.27 2014/12/12 23:23:07 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/ChangeLog,v 1.28 2015/03/25 16:20:41 prometheanfire Exp $
+
+*openvswitch-2.3.1 (25 Mar 2015)
+
+  25 Mar 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +openvswitch-2.3.1.ebuild, -openvswitch-2.3.0-r1.ebuild:
+  bumping and fixing the python shebangs for bug 544344
 
   12 Dec 2014; Michał Górny <mgorny@gentoo.org> openvswitch-1.11.0.ebuild,
   openvswitch-2.0.0-r3.ebuild, openvswitch-2.1.3.ebuild,

diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 34d2e6b42f59c1f879f2e9287aa8443e1b8aaf34..6e82330ddd720fd07a9f7477f024f1ca198a3933 100644 (file)
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -22,29 +22,28 @@ DIST openvswitch-1.11.0.tar.gz 2551510 SHA256 007d7d3f2deabe5a3845d1045d23b6b1de
 DIST openvswitch-2.0.0.tar.gz 2708774 SHA256 5060e2be69cce01c15f67b481482cb1a0eaa6ef5cbdbed592bac3c3ab2a390f8 SHA512 f6d36663b65d054d179e5a09a478cf45ae9510c8f3aa31bb2013aaee1b146ee21ce986bb8b9f63ac72036f94d0b415f30ab874451b661b855f46b44eaa42537d WHIRLPOOL be6ac428d5d01b751d8d6312e7e028a23160d44da62231cc84c21d42c19c8c5f6b9457c29c26e7b283db91b08a00d8b54368534a621e556c54e15c0682dad4a1
 DIST openvswitch-2.1.3.tar.gz 3080126 SHA256 43a2562fe5e8e48e997bfdb04691ffaaaefe73069b5699654538bf2f16ebfb1a SHA512 ede64d37f8bf4a475ab3e4a1e0cd83ae1f29df318f7834b804d9f334710ba43b25b9f562f8c7e91041e24f3121fd03e9e09fc789f398d352a2dceaa0576013dd WHIRLPOOL ddd6c1c733a7a139d58d0492ea8c0efa40065443f763faffd5964e5578acfe9b02ec1dd009c52843759d8a93027eb89412e768ca3e70d9ceeb0d030e791a9b7e
 DIST openvswitch-2.3.0.tar.gz 3259225 SHA256 011052645cd4c7afee2732e87d45e589a0540ac7b7523027d3be2d7c7db7c899 SHA512 f3a665bc84d8a6e282928db61ae648a826f273e44e34311a60e6f0e74a6ab10c8410cb374f0ce80abe7c58b9559a97388cdbfe2ef28ac4bedd2f5e52b3cd6ed1 WHIRLPOOL 0fc743b7d12c2ab9c6bea58ec3b80d7633f860c720acb2b61306ff5035d4f3bfeddf7b9bab44a21a1b7fb62c0c3828c2aaf7e9b9167a67ee2def065248ef329c
+DIST openvswitch-2.3.1.tar.gz 3266916 SHA256 21174901c311d54703b4a7f498be0c42e5d2cc68bdecb0090dbb555e2af4bcd2 SHA512 8ef4ca61b06a16b361436130bda3b119e4067e78837908fa1d509c3706bc0fe8cc8eb92c76fe439625aa6732a49cbbc6f26898f965b1bbb8b4062e21bcd2edf9 WHIRLPOOL 7556342957b8bb58667161fad37e544896a3b299384688f9edb8aa8675d7be613e6ea41bd0721f60736e52d157689a4f7e27efdd8d77e811073f6d0a9dc110b7
 EBUILD openvswitch-1.11.0.ebuild 4502 SHA256 8b5f779a14790e0d35d535ba6fd8483980e977a5481e2309084f426580274b60 SHA512 3e0a03b335f4a5fa320f09ec3761f979c22353cdee35883c8d155f80cfca51e9133867ba5e7b51dcd721982dcddd369ff17459833d4ae156afab5e515b430560 WHIRLPOOL e7724fa944c0e27094e720921b8b9e882761d9208bcf74274c569862b059987ad6168ac15c640445fe4935efc9496aa89b0c15b1b79e01d00c5c17c8a4d3da54
 EBUILD openvswitch-2.0.0-r3.ebuild 5137 SHA256 817a5f80ff1dcb043b656598ace6da5997dabeb1ebfce2d0fc57e7d275b9e91e SHA512 1e391c23084675fd80bceac44d8162212212f04ad85de0d70b851167f9fbad955ea4a650feebb41d687e0688080200102e4eefea8943dee7bec266fb4217e618 WHIRLPOOL 98c4864782fbc5a08bce61f999720c2c234196df025a7c9922d46ea94296aef99c492ff4c69ce5689bd1382ef376787e4fc4859ee5b4e7a642919d9ee84bc232
 EBUILD openvswitch-2.1.3.ebuild 4806 SHA256 1bf97f1a11528ad49f71e02a3b24fa56481c552056f5cf706bb606f79b6b384e SHA512 38328b313169438d597b3ddc9f69c1fe8083d7c5b59655eca07395c6152a00beaa0d792e00e6c29732168767dfeb77d13d775a8e55038a28996e2f204e71ba8a WHIRLPOOL 5c1396a7a70eafe462ade50d19a74c8cb9fba93233602a1b3151bf7c01200b1eaf7556fe9c75b3d15de42fc27c613bf25b6c44c78c3ceb22695d24b697187fae
-EBUILD openvswitch-2.3.0-r1.ebuild 4778 SHA256 c7a2d4ea87be20896dd73f68eb41bb1404bfd52751633bdc5ffe1d0fbe5982a6 SHA512 31e9b5e0dec816f83422ae7b7965cb8cc8437fa1cdc9a947dc2c470a0912788c93c0f3dd9aa926f21ca030694610f28a8df34487000124f1a153774706c4ad53 WHIRLPOOL 5b8051c5cba27ef17be743b870ab255bffca3178d77ae9a3027019e3612b29b6e955a58fdbde8d39b9074e618d76096eb958a3e6c32f860adfded8f3c22a442d
 EBUILD openvswitch-2.3.0.ebuild 4775 SHA256 54e4765dbd3a288486da211f31f2d2347d6c8926b862d25c695755f580caede0 SHA512 98b61666838ff701968426b2fae8b4ec17b1a20d8672c9931db56503542010d5d45a8c2687d2bfa03dac1ac290948ca6a5b6aebdc74deef8e3ba69a3af5e72d4 WHIRLPOOL 9a72412eb00697f14d6c62ec83be081ef01ebcb48efc09f3f65bb551915c0d03a6079df8111551afe3bfd64596e4d487300417ee01c9bbf7a254529a16c77f93
-MISC ChangeLog 5695 SHA256 2ef67a9a3c5ca1f84343886572c1f411daab1a97a0291e65effa0169f5228fc1 SHA512 efe4137cb3563dbf075ffd0c9435abb862266425a379cff35f60405112b623fb09318f436dbc8468d655e526e93c509a1ca5127cb12b3dafe271c79248188430 WHIRLPOOL de3381448741695da54cbf13dc6fe521e1dc8d1385528a6d68c3e4c3396e84f734c351603182048d8e7ee97bb69f1e5fd417548661c7a922f2e4af58e3e78b96
+EBUILD openvswitch-2.3.1.ebuild 5019 SHA256 a5956e00419f8ddcce7a001a18400a9dbe232e60b8c43bfe7b5bf7cb7cb5d2c9 SHA512 6d86b5d23b1198fb29cf2590596abf90b3038162b2c206a61c4a764738401da80a4b4a54c4ee865c1533f90f4d2b047acea2f5f3e2476bdb615cee7271bb7f0c WHIRLPOOL 7eae63bb2949444ee8b09d79f6de815590be502e4ccd50ef7030f2a424452e78ff837fe2acdd6b5925fe9437e56e1c1d81fa103f490eac17bf03714f66356b33
+MISC ChangeLog 5910 SHA256 631779e68728be4840b6cd8d5fd6858b9194a83d87496c4e1c3aea221a6e8112 SHA512 2260171f9440fdc49d9f81c589b3934b0610e5877965fa240343fed8d69cf3e4784d8ccab32428c967e0a5ce4081e94cc9b307f589ef78da972b9df583686ef4 WHIRLPOOL 1e52a7371d2d7014ccbd795c76b3013ee57050970a22587a7cecefe3cd579219d2e8904f39980d1c52e72a1a4ee9b78018abaa88c71840db90bbde9eab6fb63f
 MISC metadata.xml 550 SHA256 73d17e0623524a9e95d3c4c2c34a29559d29a9dd0786ff4f98969b34949bc440 SHA512 c76de2feb5eac06781f42d74654e107200d5fd8f5377fd3af71559826c7263e837e42ca923811931cd9f86f68279085dd9e15796ee99033edd3ba0ccec2618f5 WHIRLPOOL 6919b71b9691b6659dd3b319d162cfb973cf25a15c3bbd01233c0842c6cd3e54c043f14f8b5da92a455a718f0dc25daa393e6f172266d66d1af2a15fa45c4df4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUi3jeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO0N8P+wcTgeTtBc37nHQaFnOCP7oT
-Wd9b2uH8004QyuQGGLSbXx/dtrPkdXFzqNCtcaZYcXVcxyq8O+8nffxfWHIsXwMO
-I2YGa3wjClNdjePYO0xLwVbJ1ZoPatHGXOhZCFlWYTROwYJaWJ2I2dBPRltVPb1k
-UTohqzCOj6vFFDfFhiXXYOcwCF4Vijd2oUlgdrI9ttBqhD2Og+RbOZR8PKOJHjj1
-6b8VYgH01deDsPVKAYeS0GP33bxwsNK3N2t9TIWH50CSpTf0hA51fpo5dVBgnZ/0
-QJ75kj4GcO87ttH0eApj5UJHQZcDuR+Uzw/2zAgQqy4uu5coeBlczSrz5ZYhd9+V
-dgqPBmcT1LX+ehzxxnoeOIHqNoQxlZsEITNcNb8vJ/1vGmzyBCejTOnlHhJBaowY
-jbh/QVzV93lIfd5pusYNLjfLkogpGYT6S0fjjWhe7ewutFqOYfXUlWjPAOLhw1LV
-BnLiFnK6m30jlc/BCYIKeiCNUiC5PWmMIV2gNqZLO9MBdityjVw+DBS3u+VI97Up
-91JYVCzsQHkrGrUX1FNcE82JlqGLuDDHPLAC6qNCAQ0SHx919vMU2MzvkkrVbW8v
-87lr03UUxOQmlm5cZA3DytkMeXv/q+0tUYfmw74luT5SfB0l2dWNqTWwMbZ4XxFM
-cZEqEv5pi4R2crb8JqAD
-=pDB/
+iQIcBAEBCAAGBQJVEuBlAAoJEGSje+quGaToW8AQAIDnikDdbmD3ZP/pmvV6jNQj
+xl5SAG05eJTZjSbUVBW/2mqv5lYHGImp1t3p2jmSEUo1UqoE/H8C8FlQJz+YO8oY
+LaKtDf+H+Y+heLktGbNMaSvY0UiSSpi1dH43NJHZ9DmTnYUk+0m9CUT7sKySCS+G
+xDs8eTl8RLa+606pfVoVZNKjUdZCxWbm/LrOqJagUkqn6uke/GbX/lsypllH6hUR
+vn5N7evTUVdFFND31ewJDb4CQhqWZBeSmKZO2v6EvMl3a09pjlmZCcS9t2TmHLHH
+m1WTrv7/aNjbw/kqX48almqwcVhZTmASIMYySNVRUqi1SmdxCVkrdUYXBoJ1ZwYG
+yuxJ814GgIZghuz+IT27LlRE2xd6P+RSEPQkh+RuXlqZHBuEEnkmR5wVHxvJYemC
+5wlSc9nV959POrTPrf0ORYhYOoyr0+tVckkJEffBTPq89Hv0EwtLZ4PB7i1kSIni
+LKPvZwLMDVePmcbqOVaurlqLGsSDdUcAyRgPO93TXw4Ws+3/Dg5YJhcI9coTsoZ9
+NrHD2yoQVptVg0bfHhsGuQ/ilawTDxafzfmy2aiGJ3oGTqqUZ+bWd30rWahTz1nH
+hQFni10dHhNpZ3r76bFlcwRQ6yE6jadOFMCqGZu/mg6oal08sdOVFg3/T8kI/ca8
+SHCqyR78IAC9/VlGQ5k+
+=BuAe
 -----END PGP SIGNATURE-----

diff --git a/net-misc/openvswitch/openvswitch-2.3.0-r1.ebuild b/net-misc/openvswitch/openvswitch-2.3.1.ebuild
similarity index 90%
rename from net-misc/openvswitch/openvswitch-2.3.0-r1.ebuild
rename to net-misc/openvswitch/openvswitch-2.3.1.ebuild
index 8ef6ee314925f52dc0b0ecacc288094e6200bd54..99ab2627dde045ad2b7268b711eb685a72aff8b1 100644 (file)
--- a/net-misc/openvswitch/openvswitch-2.3.0-r1.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/openvswitch-2.3.0-r1.ebuild,v 1.2 2014/12/12 23:23:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/openvswitch-2.3.1.ebuild,v 1.1 2015/03/25 16:20:41 prometheanfire Exp $
 
 EAPI=5
 
@@ -76,9 +76,15 @@ src_configure() {
 src_compile() {
        default
 
-       use monitor && python_fix_shebang \
-               utilities/ovs-{pcap,tcpundump,test,vlan-test} \
-               utilities/bugtool/ovs-bugtool
+#      use monitor && python_fix_shebang \
+#              utilities/ovs-{pcap,tcpundump,test,vlan-test} \
+#              utilities/bugtool/ovs-bugtool
+       if use monitor; then
+               sed -i \
+                       's/^#\!\ python2\.7/#\!\/usr\/bin\/env\ python2\.7/' \
+                       utilities/ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpundump,test,vlan-test} \
+                       utilities/bugtool/ovs-bugtool || die "sed died :("
+       fi
 
        use modules && linux-mod_src_compile
 }