Fix compilation. Added to ~amd64. Removed old versions.

5 files changed, 37 insertions, 67 deletions

diff --git a/media-sound/qmbtagger/ChangeLog b/media-sound/qmbtagger/ChangeLog
index 64b04520d0dc..4921abe69e5a 100644
--- a/media-sound/qmbtagger/ChangeLog
+++ b/media-sound/qmbtagger/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/qmbtagger
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmbtagger/ChangeLog,v 1.7 2004/07/02 08:11:27 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmbtagger/ChangeLog,v 1.8 2004/10/10 18:37:46 eradicator Exp $
+
+  10 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/qmbtagger-0.07-errno.patch, -qmbtagger-0.04.ebuild,
+  -qmbtagger-0.05.ebuild:
+  Fix compilation.  Added to ~amd64.  Removed old versions.
 
 *qmbtagger-0.07 (02 Jul 2004)
 
diff --git a/media-sound/qmbtagger/files/qmbtagger-0.07-errno.patch b/media-sound/qmbtagger/files/qmbtagger-0.07-errno.patch
new file mode 100644
index 000000000000..60b5ff06a27d
--- /dev/null
+++ b/media-sound/qmbtagger/files/qmbtagger-0.07-errno.patch
@@ -0,0 +1,24 @@
+diff -Naur qmbtagger-0.07.orig/src/qmbflacfile.cpp qmbtagger-0.07.fixed/src/qmbflacfile.cpp
+--- qmbtagger-0.07.orig/src/qmbflacfile.cpp	2004-05-01 13:18:00.000000000 -0700
++++ qmbtagger-0.07.fixed/src/qmbflacfile.cpp	2004-10-10 10:51:59.000000000 -0700
+@@ -30,6 +30,8 @@
+ #include <musicbrainz/mb_c.h>
+ #include <FLAC++/metadata.h>
+ 
++#include <errno.h>
++
+ QMBFLACFile::QMBFLACFile()
+ 	: QMBFile(), FLAC::Decoder::File(), offset(0), decode_error(false)
+ {
+diff -Naur qmbtagger-0.07.orig/src/qmbmp3file.cpp qmbtagger-0.07.fixed/src/qmbmp3file.cpp
+--- qmbtagger-0.07.orig/src/qmbmp3file.cpp	2004-05-01 13:18:00.000000000 -0700
++++ qmbtagger-0.07.fixed/src/qmbmp3file.cpp	2004-10-10 11:00:43.807278465 -0700
+@@ -32,6 +32,8 @@
+ #include <id3/misc_support.h>
+ #include <fstream>
+ 
++#include <errno.h>
++
+ QMBMP3File::QMBMP3File()
+ 	: QMBFile()
+ {
diff --git a/media-sound/qmbtagger/qmbtagger-0.04.ebuild b/media-sound/qmbtagger/qmbtagger-0.04.ebuild
deleted file mode 100644
index ae09b0d1b260..000000000000
--- a/media-sound/qmbtagger/qmbtagger-0.04.ebuild
+++ /dev/null
@@ -1,37 +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/qmbtagger/qmbtagger-0.04.ebuild,v 1.3 2004/06/25 00:18:32 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="Qt based front-end for the MusicBrainz Client Library"
-HOMEPAGE="http://qmbtagger.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qmbtagger/${P}.tar.gz"
-RESTRICT="nomirror"
-LICENSE="LGPL-2"
-
-DEPEND=">=x11-libs/qt-3.1.2
-	media-libs/musicbrainz
-	media-sound/madplay
-	media-libs/flac
-	media-libs/id3lib
-	oggvorbis? ( media-sound/vorbis-tools )"
-
-IUSE="oggvorbis"
-SLOT="0"
-KEYWORDS="~x86"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
-src_compile() {
-	econf || die
-	emake || die "emake failed"
-}
-
-src_install () {
-	einstall || die
-	dodoc CHANGELOG COPYING INSTALL README || die "dodoc failed"
-}
diff --git a/media-sound/qmbtagger/qmbtagger-0.05.ebuild b/media-sound/qmbtagger/qmbtagger-0.05.ebuild
deleted file mode 100644
index 93ead55a8644..000000000000
--- a/media-sound/qmbtagger/qmbtagger-0.05.ebuild
+++ /dev/null
@@ -1,27 +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/qmbtagger/qmbtagger-0.05.ebuild,v 1.4 2004/06/25 00:18:32 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="Qt based front-end for the MusicBrainz Client Library"
-HOMEPAGE="http://qmbtagger.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qmbtagger/${P}.tar.bz2"
-RESTRICT="nomirror"
-LICENSE="LGPL-2"
-
-DEPEND=">=x11-libs/qt-3.1.2
-	media-libs/musicbrainz
-	media-sound/madplay
-	media-libs/flac
-	media-libs/id3lib
-	oggvorbis? ( media-sound/vorbis-tools )"
-
-IUSE="oggvorbis"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc CHANGELOG COPYING INSTALL README || die "dodoc failed"
-}
diff --git a/media-sound/qmbtagger/qmbtagger-0.07.ebuild b/media-sound/qmbtagger/qmbtagger-0.07.ebuild
index 5c94ae83fd94..2adff96f095d 100644
--- a/media-sound/qmbtagger/qmbtagger-0.07.ebuild
+++ b/media-sound/qmbtagger/qmbtagger-0.07.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmbtagger/qmbtagger-0.07.ebuild,v 1.1 2004/07/02 08:11:27 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmbtagger/qmbtagger-0.07.ebuild,v 1.2 2004/10/10 18:37:46 eradicator Exp $
 
 inherit eutils
 
@@ -18,8 +18,13 @@ DEPEND=">=x11-libs/qt-3.1.2
 
 IUSE="oggvorbis"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-errno.patch
+}
 
 src_compile() {
 	addwrite ${QTDIR}/etc/settings