summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-03-06 13:47:11 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-03-06 13:47:11 +0000
commit8a664505dd48a96044cb887cba51d9dd5ea86eae (patch)
tree8eb934c152b510f77cbfc66fa3cebd11befbc241 /dev-libs/libcdio
parentold (diff)
downloadgentoo-2-8a664505dd48a96044cb887cba51d9dd5ea86eae.tar.gz
gentoo-2-8a664505dd48a96044cb887cba51d9dd5ea86eae.tar.bz2
gentoo-2-8a664505dd48a96044cb887cba51d9dd5ea86eae.zip
Block dev-libs/libcdio-paranoia wrt #460476 by Ben Kohler
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'dev-libs/libcdio')
-rw-r--r--dev-libs/libcdio/ChangeLog5
-rw-r--r--dev-libs/libcdio/libcdio-0.83.ebuild7
2 files changed, 8 insertions, 4 deletions
diff --git a/dev-libs/libcdio/ChangeLog b/dev-libs/libcdio/ChangeLog
index 5d7eb0ff7d26..c6a8cc99a9b6 100644
--- a/dev-libs/libcdio/ChangeLog
+++ b/dev-libs/libcdio/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/libcdio
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.137 2013/03/06 13:45:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.138 2013/03/06 13:47:11 ssuominen Exp $
+
+ 06 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> libcdio-0.83.ebuild:
+ Block dev-libs/libcdio-paranoia wrt #460476 by Ben Kohler
06 Mar 2013; Samuli Suominen <ssuominen@gentoo.org>
-files/libcdio-0.80-automagic-cddb.patch, -libcdio-0.82.ebuild:
diff --git a/dev-libs/libcdio/libcdio-0.83.ebuild b/dev-libs/libcdio/libcdio-0.83.ebuild
index 7f2b332aca8b..2eb219b51694 100644
--- a/dev-libs/libcdio/libcdio-0.83.ebuild
+++ b/dev-libs/libcdio/libcdio-0.83.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/dev-libs/libcdio/libcdio-0.83.ebuild,v 1.15 2012/06/16 10:37:53 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.83.ebuild,v 1.16 2013/03/06 13:47:11 ssuominen Exp $
EAPI=4
@@ -17,7 +17,8 @@ IUSE="cddb +cxx minimal static-libs"
RDEPEND="cddb? ( >=media-libs/libcddb-1.0.1 )
!minimal? ( >=sys-libs/ncurses-5.7-r7 )
- virtual/libintl"
+ virtual/libintl
+ !dev-libs/libcdio-paranoia"
DEPEND="${RDEPEND}
sys-devel/gettext
virtual/pkgconfig"