Fix older SLOT too. Tidy patches.

(Portage version: 2.2.0_alpha105/cvs/Linux x86_64)

7 files changed, 35 insertions, 46 deletions

diff --git a/media-libs/libsidplay/ChangeLog b/media-libs/libsidplay/ChangeLog
index 32e3fed959ac..429205ebd775 100644
--- a/media-libs/libsidplay/ChangeLog
+++ b/media-libs/libsidplay/ChangeLog
@@ -1,9 +1,9 @@
 # ChangeLog for media-libs/libsidplay
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/ChangeLog,v 1.54 2012/05/16 02:16:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/ChangeLog,v 1.55 2012/05/16 02:25:49 ssuominen Exp $
 
   16 May 2012; Samuli Suominen <ssuominen@gentoo.org>
-  libsidplay-2.1.1-r2.ebuild:
+  libsidplay-1.36.59.ebuild, libsidplay-2.1.1-r2.ebuild:
   USE="static-libs" and punt useless libtool files
 
   31 Aug 2009; Brent Baude <ranger@gentoo.org> libsidplay-2.1.1-r2.ebuild:
diff --git a/media-libs/libsidplay/files/libsidplay-1.36.59-gcc43.patch b/media-libs/libsidplay/files/libsidplay-1.36.59-gcc43.patch
index 5beef46c6c14..cc6810193b98 100644
--- a/media-libs/libsidplay/files/libsidplay-1.36.59-gcc43.patch
+++ b/media-libs/libsidplay/files/libsidplay-1.36.59-gcc43.patch
@@ -1,7 +1,5 @@
-diff --git a/src/sidtune.cpp b/src/sidtune.cpp
-index 4d1d33b..6fbae80 100644
---- a/src/sidtune.cpp
-+++ b/src/sidtune.cpp
+--- src/sidtune.cpp
++++ src/sidtune.cpp
 @@ -306,11 +306,7 @@ udword sidTune::loadFile(const char* fileName, ubyte** bufferRef)
          return 0;
      }
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 6533314d1cb6..b2f4acd41a7c 100644
--- a/media-libs/libsidplay/files/libsidplay-2.1.1-fbsd.patch
+++ b/media-libs/libsidplay/files/libsidplay-2.1.1-fbsd.patch
@@ -1,7 +1,5 @@
-Index: sidplay-libs-2.1.1/libsidutils/src/ini/ini.cpp
-===================================================================
---- sidplay-libs-2.1.1.orig/libsidutils/src/ini/ini.cpp
-+++ sidplay-libs-2.1.1/libsidutils/src/ini/ini.cpp
+--- libsidutils/src/ini/ini.cpp
++++ libsidutils/src/ini/ini.cpp
 @@ -100,7 +100,7 @@
  //*******************************************************************************************************************
  #include <assert.h>
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 3b0b31ff5982..857a29750d11 100644
--- a/media-libs/libsidplay/files/libsidplay-2.1.1-gcc43.patch
+++ b/media-libs/libsidplay/files/libsidplay-2.1.1-gcc43.patch
@@ -1,7 +1,5 @@
---- sidplay-libs-2.1.1/builders/resid-builder/src/resid.cpp.old	2008-07-25 17:00:41.000000000 \
-+0000
-+++ sidplay-libs-2.1.1/builders/resid-builder/src/resid.cpp	2008-07-25 16:59:44.000000000 \
-+0000
+--- builders/resid-builder/src/resid.cpp
++++ builders/resid-builder/src/resid.cpp
 @@ -16,6 +16,8 @@
   *                                                                         *
   ***************************************************************************/
@@ -11,10 +9,8 @@
  #include "config.h"
  
  #ifdef HAVE_EXCEPTIONS
---- sidplay-libs-2.1.1/builders/resid-builder/src/resid-builder.cpp.old	2008-07-25 \
-17:02:00.000000000 +0000
-+++ sidplay-libs-2.1.1/builders/resid-builder/src/resid-builder.cpp	2008-07-25 17:01:47.000000000 \
-+0000
+--- builders/resid-builder/src/resid-builder.cpp
++++ builders/resid-builder/src/resid-builder.cpp
 @@ -37,6 +37,7 @@
   ***************************************************************************/
  
@@ -23,10 +19,8 @@
  
  #include "config.h"
  #ifdef HAVE_EXCEPTIONS
---- sidplay-libs-2.1.1/builders/hardsid-builder/src/hardsid-builder.cpp.old	2008-07-25 \
-17:08:50.000000000 +0000
-+++ sidplay-libs-2.1.1/builders/hardsid-builder/src/hardsid-builder.cpp	2008-07-25 \
-17:08:17.000000000 +0000
+--- builders/hardsid-builder/src/hardsid-builder.cpp
++++ builders/hardsid-builder/src/hardsid-builder.cpp
 @@ -47,6 +47,7 @@
   ***************************************************************************/
  
