Drop ppc64 hardened patch, closes #324899.

Package-Manager: portage-2.2_rc74/cvs/Linux x86_64

7 files changed, 26 insertions, 46 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 1b8d37430826..b032fceed132 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.420 2010/09/03 10:39:05 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.421 2010/09/08 20:41:23 eva Exp $
+
+  08 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org> glib-2.20.5-r1.ebuild,
+  glib-2.22.4.ebuild, glib-2.22.5.ebuild, glib-2.24.1-r1.ebuild,
+  glib-2.24.2.ebuild:
+  Drop ppc64 hardened patch, closes #324899.
 
 *glib-2.24.2 (03 Sep 2010)
 
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 4433f174a200..78fac9a8e3ed 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -21,17 +21,17 @@ DIST glib-2.22.5.tar.bz2 4988402 RMD160 2e2f06f956f63a75121b335e4150edc44f5e04f2
 DIST glib-2.24.1.tar.bz2 5332511 RMD160 c6ce09654c1bd28b8844435d150fcb51e6f4e872 SHA1 d4835bb1618fc1e1dfe88ef8443c12fcae69f90e SHA256 014c3da960bf17117371075c16495f05f36501db990851ceea658f15d2ea6d04
 DIST glib-2.24.2.tar.bz2 5326328 RMD160 259d2d0a92b1a01bb624a2b759d0f82eefc227ea SHA1 882350c31af929cd4e78ee6aad46108748240e78 SHA256 3aeb521abd3642dd1224379f0e54915957e5010f888a4ae74afa0ad54da0160c
 EBUILD glib-1.2.10-r5.ebuild 1764 RMD160 dc6544841f2acb73d5951100ce9c9182f4d9560e SHA1 e6649f70934720527f69995ab0b8c845032cfb0f SHA256 24442b44089e15432a4f1411d2d59dff9d5c2fbfb91c801b96087588ff71373b
