Make patches non-conditional, drop hardened useflag. Revbump to force rebuilding this without visibility enabled, or it crashes badly when using qt 3.3.5.

(Portage version: 2.0.52-r1)

4 files changed, 28 insertions, 27 deletions

diff --git a/kde-base/arts/ChangeLog b/kde-base/arts/ChangeLog
index 64368a22548f..485735f528c2 100644
--- a/kde-base/arts/ChangeLog
+++ b/kde-base/arts/ChangeLog
@@ -1,6 +1,14 @@
 # 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.180 2005/09/21 17:17:58 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.181 2005/09/25 21:12:51 flameeyes Exp $
+
+*arts-3.5_beta1-r1 (25 Sep 2005)
+
+  25 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> -arts-3.5_beta1.ebuild,
+  +arts-3.5_beta1-r1.ebuild:
+  Make patches non-conditional, drop hardened useflag. Revbump to force
+  rebuilding this without visibility enabled, or it crashes badly when using
+  qt 3.3.5.
 
 *arts-3.5_beta1 (21 Sep 2005)
 
diff --git a/kde-base/arts/Manifest b/kde-base/arts/Manifest
index e04e5baf19d2..f18f4070d74d 100644
--- a/kde-base/arts/Manifest
+++ b/kde-base/arts/Manifest
@@ -1,22 +1,22 @@
-MD5 928eedaeb235cd4ad32d29b36f6df250 arts-3.5_beta1.ebuild 2796
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 f8b59f55e56ceca59239164712ac5a76 arts-1.3.2-r1.ebuild 3061
-MD5 9780af748959ac2da43677dd72a313f0 arts-3.4.1-r2.ebuild 2854
-MD5 690984434d80662ace1ac9115a64dda8 ChangeLog 23049
 MD5 db0f7cdd6d695cdf6af189655f4758d5 arts-3.4.2.ebuild 2941
-MD5 26eed407a228c96be7a06b4207d9c2c5 arts-1.2.3.ebuild 2824
 MD5 3c7c56c646d0e58c273f9326b1b9880a arts-1.3.2.ebuild 3187
-MD5 e78db892e7b447f86fab2ea9503a3a3d files/arts-1.2.3-buffer.patch 745
-MD5 0a66e4f219b0dee9346c9c99ae4b15d0 files/digest-arts-1.3.2-r1 63
+MD5 690984434d80662ace1ac9115a64dda8 ChangeLog 23049
+MD5 9780af748959ac2da43677dd72a313f0 arts-3.4.1-r2.ebuild 2854
+MD5 26eed407a228c96be7a06b4207d9c2c5 arts-1.2.3.ebuild 2824
+MD5 608c2d4a207d9c7ecd964871f536bd2d arts-3.5_beta1-r1.ebuild 2615
+MD5 f8b59f55e56ceca59239164712ac5a76 arts-1.3.2-r1.ebuild 3061
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 196311c78bda3759d3d92a450fcf12ea files/arts-1.4-mcopidl.patch 448
+MD5 22eaa23f91c114995e7b8ae286c3ac2c files/arts-1.3.2-alsa-bigendian.patch 571
 MD5 aee14037bb0dcd09b7dfcb784e7ad12c files/digest-arts-3.4.2 63
-MD5 ac0526184e3193af65a2a8aa7fd5feab files/digest-arts-1.2.3 63
 MD5 c0838be4fcac1f2a9f9efd922b4b6d8d files/arts-3.4.1-configure.patch 4429
-MD5 3ab1771e7a2c34e08a3c1e5dbd5af975 files/digest-arts-3.5_beta1 64
-MD5 68ec6c8e74dfea13c3bb54575b1c51d4 files/1.3.0-jack-configure.in.in.patch 694
-MD5 0a66e4f219b0dee9346c9c99ae4b15d0 files/digest-arts-1.3.2 63
+MD5 3ab1771e7a2c34e08a3c1e5dbd5af975 files/digest-arts-3.5_beta1-r1 64
 MD5 64df5930253711053181dcdbba96f42b files/arts-1.3.2-mcopidl.patch 418
-MD5 22eaa23f91c114995e7b8ae286c3ac2c files/arts-1.3.2-alsa-bigendian.patch 571
+MD5 68ec6c8e74dfea13c3bb54575b1c51d4 files/1.3.0-jack-configure.in.in.patch 694
+MD5 0a66e4f219b0dee9346c9c99ae4b15d0 files/digest-arts-1.3.2-r1 63
+MD5 0756f4b60219058bac587ef4688d4b11 files/digest-arts-3.4.1-r2 63
 MD5 185a4720c0e94a1546ee383016fc3e3c files/arts-vorbis-fix.dif 1136
-MD5 196311c78bda3759d3d92a450fcf12ea files/arts-1.4-mcopidl.patch 448
+MD5 0a66e4f219b0dee9346c9c99ae4b15d0 files/digest-arts-1.3.2 63
 MD5 5fa50e6520e137f4731eea03a5a644ea files/arts-3.4.1-cpu-overload.patch 1371
-MD5 0756f4b60219058bac587ef4688d4b11 files/digest-arts-3.4.1-r2 63
+MD5 ac0526184e3193af65a2a8aa7fd5feab files/digest-arts-1.2.3 63
+MD5 e78db892e7b447f86fab2ea9503a3a3d files/arts-1.2.3-buffer.patch 745
diff --git a/kde-base/arts/arts-3.5_beta1.ebuild b/kde-base/arts/arts-3.5_beta1-r1.ebuild
index 93e56d6fa443..84fcb69a8ff4 100644
--- a/kde-base/arts/arts-3.5_beta1.ebuild
+++ b/kde-base/arts/arts-3.5_beta1-r1.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_beta1.ebuild,v 1.1 2005/09/21 17:17:59 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-3.5_beta1-r1.ebuild,v 1.1 2005/09/25 21:12:51 flameeyes Exp $
 
 inherit kde flag-o-matic eutils
 set-kdedir 3.5
@@ -18,7 +18,7 @@ LICENSE="GPL-2 LGPL-2"
 
 SLOT="3.5"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa esd artswrappersuid jack mp3 nas hardened vorbis"
+IUSE="alsa esd artswrappersuid jack mp3 nas vorbis"
 
 RDEPEND="$(qt_min_version 3.3)
 	>=dev-libs/glib-2
@@ -34,15 +34,8 @@ RDEPEND="$(qt_min_version 3.3)
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_unpack() {
-	kde_src_unpack
-	epatch "${FILESDIR}/arts-1.3.2-alsa-bigendian.patch"
-
-	if (is-flag -fstack-protector || is-flag -fstack-protector-all || use hardened); then
-		epatch ${FILESDIR}/arts-1.4-mcopidl.patch
-		make -f admin/Makefile.common || die
-	fi
-}
+PATCHES="${FILESDIR}/arts-1.3.2-alsa-bigendian.patch
+	${FILESDIR}/arts-1.4-mcopidl.patch"
 
 src_compile() {
 	myconf="$(use_enable alsa) $(use_enable vorbis)
diff --git a/kde-base/arts/files/digest-arts-3.5_beta1 b/kde-base/arts/files/digest-arts-3.5_beta1-r1
index 52272d938976..52272d938976 100644
--- a/kde-base/arts/files/digest-arts-3.5_beta1
+++ b/kde-base/arts/files/digest-arts-3.5_beta1-r1