From: Samuli Suominen <ssuominen@gentoo.org>
Date: Sun, 13 Jun 2010 10:04:13 +0000 (+0000)
Subject: amd64 stable wrt #322375
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aa3bf31dcbffa70c6f7bbdb1dd2e0c77d98a98d1;p=gentoo.git

amd64 stable wrt #322375
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/media-sound/drumstick/ChangeLog b/media-sound/drumstick/ChangeLog
index 6e6fdecc6d24..9e2154814d9b 100644
--- a/media-sound/drumstick/ChangeLog
+++ b/media-sound/drumstick/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/drumstick
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/drumstick/ChangeLog,v 1.1 2010/04/27 21:36:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/drumstick/ChangeLog,v 1.2 2010/06/13 10:03:07 ssuominen Exp $
+
+  13 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  drumstick-0.3.1.ebuild:
+  amd64 stable wrt #322375
 
 *drumstick-0.3.1 (27 Apr 2010)
 
diff --git a/media-sound/drumstick/drumstick-0.3.1.ebuild b/media-sound/drumstick/drumstick-0.3.1.ebuild
index cf052e18be1e..aadee0f23dda 100644
--- a/media-sound/drumstick/drumstick-0.3.1.ebuild
+++ b/media-sound/drumstick/drumstick-0.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/drumstick/drumstick-0.3.1.ebuild,v 1.2 2010/04/27 21:37:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/drumstick/drumstick-0.3.1.ebuild,v 1.3 2010/06/13 10:03:07 ssuominen Exp $
 
 EAPI=2
 inherit cmake-utils fdo-mime gnome2-utils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/qt-gui:4
@@ -21,6 +21,12 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
+src_prepare() {
+	sed -i \
+		-e '/CMAKE_EXE_LINKER_FLAGS/d' \
+		CMakeLists.txt || die
+}
+
 pkg_preinst() {
 	gnome2_icon_savelist
 }
diff --git a/media-sound/kmid/ChangeLog b/media-sound/kmid/ChangeLog
index 6f13cb4514c5..fc381f64d142 100644
--- a/media-sound/kmid/ChangeLog
+++ b/media-sound/kmid/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/kmid
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kmid/ChangeLog,v 1.10 2010/04/27 21:43:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kmid/ChangeLog,v 1.11 2010/06/13 10:04:13 ssuominen Exp $
+
+  13 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> kmid-2.3.0-r1.ebuild:
+  amd64 stable wrt #322375
 
 *kmid-2.3.0-r1 (27 Apr 2010)
 
diff --git a/media-sound/kmid/kmid-2.3.0-r1.ebuild b/media-sound/kmid/kmid-2.3.0-r1.ebuild
index 1ec70a4dac5b..6ed9fd63127a 100644
--- a/media-sound/kmid/kmid-2.3.0-r1.ebuild
+++ b/media-sound/kmid/kmid-2.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kmid/kmid-2.3.0-r1.ebuild,v 1.1 2010/04/27 21:43:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kmid/kmid-2.3.0-r1.ebuild,v 1.2 2010/06/13 10:04:13 ssuominen Exp $
 
 EAPI=2
 # fix linguas.desc, sr@ijekavianlatin sr@ijekavian
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/kmid2/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug +handbook"
 
 DEPEND="media-libs/alsa-lib