libbinio is required wrt #216893

(Portage version: 2.1.4.4)

5 files changed, 11 insertions, 99 deletions

diff --git a/media-sound/adplay/ChangeLog b/media-sound/adplay/ChangeLog
index ad325b3937bd..99c7af38b106 100644
--- a/media-sound/adplay/ChangeLog
+++ b/media-sound/adplay/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/adplay
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/adplay/ChangeLog,v 1.13 2006/09/19 01:46:47 dang Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/adplay/ChangeLog,v 1.14 2008/04/10 17:10:30 drac Exp $
+
+  10 Apr 2008; Samuli Suominen <drac@gentoo.org>
+  -files/adplay-1.4-libbinio.patch, -adplay-1.4.ebuild,
+  -adplay-1.4-r2.ebuild, adplay-1.5.ebuild:
+  libbinio is required wrt #216893
 
   19 Sep 2006; Daniel Gryniewicz <dang@gentoo.org> adplay-1.5.ebuild:
   Marked stable on amd64 for bug #147612
diff --git a/media-sound/adplay/adplay-1.4-r2.ebuild b/media-sound/adplay/adplay-1.4-r2.ebuild
deleted file mode 100644
index 8425078314f5..000000000000
--- a/media-sound/adplay/adplay-1.4-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/adplay/adplay-1.4-r2.ebuild,v 1.3 2006/05/29 19:19:07 blubb Exp $
-
-inherit eutils
-
-IUSE="oss esd sdl"
-
-DESCRIPTION="A console player for AdLib music"
-HOMEPAGE="http://adplug.sourceforge.net/"
-SRC_URI="mirror://sourceforge/adplug/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
-
-DEPEND=">=media-libs/adplug-1.4.1-r2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-libbinio.patch
-}
-
-src_compile() {
-	local myconf
-
-	use oss || myconf="${myconf} --disable-output-oss"
-	use esd || myconf="${myconf} --disable-output-esound"
-	use sdl || myconf="${myconf} --disable-output-sdl"
-
-	econf ${myconf} || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-}
diff --git a/media-sound/adplay/adplay-1.4.ebuild b/media-sound/adplay/adplay-1.4.ebuild
deleted file mode 100644
index 05803d090897..000000000000
--- a/media-sound/adplay/adplay-1.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/adplay/adplay-1.4.ebuild,v 1.2 2004/11/11 10:09:58 eradicator Exp $
-
-IUSE="oss esd sdl"
-
-DESCRIPTION="A console player for AdLib music"
-HOMEPAGE="http://adplug.sourceforge.net/"
-SRC_URI="mirror://sourceforge/adplug/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-
-DEPEND=">=media-libs/adplug-1.4.1"
-
-src_compile() {
-	local myconf
-
-	use oss || myconf="${myconf} --disable-output-oss"
-	use esd || myconf="${myconf} --disable-output-esound"
-	use sdl || myconf="${myconf} --disable-output-sdl"
-
-	econf ${myconf} || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-}
diff --git a/media-sound/adplay/adplay-1.5.ebuild b/media-sound/adplay/adplay-1.5.ebuild
index d37121b93398..988f4d517a66 100644
--- a/media-sound/adplay/adplay-1.5.ebuild
+++ b/media-sound/adplay/adplay-1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/adplay/adplay-1.5.ebuild,v 1.5 2006/09/19 01:46:47 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/adplay/adplay-1.5.ebuild,v 1.6 2008/04/10 17:10:30 drac Exp $
 
 inherit eutils
 
@@ -14,7 +14,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 
-DEPEND="media-libs/adplug"
+DEPEND="media-libs/adplug
+	dev-cpp/libbinio"
 
 src_compile() {
 	local myconf
diff --git a/media-sound/adplay/files/adplay-1.4-libbinio.patch b/media-sound/adplay/files/adplay-1.4-libbinio.patch
deleted file mode 100644
index 127e541c0557..000000000000
--- a/media-sound/adplay/files/adplay-1.4-libbinio.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur adplay-1.4/src/disk.cc adplay-1.4-r2/src/disk.cc
---- adplay-1.4/src/disk.cc	2004-05-13 11:50:47.000000000 +0200
-+++ adplay-1.4-r2/src/disk.cc	2006-05-14 05:50:22.000000000 +0200
-@@ -21,8 +21,8 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
--#include <binwrap.h>
--#include <binfile.h>
-+#include <libbinio/binwrap.h>
-+#include <libbinio/binfile.h>
- 
- #include "defines.h"
- #include "disk.h"
-diff -ur adplay-1.4/src/disk.h adplay-1.4-r2/src/disk.h
---- adplay-1.4/src/disk.h	2004-05-13 11:50:47.000000000 +0200
-+++ adplay-1.4-r2/src/disk.h	2006-05-14 05:49:40.000000000 +0200
-@@ -20,7 +20,7 @@
- #ifndef H_DISK
- #define H_DISK
- 
--#include <binio.h>
-+#include <libbinio/binio.h>
- 
- #include "output.h"
-