Fix bindist implementation, wrt bug 541464.

Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
Package-Manager: portage-2.2.17/cvs/Linux i686
Manifest-Sign-Key: 0x565953B95372756C

diff --git a/media-plugins/mediastreamer-silk/ChangeLog b/media-plugins/mediastreamer-silk/ChangeLog
index deac22ded17031ca49cc9ba8afd8b68d67a56353..217f25c688b753c6e834150734e5362c86b0fe66 100644 (file)
--- a/media-plugins/mediastreamer-silk/ChangeLog
+++ b/media-plugins/mediastreamer-silk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/mediastreamer-silk
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/mediastreamer-silk/ChangeLog,v 1.14 2014/11/12 14:19:46 bircoph Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/mediastreamer-silk/ChangeLog,v 1.15 2015/02/27 04:24:39 bircoph Exp $
+
+  27 Feb 2015; Andrew Savchenko <bircoph@gentoo.org>
+  mediastreamer-silk-0.0.1.ebuild:
+  Fix bindist implementation, wrt bug 541464.
 
   12 Nov 2014; Andrew Savchenko <bircoph@gentoo.org> metadata.xml:
   Package is now directly maintained instead of proxy-maintaining.

diff --git a/media-plugins/mediastreamer-silk/Manifest b/media-plugins/mediastreamer-silk/Manifest
index 8ea44adf30623e13ef04c4c062ec96e569ecda89..733a95367dd8bf9ca0e932b838cf58e523ca860f 100644 (file)
--- a/media-plugins/mediastreamer-silk/Manifest
+++ b/media-plugins/mediastreamer-silk/Manifest
@@ -4,23 +4,23 @@ Hash: SHA256
 AUX mediastreamer-silk-0.0.1-sdk.patch 1570 SHA256 029e1afd38deca4289ef37e98bdb931487de792356c5c5a73e044b6197a75d2a SHA512 c3bc9086c1a08e1a5757d4a06bb4f63ff115896deb704358b09f356a639c2f82addc05ec7da700f192d85aba13a7ab76741d5e22786f00d84ff50542ca9bd719 WHIRLPOOL 942995f99dd9bb1df5da49e895c96cf8a1c7cac45311438f6851d73b0194c20e1b98824f98f9602da6e349d320cd9d14f5177747a41371d3ff3192406da72803
 DIST SILK_SDK_SRC_v1.0.8.zip 65910872 SHA256 424536084ac2d5c105e22f8048d19103dd83cb54bc32187377f5341d17e1b838 SHA512 2d56552052ec8180de9bbbce2f89d76df63c1bf6a8ac936dacab104d39526c16b9ccac33e5602f3a757bb12057c2e6da6f955ae370b05b93ff1427632c3a9489 WHIRLPOOL a301ba53e3fd1d56bc45d75709eb1b13edcacb7b68811862f2bbb7eba561242594feff6ac13f460593eb97917ecf63d947997316561a74d0d879e7823caccbea
 DIST mssilk-0.0.1.tar.gz 57674 SHA256 58f89360a06e5b8414c2a1389b2e0d801ea1548041d7791ca16c1fc3f136e1b0 SHA512 78325c0cf28bf035212583c76aa92f1291442e3f4fbe4c354056ad2b20ff72ba8d7149250431906942352c4deec7912567f512775d5a1dfe07b6b2bd44b5552e WHIRLPOOL da0d9ef8f0d0d83c8a29e981346c876e19f207dbc5f662d53e81dfd2d92c158294008625a9a261e153e33fd50a4bbf4af0d3d58da5a2e66f2871539d01da14bb
-EBUILD mediastreamer-silk-0.0.1.ebuild 1035 SHA256 b6cf3e578277dd826c39b66a1f05e9ca11bbdcceafb54e2a4c5eb7eb5d522ff6 SHA512 b7fee6de4a67971ff0dca1e1104c75ef978bf1882d74f30937fbb04bb230e2ae2525f6260be0e243fca869302cdd2f54a4b7d1eaaf89e11291c1ef5b815d8283 WHIRLPOOL c398eac8549866b025844b07d8b30a107b0edcef16cdac506ed909662f1b8c4e2c9adcee2ad73b12bfcfd1ad1e399ff934fc9cea42c07281dc39f8e29aa4b023
-MISC ChangeLog 2030 SHA256 a9d7106419c34af6b33f36c8c976b004cdecf5ddf747820e3a578d028f4cda6c SHA512 3490e4c284965dad22a5094efd0136e8537a71035cc1836715fafdbae777f9169ce57a88eb299dd747a76cce2468d313b5a0513f07aa90e60ae9f773a84ae629 WHIRLPOOL b2332223e3280f160268526af3a5c9703bba41556cb5c0ecfb1cea068718d03e38067bb78257830b6b79355782305f3a6a98e8a30e4c8ee3b393c625600eb7b5
+EBUILD mediastreamer-silk-0.0.1.ebuild 932 SHA256 1c2bceae318a4521c5ed9b961650ea24a43e98ee802fcd4398a4af2f1d661191 SHA512 c1d98631a3c46621465f58506478c897dc859c1c7be220f3a5336fe76ccd515d06ade42c219d8dfe5696a61518a754198559324323a39a1b391874416ae3fd54 WHIRLPOOL 387811f697abebd1e2870a1c48163dbe88945969aabc45eeb79d6a0427cf2588d27f9bf0b4894c7b2762ed1856074f112e798ddf73998e7c26febd0a1f457a7e
+MISC ChangeLog 2165 SHA256 e96028debe96bcce0bca619055d1f8aecb94ea4fad0d80d70c24aae68327d0be SHA512 6c340b5c6489ca6a1e88b546c2b237f7f2100118ae6caca150527367796003e65eb498015f5f6bf39c1e0969355c50d6aaa5c1262b69db260628a692935b5858 WHIRLPOOL 44d52b8c1a4b114317079c199aed75c4258661324a0d6717dfdab402bcfe9f19f16c49aec5768cbef9a65d60da7cb2fe50a903873ab9fdec3a654c23adf88d79
 MISC metadata.xml 236 SHA256 a197d6884c9288dc3f3962fbb810f00802f7f7f45ca1a21bed74070ee119ad92 SHA512 77a2ecc4838410c6d8f7d85ad7db65352ca4ce22aff023e0a715bf93c076d4147d430efd3732b5c6def45cea5a0a5ab30b90bfc9ea3f7c76d262b192a1558760 WHIRLPOOL 18e556fbfd52d66b52e8f46866ef20a5143079a8bec1a1b3591fead01b51b0480349345b44e573e87e6a6d59a5d5729c34653ef0e45764480c81548de9ad66bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUY2yDAAoJEFZZU7lTcnVsD84P/iFIZcoyl50/Wo4jxX9jlC2M
