summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-cdr/cdrdao/ChangeLog6
-rw-r--r--app-cdr/cdrdao/cdrdao-1.2.2-r3.ebuild8
2 files changed, 6 insertions, 8 deletions
diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog
index 652f45c225b0..ebb6a9deaf6d 100644
--- a/app-cdr/cdrdao/ChangeLog
+++ b/app-cdr/cdrdao/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-cdr/cdrdao
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.143 2009/10/19 16:23:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.144 2009/10/19 16:32:58 ssuominen Exp $
+
+ 19 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
+ cdrdao-1.2.2-r3.ebuild:
+ Remove FEATURES distcc checking wrt #279463.
19 Oct 2009; Raúl Porcel <armin76@gentoo.org> cdrdao-1.2.3_rc2.ebuild:
ia64/sh/sparc stable wrt #276776
diff --git a/app-cdr/cdrdao/cdrdao-1.2.2-r3.ebuild b/app-cdr/cdrdao/cdrdao-1.2.2-r3.ebuild
index 3f695820cfcb..0f45e39e366a 100644
--- a/app-cdr/cdrdao/cdrdao-1.2.2-r3.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.2-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/app-cdr/cdrdao/cdrdao-1.2.2-r3.ebuild,v 1.10 2009/07/14 09:37:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.2.2-r3.ebuild,v 1.11 2009/10/19 16:32:58 ssuominen Exp $
EAPI=2
inherit flag-o-matic eutils
@@ -26,12 +26,6 @@ DEPEND="${RDEPEND}
pccts? ( >=dev-util/pccts-1.33.24-r1 )
!app-cdr/cue2toc"
-pkg_setup() {
- if hasq distcc ${FEATURES}; then
- die "Please emerge without distcc in FEATURES, see bug #264170."
- fi
-}
-
src_prepare() {
# Use O_EXCL to avoid conflict with HAL, bug 193603.
epatch "${FILESDIR}"/${PN}-1.2.2-excl.patch