remove Werror wrt #448160

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

6 files changed, 126 insertions, 14 deletions

diff --git a/media-libs/libechonest/ChangeLog b/media-libs/libechonest/ChangeLog
index db378dc28d5f..9ea68cb8b800 100644
--- a/media-libs/libechonest/ChangeLog
+++ b/media-libs/libechonest/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libechonest
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libechonest/ChangeLog,v 1.14 2012/07/29 16:50:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libechonest/ChangeLog,v 1.15 2012/12/27 23:14:16 hasufell Exp $
+
+  27 Dec 2012; Julian Ospald <hasufell@gentoo.org> libechonest-1.2.1.ebuild,
+  +files/libechonest-1.2.1-Werror.patch, libechonest-2.0.1.ebuild,
+  +files/libechonest-2.0.1-Werror.patch:
+  remove Werror wrt #448160
 
 *libechonest-2.0.1 (29 Jul 2012)
 
diff --git a/media-libs/libechonest/Manifest b/media-libs/libechonest/Manifest
index a99bcf70ef53..3eaa09517df7 100644
--- a/media-libs/libechonest/Manifest
+++ b/media-libs/libechonest/Manifest
@@ -1,20 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX libechonest-1.2.1-Werror.patch 1678 SHA256 85735cbf2a5c99b96404c7cfba3ed46a87b76fe4e372174ea3bd6fab95b3f470 SHA512 c514b2a5de0677e5f36666d8963bc616254507a3fb154d302b54836713b23a3e618de4606f52911f68942340c838e47c7c36552556ad62e15968cabc653b9adf WHIRLPOOL f7d6a06e6896f0fe18547a2b003baca27b530e810d6d87e8498afa64a881f5fb1ca34090033fc9bb0c592fdc3d3019a0adc7a22e83ba5630f4689507c06f38e7
+AUX libechonest-2.0.1-Werror.patch 1155 SHA256 e540a347637dc6116a3944dfdb99310552626c24622f40d4cf5f39e8bd080d3a SHA512 bad1157fe2d041be36ae55ef6f53e3125d918f4ff2ca79b20e7285a8e01241ed28d2674031b9c4a614ae0b5fe9581076d535b50160e6edef18f447cf0f537555 WHIRLPOOL 1a9dac2332848cdbe18614a5c6d20d048c5e41e81317338435bea5cb3765e659462e736a739a322d7e07feca4b3dccb7c03a3f60664fc6d46c8d2231bcf6ab5d
 DIST libechonest-1.2.1.tar.bz2 80000 SHA256 bc8032f0d107e079cb5997df6d7a5bd3589065d607e74a07ad8112dcaebbe25b SHA512 87dea62f4836d161a7a2208b64089d910fa700476105182b10e018fe152acb025c3a692ea3b0c8c536f1b0898e804ae748c34a93dc062e7731e532cb6e24e66e WHIRLPOOL f3dd8327c85e15b0e2fd592f8ba3750b8115ddb1b3d6ec25fc7da0dbba9ef45634f08b29dd198e5b7875ff0553bf51e3fb0d2b5716a1069fdf5aaaf74bb6215a
 DIST libechonest-2.0.1.tar.bz2 81900 SHA256 22535faed3232fdd00edd690ac7523fc4fa604cd847c77830ad531a2a43b513a SHA512 32b5a99cdbccef5ae8561169a69933532e96d3ba359932a38fce0ce2c7e4e647a37fe1229aeb0d0d5748776ff32045fd03e9d312b724ec2dfe55b1f4f4116e8b WHIRLPOOL 4a3c9d8faacc67a86fc6f06298f833d26809ec4c2f510029b5fe6cf682516ef9e5df3c6b2e94ed3f214fa47deec4ac243cb954cda5cc08faa79f5faf0901325b
-EBUILD libechonest-1.2.1.ebuild 678 SHA256 ff8dc357384049ba448dc41f37bc4573daf6be7c581a193b3aa4ab08450fa94f SHA512 36367ce294231fd0f7b046d82c9b81dfe48e392cb1961f89aa32d481978f3ad55195d3f2313babf0b0fdf42d63fc6a2849cafdf82d2e0048eca0bbc9602b0bc2 WHIRLPOOL 845011be7e1f916badf5c917ff92b376f8dfc5863a99875c5bdf103e618350688df79b215f06d91f280740e7df864f3329663d222559f3dbe9dfab316209f9f0
-EBUILD libechonest-2.0.1.ebuild 723 SHA256 04f72faa964748dd60e69f4de957dcbb173abb97bc949102ecbe41b84e84a558 SHA512 43b9905488876c796ae688f02d06a94b1f7a9adef03040f998510c25c22422ca3aa0b533e9b25912a24684ae11c0aec3177faa5bf68fcdd43b456fa82237e2b2 WHIRLPOOL 36dacbfb285b59b758c94aa1933ef0b665d100fb4f3c6affeb2c160ea9cad2879e3a80cc47368e45501573f252c244add6f3a1aa73fbc658ca3157f4a32c2f2c
-MISC ChangeLog 2050 SHA256 d0869f23cfb83199631c45d775257236b552dd9a245f9263e56f2ef3d0bf78d6 SHA512 fcdcd961f314b4308d915e72773bdffef949b7c064f7efa59ebdd8dc130dfd3a2006adea20db91b2475c3a40b263b42e22ffcc7f96bad647949ece8cceee7625 WHIRLPOOL 1d52520c1bc416df535ba9218f868c9b865a01b90e2e914286a218df26b59e91b3a300f5aea11fd34b56efad85f016bea2feaa598e3399db6a38f7679873443c
+EBUILD libechonest-1.2.1.ebuild 724 SHA256 1d1d3f131ef79d955e08927ea50242086935790b0e758a60f7ff86f3525ac43a SHA512 26c3790f5bfac93690f0026999a4aacce4536b3f538652dc0e759e35dd1e6ff4df361bf5c99c61a706bb0546d8cfaf845d544e9358cbfe15745a09dd0bd9a066 WHIRLPOOL 56420b0ff66c80fc315d2991c000234c5e8ee74dcd8c1ea8e9abadb6879f61dea4575be2536fde20793ecbb54a55ae2a930f5504e4ecc4113abef4aa552c7a12
+EBUILD libechonest-2.0.1.ebuild 766 SHA256 30e15a5d6451763332333ffe2bb976d551b5bc7accb0d145a2b82bf75a7c703c SHA512 2a896806f888af00924f5385ef27d45eff16d236ec4d61a87d74682a0897be6b79fb63630aaf0279e2ca7bb60886d93e6ffab70a91c665f3b2d389fb8e071f15 WHIRLPOOL 250c0408da375d075b89a7aa19168b64f959fea205bb9a021e296cea35c783c664011c0e4987e5360a7d450ba9f88df73b6e7b660b6409020a5ac50b9e1a9089
+MISC ChangeLog 2263 SHA256 e9a1c52d504d85b351e9cc19033ff2152d14e3521d2ab292e5df153c0e0678a9 SHA512 1945b094e8f4078fdf1f9a3f1990d06fee833cc3da9f17d2b25caa8c159d47537dcfaaeda5218752e314ea838e7536f1be7a1cf116e727e9c2af84b24d59dc3b WHIRLPOOL b40e75e0f73001185354f73db76e7c861096ec9b9fcf0c3cd02829ccb4e01cc0e6785d167033ec35f8982848825348de049207af8e89c47f80c22fed0b495717
 MISC metadata.xml 358 SHA256 8ae422312b08e8523a9c338068e7f2296d9ab2edea9f9285e345c10ad077564d SHA512 641a0437fef123a6ccf04cdf156e1fa333bf692481a689052e8ecbb9a3c04df6296aaacc7d66f7e79b604d086290602725e83678c7d7fffde674782457af2b09 WHIRLPOOL 47d9d0f8f8164a5da292a14b77669efce07728213cdf71d17ff11350dbc874adef9580c78ed72ed6605433177191ffe77da7c8aef39b9d30891e2763d7e7b430
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJQFWnSAAoJEEdUh39IaPFNiGgIAJMUKhlEHMoDfxuEe0rr3uN4
-SRczgp9iSJ/aNwXkcFzWaIAv6ED4YIa8NT/nKY965KU94AZZediLPjo30yoHfJoL
-4jzJ+aMmHx8F9NsTIC76bfArAk/ORY/lJsE7ufE8/DYpN60NACmjq0qkZ3ST6rbH
-wxG+xU728L2pwzbgu5Hsuogr8ojDtjIrMUPyiw037s1859S4h+ZFagdvxH57/a76
-5am1r1TL9tuWkrEPe3p98T+W+iKU50EDiQwi4w0JqKzze7fLocEkmbVc22GCgYam
-H2UAIJNxUP+CvWztyqrfZ4k6Jk0ko/SJNyMgrso7J7PTUcQ1XDUC85ozTsNCzMY=
-=o19v
+iQEcBAEBCAAGBQJQ3NZMAAoJEFpvPKfnPDWzVc4IAJQDDYgPTN92GganvRKqmJPq
+b2BpnJOZ8VclH9XJ2XWTsGPLzGAKYZv9fL5yfPPuxQNGTr7xnoZmn/RobfGKR4sj
+M7oAUmXSsqL6VM1nxIkT1E9XNhviAlTqQnjBPI0IC871J8fmeIf3zlca2RHE4IC0
+ClDC/84YOR6wuDkUn4398UtpYFCPrZAN1JW5ttRwGu2UtuRhR3Qv3yDdktr2mQd+
+cGrArdpQNMViux/mwU8CYbPi0Zx+0srPl+tuEYUEyqS7UxSeTnLowuE9oWbU2W8D
+I0X/aMWaLp/B6NG5zTsQQ66EsFh1Q5WxTiYtjY8JlSSXJOkMW1TCjlggDe7m8D0=
+=wN05
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libechonest/files/libechonest-1.2.1-Werror.patch b/media-libs/libechonest/files/libechonest-1.2.1-Werror.patch
new file mode 100644
index 000000000000..4e7fdaa4df84
--- /dev/null
+++ b/media-libs/libechonest/files/libechonest-1.2.1-Werror.patch
@@ -0,0 +1,60 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Thu Dec 27 22:58:59 UTC 2012
+Subject: build system
+
+	only enable Werror for development
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -5,13 +5,16 @@
+ 
+ cmake_minimum_required( VERSION 2.6 )
+ 
++# options
++option(WERROR "enable -Werror for development" OFF)
++option(ECHONEST_BUILD_TESTS "Build all unit tests" ON)
++
+ set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII" )
+ 
+ find_package( Qt4 COMPONENTS QtCore QtNetwork QtTest REQUIRED )
+ set( QT_DONT_USE_QTGUI TRUE )
+ 
+-
+ find_package(QJSON REQUIRED)
+ 
+ include( ${QT_USE_FILE} )
+@@ -26,7 +29,10 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+     ADD_DEFINITIONS( -Wall -Wundef -Wcast-align -Wchar-subscripts -Wpointer-arith
+        -Wwrite-strings -Wpacked -Wformat-security -Wmissing-format-attribute
+-       -Wold-style-cast -Woverloaded-virtual -Wnon-virtual-dtor -Werror )
++       -Wold-style-cast -Woverloaded-virtual -Wnon-virtual-dtor )
++    if (WERROR)
++        ADD_DEFINITIONS( -Werror )
++    endif()
+     if ( NOT WIN32 )
+         add_definitions( -fvisibility=hidden )
+     endif()
+@@ -43,8 +49,6 @@
+ endif(MSVC)
+ 
+ 
+-option(ECHONEST_BUILD_TESTS "Build all unit tests" ON)
+-
+ if(ECHONEST_BUILD_TESTS)
+   enable_testing()
+ endif(ECHONEST_BUILD_TESTS)
+--- src/CMakeLists.txt
++++ src/CMakeLists.txt
+@@ -40,10 +40,6 @@
+ 
+ QT4_WRAP_CPP( ${LIBECHONEST_H} )
+ 
+-if (CMAKE_COMPILER_IS_GNUCXX)
+-    add_definitions( -Werror )
+-endif (CMAKE_COMPILER_IS_GNUCXX)
+-
+ SET( OS_SPECIFIC_LINK_LIBRARIES "" )
+ IF( APPLE OR MINGW )
+   SET( OS_SPECIFIC_LINK_LIBRARIES ${QJSON_LIBRARIES} )
diff --git a/media-libs/libechonest/files/libechonest-2.0.1-Werror.patch b/media-libs/libechonest/files/libechonest-2.0.1-Werror.patch
new file mode 100644
index 000000000000..af8b1b9a814f
--- /dev/null
+++ b/media-libs/libechonest/files/libechonest-2.0.1-Werror.patch
@@ -0,0 +1,43 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Thu Dec 27 22:58:59 UTC 2012
+Subject: build system
+
+	only enable Werror for development
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -5,6 +5,10 @@
+ 
+ cmake_minimum_required( VERSION 2.6 )
+ 
++# options
++option(WERROR "enable -Werror for development" OFF)
++option(ECHONEST_BUILD_TESTS "Build all unit tests" ON)
++
+ set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII" )
+ 
+@@ -32,8 +36,12 @@
+     endif()
+ 
+     # disable -Werror on ARM since Qt containers cause a lot of alignment warnings
+-    if ( NOT CMAKE_SYSTEM_PROCESSOR MATCHES "arm" )
+-        add_definitions( -Werror )
++    if (WERROR)
++        if ( NOT CMAKE_SYSTEM_PROCESSOR MATCHES "arm" )
++            add_definitions( -Werror )
++	else()
++            message( STATUS "-Werror breaks this package on ARM, disabled!" )
++        endif()
+     endif()
+ 
+ # to be added:
+@@ -48,8 +56,6 @@
+ endif(MSVC)
+ 
+ 
+-option(ECHONEST_BUILD_TESTS "Build all unit tests" ON)
+-
+ if(ECHONEST_BUILD_TESTS)
+   enable_testing()
+ endif(ECHONEST_BUILD_TESTS)
diff --git a/media-libs/libechonest/libechonest-1.2.1.ebuild b/media-libs/libechonest/libechonest-1.2.1.ebuild
index 08609552b8fe..1d028af6eebf 100644
--- a/media-libs/libechonest/libechonest-1.2.1.ebuild
+++ b/media-libs/libechonest/libechonest-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libechonest/libechonest-1.2.1.ebuild,v 1.4 2012/05/05 08:02:32 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libechonest/libechonest-1.2.1.ebuild,v 1.5 2012/12/27 23:14:16 hasufell Exp $
 
 EAPI=4
 inherit cmake-utils
@@ -23,3 +23,4 @@ DEPEND="${RDEPEND}
 RESTRICT="test" # network access required
 
 DOCS=( AUTHORS README TODO )
+PATCHES=( "${FILESDIR}"/${P}-Werror.patch )
diff --git a/media-libs/libechonest/libechonest-2.0.1.ebuild b/media-libs/libechonest/libechonest-2.0.1.ebuild
index 2a76c7de60fa..37a55e7ac1c1 100644
--- a/media-libs/libechonest/libechonest-2.0.1.ebuild
+++ b/media-libs/libechonest/libechonest-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libechonest/libechonest-2.0.1.ebuild,v 1.1 2012/07/29 16:50:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libechonest/libechonest-2.0.1.ebuild,v 1.2 2012/12/27 23:14:16 hasufell Exp $
 
 EAPI=4
 inherit cmake-utils
@@ -24,3 +24,4 @@ DEPEND="${RDEPEND}
 RESTRICT="test" # network access required
 
 DOCS=( AUTHORS README TODO )
+PATCHES=( "${FILESDIR}"/${P}-Werror.patch )