-Su2epVvQJ12MBTE5WR3OefI5/npKu5Hjz+jOI6d/spdnD8ce2FeFzvdn3/HX5IQx
-BRToyVTfdPfrs0qqo+uz6b3I44DZ8yb5V8y2K7mIqQ0OzLOr15WwoadD4wBGqiPW
-hHn5QC94j0FVT5ZzA/5UEjGa2/oNHLmzw6FHbG96jTjPj0xSp09dt+7X4ouKWzp5
-+ajRBPLU9Sx1yA12RWnsu6RG0uluwg3X8wU5Yr1PFJ7ZLYPUrV0Ny4tdUm0kEqL3
-oUaLncTiPjGvOMSLRpnuUZPzmEpFA19zLtc7+WD/znoftsHQdJYpLdKXhgUnFCM+
-Rf6LIkd8ubtc6uvAnhCe6fWawT5MqaE6aSQilDEq8KmmDQcjkoY39qjkXfKiwjCQ
-rWlUx2b6VLkifXoxLantsHKNB8k6YQodDdqeokEKVwH8WIZ7DiS1Gj261AYWqpyr
-uFiH/by0DGgPDhsggbnQvFetDHEKy6qtaRpR1olm73izTbtgStI+8XDLWmSkEGmm
-XHJWPSa3tZvu1w/fV8jecAEZLaatY9shNKwgj2HwL10aivURwBySqrXUYi14+3pm
-JyNYFn99uiUrqWh9l/WybY8G+SRMAhzB20CWppBEsv5LeDE41asQ0crNbrQA/ODR
-f9tUOaRY7ZAzadJwJsLl
-=CcHp
+iQIcBAEBCAAGBQJU7/GIAAoJEPZTWjO6HuSNvxYQAKdfOoWslK/k0Cal5Yo879g+
++RQrajujLUxbwhPReSmzKD3wmfMovX0BIQYUkHMY/8UNlQHu0fCUv7dLpWro10ri
+Mnj9x30muOclkfHtcAiPxhCF6r0xfNuU6bzfcclqPfm+RbGBMMV8ZSk64rePuJ3N
+A5MPb/Zfr9eu4RKIaOnKqenb0WP519IXTRqTf0fTgYfC/Di189LwHhu1sHDwtpCJ
+XWYJd24YLa3FIUbzOdChQdCCdybGPZlbGHxRpIoXolH3/G+JwFPWrBeFoRU+NitQ
+om8WQ+tLeO8h7rzWMMmC/kIsK5fDyGqlPuzE+3dGKObXp17UzWzQ7mPTE2Gkj71z
+tGYc/MOUVNJgg6QgDoFxunzs+9+tO2gzE8Ojnda+W9vRroNS9sTV+PVCjLHasGnc
+/jPWhXJ86CZBVq4CGOnljk7nQyWmh2sVfeUKwZTlNvQPdj2a10Igcb7KBfni3L9f
+myGed1XWXfrAARgQ61WyUIuDy3vsWkiljZxU2vue1dJ7CPkIOs/AsrdmzsuA1gaR
+SdbLdH5+0AQ7iLSCC8UPo2ZCqESfu8tmPe4/8yeF6owOPJ7iIp+nuA5Ohn4AZEyL
+VGVCkfEGvV9P2/IV4J+qxOg0ES7WGCF7u64savA2pukws/kLBQKQOFQcpH1vSjC2
+iHd/0TvEejLeFl2tqLmI
+=dviH
 -----END PGP SIGNATURE-----

diff --git a/media-plugins/mediastreamer-silk/mediastreamer-silk-0.0.1.ebuild b/media-plugins/mediastreamer-silk/mediastreamer-silk-0.0.1.ebuild
index ea285d1ed01438f79f5271bed386255f8507740c..88e1e0bca50a87726ac38f152e5be67c37b5b0b9 100644 (file)
--- a/media-plugins/mediastreamer-silk/mediastreamer-silk-0.0.1.ebuild
+++ b/media-plugins/mediastreamer-silk/mediastreamer-silk-0.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/mediastreamer-silk/mediastreamer-silk-0.0.1.ebuild,v 1.10 2013/10/10 10:41:18 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/mediastreamer-silk/mediastreamer-silk-0.0.1.ebuild,v 1.11 2015/02/27 04:24:39 bircoph Exp $
 
 EAPI=5
 
@@ -25,13 +25,7 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_PN}"
 
-RESTRICT="mirror" # silk license forbids distribution
-
-pkg_setup() {
-       if use bindist; then
-               die "This package can't be redistributable due to SILK license."
-       fi
-}
+RESTRICT="bindist mirror" # silk license forbids distribution
 
 src_prepare() {
        epatch "${FILESDIR}/${P}-sdk.patch"