5 files changed, 98 insertions, 41 deletions
diff --git a/media-sound/apetag/ChangeLog b/media-sound/apetag/ChangeLog
index 649d7f36bb99..8a415d24b8b9 100644
--- a/media-sound/apetag/ChangeLog
+++ b/media-sound/apetag/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/apetag
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/apetag/ChangeLog,v 1.4 2007/01/21 21:12:20 flameeyes Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/apetag/ChangeLog,v 1.5 2008/06/15 11:09:43 loki_val Exp $
+
+*apetag-1.10 (15 Jun 2008)
+
+  15 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/apetag-1.10-gcc43.patch, -apetag-1.8.ebuild, +apetag-1.10.ebuild:
+  Bump wrt 227109. Fix gcc-4.3 compilation and nitpicks. Use user LDFLAGS.
+  Don't include html and css docs, since they're outdated. Update license,
+  now using GPL-3. Remove old.
 
 *apetag-1.8 (21 Jan 2007)
 
diff --git a/media-sound/apetag/Manifest b/media-sound/apetag/Manifest
index 1648b9d40beb..ebb4d7ce143a 100644
--- a/media-sound/apetag/Manifest
+++ b/media-sound/apetag/Manifest
@@ -1,4 +1,5 @@
-DIST apetag.1.8.tar.gz 25146 RMD160 5714707a54d6b44685655c0c4e9e4953bf75e810 SHA1 f438a611e5a8b0e642fe85e862f2fcbfbad25aae SHA256 55a1c1004fc41839c6ea42827e5f01806f0242cd1e1af7967e539eaa89ee7565
-EBUILD apetag-1.8.ebuild 810 RMD160 99ce962b13e42989ddb10a91faa4327170093817 SHA1 350516e50c9b80df5ecf78bd81d7abc90e96961c SHA256 bd767d4d9829a3b3cf5439266cff34338f3460bb7f32738028556eeb71637db7
-MISC ChangeLog 845 RMD160 bc75d3844452767514c61873217ba7c557a45eea SHA1 dae3cf01b0018a437e434c98f1be43832a40f934 SHA256 ba596e1802880ceb5d414ae52c4ee12283f156d811777b78c36c60e28955d643
+AUX apetag-1.10-gcc43.patch 1185 RMD160 0174921863b348e0f320e9fe1cc4a495ea949cae SHA1 e40ae2a2150cb88c4affec27f01b3c99a7367007 SHA256 fa6ca65fbefda9e3553a44872ae50a7502cc9ef3cb31ca5642926cb2a2d3208b
+DIST apetag.1.10.tar.gz 29605 RMD160 142d35846957d114cc8e2d8f8d3388444ae5859c SHA1 22abddfd14e8fc6b667bf40eb4cd495802f0d8ed SHA256 008c45ea5be73ea4d171534dfc7b488fe1a0acc774f3dd1789f4027a9c87c6d3
+EBUILD apetag-1.10.ebuild 911 RMD160 2f1ff4925f47c09e6abd7c16f5a6a1607e03fc6e SHA1 84e366bab5ad2a6bdb01a289b9c09e48061a0e6a SHA256 20d82f3061ab89914f743b0a8aa827f067348e4ad140c60024a42503ca6aa562
+MISC ChangeLog 1182 RMD160 c3696c464d6fefe76e678a95cd5e0e719ede3ab1 SHA1 8ec3b6416e2a788ea9d6f1c4d95d865fafdec5a4 SHA256 32f8a0e792169da3d8067c0066d5ea00a747d3afafb5accb1cba423ac6813109
 MISC metadata.xml 160 RMD160 10be84fed28405abd22adc6689e87e5bb77e3501 SHA1 0c1bb16a7cc376ef35b87d8699ec9504718d36b9 SHA256 6bafe4a5c7b42309f124ebc2a9d78ebe5379aec4dcdc88c0bda2ab79c9851a6b
