summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2009-05-22 21:32:22 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2009-05-22 21:32:22 +0000
commit3c1ebe041ccc1c585cd80ea1261cca149f28a545 (patch)
tree6795952d4dd3bfb2d4f58273754361f6d1dd2695 /app-cdr/cdrdao
parentAdd new 1.23 RC2; remove old (diff)
downloadgentoo-2-3c1ebe041ccc1c585cd80ea1261cca149f28a545.tar.gz
gentoo-2-3c1ebe041ccc1c585cd80ea1261cca149f28a545.tar.bz2
gentoo-2-3c1ebe041ccc1c585cd80ea1261cca149f28a545.zip
Don't die if FEATURES=distcc, since we no longer compile scsilib on most platforms. Bug 264170.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'app-cdr/cdrdao')
-rw-r--r--app-cdr/cdrdao/ChangeLog7
-rw-r--r--app-cdr/cdrdao/cdrdao-1.2.3_rc2.ebuild8
2 files changed, 7 insertions, 8 deletions
diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog
index da5923b7ff25..d2a548a171c2 100644
--- a/app-cdr/cdrdao/ChangeLog
+++ b/app-cdr/cdrdao/ChangeLog
@@ -1,6 +1,11 @@
# 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.131 2009/05/22 20:50:01 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.132 2009/05/22 21:32:22 loki_val Exp $
+
+ 22 May 2009; Peter Alfredsen <loki_val@gentoo.org>
+ cdrdao-1.2.3_rc2.ebuild:
+ Don't die if FEATURES=distcc, since we no longer compile scsilib on most
+ platforms. Bug 264170.
22 May 2009; Peter Alfredsen <loki_val@gentoo.org>
cdrdao-1.2.3_rc2.ebuild, +files/cdrdao-1.2.3-autoconf-update.patch:
diff --git a/app-cdr/cdrdao/cdrdao-1.2.3_rc2.ebuild b/app-cdr/cdrdao/cdrdao-1.2.3_rc2.ebuild
index a894555ad39c..53e88ae668e3 100644
--- a/app-cdr/cdrdao/cdrdao-1.2.3_rc2.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.3_rc2.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.3_rc2.ebuild,v 1.2 2009/05/22 20:50:01 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.2.3_rc2.ebuild,v 1.3 2009/05/22 21:32:22 loki_val Exp $
EAPI=2
inherit eutils flag-o-matic eutils autotools
@@ -43,12 +43,6 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${P/_}"
-pkg_setup() {
- if hasq distcc ${FEATURES}; then
- die "Please emerge without distcc in FEATURES, see bug #264170."
- fi
-}
-
src_prepare() {
# Fix ERROR: CD/cdda.toc:36: Invalid CD-TEXT item for a track.
# Bug 238891