Dependency on libmad and libid3tag is now optional

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

4 files changed, 33 insertions, 23 deletions

diff --git a/sys-fs/mtpfs/ChangeLog b/sys-fs/mtpfs/ChangeLog
index 2445e5cb2842..b809b63b17cc 100644
--- a/sys-fs/mtpfs/ChangeLog
+++ b/sys-fs/mtpfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/mtpfs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtpfs/ChangeLog,v 1.5 2012/02/29 15:50:47 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtpfs/ChangeLog,v 1.6 2012/02/29 16:03:21 xarthisius Exp $
+
+  29 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org> metadata.xml,
+  mtpfs-1.1.ebuild:
+  Dependency on libmad and libid3tag is now optional
 
   29 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org> mtpfs-1.0.ebuild,
   mtpfs-1.1.ebuild:
diff --git a/sys-fs/mtpfs/Manifest b/sys-fs/mtpfs/Manifest
index 734a50e55c9b..362bff0d0106 100644
--- a/sys-fs/mtpfs/Manifest
+++ b/sys-fs/mtpfs/Manifest
@@ -7,23 +7,23 @@ DIST mtpfs-1.1.tar.gz 108329 RMD160 2fb67b80a95445369412166cdfbe5b88b1a74f24 SHA
 DIST mtpfs_0.9.orig.tar.gz 95100 RMD160 220b85d3c3c9fba4343707d0f923c5e7e08636e2 SHA1 fc4bd7efb8d7cb09dc0d46aa5e9061bdcfb6975c SHA256 ead194b5d130f9a45fcd99b186f38e98b365c9fe505e9676921c1ca75b2cf837
 EBUILD mtpfs-0.9.ebuild 1073 RMD160 983943fd22317eac6e0229fb2899b05389731024 SHA1 b9269f3c38ddb254c710b5442869b97e56dc5baa SHA256 bdc245104bf48aeae4103040b88f66e25752e61a760260242c9df3bf0ce8e5ac
 EBUILD mtpfs-1.0.ebuild 1094 RMD160 de81266eff7da3bfb963e611f9d419b7cb6976ee SHA1 c9491f140fd5d3c355543993c987342d8f1df461 SHA256 00bcf2e692f2c7345e687576c502f0040cd323e0ab36dbe6847f124c21d3df17
