From: "Samuli Suominen (ssuominen)" <ssuominen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in app-cdr/cdrdao: ChangeLog cdrdao-1.2.3_rc2.ebuild
Date: Tue, 14 Jul 2009 09:07:09 +0000 [thread overview]
Message-ID: <E1MQdyf-0004vo-0f@stork.gentoo.org> (raw)
ssuominen 09/07/14 09:07:09
Modified: ChangeLog cdrdao-1.2.3_rc2.ebuild
Log:
Disable gcdmaster if GCC is equal to or less than 3 wrt #230415. Rename USE flags ogg and mp3 to vorbis and mad as they should be.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Revision Changes Path
1.135 app-cdr/cdrdao/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrdao/ChangeLog?rev=1.135&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrdao/ChangeLog?rev=1.135&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrdao/ChangeLog?r1=1.134&r2=1.135
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- ChangeLog 8 Jul 2009 14:48:36 -0000 1.134
+++ ChangeLog 14 Jul 2009 09:07:08 -0000 1.135
@@ -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.134 2009/07/08 14:48:36 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.135 2009/07/14 09:07:08 ssuominen Exp $
+
+ 14 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+ cdrdao-1.2.3_rc2.ebuild:
+ Disable gcdmaster if GCC is equal to or less than 3 wrt #230415. Rename
+ USE flags ogg and mp3 to vorbis and mad as they should be.
08 Jul 2009; Christian Faulhammer <fauli@gentoo.org>
cdrdao-1.2.3_rc2.ebuild:
1.5 app-cdr/cdrdao/cdrdao-1.2.3_rc2.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrdao/cdrdao-1.2.3_rc2.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrdao/cdrdao-1.2.3_rc2.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrdao/cdrdao-1.2.3_rc2.ebuild?r1=1.4&r2=1.5
Index: cdrdao-1.2.3_rc2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.2.3_rc2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cdrdao-1.2.3_rc2.ebuild 8 Jul 2009 14:48:36 -0000 1.4
+++ cdrdao-1.2.3_rc2.ebuild 14 Jul 2009 09:07:08 -0000 1.5
@@ -1,9 +1,9 @@
# 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.4 2009/07/08 14:48:36 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.2.3_rc2.ebuild,v 1.5 2009/07/14 09:07:08 ssuominen Exp $
EAPI=2
-inherit eutils flag-o-matic eutils autotools
+inherit autotools eutils toolchain-funcs
DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
HOMEPAGE="http://cdrdao.sourceforge.net/"
@@ -17,7 +17,7 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
-IUSE="gcdmaster encode pccts mp3 ogg"
+IUSE="gcdmaster encode pccts mad vorbis"
RDEPEND="virtual/cdrtools
encode? ( >=media-sound/lame-3.90 )
@@ -26,22 +26,17 @@
>=dev-cpp/libgnomecanvasmm-2.6
>=dev-cpp/gconfmm-2.6
>=dev-cpp/libgnomeuimm-2.6
- media-libs/libao
- )
- mp3? (
- media-libs/libmad
- media-libs/libao
- )
- ogg? (
- media-libs/libvorbis
- media-libs/libao
- )
- "
+ media-libs/libao )
+ mad? ( media-libs/libmad
+ media-libs/libao )
+ vorbis? ( media-libs/libvorbis
+ media-libs/libao )"
DEPEND="${RDEPEND}
pccts? ( >=dev-util/pccts-1.33.24-r1 )
!app-cdr/cue2toc"
-S="${WORKDIR}/${P/_}"
+MAKEOPTS="${MAKEOPTS} -j1"
+S=${WORKDIR}/${P/_}
src_prepare() {
# Fix ERROR: CD/cdda.toc:36: Invalid CD-TEXT item for a track.
@@ -61,23 +56,24 @@
}
src_configure() {
- # A few CFLAGS do not work see bug #99998
- #strip-flags
- #append-flags "-fno-inline"
+ local myconf
- econf \
- $(use_with gcdmaster xdao) \
- $(use_with encode lame) \
- $(use_with mp3 mp3-support) \
- $(use_with ogg ogg-support) \
- --disable-dependency-tracking || die "configure failed"
-}
+ # GCC 3.x isn't safe wrt bug #230415
+ if [[ $(gcc-major-version) -le 3 ]]; then
+ myconf="--without-xdao"
+ use gcdmaster && ewarn "You need GCC 4.x for gcdmaster to be built."
+ fi
-src_compile() {
- emake -j1 || die "could not compile"
+ econf \
+ $(use_with gcdmaster xdao) \
+ $(use_with encode lame) \
+ $(use_with mad mp3-support) \
+ $(use_with vorbis ogg-support) \
+ --disable-dependency-tracking \
+ ${myconf}
}
src_install() {
- emake -j1 DESTDIR="${D}" install
+ emake DESTDIR="${D}" install || die "emake install failed"
dodoc AUTHORS CREDITS ChangeLog NEWS README*
}
next reply other threads:[~2009-07-14 9:07 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-14 9:07 Samuli Suominen (ssuominen) [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-10-19 16:23 [gentoo-commits] gentoo-x86 commit in app-cdr/cdrdao: ChangeLog cdrdao-1.2.3_rc2.ebuild Raul Porcel (armin76)
2009-09-27 14:28 Brent Baude (ranger)
2009-09-22 7:16 Markus Meier (maekke)
2009-08-09 12:48 Gysbert Wassenaar (nixnut)
2009-08-08 18:52 Jeroen Roovers (jer)
2009-08-05 17:50 Gordon Malm (gengor)
2009-07-27 12:40 Tony Vroon (chainsaw)
2009-07-19 19:23 Tobias Klausmann (klausman)
2009-07-08 14:48 Christian Faulhammer (fauli)
2009-05-22 21:32 Peter Alfredsen (loki_val)
2009-05-22 20:50 Peter Alfredsen (loki_val)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1MQdyf-0004vo-0f@stork.gentoo.org \
--to=ssuominen@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox