Version bump, remove old.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

3 files changed, 9 insertions, 36 deletions

diff --git a/media-libs/phonon/ChangeLog b/media-libs/phonon/ChangeLog
index 90ad3da23119..127597fc6be4 100644
--- a/media-libs/phonon/ChangeLog
+++ b/media-libs/phonon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/phonon
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.53 2013/11/11 21:05:16 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.54 2013/12/06 12:54:16 johu Exp $
+
+*phonon-4.7.1 (06 Dec 2013)
+
+  06 Dec 2013; Johannes Huber <johu@gentoo.org> +phonon-4.7.1.ebuild,
+  -files/phonon-4.7.0-rpath.patch, -phonon-4.7.0.ebuild:
+  Version bump, remove old.
 
 *phonon-4.7.0 (11 Nov 2013)
 
diff --git a/media-libs/phonon/files/phonon-4.7.0-rpath.patch b/media-libs/phonon/files/phonon-4.7.0-rpath.patch
deleted file mode 100644
index b840fbe4dd2c..000000000000
--- a/media-libs/phonon/files/phonon-4.7.0-rpath.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit cf441af677beade70036453a6480d77d7e702346
-Author: Rex Dieter <rdieter@math.unl.edu>
-Date:   Tue Nov 5 20:15:03 2013 -0600
-
-    fix rpath handling
-    
-    REVIEW: 113649
-
-diff --git a/cmake/FindPhononInternal.cmake b/cmake/FindPhononInternal.cmake
-index b48bfaf..3245e9b 100644
---- a/cmake/FindPhononInternal.cmake
-+++ b/cmake/FindPhononInternal.cmake
-@@ -217,10 +217,14 @@ endif(APPLE)
- # RPATH directories outside the current CMAKE_BINARY_DIR and also the library 
- # install directory. Alex
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
--list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemPlatformLibDir)
--list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemCxxLibDir)
-+set(_abs_LIB_INSTALL_DIR "${LIB_INSTALL_DIR}")
-+if (NOT IS_ABSOLUTE "${_abs_LIB_INSTALL_DIR}")
-+   set(_abs_LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
-+endif()
-+list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${_abs_LIB_INSTALL_DIR}" _isSystemPlatformLibDir)
-+list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${_abs_LIB_INSTALL_DIR}" _isSystemCxxLibDir)
- if("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
--   set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
-+   set(CMAKE_INSTALL_RPATH "${_abs_LIB_INSTALL_DIR}")
- endif("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
- 
- 
diff --git a/media-libs/phonon/phonon-4.7.0.ebuild b/media-libs/phonon/phonon-4.7.1.ebuild
index 8442aee99a11..fc064563c0a6 100644
--- a/media-libs/phonon/phonon-4.7.0.ebuild
+++ b/media-libs/phonon/phonon-4.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.7.0.ebuild,v 1.1 2013/11/11 21:05:16 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.7.1.ebuild,v 1.1 2013/12/06 12:54:16 johu Exp $
 
 EAPI=5
 
@@ -62,10 +62,7 @@ REQUIRED_USE="
 	zeitgeist? ( qt4 )
 "
 
-PATCHES=(
-	"${FILESDIR}/${P}-plugin-install.patch"
-	"${FILESDIR}/${P}-rpath.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" )
 
 pkg_setup() {
 	MULTIBUILD_VARIANTS=()