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 | 9b4db44fb988a9825cc8374e68473afd67d9b455 (patch) | |
| tree | f4796032a90d1893ecb13f60719256c2e946025a /kde-base | |
| parent | Add patch for SuperH support. (diff) | |
| download | historical-9b4db44fb988a9825cc8374e68473afd67d9b455.tar.gz historical-9b4db44fb988a9825cc8374e68473afd67d9b455.tar.bz2 historical-9b4db44fb988a9825cc8374e68473afd67d9b455.zip | |
Only use the hardened patch if it's necessary
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/arts/ChangeLog | 5 | ||||
| -rw-r--r-- | kde-base/arts/Manifest | 4 | ||||
| -rw-r--r-- | kde-base/arts/arts-1.3.2.ebuild | 10 |
3 files changed, 13 insertions, 6 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/Manifest b/kde-base/arts/Manifest index b4bce32c2558..96a7cd16d898 100644 --- 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 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 |