@@ -35,10 +29,8 @@
  #include "config.h"
  
  #ifdef HAVE_EXCEPTIONS
---- sidplay-libs-2.1.1/libsidplay/src/sidtune/SidTune.cpp.old	2008-07-25 16:55:02.000000000 \
-+0000
-+++ sidplay-libs-2.1.1/libsidplay/src/sidtune/SidTune.cpp	2008-07-25 16:53:58.000000000 \
-+0000
+--- libsidplay/src/sidtune/SidTune.cpp
++++ libsidplay/src/sidtune/SidTune.cpp
 @@ -283,7 +283,7 @@
      uint_least32_t fileLen = 0;
  
diff --git a/media-libs/libsidplay/files/libsidplay-gcc34.patch b/media-libs/libsidplay/files/libsidplay-gcc34.patch
index 858d3a62cb74..bf59fc9c42b7 100644
--- a/media-libs/libsidplay/files/libsidplay-gcc34.patch
+++ b/media-libs/libsidplay/files/libsidplay-gcc34.patch
@@ -1,6 +1,5 @@
-diff -Naur libsidplay/src/smart.h xmms-fc-0.5.3/src/smart.h
---- libsidplay.vanilla/src/smart.h	1998-11-30 13:10:00.000000000 -0600
-+++ libsidplay/src/smart.h	2004-07-03 01:49:33.991970368 -0500
+--- src/smart.h
++++ src/smart.h
 @@ -207,16 +207,16 @@
      {
          if ( bufferLen >= 1 )
diff --git a/media-libs/libsidplay/files/libsidplay2-gcc41.patch b/media-libs/libsidplay/files/libsidplay2-gcc41.patch
index 5bbe948b7e12..f2e3b314d493 100644
--- a/media-libs/libsidplay/files/libsidplay2-gcc41.patch
+++ b/media-libs/libsidplay/files/libsidplay2-gcc41.patch
@@ -1,6 +1,5 @@
-diff -ur sidplay-libs-2.1.1-orig/libsidplay/include/sidplay/SmartPtr.h sidplay-libs-2.1.1/libsidplay/include/sidplay/SmartPtr.h
---- sidplay-libs-2.1.1-orig/libsidplay/include/sidplay/SmartPtr.h	2004-06-14 23:08:04.000000000 +0300
-+++ sidplay-libs-2.1.1/libsidplay/include/sidplay/SmartPtr.h	2005-12-19 11:12:04.000000000 +0300
+--- libsidplay/include/sidplay/SmartPtr.h
++++ libsidplay/include/sidplay/SmartPtr.h
 @@ -211,16 +211,16 @@
  	{
  		if ( bufferLen >= 1 )
@@ -25,9 +24,8 @@ diff -ur sidplay-libs-2.1.1-orig/libsidplay/include/sidplay/SmartPtr.h sidplay-l
  		}
  	}
  };
-diff -ur sidplay-libs-2.1.1-orig/libsidutils/include/sidplay/utils/SidUsage.h sidplay-libs-2.1.1/libsidutils/include/sidplay/utils/SidUsage.h
---- sidplay-libs-2.1.1-orig/libsidutils/include/sidplay/utils/SidUsage.h	2004-06-14 23:08:08.000000000 +0300
-+++ sidplay-libs-2.1.1/libsidutils/include/sidplay/utils/SidUsage.h	2005-12-19 11:12:25.000000000 +0300
+--- libsidutils/include/sidplay/utils/SidUsage.h
++++ libsidutils/include/sidplay/utils/SidUsage.h
 @@ -33,7 +33,7 @@
      uint_least16_t length;  // usage scan length
  
diff --git a/media-libs/libsidplay/libsidplay-1.36.59.ebuild b/media-libs/libsidplay/libsidplay-1.36.59.ebuild
index 22bc2cb5fc2e..25120b12bda8 100644
--- a/media-libs/libsidplay/libsidplay-1.36.59.ebuild
+++ b/media-libs/libsidplay/libsidplay-1.36.59.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/libsidplay-1.36.59.ebuild,v 1.11 2009/09/23 15:17:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/libsidplay-1.36.59.ebuild,v 1.12 2012/05/16 02:25:49 ssuominen Exp $
 
-inherit libtool eutils
+EAPI=4
+inherit eutils libtool
 
 DESCRIPTION="C64 SID player library"
 HOMEPAGE="http://critical.ch/distfiles/"
@@ -11,17 +12,20 @@ SRC_URI="http://critical.ch/distfiles/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
+IUSE="static-libs"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+DOCS="AUTHORS DEVELOPER"
+
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-gcc43.patch
-	# Needed to get a sane .so versionning on fbsd, please don't drop
-	elibtoolize
+	elibtoolize # required for fbsd .so versioning
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS DEVELOPER || die
+	default
+	rm -f "${ED}"/usr/lib*/${PN}.la
 }