media-libs/libsidplay: Fix patches.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/media-libs/libsidplay/files/libsidplay-2.1.1-fbsd.patch b/media-libs/libsidplay/files/libsidplay-2.1.1-fbsd.patch
index b2f4acd41a7ce3ee078e81a583246a585c4ea428..0f4740e3856fb4f110c77e06b3147aaaadd54f37 100644 (file)
--- a/media-libs/libsidplay/files/libsidplay-2.1.1-fbsd.patch
+++ b/media-libs/libsidplay/files/libsidplay-2.1.1-fbsd.patch
@@ -1,5 +1,5 @@
---- libsidutils/src/ini/ini.cpp
-+++ libsidutils/src/ini/ini.cpp
+--- a/libsidutils/src/ini/ini.cpp
++++ b/libsidutils/src/ini/ini.cpp
 @@ -100,7 +100,7 @@
  //*******************************************************************************************************************
  #include <assert.h>

diff --git a/media-libs/libsidplay/files/libsidplay2-gcc41.patch b/media-libs/libsidplay/files/libsidplay-2.1.1-gcc41.patch
similarity index 82%
rename from media-libs/libsidplay/files/libsidplay2-gcc41.patch
rename to media-libs/libsidplay/files/libsidplay-2.1.1-gcc41.patch
index f2e3b314d493fb00bcc4693ea2dbc98975466f75..c05f8d3e60e35e81ccc2bba9775a856467a5d9dd 100644 (file)
--- a/media-libs/libsidplay/files/libsidplay2-gcc41.patch
+++ b/media-libs/libsidplay/files/libsidplay-2.1.1-gcc41.patch
@@ -1,5 +1,5 @@
---- libsidplay/include/sidplay/SmartPtr.h
-+++ libsidplay/include/sidplay/SmartPtr.h
+--- a/libsidplay/include/sidplay/SmartPtr.h
++++ b/libsidplay/include/sidplay/SmartPtr.h
 @@ -211,16 +211,16 @@
        {
                if ( bufferLen >= 1 )
@@ -24,8 +24,8 @@
                }
        }
  };
---- libsidutils/include/sidplay/utils/SidUsage.h
-+++ libsidutils/include/sidplay/utils/SidUsage.h
+--- a/libsidutils/include/sidplay/utils/SidUsage.h
++++ b/libsidutils/include/sidplay/utils/SidUsage.h
 @@ -33,7 +33,7 @@
      uint_least16_t length;  // usage scan length
  

diff --git a/media-libs/libsidplay/files/libsidplay-2.1.1-gcc43.patch b/media-libs/libsidplay/files/libsidplay-2.1.1-gcc43.patch
index 857a29750d11864479073aae1fbf50e627676b23..419b126a1d8e63ac844320ffb3344fb7562802bc 100644 (file)
--- a/media-libs/libsidplay/files/libsidplay-2.1.1-gcc43.patch
+++ b/media-libs/libsidplay/files/libsidplay-2.1.1-gcc43.patch
@@ -1,5 +1,5 @@
---- builders/resid-builder/src/resid.cpp
-+++ builders/resid-builder/src/resid.cpp
+--- a/builders/resid-builder/src/resid.cpp
++++ b/builders/resid-builder/src/resid.cpp
 @@ -16,6 +16,8 @@
   *                                                                         *
   ***************************************************************************/
@@ -9,8 +9,8 @@
  #include "config.h"
  
  #ifdef HAVE_EXCEPTIONS
---- builders/resid-builder/src/resid-builder.cpp
-+++ builders/resid-builder/src/resid-builder.cpp
+--- a/builders/resid-builder/src/resid-builder.cpp
++++ b/builders/resid-builder/src/resid-builder.cpp
 @@ -37,6 +37,7 @@
   ***************************************************************************/
  
@@ -19,8 +19,8 @@
  
  #include "config.h"
  #ifdef HAVE_EXCEPTIONS
---- builders/hardsid-builder/src/hardsid-builder.cpp
-+++ builders/hardsid-builder/src/hardsid-builder.cpp
+--- a/builders/hardsid-builder/src/hardsid-builder.cpp
++++ b/builders/hardsid-builder/src/hardsid-builder.cpp
 @@ -47,6 +47,7 @@
   ***************************************************************************/
  
@@ -29,8 +29,8 @@
  #include "config.h"
  
  #ifdef HAVE_EXCEPTIONS
---- libsidplay/src/sidtune/SidTune.cpp
-+++ libsidplay/src/sidtune/SidTune.cpp
+--- a/libsidplay/src/sidtune/SidTune.cpp
++++ b/libsidplay/src/sidtune/SidTune.cpp
 @@ -283,7 +283,7 @@
      uint_least32_t fileLen = 0;
  

diff --git a/media-libs/libsidplay/files/libsidplay-2.1.1-no_libtool_reference.patch b/media-libs/libsidplay/files/libsidplay-2.1.1-no_libtool_reference.patch
index ee0564306a6663a7799ac8451ef16deb4764de12..c93f3cfba29bbc4c99955e3bc2c270b0ef38c5d4 100644 (file)
--- a/media-libs/libsidplay/files/libsidplay-2.1.1-no_libtool_reference.patch
+++ b/media-libs/libsidplay/files/libsidplay-2.1.1-no_libtool_reference.patch
@@ -1,5 +1,5 @@
---- libsidplay/unix/libsidplay2.pc.in
-+++ libsidplay/unix/libsidplay2.pc.in
+--- a/libsidplay/unix/libsidplay2.pc.in
++++ b/libsidplay/unix/libsidplay2.pc.in
 @@ -7,5 +7,5 @@
  Name: @PACKAGE@
  Description: C64 cycle exact stereo sidplayer library.
@@ -7,8 +7,8 @@
 -Libs: ${libdir}/libsidplay2.la
 +Libs: -lsidplay2
  Cflags: -DHAVE_UNIX -I${includedir}
---- libsidutils/unix/libsidutils.pc.in
-+++ libsidutils/unix/libsidutils.pc.in
+--- a/libsidutils/unix/libsidutils.pc.in
++++ b/libsidutils/unix/libsidutils.pc.in
 @@ -6,5 +6,5 @@
  Name: @PACKAGE@
  Description: Utils for supporting the libsidplay2 library.

diff --git a/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild b/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild
index 99e72b3517a9e9512cd8833f291f7087f96bf92f..9dbf82345def968c47fb465f0abe23ab8b6fe98e 100644 (file)
--- a/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild
+++ b/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,7 +26,7 @@ MULTILIB_WRAPPED_HEADERS=(
 
 src_prepare() {
        epatch \
-               "${FILESDIR}"/${PN}2-gcc41.patch \
+               "${FILESDIR}"/${P}-gcc41.patch \
                "${FILESDIR}"/${P}-fbsd.patch \
                "${FILESDIR}"/${P}-gcc43.patch \
                "${FILESDIR}"/${P}-no_libtool_reference.patch