Fix by Alexandre Rostovtsev for building with newer boost #527658 by Diego Elio Pettenò.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

diff --git a/media-video/cclive/ChangeLog b/media-video/cclive/ChangeLog
index adc9be4a9f1316d50126cf865b9072d4a86f8f28..58feebcb47f4983acee5d734eeba8316d08a5a46 100644 (file)
--- a/media-video/cclive/ChangeLog
+++ b/media-video/cclive/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/cclive
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cclive/ChangeLog,v 1.71 2014/07/27 17:02:24 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/cclive/ChangeLog,v 1.72 2015/02/17 00:39:59 vapier Exp $
+
+  17 Feb 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/cclive-0.9.3-iostream.patch, cclive-0.9.3-r1.ebuild:
+  Fix by Alexandre Rostovtsev for building with newer boost #527658 by Diego
+  Elio Pettenò.
 
   27 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> -cclive-0.7.12.ebuild,
   -cclive-0.7.13.ebuild, -cclive-0.7.15.ebuild, -cclive-0.7.16.ebuild,

diff --git a/media-video/cclive/Manifest b/media-video/cclive/Manifest
index 1ceea4bda127903cb2468855355a831b1593cd38..a1c9d9e8d0c344e5c8d785ef284a7aec05ce2a4c 100644 (file)
--- a/media-video/cclive/Manifest
+++ b/media-video/cclive/Manifest
@@ -1,18 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX cclive-0.9.3-iostream.patch 1926 SHA256 c21d459944cfd9cb9a129a4577b87ea7d431337d24e40407cc279e50adf0ea31 SHA512 ccf137cfa06a9ac8cafd9cafd9ae7cd06f72bfe17a3bba5171682d8e5d97007680ac385467f90e260b6e715785330152055778af8a24a4fe50435e4298a6ca8c WHIRLPOOL cdb1bf13f1b902de5f16e8011519c090c2e3d1cc22a2bca0497d692d3e313ef497b0ecc3acf233af5379975d99fae230da9067536a35852c9dc2deee107cfca8
 DIST cclive-0.9.3.tar.xz 296720 SHA256 2edeaf5d76455723577e0b593f0322a97f1e0c8b0cffcc70eca8b5d17374a495 SHA512 0d8f6f870e24e2906542c1e02745009597fca2e879261bef7a81e07f8dec016ee200d8a4b37dd0f20b3ad27c12e2445fed1f6a9dc262a6c27e40222048bb5438 WHIRLPOOL 441a3ef5e7c7633c91b4761a1f728998997648ebb6a7984e6a1dafea418a8863be76ffff7dc3e3727ddff81d4ed5f16d5454fb0e0b84c3dcea7e8214f27f8d35
