make cdrdao die if trying to compile with gcc 3.4 and USE=gnome, since xdao does not yet compile. however, cdrdao compiles fine without problems now that it's dependencies have been fixed for gcc 3.4

5 files changed, 45 insertions, 13 deletions

diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog
index 4eaca527e508..c2744a07c188 100644
--- a/app-cdr/cdrdao/ChangeLog
+++ b/app-cdr/cdrdao/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/cdrdao
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.49 2004/07/14 13:24:04 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.50 2004/07/14 14:01:00 lv Exp $
+
+  14 Jul 2004; Travis Tilley <lv@gentoo.org> cdrdao-1.1.8-r1.ebuild,
+  cdrdao-1.1.8.ebuild, cdrdao-1.1.9.ebuild:
+  make cdrdao die if trying to compile with gcc 3.4 and USE=gnome, since xdao
+  does not yet compile. however, cdrdao compiles fine without problems now that
+  it's dependencies have been fixed for gcc 3.4
 
   14 Jul 2004; Travis Tilley <lv@gentoo.org> +files/cdrdao-1.1.9-cast.patch:
   add cast patch for cdrdao 1.1.9
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index e8632c4d704d..dab66ddd8b68 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -1,10 +1,10 @@
 MD5 c01c265415420cc2728985bb2a89c31b cdrdao-1.1.7-r2.ebuild 2686
 MD5 392c7634fa77f1f99964acc24bc6e035 cdrdao-1.1.7.ebuild 1889
-MD5 be37908dacc7233efc895003da6aa1b4 cdrdao-1.1.8-r1.ebuild 1991
-MD5 6ad464d36931601a59a6a939d97a4cc3 cdrdao-1.1.9.ebuild 1851
+MD5 f778ebef6a09b3a09eecb3d86dc75d57 cdrdao-1.1.8-r1.ebuild 2423
+MD5 a8de681947c28ac005947c4685946c7b cdrdao-1.1.9.ebuild 2256
 MD5 33d8e0d08cf62010891d40f5ce56c9e7 cdrdao-1.1.7-r3.ebuild 3009
-MD5 4b8f73b330a0e73839e030c6e4fd007f cdrdao-1.1.8.ebuild 1402
-MD5 05246aebb476152f92fe18a2f232996f ChangeLog 6462
+MD5 df255d82a3e8056cf504461d0ff38275 cdrdao-1.1.8.ebuild 1830
+MD5 c1a2ff559f9ed43711d7fb63289ad715 ChangeLog 6782
 MD5 bab69ebf527bd1791f4969f30c35cb38 metadata.xml 417
 MD5 85e424cd2e0be3ab2c7f3f4e28ae13bf cdrdao-1.1.5-r1.ebuild 2542
 MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7 69
diff --git a/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild b/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild
index 5b8dd524c369..30cfa5564027 100644
--- a/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild,v 1.9 2004/07/11 15:49:26 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild,v 1.10 2004/07/14 14:01:00 lv Exp $
 
-inherit flag-o-matic eutils
+inherit flag-o-matic eutils gcc
 
 DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
 HOMEPAGE="http://cdrdao.sourceforge.net/"
@@ -26,6 +26,15 @@ DEPEND=">=dev-util/pccts-1.33.24-r1
 	>=sys-apps/sed-4"
 
 src_unpack() {
+	if ([ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ] && use gnome); then
+		eerror "xdao current will not compile using gcc 3.4. in order to compile"
+		eerror "and install cdrdao, you will have to USE="-gnome". a simple way"
+		eerror "to do this via portage is to:"
+		einfo "mkdir -p /etc/portage"
+		einfo "echo \"app-cdr/cdrdao -gnome\" >> /etc/portage/package.use"
+		die "xdao wont compile using gcc 3.4"
+	fi
+
 	unpack ${A}
 
 	cd ${S}
diff --git a/app-cdr/cdrdao/cdrdao-1.1.8.ebuild b/app-cdr/cdrdao/cdrdao-1.1.8.ebuild
index df84e3a74fa2..65d423b672c4 100644
--- a/app-cdr/cdrdao/cdrdao-1.1.8.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.1.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.8.ebuild,v 1.11 2004/06/29 19:56:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.8.ebuild,v 1.12 2004/07/14 14:01:00 lv Exp $
 
-inherit flag-o-matic eutils
+inherit flag-o-matic eutils gcc
 
 DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
 HOMEPAGE="http://cdrdao.sourceforge.net/"
@@ -26,6 +26,15 @@ src_unpack() {
 
 	cd ${S}
 	epatch ${FILESDIR}/${PV}-gcc34.patch
+	if ([ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ] && use gnome); then
+		eerror "xdao current will not compile using gcc 3.4. in order to compile"
+		eerror "and install cdrdao, you will have to USE="-gnome". a simple way"
+		eerror "to do this via portage is to:"
+		einfo "mkdir -p /etc/portage"
+		einfo "echo \"app-cdr/cdrdao -gnome\" >> /etc/portage/package.use"
+		die "xdao wont compile using gcc 3.4"
+	fi
+
 	# Only way to disable gcdmaster currently ...
 	use gnome || \
 		sed -i -e 's:^en_xdao=yes:en_xdao=no:g' configure
diff --git a/app-cdr/cdrdao/cdrdao-1.1.9.ebuild b/app-cdr/cdrdao/cdrdao-1.1.9.ebuild
index f90e062dfe22..a645c40ae0ed 100644
--- a/app-cdr/cdrdao/cdrdao-1.1.9.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.1.9.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.9.ebuild,v 1.2 2004/07/12 08:48:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.9.ebuild,v 1.3 2004/07/14 14:01:00 lv Exp $
 
-inherit flag-o-matic eutils
+inherit flag-o-matic eutils gcc
 
 DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
 HOMEPAGE="http://cdrdao.sourceforge.net/"
@@ -19,13 +19,21 @@ RDEPEND=">=media-sound/lame-3.90
 		=dev-cpp/libgnomemm-2.0*
 		=dev-cpp/libgnomecanvasmm-2.0*
 		=dev-cpp/gconfmm-2.0*
-		=dev-cpp/libgnomeuimm-2.0.0
-		<sys-devel/gcc-3.4 )"
+		=dev-cpp/libgnomeuimm-2.0.0)"
 DEPEND=">=dev-util/pccts-1.33.24-r1
 	>=app-cdr/cdrtools-2.01_alpha20
 	${RDEPEND}"
 
 src_unpack() {
+	if ([ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ] && use gnome); then
+		eerror "xdao current will not compile using gcc 3.4. in order to compile"
+		eerror "and install cdrdao, you will have to USE="-gnome". a simple way"
+		eerror "to do this via portage is to:"
+		einfo "mkdir -p /etc/portage"
+		einfo "echo \"app-cdr/cdrdao -gnome\" >> /etc/portage/package.use"
+		die "xdao wont compile using gcc 3.4"
+	fi
+
 	unpack ${A}
 
 	cd ${S}