diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2013-03-12 08:23:56 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-03-12 08:23:56 +0000 |
commit | 52c5c3aeeabef840aeec31e92b705f651bda7877 (patch) | |
tree | 5b4d1a97fb3dcb44e971902cfab951637edf12cf | |
parent | Solve openssl-1.0 compatibility, per bug#460270, thanks to Per Pomsel (diff) | |
download | gentoo-2-52c5c3aeeabef840aeec31e92b705f651bda7877.tar.gz gentoo-2-52c5c3aeeabef840aeec31e92b705f651bda7877.tar.bz2 gentoo-2-52c5c3aeeabef840aeec31e92b705f651bda7877.zip |
old
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
-rw-r--r-- | media-libs/libechonest/ChangeLog | 6 | ||||
-rw-r--r-- | media-libs/libechonest/files/libechonest-1.2.1-Werror.patch | 60 | ||||
-rw-r--r-- | media-libs/libechonest/libechonest-1.2.1.ebuild | 26 |
3 files changed, 5 insertions, 87 deletions
diff --git a/media-libs/libechonest/ChangeLog b/media-libs/libechonest/ChangeLog index 146cfa8488bf..9a4d9ce89c9d 100644 --- a/media-libs/libechonest/ChangeLog +++ b/media-libs/libechonest/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libechonest # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libechonest/ChangeLog,v 1.20 2013/03/02 21:44:00 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libechonest/ChangeLog,v 1.21 2013/03/12 08:23:55 ssuominen Exp $ + + 12 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> + -libechonest-1.2.1.ebuild, -files/libechonest-1.2.1-Werror.patch: + old 02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> libechonest-1.2.1.ebuild, libechonest-2.0.2.ebuild: diff --git a/media-libs/libechonest/files/libechonest-1.2.1-Werror.patch b/media-libs/libechonest/files/libechonest-1.2.1-Werror.patch deleted file mode 100644 index 4e7fdaa4df84..000000000000 --- a/media-libs/libechonest/files/libechonest-1.2.1-Werror.patch +++ /dev/null @@ -1,60 +0,0 @@ -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/libechonest-1.2.1.ebuild b/media-libs/libechonest/libechonest-1.2.1.ebuild deleted file mode 100644 index 67c003fb3456..000000000000 --- a/media-libs/libechonest/libechonest-1.2.1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2013 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.6 2013/03/02 21:44:00 hwoarang Exp $ - -EAPI=4 -inherit cmake-utils - -DESCRIPTION="A library for communicating with The Echo Nest" -HOMEPAGE="http://projects.kde.org/projects/playground/libs/libechonest" -SRC_URI="http://pwsp.cleinias.com/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=">=dev-libs/qjson-0.5 - dev-qt/qtcore:4" -DEPEND="${RDEPEND} - virtual/pkgconfig - dev-qt/qttest:4" - -RESTRICT="test" # network access required - -DOCS=( AUTHORS README TODO ) -PATCHES=( "${FILESDIR}"/${P}-Werror.patch ) |