Only use the hardened patch if it's necessary

diff --git a/kde-base/arts/ChangeLog b/kde-base/arts/ChangeLog
index 0070b40a28d71f2bfe224ba1f16cd1232f2e5162..3b93ebf612005ad09b818c80e0c301b86eb46472 100644 (file)
--- a/kde-base/arts/ChangeLog
+++ b/kde-base/arts/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/arts
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.128 2004/12/09 11:32:51 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.129 2004/12/09 15:44:11 caleb Exp $
+
+  09 Dec 2004; Caleb Tennis <caleb@gentoo.org> arts-1.3.2.ebuild:
+  Only use the hardened patch if it's necessary
 
   09 Dec 2004; Caleb Tennis <caleb@gentoo.org> arts-1.3.2.ebuild:
   Add a patch to apply -fno-stack-protector so arts doesn't die for some people

diff --git a/kde-base/arts/Manifest b/kde-base/arts/Manifest
index b4bce32c255871de91a3eea396417c633816aee1..96a7cd16d8982a99e3920ae7b63bd67e83618bf4 100644 (file)
--- a/kde-base/arts/Manifest
+++ b/kde-base/arts/Manifest
@@ -1,10 +1,10 @@
 MD5 2397f14df73b06f4d1d899679481f3bc arts-1.3.0.ebuild 2977
-MD5 6315aa617b8c3b1779935c9315194798 arts-1.3.2.ebuild 3081
+MD5 60e52495bbc57c9beb8152a4666b7d59 arts-1.3.2.ebuild 3184
 MD5 7d6ae50bdf1adcd0bb79daccefa6ce94 arts-1.1.5.ebuild 2756
 MD5 bab807d1a8aaeb6738fafd25d14dd63e arts-1.2.3.ebuild 2827
 MD5 2efd88cdfab4993faf80298cc757d137 arts-1.3.1.ebuild 3033
 MD5 9c1e707e6fe4ef2698b71e3ca63b7fdc arts-1.2.0.ebuild 2577
-MD5 3c08ba219a3d265fa600f6694255e83a ChangeLog 16651
+MD5 c8a386450e8ab620fa302093c6b1697d ChangeLog 16766
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 6d8f52083c2f7e211ceff377e2d60432 arts-1.2.2.ebuild 2822
 MD5 9ffc978b18c6e1ad49a0c7eec49074f6 files/optional-deps.diff 3154

diff --git a/kde-base/arts/arts-1.3.2.ebuild b/kde-base/arts/arts-1.3.2.ebuild
index dcd597e446cb197b25364db4d6742f5fbce58b6d..8e2b507429bfc1b71ddd26e79c1d655f2ddf4b29 100644 (file)
--- a/kde-base/arts/arts-1.3.2.ebuild
+++ b/kde-base/arts/arts-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-1.3.2.ebuild,v 1.2 2004/12/09 11:32:51 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-1.3.2.ebuild,v 1.3 2004/12/09 15:44:11 caleb Exp $
 
 inherit kde flag-o-matic eutils
 set-kdedir 3.3
@@ -12,7 +12,7 @@ SRC_URI="mirror://kde/stable/${PV/1.3.2/3.3.2}/src/${PN}-${PV}.tar.bz2"
 LICENSE="GPL-2 LGPL-2"
 SLOT="3.3"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~alpha"
-IUSE="alsa oggvorbis esd artswrappersuid jack mad"
+IUSE="alsa oggvorbis esd artswrappersuid jack mad hardened"
 
 DEPEND="alsa? ( media-libs/alsa-lib virtual/alsa )
        oggvorbis? ( media-libs/libvorbis media-libs/libogg )
@@ -33,7 +33,11 @@ src_unpack() {
        kde_src_unpack
        epatch ${FILESDIR}/1.3.0-jack-configure.in.in.patch
        epatch ${FILESDIR}/${P}-alsa-bigendian.patch
-       epatch ${FILESDIR}/arts-1.3.2-mcopidl.patch
+
+       if (is-flag -fstack-protector || is-flag -fstack-protector-all || use hardened); then
+               epatch ${FILESDIR}/arts-1.3.2-mcopidl.patch
+       fi
+
        kde_sandbox_patch ${S}/soundserver
        # for the configure.in.in patch, for some reason it's not automatically picked up
        # rm -f $S/configure