Don't force using gst-plugins-oss, let the uesrs select what they want. Close #105298.

The sed for libpq-fe is no more needed.
Make musicbrainz optional with musicbrainz useflag. Close #105298.
Package-Manager: portage-2.0.51.22

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 227670376ea04ac93bc193288e26859eafdcd97c..9719d9f5af6b4386c1327cba5c375eed94c2f103 100644 (file)
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.70 2005/09/08 16:38:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.71 2005/09/08 23:06:39 flameeyes Exp $
+
+  08 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> amarok-1.3.1-r1.ebuild:
+  Don't force using gst-plugins-oss, let the uesrs select what they want.
+  Close #105298. The sed for libpq-fe is no more needed. Make musicbrainz
+  optional with musicbrainz useflag. Close #105298.
 
 *amarok-1.3.1-r1 (08 Sep 2005)
 

diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index b6f8d8f27c673d861df5c994a54056cb58f60548..0ae9a0ec0a08ab379acb63e7dd1dc7a7479b7bf4 100644 (file)
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6a300943d07d5c904c72f6747b131b6e ChangeLog 10791
-MD5 eff20abea92993991b36facb5714fd0d amarok-1.3.1-r1.ebuild 3356
+MD5 d3b9275e6158865a8077dde0f40b4e0a ChangeLog 11069
+MD5 81f00c356bf82789fc54bdd49f627547 amarok-1.3.1-r1.ebuild 3225
 MD5 91f47828b3a009ecbaa2ef170520aa5f amarok-1.3.ebuild 3001
 MD5 a62708867dd0a86debc654ed4ab63800 amarok-1.2.3.ebuild 2331
 MD5 b23600108f12c98a4fd574d3487ee598 metadata.xml 175
@@ -16,7 +16,7 @@ MD5 55c15fa0003bd71db5f7e23d750c0b16 files/digest-amarok-1.2.3 66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDIGkaj5H05b2HAEkRAl05AJ4m5iEy9S6BRuNKBXWe8IeZucvsXQCdF+Tj
-w2zc0JnPe2gRjmuzx+Rdfc4=
-=z9Y9
+iD8DBQFDIMQZj5H05b2HAEkRAvm/AKCPRu/mJ1v4bXWTMS58WUGdgdEqMACfS4uX
+6JUalUVvk3MDccqURfMTC7g=
+=k7/9
 -----END PGP SIGNATURE-----

diff --git a/media-sound/amarok/amarok-1.3.1-r1.ebuild b/media-sound/amarok/amarok-1.3.1-r1.ebuild
index 7daae02ca5c17459bd6544ba6e91afdb27497725..871c4754b1dc54144e027d122e61e245e960c392 100644 (file)
--- a/media-sound/amarok/amarok-1.3.1-r1.ebuild
+++ b/media-sound/amarok/amarok-1.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.3.1-r1.ebuild,v 1.1 2005/09/08 16:38:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.3.1-r1.ebuild,v 1.2 2005/09/08 23:06:39 flameeyes Exp $
 
 inherit kde eutils
 
@@ -13,7 +13,8 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~ppc -sparc ~x86"
-IUSE="arts flac gstreamer kde mp3 mysql noamazon opengl postgres xine xmms visualization vorbis"
+IUSE="arts flac gstreamer kde mp3 mysql noamazon opengl postgres xine xmms
+visualization vorbis musicbrainz"
 # kde: enables compilation of the konqueror sidebar plugin
 
 S=${WORKDIR}/${MY_P}
@@ -25,7 +26,7 @@ DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
         xine? ( >=media-libs/xine-lib-1_rc4 )
         gstreamer? ( >=media-libs/gstreamer-0.8.8
                      >=media-libs/gst-plugins-0.8.6 )
-        >=media-libs/tunepimp-0.3.0
+        musicbrainz? ( >=media-libs/tunepimp-0.3.0 )
         >=media-libs/taglib-1.4
         mysql? ( >=dev-db/mysql-4.0.16 )
         postgres? ( dev-db/postgresql )
@@ -38,8 +39,7 @@ RDEPEND="${DEPEND}
        gstreamer? ( mp3? ( >=media-plugins/gst-plugins-mad-0.8.6 )
                     vorbis? ( >=media-plugins/gst-plugins-ogg-0.8.6
                               >=media-plugins/gst-plugins-vorbis-0.8.6 )
-                    flac? ( >=media-plugins/gst-plugins-flac-0.8.6 )
-                                >=media-plugins/gst-plugins-oss-0.8.6 )"
+                    flac? ( >=media-plugins/gst-plugins-flac-0.8.6 ) )"
 
 DEPEND="${DEPEND}
        >=dev-util/pkgconfig-0.9.0"
@@ -66,11 +66,6 @@ pkg_setup() {
        kde_pkg_setup
 }
 
-src_unpack() {
-       kde_src_unpack
-       sed -i -e "s:postgresql/pgsql/libpq-fe.h:libpq-fe.h:" amarok/src/collectiondb.cpp
-}
-
 src_compile() {
        # amarok does not respect kde coding standards, and makes a lot of
        # assuptions regarding its installation directory. For this reason,