media-sound/mtag: EAPI bump, added gcc46 patch, slotted depends, updated description.

svn path=/sunrise/; revision=12221

5 files changed, 62 insertions, 15 deletions

diff --git a/media-sound/mtag/ChangeLog b/media-sound/mtag/ChangeLog
index 9f403b16d..d55c7a109 100644
--- a/media-sound/mtag/ChangeLog
+++ b/media-sound/mtag/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for media-sound/mtag
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Jul 2011; Piotr Szymaniak <szarpaj@grubelek.pl> mtag-3.ebuild,
+  +files/mtag-3-gcc46.patch, mtag-9999.ebuild:
+  EAPI bump, added gcc46 patch, slotted depends, updated description.
+
   22 Apr 2009; Christian Ruppert <idl0r@gentoo.org> mtag-3.ebuild,
   mtag-9999.ebuild:
   Removed unused eutils inherit, added cmake-utils. Added missing die statements.
diff --git a/media-sound/mtag/Manifest b/media-sound/mtag/Manifest
index 4e546b903..8ddab1b42 100644
--- a/media-sound/mtag/Manifest
+++ b/media-sound/mtag/Manifest
@@ -1,5 +1,6 @@
+AUX mtag-3-gcc46.patch 687 RMD160 3dc4c3d6ef0587df75216d4e67b037dcf9a489d2 SHA1 5241fcd66b077c8669e516becf49cda26de07054 SHA256 12fae33e1880ee290fda7dce36586c7e6f12447c9179baebb7482d8ced10f9c7
 DIST mtag-3.tar.gz 33119 RMD160 b8d2f77c3444ceded29451d8e3b0cdfe06e9faa8 SHA1 dded1645d7fd598fa6b3b5c55544d9352a3d03ee SHA256 7db5329b0db3ab5b5324f49e8575e818d1f64435e7fafb22577e81ddf22babb9
-EBUILD mtag-3.ebuild 588 RMD160 dcac6784ef0dd4a70fc84301f9978a2ea0bee177 SHA1 ad20b22be52c5781eb0e42633fec00955d3cd8c4 SHA256 cab9efa438e94f623d0127248f1200a6f0ae627f89d063ce2f17aff130e3f7ba
-EBUILD mtag-9999.ebuild 756 RMD160 51d4df34e8efc025e69ea5e5199702461c2bad9d SHA1 837ac9d31a312bcbad5d6e0b9a0709d47a384c41 SHA256 57f5c8e02105863ed05bd47b2da9125436a0d87b98d191c527a1435ae9d40ac0
-MISC ChangeLog 1496 RMD160 c1de6596657a1741f8bf02ef4d9d1d78fc35e700 SHA1 1e6eeceeee2b4d9cef6d121e3fdb74ecbf76ded6 SHA256 be60a552e40200775c2ddf5777cec32887161e2c8967bbb3008172d4469e9b15
+EBUILD mtag-3.ebuild 584 RMD160 2282e5cee44aed650c23362ae720d5ab1f99d6b5 SHA1 151ef69176eba8ccae18d153656246e21cf7498a SHA256 d57bd4e222a4fa93922cce241a2be019b1bfb38ecd32931fe00b070cca6fcdf9
+EBUILD mtag-9999.ebuild 753 RMD160 3be2fadaedefe3756831e8e093d91a5ef9368bf5 SHA1 1376a456b547f340509327373e274324d55a5cd8 SHA256 8f2e26ef08896024d879a70c963ba54b64a16f198a60e1446da0154d9410ca57
+MISC ChangeLog 1682 RMD160 c97c712195a334fc4e49d2d267c2c3d28c681538 SHA1 d4bdcf7294e7bcb9d7512b0c19ed40b3927e11a6 SHA256 e5953260a51fa97af2d2d3c2611c061d44e25ca3cb5f2f836a6de17108a4780d
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/media-sound/mtag/files/mtag-3-gcc46.patch b/media-sound/mtag/files/mtag-3-gcc46.patch
new file mode 100644
index 000000000..4910e9aab
--- /dev/null
+++ b/media-sound/mtag/files/mtag-3-gcc46.patch
@@ -0,0 +1,36 @@
+diff --git a/main.cpp b/main.cpp
+index aab75d2..114b8dc 100644
+--- a/main.cpp
++++ b/main.cpp
+@@ -7,6 +7,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <cstdlib>
++#include <iostream>
+ 
+ /* For taglib */
+ #include <fileref.h>
+diff --git a/meta.cpp b/meta.cpp
+index 79b7abc..dd53007 100644
+--- a/meta.cpp
++++ b/meta.cpp
+@@ -15,6 +15,7 @@
+ #include "tagger.h"
+ #include "sql.h"
+ #include "utils.h"
++#include <iostream>
+ 
+ /* For taglib */
+ #include <fileref.h>
+diff --git a/utils.cpp b/utils.cpp
+index 1521efb..7283785 100644
+--- a/utils.cpp
++++ b/utils.cpp
+@@ -16,6 +16,7 @@
+ #include <unistd.h>
+ #include <fileref.h>
+ #include <tag.h>
++#include <iostream>
+ 
+ #include "utils.h"
+ 
diff --git a/media-sound/mtag/mtag-3.ebuild b/media-sound/mtag/mtag-3.ebuild
index 5369b56e7..260871a06 100644
--- a/media-sound/mtag/mtag-3.ebuild
+++ b/media-sound/mtag/mtag-3.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit cmake-utils
+EAPI=4
 
-DESCRIPTION="the fast media tag lib"
+inherit cmake-utils eutils
+
+DESCRIPTION="Fast media tag lib"
 HOMEPAGE="http://mtag.berlios.de/"
 SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
 
@@ -14,15 +16,19 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 RDEPEND="media-libs/taglib
-	>=dev-db/sqlite-3.3.12"
+	dev-db/sqlite:3"
 DEPEND="${RDEPEND}"
 
 CMAKE_IN_SOURCE_BUILD=1
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc46.patch
+}
+
 src_install() {
-	dobin mtag || die "dobin failed"
-	dodoc README ChangeLog AUTHORS || die "dodoc failed"
+	dobin ${PN}
+	dodoc AUTHORS ChangeLog README
 	if use doc; then
-		dohtml -r html/* || die "dohtml failed"
+		dohtml -r html/*
 	fi
 }
diff --git a/media-sound/mtag/mtag-9999.ebuild b/media-sound/mtag/mtag-9999.ebuild
index bff818451..580ee0c0b 100644
--- a/media-sound/mtag/mtag-9999.ebuild
+++ b/media-sound/mtag/mtag-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 inherit cmake-utils subversion
 
-DESCRIPTION="the fast media tag lib"
+DESCRIPTION="Fast media tag lib"
 HOMEPAGE="http://mtag.berlios.de/"
 SRC_URI=""
 ESVN_REPO_URI="http://svn.berlios.de/svnroot/repos/mtag/trunk/mtag"
@@ -29,8 +29,8 @@ src_compile() {
 }
 
 src_install() {
-	dobin mtag || die "dobin failed"
-	dodoc README ChangeLog AUTHORS || die "dodoc failed"
+	dobin ${PN} || die "dobin failed"
+	dodoc AUTHORS ChangeLog README || die "dodoc failed"
 	if use doc; then
 		dohtml -r html/* || die "dohtml failed"
 	fi