Added a patch that fixes the adplug header files for libbinio 1.4+.

(Portage version: 2.1_pre10-r5)

6 files changed, 136 insertions, 1 deletions

diff --git a/media-libs/adplug/ChangeLog b/media-libs/adplug/ChangeLog
index 529b54e58524..6dbc9e4da1bd 100644
--- a/media-libs/adplug/ChangeLog
+++ b/media-libs/adplug/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/adplug
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/adplug/ChangeLog,v 1.9 2006/01/07 17:47:33 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/adplug/ChangeLog,v 1.10 2006/05/14 12:26:00 spock Exp $
+
+*adplug-1.5.1-r2 (14 May 2006)
+
+  14 May 2006; Michał Januszewski <spock@gentoo.org>
+  +files/adplug-1.5.1-libbinio.patch, +adplug-1.5.1-r2.ebuild:
+  Added a patch that fixes the adplug header files for libbinio 1.4+ (bug
+  #130762, thanks to Stian Skjelstad).
 
 *adplug-1.5.1-r1 (07 Jan 2006)
 
diff --git a/media-libs/adplug/adplug-1.5.1-r2.ebuild b/media-libs/adplug/adplug-1.5.1-r2.ebuild
new file mode 100644
index 000000000000..bac8321f3bf4
--- /dev/null
+++ b/media-libs/adplug/adplug-1.5.1-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/adplug/adplug-1.5.1-r2.ebuild,v 1.1 2006/05/14 12:26:00 spock Exp $
+
+IUSE=""
+
+DESCRIPTION="A free, cross-platform, hardware independent AdLib sound player library"
+HOMEPAGE="http://adplug.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-cpp/libbinio-1.4"
+
+inherit eutils
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-libbinio.patch
+}
+
+src_compile() {
+	econf || die "econf"
+	emake || die "emake"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
+}
diff --git a/media-libs/adplug/files/adplug-1.5.1-libbinio.patch b/media-libs/adplug/files/adplug-1.5.1-libbinio.patch
new file mode 100644
index 000000000000..d662eac8691a
--- /dev/null
+++ b/media-libs/adplug/files/adplug-1.5.1-libbinio.patch
@@ -0,0 +1,88 @@
+diff -ru adplug-1.5.1/adplugdb/adplugdb.cpp adplug-1.5.1-r2/adplugdb/adplugdb.cpp
+--- adplug-1.5.1/adplugdb/adplugdb.cpp	2004-08-08 21:20:07.000000000 +0200
++++ adplug-1.5.1-r2/adplugdb/adplugdb.cpp	2006-05-14 15:59:43.000000000 +0200
+@@ -26,7 +26,7 @@
+ #include <stdio.h>
+ #include <stdarg.h>
+ #include <string.h>
+-#include <binfile.h>
++#include <libbinio/binfile.h>
+ #include <string>
+ #include <iostream>
+ 
+diff -ru adplug-1.5.1/src/adplug.cpp adplug-1.5.1-r2/src/adplug.cpp
+--- adplug-1.5.1/src/adplug.cpp	2005-05-12 18:48:10.000000000 +0200
++++ adplug-1.5.1-r2/src/adplug.cpp	2006-05-14 15:59:07.000000000 +0200
+@@ -20,7 +20,7 @@
+  */
+ 
+ #include <string>
+-#include <binfile.h>
++#include <libbinio/binfile.h>
+ 
+ #include "adplug.h"
+ #include "debug.h"
+diff -ru adplug-1.5.1/src/database.cpp adplug-1.5.1-r2/src/database.cpp
+--- adplug-1.5.1/src/database.cpp	2003-03-01 19:51:59.000000000 +0100
++++ adplug-1.5.1-r2/src/database.cpp	2006-05-14 15:59:31.000000000 +0200
+@@ -21,8 +21,8 @@
+  * Copyright (c) 2002, 2003 Simon Peter <dn.tlp@gmx.net>
+  */
+ 
+-#include <binio.h>
+-#include <binfile.h>
++#include <libbinio/binio.h>
++#include <libbinio/binfile.h>
+ #include <string.h>
+ 
+ #include "database.h"
+diff -ru adplug-1.5.1/src/database.h adplug-1.5.1-r2/src/database.h
+--- adplug-1.5.1/src/database.h	2003-03-01 19:51:59.000000000 +0100
++++ adplug-1.5.1-r2/src/database.h	2006-05-14 15:51:38.000000000 +0200
+@@ -26,7 +26,7 @@
+ 
+ #include <iostream>
+ #include <string>
+-#include <binio.h>
++#include <libbinio/binio.h>
+ 
+ class CAdPlugDatabase
+ {
+diff -ru adplug-1.5.1/src/dmo.cpp adplug-1.5.1-r2/src/dmo.cpp
+--- adplug-1.5.1/src/dmo.cpp	2004-09-02 21:48:12.000000000 +0200
++++ adplug-1.5.1-r2/src/dmo.cpp	2006-05-14 16:35:22.000000000 +0200
+@@ -26,7 +26,7 @@
+ */
+ 
+ #include <string.h>
+-#include <binstr.h>
++#include <libbinio/binstr.h>
+ 
+ #include "dmo.h"
+ #include "debug.h"
+diff -ru adplug-1.5.1/src/fprovide.cpp adplug-1.5.1-r2/src/fprovide.cpp
+--- adplug-1.5.1/src/fprovide.cpp	2003-02-17 17:42:50.000000000 +0100
++++ adplug-1.5.1-r2/src/fprovide.cpp	2006-05-14 15:59:20.000000000 +0200
+@@ -20,8 +20,8 @@
+  */
+ 
+ #include <string.h>
+-#include <binio.h>
+-#include <binfile.h>
++#include <libbinio/binio.h>
++#include <libbinio/binfile.h>
+ 
+ #include "fprovide.h"
+ 
+diff -ru adplug-1.5.1/src/fprovide.h adplug-1.5.1-r2/src/fprovide.h
+--- adplug-1.5.1/src/fprovide.h	2003-01-28 14:34:35.000000000 +0100
++++ adplug-1.5.1-r2/src/fprovide.h	2006-05-14 15:51:57.000000000 +0200
+@@ -23,7 +23,7 @@
+ #define H_ADPLUG_FILEPROVIDER
+ 
+ #include <string>
+-#include <binio.h>
++#include <libbinio/binio.h>
+ 
+ class CFileProvider
+ {
diff --git a/media-libs/adplug/files/digest-adplug-1.5.1 b/media-libs/adplug/files/digest-adplug-1.5.1
index 3b5bc2b85f4b..5c0cc53cd16b 100644
--- a/media-libs/adplug/files/digest-adplug-1.5.1
+++ b/media-libs/adplug/files/digest-adplug-1.5.1
@@ -1 +1,3 @@
 MD5 95d62805cff551bed84298e737a26df9 adplug-1.5.1.tar.bz2 681981
+RMD160 63b20d25b1384403b23f5f2ef136554ae76a737b adplug-1.5.1.tar.bz2 681981
+SHA256 ba2a07df2d2e31687458eac442a9316342c166ca61c2bb30cbd721ee74373027 adplug-1.5.1.tar.bz2 681981
diff --git a/media-libs/adplug/files/digest-adplug-1.5.1-r1 b/media-libs/adplug/files/digest-adplug-1.5.1-r1
index 3b5bc2b85f4b..5c0cc53cd16b 100644
--- a/media-libs/adplug/files/digest-adplug-1.5.1-r1
+++ b/media-libs/adplug/files/digest-adplug-1.5.1-r1
@@ -1 +1,3 @@
 MD5 95d62805cff551bed84298e737a26df9 adplug-1.5.1.tar.bz2 681981
+RMD160 63b20d25b1384403b23f5f2ef136554ae76a737b adplug-1.5.1.tar.bz2 681981
+SHA256 ba2a07df2d2e31687458eac442a9316342c166ca61c2bb30cbd721ee74373027 adplug-1.5.1.tar.bz2 681981
diff --git a/media-libs/adplug/files/digest-adplug-1.5.1-r2 b/media-libs/adplug/files/digest-adplug-1.5.1-r2
new file mode 100644
index 000000000000..5c0cc53cd16b
--- /dev/null
+++ b/media-libs/adplug/files/digest-adplug-1.5.1-r2
@@ -0,0 +1,3 @@
+MD5 95d62805cff551bed84298e737a26df9 adplug-1.5.1.tar.bz2 681981
+RMD160 63b20d25b1384403b23f5f2ef136554ae76a737b adplug-1.5.1.tar.bz2 681981
+SHA256 ba2a07df2d2e31687458eac442a9316342c166ca61c2bb30cbd721ee74373027 adplug-1.5.1.tar.bz2 681981