Fix license and deps for both vers

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-libs/taglib/taglib-1.6.1-r1.ebuild b/media-libs/taglib/taglib-1.6.1-r1.ebuild
index bb7de4ad08589d8b06e5b71018382b881a65155f..2dc3314cd8c3ab1afeb6408b137120d4f1eff6a5 100644 (file)
--- a/media-libs/taglib/taglib-1.6.1-r1.ebuild
+++ b/media-libs/taglib/taglib-1.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib/taglib-1.6.1-r1.ebuild,v 1.9 2010/04/04 18:22:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib/taglib-1.6.1-r1.ebuild,v 1.10 2010/04/09 20:41:03 ssuominen Exp $
 
 EAPI=2
 inherit cmake-utils
@@ -9,7 +9,7 @@ DESCRIPTION="A library for reading and editing audio meta data"
 HOMEPAGE="http://developer.kde.org/~wheeler/taglib.html"
 SRC_URI="http://developer.kde.org/~wheeler/files/src/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2 MPL-1.1"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 SLOT="0"
 IUSE="+asf debug examples +mp4 test"
@@ -18,7 +18,8 @@ DEPEND="
        dev-util/pkgconfig
        test? ( dev-util/cppunit )
 "
-RDEPEND=""
+RDEPEND="${DEPEND}
+       sys-libs/zlib"
 
 PATCHES=(
        "${FILESDIR}"/${P}-install-examples.patch

diff --git a/media-libs/taglib/taglib-1.6.2.ebuild b/media-libs/taglib/taglib-1.6.2.ebuild
index 136ecd257ab0543f8f65d8e1a936e7f2927b8a8f..1c0e454df1164cb1cd3a3f424e11dc63dccf99dd 100644 (file)
--- a/media-libs/taglib/taglib-1.6.2.ebuild
+++ b/media-libs/taglib/taglib-1.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib/taglib-1.6.2.ebuild,v 1.1 2010/04/09 20:36:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib/taglib-1.6.2.ebuild,v 1.2 2010/04/09 20:41:03 ssuominen Exp $
 
 EAPI=3
 inherit cmake-utils
@@ -14,8 +14,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-
 SLOT="0"
 IUSE="+asf debug examples +mp4 test"
 
-RDEPEND=""
-DEPEND="dev-util/pkgconfig
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+       dev-util/pkgconfig
        test? ( dev-util/cppunit )"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.6.1-install-examples.patch )