libbinio is required wrt #216893

Package-Manager: portage-2.1.4.4

6 files changed, 13 insertions, 105 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/Manifest b/media-sound/adplay/Manifest
index bc2224add8ce..83d12fe0ffd3 100644
--- a/media-sound/adplay/Manifest
+++ b/media-sound/adplay/Manifest
@@ -1,8 +1,4 @@
-AUX adplay-1.4-libbinio.patch 725 RMD160 e1a4b664b5d0beddb85b786145a4878e78b09a69 SHA1 dfbf986e4f46101a0f8561dfdff9f47729cd6219 SHA256 32cbe32f7321c368fa4c4d7ed1382f4102f85d5257d01083f11dfd7c321d0d3c
-DIST adplay-1.4.tar.bz2 243047 RMD160 6301b79ea9869f58fdc77feda8b4103780518b79 SHA1 3a3d0d7b46624cda10023fd528f0d2b8779b65fe SHA256 83fe50f7cd511d18e90f95168b26504143d0063c0bfb48a9a9be19357ce8890a
 DIST adplay-1.5.tar.bz2 228151 RMD160 3ba58763e5577e50060142713bf1c1f19358fd69 SHA1 a8e09809a4c6024dec7e8276d3ffb18f9f6cbe9b SHA256 63798e2bded3b17d9300027f0d0bd072b1184bb895a3d57e7083db9bf084f73f
-EBUILD adplay-1.4-r2.ebuild 878 RMD160 d1f97f4668980dfb45854cadf3489379071e60e5 SHA1 484badd95d23590ba9bb80d54594278299aef9af SHA256 248caefb877cfd7220f36f96b5a8b55209a643c805d8a8e43b54626b733a3bea
-EBUILD adplay-1.4.ebuild 779 RMD160 7e132338972ef48a6120b5f1702b8ce0afd324f8 SHA1 552cba12d4cc34bc16c414e63636a710cbf9da1c SHA256 f972f7be0751267920e493164e497e40c8f01d2937e28e18eaea3252234f0b85
-EBUILD adplay-1.5.ebuild 839 RMD160 28be16eaef9dd8e7d0714d797529fba07260c553 SHA1 77d5dea0051950467749e952d741d1bdc5ad6e45 SHA256 e0f872881960ff9a52cbcad1c3414d4574e89bf2dc177d923b95f8518c373961
-MISC ChangeLog 1850 RMD160 74ddbcef622b042cafc677af989ac04f5b8a3e55 SHA1 755f42476381488fe062a37e1eae31ca842cb2d6 SHA256 baed469b00829f2a5efe98c2ba43866f0bab00e003e152667963606a5a82adbb
+EBUILD adplay-1.5.ebuild 857 RMD160 808213e5d8d2d9a624a7ebab003a443eda9dc54d SHA1 679ef88852cf39c000cdad36815a029c5ff5b468 SHA256 373ef73795dbe4164b5d94711d35699fe5dfce95512d3e48f1f633784061cf81
+MISC ChangeLog 2035 RMD160 e088c43452837efb50673d94b96dc60c404f01ad SHA1 12fba903b5041b598d6e271c2aea29785020da53 SHA256 dae218fc7b7b78bca2b22f0a11fc2d2f2d0a26429637fa504563a1e113cc648f
 MISC metadata.xml 219 RMD160 adf9425714d416c5d3a617022a7f329b3028d7e1 SHA1 58176182db443c822f2bad772e2649eab15c336c SHA256 daa9d68ed73b1674688e969febaa6645c856c9334ea454e7bee99d56fcdda106
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"
-