diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-07-21 10:25:57 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-21 10:25:57 +0000 |
| commit | 065d88974287ffcce3e8ae5609c813423a556d53 (patch) | |
| tree | 01e3713d32d11b719de269b4ddcc99b822ea4956 /media-sound/kid3 | |
| parent | added net-misc/asterisk-spandsp_codec_g726 (diff) | |
| download | historical-065d88974287ffcce3e8ae5609c813423a556d53.tar.gz historical-065d88974287ffcce3e8ae5609c813423a556d53.tar.bz2 historical-065d88974287ffcce3e8ae5609c813423a556d53.zip | |
Fix building with USE="flac -vorbis" wrt #325935 by Thomas Kahle.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'media-sound/kid3')
| -rw-r--r-- | media-sound/kid3/ChangeLog | 5 | ||||
| -rw-r--r-- | media-sound/kid3/Manifest | 4 | ||||
| -rw-r--r-- | media-sound/kid3/kid3-1.4.ebuild | 21 |
3 files changed, 21 insertions, 9 deletions
diff --git a/media-sound/kid3/ChangeLog b/media-sound/kid3/ChangeLog index 915121862db9..e18a4809d881 100644 --- a/media-sound/kid3/ChangeLog +++ b/media-sound/kid3/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-sound/kid3 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.50 2010/06/28 08:55:14 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.51 2010/07/21 10:25:57 ssuominen Exp $ + + 21 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> kid3-1.4.ebuild: + Fix building with USE="flac -vorbis" wrt #325935 by Thomas Kahle. 28 Jun 2010; Markos Chandras <hwoarang@gentoo.org> kid3-1.4.ebuild: Stable on amd64 wrt bug #325935 diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest index 96fdbbf5ae8c..145a3d960e09 100644 --- a/media-sound/kid3/Manifest +++ b/media-sound/kid3/Manifest @@ -2,6 +2,6 @@ DIST kid3-1.2-libmp4v2.patch.bz2 8675 RMD160 8b25ad54e4c3718004686731a0b638c8422 DIST kid3-1.2.tar.gz 1381577 RMD160 3df2b29de8204611f1621c3764487263442f0531 SHA1 267eaab450293a722d146c1511c0bbc24cd5e286 SHA256 55959970708c720574f25420215f6ff43ed468df7905ae45517d6b1dc07ffa6f DIST kid3-1.4.tar.gz 1539244 RMD160 c73090e90d7c785d33b4e10d6ff5f75d525aeb30 SHA1 4c53ac9f23449c6643bf3d9d7547978c41146922 SHA256 dc3f79617cfe2e3fcc3414542d65424ea22864b289d93f3552853c2ba14df418 EBUILD kid3-1.2-r3.ebuild 1111 RMD160 a91a032b2946e953ffd8b28ce122c65d32a4a928 SHA1 e0cde7984056899ef015c2d0d7f73eed01037b41 SHA256 43de5e8e394ae6cda8182edb4fa1bb0d2f52780a7e532e1d3dc570c5a53c7367 -EBUILD kid3-1.4.ebuild 1036 RMD160 609fb0cadb600c7a140f11575c4a7d7228793578 SHA1 85d9f7cf134d8237a492b66e6a9fe7bdda8a0e26 SHA256 060880ef6fbd0ccf97cd6a77d764ef3b9de758a7ca4f01b7362064e2ab437a9b -MISC ChangeLog 6775 RMD160 94084d63eded8056dfdad5325385d680d9cb72d6 SHA1 10a74e361e8756b1d363701e7a658cd4fa62c356 SHA256 151664f72a46ddfde7116e00f80ee082e43724d302f82fee6ed1be1f34629781 +EBUILD kid3-1.4.ebuild 1152 RMD160 a61ed14f77babf961cde4b913ed5bc022afeb9c5 SHA1 55c9bb884d9c0b701d6300b4ffd5bd84b819e786 SHA256 409e6ec87bdf8448dcbc70fdb7bce3a644aabcf7415b9cf620d3dbddec967172 +MISC ChangeLog 6916 RMD160 ab2a502493b691cede33218af6c30f372f8a761f SHA1 86feb6e56e8795c1c236ea7c8058ac8b950873a1 SHA256 88100800f60858ad90c8652c540fea1ac533b5a184d1faf98f02473da1690f9d MISC metadata.xml 179 RMD160 224e1883835fc791f44fdef156866625e02ef60d SHA1 607ee34e3564d7e6d8e0ada382cf18c0315ba5fb SHA256 a6cc704b7ee96c5ce8f058d37447ffb4963d319e557b7fd8ff2bc63e5377d030 diff --git a/media-sound/kid3/kid3-1.4.ebuild b/media-sound/kid3/kid3-1.4.ebuild index 7bf92bc5650f..84f699078c10 100644 --- a/media-sound/kid3/kid3-1.4.ebuild +++ b/media-sound/kid3/kid3-1.4.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-1.4.ebuild,v 1.3 2010/06/28 08:55:14 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-1.4.ebuild,v 1.4 2010/07/21 10:25:57 ssuominen Exp $ -EAPI=2 +EAPI=3 inherit kde4-base DESCRIPTION="A simple tag editor for KDE" @@ -14,23 +14,32 @@ SLOT="4" KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" IUSE="flac +handbook mp3 mp4 +taglib vorbis" -DEPEND="flac? ( media-libs/flac[cxx] ) +RDEPEND=" + flac? ( media-libs/flac[cxx] + media-libs/libvorbis ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2 ) taglib? ( media-libs/taglib ) vorbis? ( media-libs/libvorbis )" +DEPEND="${RDEPEND}" src_configure() { - # tunepimp uses the old RDF WebService and should not be used... - # and -WITH_KDE=OFF doesn't compile (last checked, 1.3) + # -DWITH_TUNEPIMP is using deprecated RDF WebService + # -DWITH_KDE=OFF doesn't compile, last checked 1.4 + mycmakeargs+=( $(cmake-utils_use_with flac) $(cmake-utils_use_with mp3 ID3LIB) $(cmake-utils_use_with mp4 MP4V2) $(cmake-utils_use_with taglib) "-DWITH_TUNEPIMP=OFF" - $(cmake-utils_use_with vorbis) ) + if use flac; then + mycmakeargs+=( "-DWITH_VORBIS=ON" ) + else + mycmakeargs+=( $(cmake-utils_use_with vorbis) ) + fi + kde4-base_src_configure } |