diff options
| author |   Caleb Tennis <caleb@gentoo.org> | 2004-12-09 15:44:11 +0000 |
|---|---|---|
| committer | Caleb Tennis <caleb@gentoo.org> | 2004-12-09 15:44:11 +0000 |
| commit | e18c8068710f71a404f5319d7dfbb0e907082166 (patch) | |
| tree | 3d25326c1fdfa28def20b21950a4c9b2113f88a5 /kde-base/arts | |
| parent | Add patch for SuperH support. (Manifest recommit) (diff) | |
| download | gentoo-2-e18c8068710f71a404f5319d7dfbb0e907082166.tar.gz gentoo-2-e18c8068710f71a404f5319d7dfbb0e907082166.tar.bz2 gentoo-2-e18c8068710f71a404f5319d7dfbb0e907082166.zip | |
Only use the hardened patch if it's necessary
Diffstat (limited to 'kde-base/arts')
| -rw-r--r-- | kde-base/arts/ChangeLog | 5 | ||||
| -rw-r--r-- | kde-base/arts/arts-1.3.2.ebuild | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/kde-base/arts/ChangeLog b/kde-base/arts/ChangeLog index 0070b40a28d7..3b93ebf61200 100644 --- 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/arts-1.3.2.ebuild b/kde-base/arts/arts-1.3.2.ebuild index dcd597e446cb..8e2b507429bf 100644 --- 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 |