Remove has_hardened conditional, as requested in bug 100974

Package-Manager: portage-2.1.2-r9

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index 3a115218834823e47d309c399ea6fb51e2fbd2d0..ba789b2167a00f34c3fb362a21b447d4ec1b5393 100644 (file)
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-p2p/amule
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.82 2007/02/10 18:39:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.83 2007/02/13 15:11:34 armin76 Exp $
+
+  13 Feb 2007; Raúl Porcel <armin76@gentoo.org> amule-2.1.3.ebuild:
+  Remove has_hardened conditional, as requested in bug 100974
 
   10 Feb 2007; Raúl Porcel <armin76@gentoo.org> -amule-2.0.1-r2.ebuild,
   -amule-2.1.0-r1.ebuild, -amule-2.1.1.ebuild, -amule-2.1.2.ebuild:

diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index ced9889248c56459fe06b9d8f861a2988da0ffe8..ba401939ce2a01853c6b63ab979d3ea32c035499 100644 (file)
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -20,14 +20,14 @@ EBUILD amule-2.0.3-r4.ebuild 2741 RMD160 da110e911e8914a35fc3646cad567811c85c59c
 MD5 14aa0b4a70ea87006f771ac2300cb887 amule-2.0.3-r4.ebuild 2741
 RMD160 da110e911e8914a35fc3646cad567811c85c59c4 amule-2.0.3-r4.ebuild 2741
 SHA256 360d9f1b5026374657250f65a2062865158028c9c97a4a6295f467aa6154ff03 amule-2.0.3-r4.ebuild 2741
-EBUILD amule-2.1.3.ebuild 3072 RMD160 78c80ef51e8e5cae50316cbca8ed11adb3f881d1 SHA1 b7842954b198abbb0b1b16cf3732f4163ace09b2 SHA256 230ec6c33755bbe4c5c3997535e49b94e77988e76c7dc9371540f3a807bee079
-MD5 4e732f3dd7c43ad457f56e3c2a2487cb amule-2.1.3.ebuild 3072
-RMD160 78c80ef51e8e5cae50316cbca8ed11adb3f881d1 amule-2.1.3.ebuild 3072
-SHA256 230ec6c33755bbe4c5c3997535e49b94e77988e76c7dc9371540f3a807bee079 amule-2.1.3.ebuild 3072
-MISC ChangeLog 11530 RMD160 f00ea8a4f26316b396eefb5037b15200913eaa62 SHA1 142e11a75013c81b6522651f2fc7b5a8a67a23e8 SHA256 5cf73a0342b88d08d9978435c03671305c29e0396598eb3c9d0761a7cdb61189
-MD5 31f4b24706e9bc8550107f6b7249e523 ChangeLog 11530
-RMD160 f00ea8a4f26316b396eefb5037b15200913eaa62 ChangeLog 11530
-SHA256 5cf73a0342b88d08d9978435c03671305c29e0396598eb3c9d0761a7cdb61189 ChangeLog 11530
+EBUILD amule-2.1.3.ebuild 3045 RMD160 37413cba09158ac6fd1a7201cd7f78ac2aa6d452 SHA1 057629101ee9ce6e13b03f0988dc99b4ea589ef2 SHA256 8b04b9a8dd263bedd23c2c6a30c12b143810d0542f969a05c7b3a471ed212904
+MD5 f13462a38774d94f21ebbda561a29f4f amule-2.1.3.ebuild 3045
+RMD160 37413cba09158ac6fd1a7201cd7f78ac2aa6d452 amule-2.1.3.ebuild 3045
+SHA256 8b04b9a8dd263bedd23c2c6a30c12b143810d0542f969a05c7b3a471ed212904 amule-2.1.3.ebuild 3045
+MISC ChangeLog 11662 RMD160 cb7b6c078b4fbcb5f7b7c93947d57d2230ebb118 SHA1 f2842d43abd498b996ca7c04a9fb112911029185 SHA256 6dcf7d4cd0c703203f192610a895123a5e611851f521fae4a3f70e43370f91c6
+MD5 6e6b420433326ed4736fba3ad7ce0c05 ChangeLog 11662
+RMD160 cb7b6c078b4fbcb5f7b7c93947d57d2230ebb118 ChangeLog 11662
+SHA256 6dcf7d4cd0c703203f192610a895123a5e611851f521fae4a3f70e43370f91c6 ChangeLog 11662
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160

diff --git a/net-p2p/amule/amule-2.1.3.ebuild b/net-p2p/amule/amule-2.1.3.ebuild
index ef6e0c2209bf197e6e98d5e9143c6003ba4001c8..501bdd03dbb0439cb15516dbec2d57ac5cb20723 100644 (file)
--- a/net-p2p/amule/amule-2.1.3.ebuild
+++ b/net-p2p/amule/amule-2.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.1.3.ebuild,v 1.9 2007/02/07 14:22:17 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.1.3.ebuild,v 1.10 2007/02/13 15:11:34 armin76 Exp $
 
 inherit eutils flag-o-matic wxwidgets
 
@@ -95,9 +95,8 @@ src_compile() {
                                ${myconf} || die
 
                # we filter ssp until bug #74457 is closed to build on hardened
-               if has_hardened; then
-                               filter-flags -fstack-protector -fstack-protector-all
-               fi
+               filter-flags -fstack-protector -fstack-protector-all
+
                emake -j1 || die
 }