-EBUILD glib-2.20.5-r1.ebuild 2764 RMD160 36b82bded5d46abd6f786ceb40bb9a5ea7a654c9 SHA1 54daa7a36b3dafd74818b3769da523f06e5ed23d SHA256 3714c57070320eb4ba89a13e03f21f3fff281a82423c7609bdfabc77864ee6f1
-EBUILD glib-2.22.4.ebuild 2867 RMD160 df24757da42438c1f60b248b768bbc16927bd25c SHA1 459b59f64e9784f23729f7d3ddce36e575f395dd SHA256 b5ff0719930157317dcfa53a93bf2e156c43972712a4799e1b2f4529ea54eccf
-EBUILD glib-2.22.5.ebuild 2867 RMD160 509f8aec204b55e1689a0d75f152f88742b6a2be SHA1 b3029fc61a55c97a97c429dfa4f0387576018659 SHA256 426048c30016ebd837ff7d8eabfd03d946bf36ea45452c51ed78f17704eeb8a1
-EBUILD glib-2.24.1-r1.ebuild 3586 RMD160 2da351a70bc4c090f56b8bad67ffad8f17aa1287 SHA1 5ed64e3deeb03a0652792c85ee65827bd8e3b8bf SHA256 4b796a0b4982b1c6feb1b00b0d549771ce47f003ed8f4e829a94d547d9fdf36c
-EBUILD glib-2.24.2.ebuild 3584 RMD160 7662ce1e6885edbf49965f849b393ff88b2c6b7b SHA1 03f8b0c4b0adba8062c2b5adfc912d923bcd49ec SHA256 0c142325eaae5e43c6a021645e083f3abb793453458126326cd824ec78fd0d6e
-MISC ChangeLog 52107 RMD160 68aaee584c88e2e025d5fce7d12bdbb0093e09f9 SHA1 387ed77d618820d2fcf23ef0c4d1b5409437b994 SHA256 26e437bd15986b6297ddf121c405c1fc5b5c5b621c3cca0c6024c94124ec8b93
+EBUILD glib-2.20.5-r1.ebuild 2629 RMD160 463ad015124d8dd7385a78b2448dc2508825878a SHA1 6271695a9137c2d48a0528f059f4b307593f9b2a SHA256 30b08ebd051f72739ceb475a6163fa466bb663ddc7222782f28d7925aae5df5f
+EBUILD glib-2.22.4.ebuild 2732 RMD160 b79dfe5bb2b5cb9b3c7ecb9ccf46ab450aa87bc3 SHA1 13496a9a0f26f10173f433fb5843a1a9f6eb01f1 SHA256 b7ab7a260d974d1fcfb58a47055b3cc8f826a5a547ea6e8d663ca8e36619a00f
+EBUILD glib-2.22.5.ebuild 2732 RMD160 212f9e2c93dd48dea140d7f508ce945f7b8e8c6f SHA1 f4f14c0eef4d227469e6e958226d38667adc5fbe SHA256 6c3b9b2429665e3c056495a80959ab66a8d3bcd2112c74ef61331552252430d1
+EBUILD glib-2.24.1-r1.ebuild 3452 RMD160 2a0b6839d1169b93d81b18d9db4aa3a7fa3887eb SHA1 2bddb40df7e0105eb5c90b92157ea478b6d8180c SHA256 0a3f3f9bbc6aa0cffb5b5e3669e2d368ebf7ce4e3aa54a760532eba8017cf276
+EBUILD glib-2.24.2.ebuild 3452 RMD160 eb0d42a28a7a3b15c4b88c144faecdd27775a8e5 SHA1 4d8332be60a0b5f695e180a6d41c12410ba4db1e SHA256 09d8730088dfe2105c04a86fef5337359fe761b9789ae167fb5697b885103eb0
+MISC ChangeLog 52317 RMD160 40aaa1189e6210d6f03f7cc90d90937aa7c9c7d3 SHA1 ad704ac3706eaed1d8c375254f10bec113fde1ab SHA256 f89e94c3da75e61bdec7fd8ba0543a333e445cd0dbc6cb3dfe69554407da4817
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyA0FYACgkQ1fmVwcYIWAYIawCg0t+ItUGpXnWIdo1HuPR8M2rn
-WzsAoKp7S+za4SvmAt+Ah0/Z49ZQPLhm
-=LKWw
+iEYEARECAAYFAkyH9PsACgkQ1fmVwcYIWAYF3gCfT6O6Cu6t+2C71ooj2DlLehtU
+9H0AoJrhMKp+0gEQRhvkLiM3TC2ucvk9
+=wMy2
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-2.20.5-r1.ebuild b/dev-libs/glib/glib-2.20.5-r1.ebuild
index 764887b287db..23fbf47fa6bc 100644
--- a/dev-libs/glib/glib-2.20.5-r1.ebuild
+++ b/dev-libs/glib/glib-2.20.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.20.5-r1.ebuild,v 1.10 2009/11/17 15:41:51 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.20.5-r1.ebuild,v 1.11 2010/09/08 20:41:23 eva Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtk.org/"
 LICENSE="LGPL-2"
 SLOT="2"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="debug doc fam hardened selinux xattr"
+IUSE="debug doc fam selinux xattr"
 
 RDEPEND="virtual/libiconv
 	xattr? ( sys-apps/attr )
