projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e3e392f)
Version bump, this also handles bpmdetect dependency properly (bug #284036, thanks...
authorPacho Ramos <pacho@gentoo.org>
Mon, 21 Nov 2011 11:50:05 +0000 (11:50 +0000)
committerPacho Ramos <pacho@gentoo.org>
Mon, 21 Nov 2011 11:50:05 +0000 (11:50 +0000)
Package-Manager: portage-2.1.10.36/cvs/Linux x86_64

media-sound/banshee/ChangeLog patch | blob | history
media-sound/banshee/Manifest patch | blob | history
media-sound/banshee/banshee-2.2.1.ebuild [moved from media-sound/banshee/banshee-2.0.0.ebuild with 79% similarity] patch | blob | history
media-sound/banshee/metadata.xml patch | blob | history

diff --git a/media-sound/banshee/ChangeLog b/media-sound/banshee/ChangeLog
index 690b559255e8b0740c6a7ebaf22adfdf60e80f69..54b42d0c0986c7649eab3df82cdb72ae0bf4ab00 100644 (file)
--- a/media-sound/banshee/ChangeLog
+++ b/media-sound/banshee/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/banshee
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.143 2011/11/05 12:28:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.144 2011/11/21 11:50:05 pacho Exp $
+
+*banshee-2.2.1 (21 Nov 2011)
+
+  21 Nov 2011; Pacho Ramos <pacho@gentoo.org> +banshee-2.2.1.ebuild,
+  -banshee-2.0.0.ebuild, metadata.xml:
+  Version bump, this also handles bpmdetect dependency properly (bug #284036,
+  thanks to Colin Macdonald, Mart Raudsepp, Paweł Hajdan, Jr and others), and
+  fixes notifications (bug #387569 by Travis Hansen).
 
   05 Nov 2011; Markos Chandras <hwoarang@gentoo.org> banshee-2.2.0-r1.ebuild:
   Stable on amd64 wrt bug #389181
diff --git a/media-sound/banshee/Manifest b/media-sound/banshee/Manifest
index 17d414320b93f401a3be5a5e437410bfdcc0209c..93d18082a69f66c687a65a2a92b25207bf049bf8 100644 (file)
--- a/media-sound/banshee/Manifest
+++ b/media-sound/banshee/Manifest
@@ -1,28 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX banshee-1.7.4-make-webkit-optional.patch 2151 RMD160 70ad41d04763a5023f9863809f3e35c77f103ada SHA1 6acad219469ee67ada7a89508fb639922db12e22 SHA256 5f5ceea4e09dd9f9dca776b9775d6998faa641c7daa8968241b9bbddd6f72ecf
 AUX banshee-2.2.0-fix-equalizer-values.patch 1385 RMD160 086766a26e01a7cdb078bca1e10110b939bf9301 SHA1 358e8d458187d2a98fdaacdcb3af6b11426a1482 SHA256 23752f3da13c3b87d378a8fb7b42a6c1b3062f12432f74da8f80427b71434f08
-DIST banshee-2.0.0.tar.bz2 3575359 RMD160 11ef5f5773761546dbb1f33c9fdb09658dad171c SHA1 2b67fda2a15aa7eb5bc2a1e88f7013f3896913a4 SHA256 c6618d551556e1b994b16cc46bb5b4597b707e6c2dfda691ee852e0d1f544916
 DIST banshee-2.2.0.tar.xz 3069044 RMD160 b36900677265a4cf4264501e4c0f6a385189cb51 SHA1 08a1b28688cf545512fae039cef7555a8e3ac8e9 SHA256 85026f270777be15b778a8bf676d2c6e1a0d3d9758145515809bf209f7ab1815
-EBUILD banshee-2.0.0.ebuild 4033 RMD160 ecb18238d758bcc72c864f60badfa4ee4def2cea SHA1 b8d87c7cf2960f371cf87edda59ca28d05e6e282 SHA256 471ac04fb111990e196c4350b310132d9372e24d8d2b8778a6cad4cbb2d21c5b
+DIST banshee-2.2.1.tar.xz 3084484 RMD160 47b5ae9538306b27e6cc6288c61a94a1a1b72102 SHA1 7b77c3f47f60c3f26ee8b46fca3316e20f97fde2 SHA256 55c03ddf9732199b9f83d4ff375af99ae5a4eea46b8a198695427e5c48f1b9a5
 EBUILD banshee-2.2.0-r1.ebuild 3921 RMD160 2bd22a762dad23fab06190fa604e85474b668a52 SHA1 76d677cfe932e159d2e9484aa1995feadf7e148b SHA256 63f4681873254de5504020652bc1b780a734f3c9cc6bb757aff2678ebb272689
-MISC ChangeLog 26833 RMD160 58a2d6bbbd8e7642200847bca08d4818a79560ef SHA1 09ea04bcfbf7a913fd37eaf809cd70810439d077 SHA256 ab7225fd0c1eb2edfbad7330aeba96f43590c08473fbab3f3fcde10ea667a451
-MISC metadata.xml 716 RMD160 a3ace5c3df28db2b8814cbbbddd3c684b1558a02 SHA1 98985189362dcfa52450c191b577d969055ae5cf SHA256 85cea10541f92ee15f7971df81dfe4f784290863c5d6c55eaf752da2cb2a12ee
+EBUILD banshee-2.2.1.ebuild 4126 RMD160 28510f774621d80352ef9bfb90bf3982c1217361 SHA1 3bfc8a86b597344f4dee08168719b7cf07413093 SHA256 88ce579ead6710be8a106d45e7fc08fab1681f67fe8c649e881d34ca1c15a588
+MISC ChangeLog 27180 RMD160 061d049e2768d6730392a4687871a9e4b700650c SHA1 787803fb447ce3a977c26b16f6c4cf92eed742ad SHA256 debc0ba18863feb1ba0d76bfad0b55dd5dd78893a052ad91537d68c3c4eef15c
+MISC metadata.xml 698 RMD160 95a11b2d382d5c91b411829fe455b733ecea1228 SHA1 414284c191fdfadcf7b8ed4b0839a539ff850cca SHA256 fdccdd9d76ee8b2de867fad022cc51569cf5932e8ddf4b1eba263f0add1f4973
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOtSv+AAoJEPqDWhW0r/LCtpgQAKu7vAoqqVDHRJna5DMXZHC4
-BOU/8SjESRygEE4R5A0Amsd6Lrj7FQz6cFetLT0NNM/mTwFtHUR2w5yrPs8v4CPV
-f4IfzX5n5m+KAr8RvqtJYeOIyzp90zEquDO+ftogGHgyVjmY6O6Et8px7uIeIs/F
-2MUzXvdtuGx1HzyNFEWfBbsdpBJxQCrLcD4GTDKnSfajZQZ/4a5FG8BZmOi5Tl7g
-G0mz6cnySqaUKuxk8tXGOX2XiZhiMGxvkPVcCd/2qyB38jlU6CnmquzQqLzXOWuX
-wAGMm3+6TPs6jyybA664PF/M6YXDb80OwoiRtXPfA8ylqYJlz4t0bAwwHznqr1HU
-SnqDZ3b4VerJb4ZrQkpizDyDTpZ8Fx2ni7go6wSxUfd32tq+o3QW2F9CKqfs+ypw
-2kl49Qf1fLDFzbmzNzakwMWCXSzfzcsgSHImG0tSfy2fl5oQTmbke7wUSqcQ++O1
-JyoUaz+0wwNJ9Ogqy9taPMTUL2Y7fVdI8CUzzAC4htn5HfJai7K2eaTTqqUrxNcm
-+zzz4uU8hDCPwbJJFouxBMBaPltXqRa7DwYxzg3bBDK11EYpajH1liQggQKJkU8Y
-Vq57RF6/cGmA5yWZcWWdOvvEJ/PLxkJlLFKcsnhGPvAye03LyicSxY2+FNISYCPb
-+oTuAamD3TNTeETQuHkp
-=AVhZ
+iEYEARECAAYFAk7KOvIACgkQCaWpQKGI+9T5aACfaHJ/rsfmXQhzN3HrwXQ3T+5G
+E9MAn1F3/evVOQelTE57edqKMkCDgV/Y
+=R7qW
 -----END PGP SIGNATURE-----
diff --git a/media-sound/banshee/banshee-2.0.0.ebuild b/media-sound/banshee/banshee-2.2.1.ebuild
similarity index 79%
rename from media-sound/banshee/banshee-2.0.0.ebuild
rename to media-sound/banshee/banshee-2.2.1.ebuild
index 7a679af48934020df3ec4a9fd585dc9d78e4d230..d10fcd4c953625a175c33e90b6d546bd2c926930 100644 (file)
--- a/media-sound/banshee/banshee-2.0.0.ebuild
+++ b/media-sound/banshee/banshee-2.2.1.ebuild
@@ -1,25 +1,20 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-2.0.0.ebuild,v 1.3 2011/06/30 14:16:53 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-2.2.1.ebuild,v 1.1 2011/11/21 11:50:05 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 
-inherit eutils autotools mono gnome2-utils fdo-mime versionator
+inherit eutils autotools mono gnome2-utils fdo-mime versionator gnome.org
 
 GVER=0.10.7
 
 DESCRIPTION="Import, organize, play, and share your music using a simple and powerful interface."
 HOMEPAGE="http://banshee.fm/"
 
-#BANSHEE_V2=$(get_version_component_range 2)
-#[[ $((${BANSHEE_V2} % 2)) -eq 0 ]] && RELTYPE=stable || RELTYPE=unstable
-#SRC_URI="http://download.banshee-project.org/${PN}/${RELTYPE}/${PV}/${PN}-1-${PV}.tar.bz2"
-SRC_URI="http://download.banshee-project.org/${PN}/stable/${PV}/${P}.tar.bz2"
-
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+aac +cdda boo daap doc +encode ipod karma mtp podcast test udev +web youtube"
+KEYWORDS="~amd64 ~x86"
+IUSE="+aac +cdda +bpm boo daap doc +encode ipod karma mtp test udev +web youtube"
 
 RDEPEND=">=dev-lang/mono-2.4.3
        gnome-base/gnome-settings-daemon
@@ -43,8 +38,8 @@ RDEPEND=">=dev-lang/mono-2.4.3
                )
        )
        media-libs/musicbrainz:1
-       >=dev-dotnet/ndesk-dbus-glib-0.4.1
-       >=dev-dotnet/ndesk-dbus-0.6.1a
+       dev-dotnet/dbus-sharp
+       dev-dotnet/dbus-sharp-glib
        >=dev-dotnet/mono-addins-0.4[gtk]
        >=dev-dotnet/taglib-sharp-2.0.3.7
        >=dev-db/sqlite-3.4:3
@@ -53,6 +48,7 @@ RDEPEND=">=dev-lang/mono-2.4.3
        boo? (
                >=dev-lang/boo-0.8.1
        )
+       bpm? ( >=media-plugins/gst-plugins-soundtouch-${GVER}:0.10 )
        daap? (
                >=dev-dotnet/mono-zeroconf-0.8.0-r1
        )
@@ -86,30 +82,40 @@ RDEPEND=">=dev-lang/mono-2.4.3
        )"
 
 DEPEND="${RDEPEND}
+       app-arch/xz-utils
        dev-util/pkgconfig"
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README"
 
 src_prepare () {
+       # Don't build BPM extension when not wanted
+       if ! use bpm; then
+               sed -i -e 's:Banshee.Bpm:$(NULL):g' src/Extensions/Makefile.am || die
+       fi
+
+       # EqualizerManager: Update values for the Smiley Face preset (bgo#661224)
+       epatch "${FILESDIR}/${PN}-2.2.0-fix-equalizer-values.patch"
+
        epatch "${FILESDIR}/${PN}-1.7.4-make-webkit-optional.patch" # upstream bug 628518
        AT_M4DIR="-I build/m4/banshee -I build/m4/shamrock -I build/m4/shave" \
                eautoreconf
 }
 
 src_configure() {
+       # soundmenu needs a properly maintained and updated indicate-sharp
        local myconf="--disable-dependency-tracking
                --disable-static
+               --disable-maintainer-mode
                --enable-gnome
                --enable-schemas-install
                --with-gconf-schema-file-dir=/etc/gconf/schemas
                --with-vendor-build-id=Gentoo/${PN}/${PVR}
                --enable-gapless-playback
                --disable-gst-sharp
-               --disable-hal
                --disable-torrent
                --disable-shave
                --disable-ubuntuone
-               --enable-soundmenu"
+               --disable-soundmenu"
 
        econf \
                $(use_enable doc docs) \
@@ -117,8 +123,7 @@ src_configure() {
                $(use_enable boo) \
                $(use_enable mtp) \
                $(use_enable daap) \
-               $(use_enable ipod appledevice) --disable-ipod \
-               $(use_enable podcast) \
+               $(use_enable ipod appledevice) \
                $(use_enable karma) \
                $(use_enable web webkit) \
                $(use_enable youtube) \
@@ -132,7 +137,7 @@ src_compile() {
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die
+       emake DESTDIR="${D}" install
        find "${ED}" -name '*.la' -exec rm -f {} +
 }
 
diff --git a/media-sound/banshee/metadata.xml b/media-sound/banshee/metadata.xml
index 14711119f52f48a645ae1a9451c252d328206b25..e3c4e2f5d7d7d50f0bbde44e28e093356852a3f9 100644 (file)
--- a/media-sound/banshee/metadata.xml
+++ b/media-sound/banshee/metadata.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dotnet</herd>
-  <herd>gstreamer</herd>
-  <use>
-    <flag name="boo">Use external Boo instead of the bundled one</flag>
+<herd>dotnet</herd>
+<herd>gstreamer</herd>
+<use>
+       <flag name="boo">Use external Boo instead of the bundled one</flag>
+       <flag name="bpm">Build beats per minute detection extension</flag>
        <flag name="cdda">Build with audio CD support</flag>
-    <flag name="daap">Build with Daap support</flag>
-    <flag name="karma">Build with karma support</flag>
-    <flag name="podcast">Build with podcasting support</flag>
-   <flag name="web">Enable support for plugins that access web-based services
-               such as Amazon and wikipedia (requires
-               <pkg>net-libs/webkit-gtk</pkg>)</flag>
-   <flag name="youtube">Enable the Youtube plugin</flag>
-  </use>
+       <flag name="daap">Build with Daap support</flag>
+       <flag name="karma">Build with karma support</flag>
+       <flag name="web">Enable support for plugins that access web-based services
+       such as Amazon and wikipedia (requires <pkg>net-libs/webkit-gtk</pkg>)</flag>
+       <flag name="youtube">Enable the Youtube plugin</flag>
+</use>
 </pkgmetadata>
Unnamed repository; edit this file 'description' to name the repository.