-EBUILD cclive-0.9.3-r1.ebuild 730 SHA256 010a3dd39279389058851e307ccd5fb57eaca58a0e7f8bfc46a92d9067b59806 SHA512 b2eb280f0d5d67c851e93c1149ea1c8c29a5b06c352b33f32e7b51023d1c8d03c08aec76b8755966ec28925faf20b9b89aab859357d4355b6ca718865b3b0ba0 WHIRLPOOL d8aa1596f0faf0bb591d7dac3575d045dd9b449bb2c54faabaa77239072ea2c6a10b15acc52e310e42d22aede7c0a93cddf7b14a235a6c6482090c131a77b2a5
-MISC ChangeLog 9634 SHA256 ecf17e5b41c12b47690e69b87b9848f08937c08c2ed78f22a7fd622cade81020 SHA512 276239fa17c160254ab9c985ec1d3ca19006218b7dc81f510b8d6d66eab565c10481e462b7e146e6b4e5a6beb51293157547b81e0adeace6593700bc6e246fb6 WHIRLPOOL b788e40eef1f5585afd91209743d02f475f8e2f43fec6f2340657271cd46db93fc549a0e27a99fab5badd7ed61714ae3c350b2652506d82ff723a0cec1c9a8cf
+EBUILD cclive-0.9.3-r1.ebuild 816 SHA256 d0831c05882b6f37eea0d4e628ea00bec4fa6c0607df62d35ef8903cacd3dfe4 SHA512 e2086ffe47e768fac8a397397460dade9e0a255fde68957e207f57aef1d17c8cd8c897ddbe5f43e8bbd9446418f0a0e7b3ba2fd2d16c90456e1113beb85b74bb WHIRLPOOL 6e4e7592b9fccf5f9ff9db998a514b4d08dbbfa0eb85fc7ce6013fe12612bc97358192cfab5ff2ec84270f9931c3d082c0a2b43a1e1b92aeac743a4685b5a6e9
+MISC ChangeLog 9838 SHA256 7f92a5d5df29807b3517cd5c2b7a886e4d6b4105a34d06e1de7f0150ac930b9c SHA512 5be06a6b83929240ac8585fc9698811381f9f5a6229f41ac53f8837a7f8df51e2d5cc87258921332f674e72377bf009d53dbb932617b65c0d6346bffdb1cfc4a WHIRLPOOL 745dd7cc4342e5b3042d44142c349df381bdc67fa5a259acc106b2de7ab0d28fb24df872ace1081afc6662d5c5f54ca3c991eb70fa3dc5d03c85970e5a954d7b
 MISC metadata.xml 326 SHA256 8cde56c1534d535ab7783620c90f2d7a530a882110205a1ceb94f2933caa4bdf SHA512 ab91e6ec0f85973f2f05454a1f28ad6de1abc70a15f29ead8e79adecc38e1de5a19f0f898e47ef6e94470425ebcf26a802d7d22b7ee147aba6ff1b2e7ff2ca14 WHIRLPOOL 95f0691a4e1c313a8df24c3ba4ef1052f1fcfb8b68bfedccc461d1d0b9550bdf0d584ce68aa2826ac2ff270938f3ab612fe22a15ef9fde4dc4254a68d12b1214
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT1TCUAAoJEEdUh39IaPFNYAQH/3nH9M6r5pKOVlneV+miPJ8S
-JM3R+6HDtPCcAECn/IFK211VJOoz9XpS7bd9MEFLhFroEGf47frwWHPSpkBL9I96
-EI0dIZeYQq6iLN51UxvrvJRUIGAWWgae5lshY48s3qZ861CUqDUp7wVm1+PwOL1K
-gFHJ0zX/TSn942Ex99QZb/olYZZAIOIT2LOHx0aCwfMtHK71AhPoTlVTJF7U1urS
-ojLf0VqtV2RmQALnzqOfEIwZp3Dqq4ZL3DxP+M8cWLcn2Ut+22CsQsJsiiOEGGKL
-xxGSWF94Rx9T6Lp0gDxb0r/jL/wkazWsZgxSJbTT1vS7B+HQUFeNcCgyxn+EzrY=
-=2uR5
+iQIcBAEBCAAGBQJU4o59AAoJEPGu1DbS6WIANvEP/0d2oyXQt2EObbJPdNOPIYgh
+WPlSVExPOnK5++vcbhnmxd9wzgizkYWQfh40Bzd1WWlvXJHz0fTUm7FBEcPDmaBX
+ef7HiuilyWIHCeaNX8A9lO8fbGvbWIyHh+kC7Cl8TC6XFHp532NEeNrViYkDmEoi
+JDqHbnfIOXd2226kMIra+1xIuO/dfRA4n5OIjB8hc22gs949w5xsHEVyaRwidbge
+p5cX7Tc/XMFY7eNTHTJnsCQarZS5qsuCq/Ae4HA+qUdHeIvd0BvhUrYvSgjvW0KI
+67dL0wTMt0zMMjYMF2TAuTev05ObeVAwa5WP4voRaeV5J8v2FR4eBssBOH+Khv8L
+k1/Sl9cuBzItNO9gX7+M9zYhQRPH/2ZLkH0CT9wFTBxU+qmVs4iWbQJIJwBuWwPh
+WF2Cl0sdUvFT+Xdi0pWa1jyFsmZTl1ZNh57mOq+klIkDRWWriZz2+1Lj0b7zYEH7
+ZBzixtTTAigD8RcXxfbLV9kpsjPFzYOyA7Kzh5Ejx+WeWw45jx78QiSB7GAQTuga
+FhtTDDyiU62RbtCBiHRMRtgv4E5fQeWpqbIqeEZlN3hWYWupB2qgA19uUD/bhAra
+DFD7v36/fBShFwAazN5k3mGqm+3mRedH0JA8XC9M12QvqKaemnoOHiVM/cmn+lJy
+tMTJjShFp74n5jVxOl80
+=fDiy
 -----END PGP SIGNATURE-----

