[proaudio] [1087] Fixed phat-9999.ebuild.

[subversion@xxxxxxxxxxxxx]

Revision: 1087
Author:   marcochapeau
Date:     2008-01-04 17:40:17 +0000 (Fri, 04 Jan 2008)

Log Message:
-----------
Fixed phat-9999.ebuild. CFLAGS are now taken into account and it builds with gcc 4.2.2

Modified Paths:
--------------
    trunk/overlays/proaudio/media-libs/phat/ChangeLog
    trunk/overlays/proaudio/media-libs/phat/Manifest
    trunk/overlays/proaudio/media-libs/phat/phat-9999.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-libs/phat/files/svn-configure-ac-CFLAGS-fix.patch


Modified: trunk/overlays/proaudio/media-libs/phat/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-libs/phat/ChangeLog	2008-01-04 12:08:45 UTC (rev 1086)
+++ trunk/overlays/proaudio/media-libs/phat/ChangeLog	2008-01-04 17:40:17 UTC (rev 1087)
@@ -1,7 +1,10 @@
 # ChangeLog for media-libs/phat
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Jan 2008; Marc-Olivier Barre <mobarre@xxxxxxxxx> phat-9999.ebuild:
+  Added a patch and an ebuild fix to get svn to work with gcc 4.2.2 and not
+  munge users CFLAGS
+
   17 Dec 2007; Thomas Kuther <gimpel@xxxxxxxxxxxxxxxx> ChangeLog:
   added a changelog
-

Modified: trunk/overlays/proaudio/media-libs/phat/Manifest
===================================================================
--- trunk/overlays/proaudio/media-libs/phat/Manifest	2008-01-04 12:08:45 UTC (rev 1086)
+++ trunk/overlays/proaudio/media-libs/phat/Manifest	2008-01-04 17:40:17 UTC (rev 1087)
@@ -1,3 +1,4 @@
+AUX svn-configure-ac-CFLAGS-fix.patch 569 RMD160 c50280908ca7e6a67c933ed5d22731b070a53abd SHA1 de5cd3294d0e0fd345071099de5c40d371614663 SHA256 91022fe80215c5aa54a315f65a6e66112ab6ee96afc5c8ccf88376fbf1b23478
 DIST phat-0.3.1.tar.gz 371664 RMD160 cc33cf747d7fbc2f52203aba434ff9fc9a035789 SHA1 3e313ea3e214dba838729e51a31ef2d1f67e408e SHA256 e4529756f87b05b62673b735dd888acfb28727794c24f1a9841849cfcbcb214c
 DIST phat-0.4.0.tar.gz 540781 RMD160 0a61fdd53442000367b36e5e8d215545aa605d67 SHA1 d609c1d1b3e50ca089fadc55470231277a5b8258 SHA256 536ffec1d63e660a6a2318a7951d0acd19933162f9de3bb47f5c2e729c5f5908
 EBUILD phat-0.3.1.ebuild 705 RMD160 9feaeedabf0806280909294943efa7d075948593 SHA1 87ad657a15531a46139e873c8c126fa6a5ad9f6e SHA256 4731e185eb221223b02d66da4953603d322bdaba5e7c4fde875248afa7599e04
@@ -2,4 +3,4 @@
 EBUILD phat-0.4.0.ebuild 705 RMD160 9feaeedabf0806280909294943efa7d075948593 SHA1 87ad657a15531a46139e873c8c126fa6a5ad9f6e SHA256 4731e185eb221223b02d66da4953603d322bdaba5e7c4fde875248afa7599e04
-EBUILD phat-9999.ebuild 794 RMD160 586a809088a61dbc9ee96c0261e377cf684d61df SHA1 27349afecaee73eb34ad3f6f529a71537cdb168c SHA256 856345ced30f31d465a6a1bd4d4052df8d65e7d8b3a0a01791b2b885f4091cdb
-MISC ChangeLog 203 RMD160 23f234268e50f090449463e76d2a325e011781a3 SHA1 e55e1ce0d079a0c77bc891eb86856caf50dff880 SHA256 323a5d2a7dd519f0af0c5b0abde1089181556f7608119f53fd0aae71ddf7448a
+EBUILD phat-9999.ebuild 1170 RMD160 3684d7d54b356e1b897c55934edc4b186c0909b0 SHA1 2bd5e3f6264cc5c338a96f37a6d6d679a3630ab5 SHA256 93c06ce29e396eb9723aaa1964ecbf2a2d9e9acbdf5fda852b039f7790a5f1d5
+MISC ChangeLog 372 RMD160 797d20f48a3e0b371d1ea58f2a3a61300df8eaae SHA1 d3b68db903dd27c3ece9cbccb74db5bfc53f749d SHA256 8bb999369a1d163e86cecc6cecd379df1cfd61ac9c990831f3028de811421e5b
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Added: trunk/overlays/proaudio/media-libs/phat/files/svn-configure-ac-CFLAGS-fix.patch
===================================================================
--- trunk/overlays/proaudio/media-libs/phat/files/svn-configure-ac-CFLAGS-fix.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-libs/phat/files/svn-configure-ac-CFLAGS-fix.patch	2008-01-04 17:40:17 UTC (rev 1087)
@@ -0,0 +1,19 @@
+Index: phat2/configure.ac
+===================================================================
+--- phat2/configure.ac	(revision 117)
++++ phat2/configure.ac	(working copy)
+@@ -20,10 +20,12 @@
+     [if test x$enable_debug = xyes; then with_debug=yes ; fi])
+ 
+ if test x$with_debug = xno; then
+-    CFLAGS="-O3"
++    if test -z $CFLAGS; then 
++        CFLAGS="-O3"
++    fi
+     AC_DEFINE(DEBUG, 0, [[whether to display debugging output or not]])
+ else
+-    CFLAGS="-g"
++    CFLAGS="$CFLAGS -g"
+     AC_DEFINE(DEBUG, 1, [[whether to display debugging output or not]])
+ fi
+ 

Modified: trunk/overlays/proaudio/media-libs/phat/phat-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/phat/phat-9999.ebuild	2008-01-04 12:08:45 UTC (rev 1086)
+++ trunk/overlays/proaudio/media-libs/phat/phat-9999.ebuild	2008-01-04 17:40:17 UTC (rev 1087)
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils subversion autotools
+inherit eutils subversion autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="Collection of GTK+ widgets geared toward pro-audio apps."
 HOMEPAGE="https://developper.berlios.de/projects/phat/";
@@ -15,19 +15,30 @@
 
 S="${WORKDIR}/${PN}"
 
-IUSE="debug doc"
+IUSE="debug doc glade"
 DEPEND=">x11-libs/gtk+-2
-	doc? ( dev-util/gtk-doc )"
+	doc? ( dev-util/gtk-doc )
+	glade? ( dev-util/glade )"
 
 src_unpack() {
 	subversion_src_unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}/svn-configure-ac-CFLAGS-fix.patch"
 	./bootstrap
+    if [[ $(gcc-major-version)$(gcc-minor-version)$(gcc-micro-version) -ge 413 ]] ; then
+		ewarn "Appending -fgnu89-inline to CFLAGS/CXXFLAGS"
+		append-flags -fgnu89-inline
+	fi
 }
 
 src_compile() {
+	if use glade; then
+		myconf="${myconf} --enable-glade-plugin"
+	fi
+
 	econf $(use_enable debug) \
-	      $(use_enable doc gtk-doc) || die "Configure failed"
+	      $(use_enable doc gtk-doc)\
+		  $myconf || die "Configure failed"
 
 	emake || die
 }