[gentoo-commits] proj/qt:master commit in: media-sound/kajammer/, media-sound/kajammer/files/

["Michael Palimaka" <kensington@gentoo.org>]

commit:     cd995278456077cad5e60dabe2c3a2605c2d968d
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 31 16:27:03 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Aug 31 16:27:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=cd995278

[media-sound/kajammer] Fix deps wrt bug #431478. Respect CXXFLAGS.

(Portage version: 2.1.11.12/git/Linux x86_64, unsigned Manifest commit)

---
 .../kajammer/files/kajammer-0.9.3-gentoo.patch     |    2 +-
 ...ammer-0.9.3.ebuild => kajammer-0.9.3-r1.ebuild} |    7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/media-sound/kajammer/files/kajammer-0.9.3-gentoo.patch b/media-sound/kajammer/files/kajammer-0.9.3-gentoo.patch
index 74cc688..200223b 100644
--- a/media-sound/kajammer/files/kajammer-0.9.3-gentoo.patch
+++ b/media-sound/kajammer/files/kajammer-0.9.3-gentoo.patch
@@ -5,7 +5,7 @@
  
  SET( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake )
 -SET(CMAKE_CXX_FLAGS "-g -Wall")
-+SET(CMAKE_CXX_FLAGS "-Wall")
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
  
  FIND_PACKAGE( Qt4 REQUIRED )
  FIND_PACKAGE( Phonon REQUIRED )

diff --git a/media-sound/kajammer/kajammer-0.9.3.ebuild b/media-sound/kajammer/kajammer-0.9.3-r1.ebuild
similarity index 87%
rename from media-sound/kajammer/kajammer-0.9.3.ebuild
rename to media-sound/kajammer/kajammer-0.9.3-r1.ebuild
index e51a41c..ab3d9fb 100644
--- a/media-sound/kajammer/kajammer-0.9.3.ebuild
+++ b/media-sound/kajammer/kajammer-0.9.3-r1.ebuild
@@ -13,12 +13,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="kde lastfm"
+IUSE="lastfm"
 
-DEPEND="x11-libs/qt-core:4
+DEPEND="media-libs/phonon
+	x11-libs/qt-core:4
 	x11-libs/qt-gui:4
-	kde? ( media-libs/phonon )
-	!kde? ( x11-libs/qt-phonon:4 )
 	lastfm? ( media-libs/liblastfm )"
 RDEPEND="${DEPEND}"