diff --git a/media-video/cclive/cclive-0.9.3-r1.ebuild b/media-video/cclive/cclive-0.9.3-r1.ebuild
index 9324e6bc3dfd7dede13bc8e06cd5b8cc25475936..6991b6f6f1e702a6df89f5607b2c341878e567b9 100644 (file)
--- a/media-video/cclive/cclive-0.9.3-r1.ebuild
+++ b/media-video/cclive/cclive-0.9.3-r1.ebuild
@@ -1,9 +1,11 @@
-# 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/media-video/cclive/cclive-0.9.3-r1.ebuild,v 1.5 2014/02/23 16:09:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cclive/cclive-0.9.3-r1.ebuild,v 1.6 2015/02/17 00:39:59 vapier Exp $
 
 EAPI=5
 
+inherit eutils
+
 DESCRIPTION="Command line tool for extracting videos from various websites"
 HOMEPAGE="http://cclive.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.xz"
@@ -22,6 +24,10 @@ DEPEND="${RDEPEND}
        app-arch/xz-utils
        virtual/pkgconfig"
 
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-iostream.patch #527658
+}
+
 src_configure() {
        econf --disable-ccl
 }

diff --git a/media-video/cclive/files/cclive-0.9.3-iostream.patch b/media-video/cclive/files/cclive-0.9.3-iostream.patch
new file mode 100644 (file)
index 0000000..f7bfd07
--- /dev/null
+++ b/media-video/cclive/files/cclive-0.9.3-iostream.patch
@@ -0,0 +1,80 @@
+https://github.com/legatvs/cclive/pull/2
+
+From dcaed542d002cbf857e0bca1fa12f8ab501c419a Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Fri, 26 Dec 2014 13:49:36 -0500
+Subject: [PATCH] Add explicit <iostream> includes, fixes build with Boost 1.56
+
+See https://bugs.gentoo.org/show_bug.cgi?id=527658 and
+https://bugs.gentoo.org/show_bug.cgi?id=533506
+---
+ src/cc/error.h   | 1 +
+ src/cc/input.h   | 1 +
+ src/cc/log.h     | 1 +
+ src/cc/options.h | 1 +
+ src/cc/sig.h     | 1 +
+ 5 files changed, 5 insertions(+)
+
+diff --git a/src/cc/error.h b/src/cc/error.h
+index c1d80ab..f6a3e6d 100644
+--- a/src/cc/error.h
++++ b/src/cc/error.h
+@@ -28,6 +28,7 @@
+ #include <boost/exception/get_error_info.hpp>
+ #include <boost/exception/errinfo_errno.hpp>
+ #include <boost/tuple/tuple.hpp>
++#include <iostream>
+ #include <cerrno>
+ 
+ namespace cc
+diff --git a/src/cc/input.h b/src/cc/input.h
+index 98c334b..523e9fe 100644
+--- a/src/cc/input.h
++++ b/src/cc/input.h
+@@ -23,6 +23,7 @@
+ 
+ #include <ccinternal>
+ 
++#include <iostream>
+ #include <istream>
+ #include <sstream>
+ 
+diff --git a/src/cc/log.h b/src/cc/log.h
+index 2b2c986..aaf3b32 100644
+--- a/src/cc/log.h
++++ b/src/cc/log.h
+@@ -25,6 +25,7 @@
+ 
+ #include <boost/iostreams/filtering_stream.hpp>
+ #include <boost/filesystem.hpp>
++#include <iostream>
+ #include <fstream>
+ 
+ #include <ccerror>
+diff --git a/src/cc/options.h b/src/cc/options.h
+index 6c45ce8..6a7e40c 100644
+--- a/src/cc/options.h
++++ b/src/cc/options.h
+@@ -37,6 +37,7 @@
+ #include <boost/filesystem.hpp>
+ #include <boost/foreach.hpp>
+ #include <boost/format.hpp>
++#include <iostream>
+ #include <fstream>
+ 
+ #include <ccerror>
+diff --git a/src/cc/sig.h b/src/cc/sig.h
+index 56de768..cca23ad 100644
+--- a/src/cc/sig.h
++++ b/src/cc/sig.h
+@@ -26,6 +26,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+ #include <unistd.h>
++#include <iostream>
+ #include <csignal>
+ #include <cstdio>
+ 
+-- 
+2.2.1
+