summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2009-05-19 21:22:24 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2009-05-19 21:22:24 +0000
commit8a1f20e49e5e24f679af2a413f7af1637bdd6731 (patch)
tree2160aef6cc30e9d64909cbd08e80f846ad42e25f /media-sound/qmpdclient
parentFix error in dodoc. Per bug #270493. (diff)
downloadhistorical-8a1f20e49e5e24f679af2a413f7af1637bdd6731.tar.gz
historical-8a1f20e49e5e24f679af2a413f7af1637bdd6731.tar.bz2
historical-8a1f20e49e5e24f679af2a413f7af1637bdd6731.zip
Fix dbus automagic dependency check. Remove old ebuild
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'media-sound/qmpdclient')
-rw-r--r--media-sound/qmpdclient/ChangeLog8
-rw-r--r--media-sound/qmpdclient/Manifest4
-rw-r--r--media-sound/qmpdclient/qmpdclient-1.1.0-r3.ebuild (renamed from media-sound/qmpdclient/qmpdclient-1.1.0-r2.ebuild)12
3 files changed, 19 insertions, 5 deletions
diff --git a/media-sound/qmpdclient/ChangeLog b/media-sound/qmpdclient/ChangeLog
index 29b2ecf79b58..df360f55f0e8 100644
--- a/media-sound/qmpdclient/ChangeLog
+++ b/media-sound/qmpdclient/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-sound/qmpdclient
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/ChangeLog,v 1.44 2009/05/18 18:18:30 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/ChangeLog,v 1.45 2009/05/19 21:22:24 hwoarang Exp $
+
+*qmpdclient-1.1.0-r3 (19 May 2009)
+
+ 19 May 2009; Markos Chandras <hwoarang@gentoo.org>
+ -qmpdclient-1.1.0-r2.ebuild, +qmpdclient-1.1.0-r3.ebuild:
+ Fix dbus automagic dependency check. Remove old ebuild
*qmpdclient-1.1.0-r2 (18 May 2009)
diff --git a/media-sound/qmpdclient/Manifest b/media-sound/qmpdclient/Manifest
index e827070351fa..1d48227e2f1d 100644
--- a/media-sound/qmpdclient/Manifest
+++ b/media-sound/qmpdclient/Manifest
@@ -6,7 +6,7 @@ EBUILD qmpdclient-1.0.8-r1.ebuild 1225 RMD160 2d3ce10913a0baaed48c31d67f3f230e91
EBUILD qmpdclient-1.0.8.ebuild 1527 RMD160 7e926e072b8a6dbdb0d09306ce56d790a6431ef6 SHA1 c58f5712cf44cfdfdb69195aeedadcb814bb8f9a SHA256 067632db710c2f77bd555252bcddd2fca3be8e749d4cdf6794867b16fd7b366e
EBUILD qmpdclient-1.0.9.ebuild 1111 RMD160 73d25c921f7e70236ac4e1604901e30799d0c603 SHA1 ddcaa9280cff5f8d16e4bff03402af74d0316410 SHA256 cf9bf94519331134d7cc2291203f356478ab7a3d8469246fe5bfe573fe817364
EBUILD qmpdclient-1.1.0-r1.ebuild 2338 RMD160 984edc0022d24f5978ae9c5c423f706859cd149f SHA1 d1694650d5e7043ddb7ffc132823a30defc93879 SHA256 13c6502b9c0fb31a6b92e462064932f645649ecd3bcc2e47a0a63222d905042c
-EBUILD qmpdclient-1.1.0-r2.ebuild 2349 RMD160 53673f6bb1aa301b6f47ff876d5598451945da18 SHA1 ba11cdc7242b19d5a24caf12b1fa14de8c23e0b4 SHA256 086b77eca3a71d35cc7304630d86f09e14992d8587250dc65df21615097a5332
+EBUILD qmpdclient-1.1.0-r3.ebuild 2657 RMD160 4dd1e81764b81a8ebb90328d86292c4ff379bf6c SHA1 6354a8788a7fd078badd360ff95f775510da11ce SHA256 f9580f92f8e5502936e90312ce0f255c9099da415a2eca58d7c2f1bd3b03c078
EBUILD qmpdclient-1.1.0.ebuild 1454 RMD160 631acf033bfa52dfb02c374ec50f28baeec7c81a SHA1 fa1c3bf16845c4b4cfffe27286dcbec7e025f98c SHA256 73cc132a186778df11b0b4fcbae80220de702626eeaece08fc83634f388b567e
-MISC ChangeLog 6964 RMD160 023598b4b3c89ed125c32e5384422bbcd7ca4c38 SHA1 e1881e6dcab676d200d18e6007eaeedc0dabc390 SHA256 858b4506a6834b113e99815de3b8cd1bf964757c9d7b5e835aecc65c6aa3f4e0
+MISC ChangeLog 7171 RMD160 06843277ff88e792eaf623ff3bec0ecf6cffd720 SHA1 64a2d4df3f7c361a402b8a5831735b0e5e92ca54 SHA256 a23da2d7a8ad78b41fa762b19b4e966bba4e2751bb94a48e2e12f2d5247d2be4
MISC metadata.xml 258 RMD160 f32ba62126b21562a3642f9d351eec482fa91c19 SHA1 c9dcd2a5a50ab150a1ddd117357dd705c4d05e77 SHA256 3f6828f13a57795ebfa18907e3cb7a9bf80b7be961ab0b198ec135762e90c723
diff --git a/media-sound/qmpdclient/qmpdclient-1.1.0-r2.ebuild b/media-sound/qmpdclient/qmpdclient-1.1.0-r3.ebuild
index 9844f69876e4..343c0df4eadc 100644
--- a/media-sound/qmpdclient/qmpdclient-1.1.0-r2.ebuild
+++ b/media-sound/qmpdclient/qmpdclient-1.1.0-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/qmpdclient-1.1.0-r2.ebuild,v 1.1 2009/05/18 18:18:30 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/qmpdclient-1.1.0-r3.ebuild,v 1.1 2009/05/19 21:22:24 hwoarang Exp $
EAPI="2"
@@ -18,7 +18,7 @@ SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
IUSE="debug dbus"
-DEPEND="x11-libs/qt-gui:4[dbus=]"
+DEPEND="x11-libs/qt-gui:4[dbus?]"
RDEPEND="${DEPEND}"
LANGS="de_DE fr_FR it_IT nl_NL nn_NO no_NO ru_RU sv_SE tr_TR uk_UA"
@@ -49,6 +49,14 @@ src_prepare() {
# fix installation folder name
sed -i "s/share\/QMPDClient/share\/qmpdclient/" src/config.cpp \
|| die "failed to fix installation directory"
+
+ # check dbus
+ if ! use dbus; then
+ sed -i -e "s/message(DBus notifier:\ enabled)/message(DBus notifier:\ disabled)/" \
+ -e "s/CONFIG\ +=\ nostrip\ qdbus//" \
+ -e "s/SOURCES\ +=\ src\/notifications_dbus.cpp/SOURCES\ +=\ src\/notifications_nodbus.cpp/" \
+ ${PN}.pro || die "disabling dbus failed"
+ fi
}
src_configure() {