diff --git a/media-sound/apetag/apetag-1.10.ebuild b/media-sound/apetag/apetag-1.10.ebuild
new file mode 100644
index 000000000000..7672ea129f50
--- /dev/null
+++ b/media-sound/apetag/apetag-1.10.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/apetag/apetag-1.10.ebuild,v 1.1 2008/06/15 11:09:43 loki_val Exp $
+
+inherit eutils toolchain-funcs base
+
+DESCRIPTION="Command-line ape 2.0 tagger"
+HOMEPAGE="http://muth.org/Robert/Apetag/"
+SRC_URI="http://muth.org/Robert/Apetag/${PN}.${PV}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE=""
+
+KEYWORDS="-amd64 ~x86"
+
+DEPEND=""
+RDEPEND="dev-lang/python"
+
+S="${WORKDIR}/Apetag"
+
+PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
+
+src_unpack() {
+	base_src_unpack
+	sed -i \
+		-e 's,CXXDEBUG,LDFLAGS,g' \
+		Apetag/Makefile \
+		|| die "404. Makefile not found."
+}
+
+src_compile() {
+	emake CXX="$(tc-getCXX)" LDFLAGS="${LDFLAGS}" CXXOPT="${CXXFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dobin apetag || die
+	dobin tagdir.py rmid3tag.py cddb.py || die
+	dodoc 00readme || die
+}
diff --git a/media-sound/apetag/apetag-1.8.ebuild b/media-sound/apetag/apetag-1.8.ebuild
deleted file mode 100644
index 30e680872def..000000000000
--- a/media-sound/apetag/apetag-1.8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/apetag/apetag-1.8.ebuild,v 1.1 2007/01/21 21:12:20 flameeyes Exp $
-
-IUSE=""
-
-inherit eutils toolchain-funcs
-
-S="${WORKDIR}/Apetag"
-
-DESCRIPTION="Command-line ape 2.0 tagger"
-HOMEPAGE="http://muth.org/Robert/Apetag/"
-SRC_URI="http://muth.org/Robert/Apetag/${PN}.${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-amd64 ~x86"
-
-DEPEND=""
-RDEPEND="dev-lang/python"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i -e "s:-e Artist= -e:-p Artist= -p:" main.C || die
-}
-
-src_compile() {
-	emake CXX="$(tc-getCXX)" CXXDEBUG="" CXXOPT="${CXXFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	dobin apetag || die
-	dobin tagdir.py || die
-	dodoc 00changes 00readme || die
-}
diff --git a/media-sound/apetag/files/apetag-1.10-gcc43.patch b/media-sound/apetag/files/apetag-1.10-gcc43.patch
new file mode 100644
index 000000000000..8e76f30bfb95
--- /dev/null
+++ b/media-sound/apetag/files/apetag-1.10-gcc43.patch
@@ -0,0 +1,44 @@
+diff -NrU5 Apetag.orig/basic.C Apetag/basic.C
+--- Apetag.orig/basic.C	2008-06-15 12:32:43.000000000 +0200
++++ Apetag/basic.C	2008-06-15 12:46:06.000000000 +0200
+@@ -24,10 +24,11 @@
+ /* ================================================================== */
+ 
+ using namespace std;
+ 
+ #include <string>
++#include <cstdlib>
+ #include "basic.H"
+ 
+ /* ================================================================== */
+ // special imports
+ /* ================================================================== */
+@@ -268,11 +269,11 @@
+ {
+     exit(-1);
+ }
+ 
+ // ========================================================================
+-LOCALFUN VOID DefaultSignalHandler(int arg)
++LOCALFUN VOID DefaultSignalHandler(int __attribute__((unused)) arg)
+ {
+     if( !has_executed_before )
+     {
+         TraceCallBack();
+         TerminateCallBack();
+diff -NrU5 Apetag.orig/switch.H Apetag/switch.H
+--- Apetag.orig/switch.H	2008-06-15 12:32:43.000000000 +0200
++++ Apetag/switch.H	2008-06-15 12:36:59.000000000 +0200
+@@ -17,10 +17,12 @@
+ */
+ 
+ #ifndef SWITCH_H
+ #define SWITCH_H
+ 
++#include <cstdlib>
++
+ typedef enum
+ {
+     SWITCH_TYPE_INVALID,
+     SWITCH_TYPE_BOOL,
+     SWITCH_TYPE_INT32,