From b4dd0fdf2f295b39c4199d1b5c38915454217e05 Mon Sep 17 00:00:00 2001 From: Richard Farina Date: Fri, 20 Feb 2015 18:35:08 +0000 Subject: [PATCH] workaround for bug #540658, adjust dep for non-broken version of qwt:6 Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0xDD11F94A --- net-wireless/gnuradio/ChangeLog | 6 +++- net-wireless/gnuradio/Manifest | 32 +++++++++---------- net-wireless/gnuradio/gnuradio-3.7.6.1.ebuild | 4 +-- net-wireless/gnuradio/gnuradio-9999.ebuild | 4 +-- 4 files changed, 25 insertions(+), 21 deletions(-) diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog index fe1a5c98af7b..88276338a1f1 100644 --- a/net-wireless/gnuradio/ChangeLog +++ b/net-wireless/gnuradio/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-wireless/gnuradio # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.62 2015/02/17 16:07:10 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.63 2015/02/20 18:35:04 zerochaos Exp $ + + 20 Feb 2015; Rick Farina gnuradio-3.7.6.1.ebuild, + gnuradio-9999.ebuild: + workaround for bug #540658, adjust dep for non-broken version of qwt:6 *gnuradio-3.7.6.1 (17 Feb 2015) diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest index 58306fb5a1ee..c91f5abbb8a1 100644 --- a/net-wireless/gnuradio/Manifest +++ b/net-wireless/gnuradio/Manifest @@ -7,24 +7,24 @@ AUX gnuradio-9999-build-type-nonfatal.patch 619 SHA256 35fb7fe91213537f89224249d DIST gnuradio-3.6.5.1.tar.gz 3150283 SHA256 0875d2f0a7da0f3bcc1771b528b0f98f79d9ab69aa1ef953651bbbe1f57b4621 SHA512 23a22aed482da11005b17e5197ee3ba24d442b30309522b0858e694b58f46b76cc050143d365623c7dd4241cdf8b9f988e1a4dabe2e1f98d0fd4cca71bbb82e8 WHIRLPOOL 7cf55be5fac7891a737d228d83718bbc43f9069c6275c5ac465ae11088559dca5e7fa31239e281271b529aa8b9ae1a0efe3850a16a40e53c0f1fe57e351ff2a8 DIST gnuradio-3.7.6.1.tar.gz 3588833 SHA256 39dede70eec36f430c4895900bbd7ed266aa9e846d0a362987e806b7197c4c0b SHA512 88ec30b2bd93ca032c29f4606856a8e70b0123474fd84115657804429f381dea78f97a7523c9684acad6a27b357ddf876632e957de5c6e0170045dc38d121939 WHIRLPOOL 97d70e403fe46b0afbd1e6f0812f8d9de4ea506dcb2190a23d9a0f0499662f9e2bbaa86d1b624f7c621ae1675094f92cd295bc273db0759b2647e2dfb2a49b43 EBUILD gnuradio-3.6.5.1-r2.ebuild 5601 SHA256 93cf9a2d92ecf28f7147343279ce2b8a8a66aa27fed53099f9d9873106a2159d SHA512 fe77be87f2f17ed2d28a311f0c8c16147c790b04e92c36ab9e2b181b94c535afe3d3122a15531277049384dac17c83cd0d9fe47a4e007f899ee608a5f1a5abaa WHIRLPOOL de62e59571dfdd082b545a4ec90541f2db9971f586b95f74c2af48076e96c51c9a249ce4ce9ef30c191be631fe23574559a7e230c98466af9529a7d69ecb0ac5 -EBUILD gnuradio-3.7.6.1.ebuild 7061 SHA256 4db3bad8afa262e0311a565f545f3c3953a9f91259b924a17965a0d39934de47 SHA512 9384645a837fa967749da7ef52cc505f18a58c94487cf1f55f88c2b6c68d18942d2f492115964892aec1ac4607ecd6c49041274a5057eb157619187e116bf730 WHIRLPOOL d966f90c5a11a61efc85d260af841ce7b2400f61e29d1eb1e3f09e0949623da7edaabe4d60422c5c084d1faec4d53a3879642351ba26c199e79354df52bc464e -EBUILD gnuradio-9999.ebuild 7062 SHA256 b8bd6e45fb4c08a5f206f93a7de4f3e1b67e7ab4b5393552f16904fbf0dc5dfc SHA512 5453d9b63970de14a14eb0064b5329a38b87de6ef716e6b879f96652cf20bd7083e91e6d1b621c9a8e9bf547969c51b5c642b4cf98011b4a430edbace56b3e4f WHIRLPOOL b14c32f3ed901e2268cd882fe3765923065e5472e9f3e2f6853f62d3c324f142727b7444bbbd24fbf097c352eac211ad9f30e09d7b50b879afb509292f1165d7 -MISC ChangeLog 11683 SHA256 097a53393f93ce83b6020b2dee15a5107def0ff8234f9a068a67c7d5acdae05c SHA512 49b2e68a50a1d4743138d0e8a5cc061efb867ac1783b7af1651e0e850c96cd14bfe8cb0b8228ae2d4f8e16571e3b258d1a13306b124f91e262d1b33e16ad3198 WHIRLPOOL ff28579fbf5617718234948807adc7a1e61a55043baa5df40793b9d3c7bbef5ef7bb7f8e7f32c5433d2df84e0e185e446de5f727e804bcc541f102e2a6f08cbb +EBUILD gnuradio-3.7.6.1.ebuild 7071 SHA256 28f6aa13d94c85231501ab8c9e653d9de03dcd0db698ebf737ae261df9874a40 SHA512 26350f681bcba799539237443881e3d933952add951416dd46546c989d7386c49c68ef99b6948aeb52fa63ac2ad8e0dda45cbba984251d81495fadb5926de653 WHIRLPOOL 695b613d499d9ca9637ecf4877815d908f2ab338310c6f265a7a7529ecd5363145b72fdfe870cce28dd44d97d6573af6c13e250de3bd74ae1430c4c886d61115 +EBUILD gnuradio-9999.ebuild 7076 SHA256 0dc0205e0bf6000ce02c5f7f439d727024bb0c9877db36859177e7fe35893ae7 SHA512 9acc715ab8f3daa665ab3af2fc1784aebb45d1f89f75e7893f96599fa1bfe9047cae2e73cef720c1d3f81bae517dccfcff6c4eda4fff61d2baa47823c80d260e WHIRLPOOL b31752b17a0f34ed30625a07468f4fc62fa7fdb1b9e0d845ee560b25409c86caa30f87589b34c9deb632410d5b5779596a06896f0bf9aceae58c75badbeb9564 +MISC ChangeLog 11856 SHA256 73455a2078bc8c63ae8d90a16a5ef96e0dec3bd6e9510ab997de59664290d698 SHA512 601aa7bcc2ee97d5ef8bfe57e9926d091ca00bcb4258a494d45a4e36b26d8d15b4ccd1a385621b12ec7ea0b35598cb05467a3a2950b3792d29bbf2084c9fdf71 WHIRLPOOL 1405f9fe3e5216839095369dca2f8c2c25f4c14c068201c92d31c2c29ec7e22a7fb790ffc0b1fed260e5debaca90830f9c083df51514ef64aab6bc512c52e49a MISC metadata.xml 1750 SHA256 d8fc5305ded243faf3b60e63f3e36779d6ba44238cf6a3ec6ab605413f3a5b13 SHA512 598b4cd9d9090906f039f1d90e2c5f6cea5b5d0faca0dd3cb5e71adf6597c997d3bc36d21a92d532968be9885af96291e8a5ad6b67f1c41e5a2e89fb015481fc WHIRLPOOL 5b5cea4f525c11540f7c91fcf23c8fa01e50b14f879c0e8480b2a96ccd308e22aea9dda61f72ad5ceb5dc82922e4d6b5acc823a890e5aaa1cfbc5b0c8883a122 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJU42c1AAoJEKXdFCfdEflK7zMP/i6fma26AvojechsQv4izUCQ -mwe2CrLvT2eOOJjvnSgFFyQJ0KWP+415S81Qbqv9UZUMzB5gcPJ6uYcsH3VWSucf -b0f4Nn9GxzomsOCcFr1kgWDU47GWBfugpNaHAlVBrEQcdwWjp25bePvq32MXr4xT -2sdFhfRBmz+yvWjuGISCPRyz2UZ6Qr/N9kCDBDc9ez1nvlzk/rxqIgNHYurYAsBC -UsDQf2R5jiI/qUIzYBA7Oy0nRePQ2xtvGx3EUxtsFSAf2OQV1K23Vg5dioTOg+SN -NpM81hyyzNYaRcPC8qVTtWnTMkGeTnuH0VQnFFqmqHScRlEHcDBvrcj6nmk2/6HN -irqddvxaayHyIFc2fj0wv8HR3zPnGz5S/ZfDilvAo3+sdQwOxjV8RGlfWPjC0Nol -taBuEWu4TDat3Dr/Dtl6avAqaNA/6wnuYHwFhCjrCX0vL8SQe1MZYPPpXEYAkrIO -o1kPDMOI3MdBWXgcNxlCYXvHROb8ljxDDvL3kL0IGZ0UdQJMFmM4fvc+eLGKSFRD -dD5NnZka2vgc9SqSyAaNboWHh6XwmMQDAti8cY0elHjU94mcq8i5DokkbL/Mg32j -EgaBuac8XJ7Mx30+s1Bqw6jO+6hpLGXV3V+YCGIE/uHMignqwGInimGSg9TCKQI+ -2OU7j9jrClJEnylxXHcn -=nQnX +iQIcBAEBCAAGBQJU535gAAoJEKXdFCfdEflKVPUP/3oZeEUj0iKe+0R8FgGjpau3 +MmL4nwwuDL3lW0i57rRPMIEd1tjVy3FuKMk74mJdOCQKilt+8okgkycsbfpGBQ8i ++nvg92O8eX+4mLhPOLs74X1y9+PmgcbB7b2ENVl+kui9GChlvtTp2oY9VBaEKsKF +passa/0vgdofcsKALB5UgA+nyflDMiv498I5oPXWodA4yrwAxn3fz+xsFI08RXNr +g7u5VCvzaOstb6PGcYhsS81QoKpgURiG14Y7z4CP6YTyUjMeOkKAe+AJP5oiY5Ul +Snx9Z6mkWMFhRjBOvNOirPyNHwPj3hlE0FWpQ09mzskiPXROAemCaDm8IFeH4c84 +7uL6rl7AXsv7nriGCPv319JXuFG+PAPBuUynaLNOnwis5hdwCI7siiggmZqyY11j +jyVrFH1MSmMhOsiImHXOgll1q723kZSdknsRmfm00GtkKRvSdNhysYS0EkR8HYnm +QrHJZg0PT22LTytQU/pb6c9TOKRk6P/xC9aV+Oor+xfEbleh/2+zkmAyUku77aIX +Il0gW6lbZUwqtY0L0ebBHmUE3jWmE+XmWwyrCthNMOfRVS6WlqL/zX647MrArTJZ +8S5gagoAbA+dRmd6MvDsxNs2t7QmraFq6TVO/gt0RpPqa7bUvwKMUihGUfMI/Tqq +Lqss5wy7EJ1vOnT7yGIN +=9rbL -----END PGP SIGNATURE----- diff --git a/net-wireless/gnuradio/gnuradio-3.7.6.1.ebuild b/net-wireless/gnuradio/gnuradio-3.7.6.1.ebuild index 69a5c5206153..f02037723c0b 100644 --- a/net-wireless/gnuradio/gnuradio-3.7.6.1.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.7.6.1.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/net-wireless/gnuradio/gnuradio-3.7.6.1.ebuild,v 1.1 2015/02/17 16:07:10 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.7.6.1.ebuild,v 1.2 2015/02/20 18:35:04 zerochaos Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -72,7 +72,7 @@ RDEPEND="${PYTHON_DEPS} >=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}] >=dev-qt/qtcore-4.4:4 >=dev-qt/qtgui-4.4:4 - x11-libs/qwt:6 + =media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] ) diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild index 5a686d36e4e7..2e8de326133d 100644 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild +++ b/net-wireless/gnuradio/gnuradio-9999.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/net-wireless/gnuradio/gnuradio-9999.ebuild,v 1.28 2015/01/21 12:32:44 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild,v 1.29 2015/02/20 18:35:04 zerochaos Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -72,7 +72,7 @@ RDEPEND="${PYTHON_DEPS} >=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}] >=dev-qt/qtcore-4.4:4 >=dev-qt/qtgui-4.4:4 - x11-libs/qwt:6 + =media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] ) -- 2.26.2