summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-01-15 19:23:19 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-01-15 19:23:19 +0000
commit303f1724f2a2b311f327dfbbb8df4df2d51ee326 (patch)
treec8db72f87de7437299b556c6f6dc8c7c0af5599a /media-sound/pragha
parentBump. (diff)
downloadgentoo-2-303f1724f2a2b311f327dfbbb8df4df2d51ee326.tar.gz
gentoo-2-303f1724f2a2b311f327dfbbb8df4df2d51ee326.tar.bz2
gentoo-2-303f1724f2a2b311f327dfbbb8df4df2d51ee326.zip
Fix compability with dev-libs/libcdio-paranoia.
(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'media-sound/pragha')
-rw-r--r--media-sound/pragha/ChangeLog7
-rw-r--r--media-sound/pragha/pragha-1.1.1.ebuild10
2 files changed, 12 insertions, 5 deletions
diff --git a/media-sound/pragha/ChangeLog b/media-sound/pragha/ChangeLog
index 80c126924737..f2760a9ae602 100644
--- a/media-sound/pragha/ChangeLog
+++ b/media-sound/pragha/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-sound/pragha
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pragha/ChangeLog,v 1.24 2012/11/28 12:40:31 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pragha/ChangeLog,v 1.25 2013/01/15 19:23:19 ssuominen Exp $
+
+ 15 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> pragha-1.1.1.ebuild:
+ Fix compability with dev-libs/libcdio-paranoia.
28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> pragha-1.1.1.ebuild:
EAPI5
diff --git a/media-sound/pragha/pragha-1.1.1.ebuild b/media-sound/pragha/pragha-1.1.1.ebuild
index 696fbf7f8803..63880c4b6b97 100644
--- a/media-sound/pragha/pragha-1.1.1.ebuild
+++ b/media-sound/pragha/pragha-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pragha/pragha-1.1.1.ebuild,v 1.4 2012/11/28 12:40:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pragha/pragha-1.1.1.ebuild,v 1.5 2013/01/15 19:23:19 ssuominen Exp $
EAPI=5
inherit xfconf
@@ -18,7 +18,7 @@ COMMON_DEPEND="dev-db/sqlite:3
>=dev-libs/dbus-glib-0.98
>=dev-libs/glib-2.28
>=dev-libs/keybinder-0.2.2:0
- >=dev-libs/libcdio-0.78
+ || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90 )
media-libs/gst-plugins-base:0.10
>=media-libs/libcddb-1.3.2
>=media-libs/taglib-1.7.1
@@ -47,6 +47,10 @@ pkg_setup() {
}
src_prepare() {
+ if has_version dev-libs/libcdio-paranoia; then
+ sed -i -e '/#include/s:cdio/cdda.h:cdio/paranoia/cdda.h:' src/cdda.h || die
+ fi
+
sed -i -e '/CFLAGS/s:-g -ggdb -O0::' configure || die
xfconf_src_prepare
}