-EBUILD mtpfs-1.1.ebuild 1105 RMD160 f68464631b2449b433f9988f0d12dedae8ed9db5 SHA1 5c9d357dd7bc82ffba9eb33e1550901bf6d282c3 SHA256 a5f7ab9d550021a520d1a17fbc48044057ba1a81052a35215ef7a31320afeff1
-MISC ChangeLog 949 RMD160 8090566ca8772d32d63f278bde84ce6526b9d55b SHA1 4f951ea9fddc981f47372a1acd0b0d5b60bc5e24 SHA256 e5e93c44a3901f75e435a50b0e3866ccf3938044b4386689d2f28a2688949a86
-MISC metadata.xml 580 RMD160 b6d46a4cb9c56acaa3edd88dda430b35dc79998d SHA1 c381f908cd33bbc0c1589d1abef9141cbf2e242d SHA256 0fe8d280f44d8a951e9867fabce5afffb974080b3171d076699b8d0670893793
+EBUILD mtpfs-1.1.ebuild 1144 RMD160 96e242f2cab516fad0cbf51e367b729c58ddacd8 SHA1 1d313102f40ecffce23911118edd753a7d9ce75a SHA256 b4f84cb4adf1671fe74b9fac5e1af4b0b34f42de40519257d9ad542c8037aced
+MISC ChangeLog 1091 RMD160 d84cff23458b601dfac1a3bdbec0db7e1d66875e SHA1 665e998e72c9afbd9e4f8ec15518a85d00e956bf SHA256 3662025783476319a9e6c65147bb77c2ccf566c4fa15725ae65154659c67b74b
+MISC metadata.xml 655 RMD160 e7e8ea3276055cc9643d7c3d8066f9ae6d026b75 SHA1 7c35ed8a6e00e8393c61cc2fb97b3c587a1b3231 SHA256 b417007985d6ea143de6c02b632876d9902208d3eb5810106b5ffb4a062eee2b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPTkliAAoJEF0huFKJUZL5cSEQAJWmRGyTt9/471gRp/LmWreA
-ERhalXVU3cmZ2dgxT9erlnPuwLGPK4UWNdp6WzKKFegTxTS+T65DvhQg2eXAu0+c
-krAwzhUXSjLyVC7VvIl7iO7HLp77cMBhvGhXBgMdyWJYEZCheaSLQeiVPBOv80yz
-CX0y+rrXhjFfXvtGbwMAMOzYdo60pU0RGJ2Xz1wihZIiDTh+SYf6KgklettpiQRm
-d2HEyP0ZhqcE+qCSGyB+AMbkcln9c/GrTyOQ8sd6zk21ayGKT373dUKgw5KWFsPM
-uYG7CV6C3dRAMzEkUZybjVWN+bGU31M0qdgdOsgsjwZyp++VWVdH7oocHcw4sG1A
-UvtmAZVfHtPuVHvrQCavwJjxVI6tTh0ajGR51Z4oIkS8rwFZ4Jn3/U05PVXQl7Mo
-aSNWkjRpmhdeZVUI5ruc+W+oBQi4a4GCmdwJ6Ob/4nX531vycvZSYrxi0nqDlFeT
-QMs2z/aIxOO9lZfTRfDnpYqXbCxRMqz9iywUK25RlS+n/a7iSHNFMOtQI4yg7TzC
-9WBhtzUOSztA+5Ius1pSA2K2n5T37YgD0mww6jX7kuPMJA5ekH4ZrWy0DPk2Cyhr
-CUOnm3/AEijO+zTQ8jypwsPU3ihp6VAkrAVDKbD/l+olrgGqbwM+ypJcsZmr945Y
-eEy1LnFMHk4TRXDVybak
-=cAid
+iQIcBAEBCAAGBQJPTkxUAAoJEF0huFKJUZL5X90QAJsroRDqYfHnJFL3meLXHjIA
+KaKqLBKRGTKJElyKbW4Bx9iC+rc0m3Z5pg3E2rdghmDicHKqeDq6QqaFbDKKVx7d
+MMvFTSejmHVaMZkeL1ZIUJ29JmpHRCEgYmfk5DUmeJESB4qKJqsp9waoa568YtC1
+Griwwma4sgUDQi90Sc/qt7Cuw6Y86YpBieoYncGtjN8GdUtWCT7Y9rVTtjTSv1DE
+0K6HnWau2gt7LMhC7QdLPMHGeteRpBxQX4aZUIwMate77j/0Rl11rdafUopNRFNY
+ihUxbr94kS9vZ9hFLlzWj/DLuXAEDF4kEcM6QM6FzPtN2fIXAgm4awHRwZl1sSDH
+U3ygCEFEHNP4/6nzpkx7iDt+1AMw7KUWu0wAGH774altJ/c/mSKLQWYAbzvn3al5
+CM1o/MBp4N6GL+QTCO5F3zOpKZMT6waicLOBACPoL2EbsFuXm6C0Mw85oKYaX/Pj
+K9fjRwMtrtyZx1/4KNb2cj2NCa1H9uFiFICfA41DxatADYPhDpU9gPAY1xPH0WEk
+UAG1D0RBuu3w8c2gMKILi+5sIkFBK3XjNcnINnsAuf3g021WvZhmGbUPo8EE1CuT
+zMGp5tN+3OcG9B/JBAgOdkEqOlTkthsjSi2FFRg8WBDeJjNamb5FO3Ua4vXlzNLd
+DeK39/GXz2BDV6JgTtCR
+=WKdR
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/mtpfs/metadata.xml b/sys-fs/mtpfs/metadata.xml
index 94e7db434bf1..6b71cbcac86c 100644
--- a/sys-fs/mtpfs/metadata.xml
+++ b/sys-fs/mtpfs/metadata.xml
@@ -14,4 +14,7 @@
 		MTP device, as supported by libmtp. MTPfs includes extra features such
 		as playlist and meta information support for MP3 players.
 	</longdescription>
+	<use>
+		<flag name='mad'>Enable handling of MP3's metadata</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-fs/mtpfs/mtpfs-1.1.ebuild b/sys-fs/mtpfs/mtpfs-1.1.ebuild
index 510707a819fd..eeaf1b9131c7 100644
--- a/sys-fs/mtpfs/mtpfs-1.1.ebuild
+++ b/sys-fs/mtpfs/mtpfs-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtpfs/mtpfs-1.1.ebuild,v 1.2 2012/02/29 15:50:47 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtpfs/mtpfs-1.1.ebuild,v 1.3 2012/02/29 16:03:21 xarthisius Exp $
 
 EAPI=4
 
@@ -11,13 +11,15 @@ SRC_URI="http://www.adebenham.com/files/mtp/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug"
+IUSE="debug mad"
 
 DEPEND="dev-libs/glib:2
-	media-libs/libid3tag
-	media-libs/libmad
 	>=media-libs/libmtp-1.1.2
-	sys-fs/fuse"
+	sys-fs/fuse
+	mad? (
+		media-libs/libid3tag
+		media-libs/libmad
+	)"
 RDEPEND="${DEPEND}"
 
 DOCS=(AUTHORS NEWS README)
@@ -28,7 +30,8 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_enable debug)
+	econf $(use_enable debug) \
+		$(use_enable mad)
 }
 
 pkg_postinst() {