@@ -27,11 +27,6 @@ DEPEND="${RDEPEND}
 		~app-text/docbook-xml-dtd-4.1.2 )"
 
 src_prepare() {
-	if use ppc64 && use hardened ; then
-		replace-flags -O[2-3] -O1
-		epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch"
-	fi
-
 	if use ia64 ; then
 		# Only apply for < 4.1
 		local major=$(gcc-major-version)
diff --git a/dev-libs/glib/glib-2.22.4.ebuild b/dev-libs/glib/glib-2.22.4.ebuild
index b1f64f3de751..d73391c19e29 100644
--- a/dev-libs/glib/glib-2.22.4.ebuild
+++ b/dev-libs/glib/glib-2.22.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.22.4.ebuild,v 1.7 2010/05/11 19:46:05 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.22.4.ebuild,v 1.8 2010/09/08 20:41:23 eva Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtk.org/"
 LICENSE="LGPL-2"
 SLOT="2"
 KEYWORDS="alpha amd64 arm ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="debug doc fam hardened selinux xattr"
+IUSE="debug doc fam selinux xattr"
 
 RDEPEND="virtual/libiconv
 	xattr? ( sys-apps/attr )
@@ -26,11 +26,6 @@ DEPEND="${RDEPEND}
 		~app-text/docbook-xml-dtd-4.1.2 )"
 
 src_prepare() {
-	if use ppc64 && use hardened ; then
-		replace-flags -O[2-3] -O1
-		epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch"
-	fi
-
 	if use ia64 ; then
 		# Only apply for < 4.1
 		local major=$(gcc-major-version)
diff --git a/dev-libs/glib/glib-2.22.5.ebuild b/dev-libs/glib/glib-2.22.5.ebuild
index 08c6d7b71d7e..49d319d3480e 100644
--- a/dev-libs/glib/glib-2.22.5.ebuild
+++ b/dev-libs/glib/glib-2.22.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.22.5.ebuild,v 1.7 2010/08/18 20:49:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.22.5.ebuild,v 1.8 2010/09/08 20:41:23 eva Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtk.org/"
 LICENSE="LGPL-2"
 SLOT="2"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="debug doc fam hardened selinux xattr"
+IUSE="debug doc fam selinux xattr"
 
 RDEPEND="virtual/libiconv
 	xattr? ( sys-apps/attr )
@@ -26,11 +26,6 @@ DEPEND="${RDEPEND}
 		~app-text/docbook-xml-dtd-4.1.2 )"
 
 src_prepare() {
-	if use ppc64 && use hardened ; then
-		replace-flags -O[2-3] -O1
-		epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch"
-	fi
-
 	if use ia64 ; then
 		# Only apply for < 4.1
 		local major=$(gcc-major-version)
diff --git a/dev-libs/glib/glib-2.24.1-r1.ebuild b/dev-libs/glib/glib-2.24.1-r1.ebuild
index 972fa6f916c6..0cb90f3bc027 100644
--- a/dev-libs/glib/glib-2.24.1-r1.ebuild
+++ b/dev-libs/glib/glib-2.24.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.24.1-r1.ebuild,v 1.7 2010/08/31 12:58:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.24.1-r1.ebuild,v 1.8 2010/09/08 20:41:23 eva Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtk.org/"
 LICENSE="LGPL-2"
 SLOT="2"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="debug doc fam hardened selinux xattr"
+IUSE="debug doc fam selinux xattr"
 
 RDEPEND="virtual/libiconv
 	xattr? ( sys-apps/attr )
@@ -29,11 +29,6 @@ DEPEND="${RDEPEND}
 # XXX: Consider adding test? ( sys-devel/gdb ); assert-msg-test tries to use it
 
 src_prepare() {
-	if use ppc64 && use hardened ; then
-		replace-flags -O[2-3] -O1
-		epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch"
-	fi
-
 	if use ia64 ; then
 		# Only apply for < 4.1
 		local major=$(gcc-major-version)
diff --git a/dev-libs/glib/glib-2.24.2.ebuild b/dev-libs/glib/glib-2.24.2.ebuild
index dfcff2188815..685fd69c15a3 100644
--- a/dev-libs/glib/glib-2.24.2.ebuild
+++ b/dev-libs/glib/glib-2.24.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.24.2.ebuild,v 1.1 2010/09/03 10:39:05 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.24.2.ebuild,v 1.2 2010/09/08 20:41:23 eva Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtk.org/"
 LICENSE="LGPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="debug doc fam hardened selinux xattr"
+IUSE="debug doc fam selinux xattr"
 
 RDEPEND="virtual/libiconv
 	xattr? ( sys-apps/attr )
@@ -29,11 +29,6 @@ DEPEND="${RDEPEND}
 # XXX: Consider adding test? ( sys-devel/gdb ); assert-msg-test tries to use it
 
 src_prepare() {
-	if use ppc64 && use hardened ; then
-		replace-flags -O[2-3] -O1
-		epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch"
-	fi
-
 	if use ia64 ; then
 		# Only apply for < 4.1
 		local major=$(gcc-major-version)