Use an alternative to alsa-1.4-mcopidl, testing the flags supported for disabling...

Package-Manager: portage-2.0.53_rc7

diff --git a/kde-base/arts/ChangeLog b/kde-base/arts/ChangeLog
index 0e1bf161f637f2900424cde26ab00a18e599cd6d..681691b8587699485275cd6592a9b811e6387bd3 100644 (file)
--- a/kde-base/arts/ChangeLog
+++ b/kde-base/arts/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/arts
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.186 2005/11/12 15:49:22 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.187 2005/11/13 00:23:51 flameeyes Exp $
+
+  13 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> arts-3.5.0_rc1.ebuild:
+  Use an alternative to alsa-1.4-mcopidl, testing the flags supported for
+  disabling stack protector. This allows to build arts with vanilla GCC and
+  GCC 4.1 (and non-GCC too, probably).
 
 *arts-3.5.0_rc1 (12 Nov 2005)
 

diff --git a/kde-base/arts/Manifest b/kde-base/arts/Manifest
index af7104880263e70847f85a98898def2813e49d5c..0cca578e05872bafcafe5b9c921f666a97215ab0 100644 (file)
--- a/kde-base/arts/Manifest
+++ b/kde-base/arts/Manifest
@@ -1,11 +1,14 @@
-MD5 9fef0ee987915faac421d89642216bca ChangeLog 23837
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8150432e950d700450e6930dea3bb60a ChangeLog 24104
 MD5 9503779c4a371ce5172784d2e8a48274 arts-1.3.2-r1.ebuild 2655
 MD5 51046f9ff099e5b3045caa3884c8d8eb arts-1.3.2.ebuild 2780
 MD5 9780af748959ac2da43677dd72a313f0 arts-3.4.1-r2.ebuild 2854
 MD5 db0f7cdd6d695cdf6af189655f4758d5 arts-3.4.2.ebuild 2941
 MD5 b48bf1d6fea6115c0b3f7bffd54ed518 arts-3.4.3.ebuild 2942
 MD5 d9248d6dc9fd9c9372024083c991f59d arts-3.5.0_beta2.ebuild 2619
-MD5 9ef302a7ab68a47c030ec87f22544e25 arts-3.5.0_rc1.ebuild 2567
+MD5 f3b94ddee980c92ef24f96e2d870ae56 arts-3.5.0_rc1.ebuild 3045
 MD5 5ab88e65406f5d0dcb2c22a7174f7806 arts-3.5_beta1-r1.ebuild 2621
 MD5 68ec6c8e74dfea13c3bb54575b1c51d4 files/1.3.0-jack-configure.in.in.patch 694
 MD5 22eaa23f91c114995e7b8ae286c3ac2c files/arts-1.3.2-alsa-bigendian.patch 571
@@ -22,3 +25,10 @@ MD5 594b1aee0aa6fec867f62b1774586434 files/digest-arts-3.5.0_beta2 64
 MD5 9efe20df34c4f9e516b9d12dea825e25 files/digest-arts-3.5.0_rc1 67
 MD5 3ab1771e7a2c34e08a3c1e5dbd5af975 files/digest-arts-3.5_beta1-r1 64
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDdoekAiZjviIA2XgRAnxRAKDy3AD1HQiRFUm40BMAiahGarOT7ACeOkJC
+/acU1kI5PrfDhUJco8uQcDk=
+=jOby
+-----END PGP SIGNATURE-----

diff --git a/kde-base/arts/arts-3.5.0_rc1.ebuild b/kde-base/arts/arts-3.5.0_rc1.ebuild
index 35ab2c0ea3b7cac1fc2b16334381fdbf48d61ba9..b5ec4b9f8357dc733705644e68bc7e614d688e63 100644 (file)
--- a/kde-base/arts/arts-3.5.0_rc1.ebuild
+++ b/kde-base/arts/arts-3.5.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:22 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-3.5.0_rc1.ebuild,v 1.2 2005/11/13 00:23:51 flameeyes Exp $
 
 inherit kde flag-o-matic eutils
 set-kdedir 3.5
@@ -32,8 +32,23 @@ RDEPEND="$(qt_min_version 3.3)
 DEPEND="${RDEPEND}
        dev-util/pkgconfig"
 
-PATCHES="${FILESDIR}/arts-1.3.2-alsa-bigendian.patch
-       ${FILESDIR}/arts-1.4-mcopidl.patch"
+PATCHES="${FILESDIR}/arts-1.3.2-alsa-bigendian.patch"
+
+src_unpack() {
+       kde_src_unpack
+
+       # Alternative to arts-1.4-mcopidl.patch, make sure that flags are supported
+       # before trying to use them, for non-GCC, vanilla GCC or GCC 4.1 compilers
+       local nosspflags
+
+       [[ -n $(test_flag -fno-stack-protector) ]] && \
+               nosspflags="${nosspflags} -fno-stack-protector"
+       [[ -n $(test_flag -fno-stack-protector-all) ]] && \
+               nosspflags="${nosspflags} -fno-stack-protector-all"
+       
+       sed -i -e "s:KDE_CXXFLAGS =\(.*\):KDE_CXXFLAGS = \1 ${nosspflags}:" \
+               ${S}/mcopidl/Makefile.am
+}
 
 src_compile() {
        myconf="$(use_enable alsa) $(use_enable vorbis)