Added workaround for alpha/s390/sh to make samba build successfully on these arches

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 28 insertions, 9 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 29c0313b17c7..ab2722bcd9a3 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.608 2013/10/06 14:06:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.609 2013/10/06 16:07:23 polynomial-c Exp $
+
+  06 Oct 2013; Lars Wendler <polynomial-c@gentoo.org> samba-3.6.19.ebuild:
+  Added workaround for alpha/s390/sh to make samba build successfully on these
+  arches. Change requested by ago.
 
   06 Oct 2013; Jeroen Roovers <jer@gentoo.org> samba-3.5.22.ebuild,
   samba-3.6.19.ebuild:
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index beb65008fb09..186def0d752d 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -48,17 +48,27 @@ DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d
 EBUILD samba-3.5.21.ebuild 12311 SHA256 2a849451f886614315680b28b944840d1c670a2b878329773de63a72797a6fa1 SHA512 5006f1afdc2df93f317d15e1e9781bee20eb0e17e4a15892cb5ebe8bb2ab0a7a56bbbf2ed67099620391eda14b53a8fdb78a5ee9634a489915fcf84b031704b7 WHIRLPOOL a295b28990480ed3e13cf76d4f04270739b2669837d5ea93691888c488ee10dad22cd4bcc2037b09e66be41eda4d3d2e064e28701acb1f2dc7acf80935283123
 EBUILD samba-3.5.22.ebuild 12314 SHA256 7cbf39f1c90caec1e2d5e8a67a7b11b19bd6aa7397fbb8a273ed0d259c10c7fa SHA512 1d36189354bc88ce846efdbfd35f9108e1df4460101b6bc6a8b7e7a79dc546e11dc6e698370965e374b850089414407fd5f95713850431888623d7201f63fb93 WHIRLPOOL 66b5e01236e204c429d61d7010fc7311a8f07651004ce554b7625c68d4689e95cd3ecf2bdfb260fdbd2a3a222bf073047be3d2e00422166508a0912aa83f1800
 EBUILD samba-3.6.16.ebuild 12630 SHA256 44b15c6a344343e44d0363a099ee616d12d26a9b7de25bb969fc0bfac460d5d6 SHA512 550b7d166ec024c92c6370b01bc95c1ecc6fe7c6c17a520135dea1424d313e4a16826ef5c0a234370507e15f62bf73aadeeaa95b353d6fd549c68cf020a9ca3c WHIRLPOOL 7a06b107ebe1c131a8f73a2c80f4adba5fd828eb2cf1d87d4d3079513c32a49e1d0d36348d138aea2a04c5e10f368135dc44b22fb3ace3bf5507e0c809af5f14
-EBUILD samba-3.6.19.ebuild 12635 SHA256 24954e6d75be6e2f9e800824acaeb3c3bdc6992d7415c5ddda1bd405635dde44 SHA512 73e284f868ad4a9dd3609a69cf0fac2da44808a44f0b30a530749c43952345000d4a742a30b3eb010e2a2cce5d8e6307026d4ba30c44cd3a4e5e8bfce0c5f361 WHIRLPOOL 2721fc0ae8b18c840900cced6990d8c64ab6788c4b391941edbd7bbbb306e902000efc378bb6a21095535b94f1a0ad5880743300cd0a32c7eb41fdb9a5a0c05a
+EBUILD samba-3.6.19.ebuild 12763 SHA256 514db13b287f4f2abf25b28edffdb7a1a4e7f7c8aeb1a3dc26eb919774b882f2 SHA512 1203e654c8787ea4c8835d8fa6d71feedbac006596a53bd3513c134f5ee411cf2295137089a348935b8844952a467be18b46c81ddb6614bec3ec9ce45d1eea6b WHIRLPOOL 6d402833283eb73cd1e2154e1707f89f36dd615047751a790f09221a0cd9587fb9dda3eea7d509032a541c428dc11b74f700fec7c1bf1d1bbfb01c6f859a1c79
 EBUILD samba-4.0.8-r2.ebuild 4322 SHA256 b761a4e93c9a32d8cc7739de47ac3344bac5c232d7445420f563e54fb855b3e0 SHA512 eb52d4504b06607a0bf4871afe01de33ebcf28a9aeea463b41eaa597f4ba15e238509d12e5d2d8ad235b860d8a53af6bfaff6152bc1b5c86079200b862deb038 WHIRLPOOL 201a3edb9269b5f1fe491bcd53ca933ae65e1f97b10ae5aad56c58ae63cc62ec4129400c9cae4dddef676d106e14b8af0ee84715145af5bbbbca02efe57d1672
 EBUILD samba-4.0.9.ebuild 4325 SHA256 0dbf97dcd2e1dd7de1c8ebf1c3e5120b5fd1c28ddda9d81f8ee907277601684d SHA512 a87897c7db222bc715012022b3e5b519414fa9a78f9d07b8c261c25ded6bcd998e588f6a50ba9d666a51dcf0da1f7f5dfb2192578aca4fe76eec89e8e250a800 WHIRLPOOL debc771614aae2e453b726a6a11b3d298c8be8d853e5a7118c3b5be0b045ca8b1fff53b72596ea38d865824bd8b65c8da97302351443213aa6fca3b2eb87acc8
 EBUILD samba-4.1.0_rc3.ebuild 4163 SHA256 cb2ae78ad8535fc4bbc34af2208ac41016a5c8720647d2ae5c19a81b764e7a7d SHA512 7c831adb0163597591478d4e2db6663dab776b6fac5b2bb167ab3617a2fe22c4e89e4b1af185fe99bf26d29e98b4e7b2994f2b88d34aeca208c0ad0447a9087b WHIRLPOOL 28d5e830c9dbc801a3decb7deac6b02b69d2568aae99becd1de9e021d9e6c4a94b4c0564ccbe730fbd191adabeb3295266dea9ed04e310f56473dac8ed7078eb
 EBUILD samba-4.1.0_rc4.ebuild 4163 SHA256 951672616fa9d0dd41d75ef5d86e522b2dac34405648b201b9fb53b7a6ef944a SHA512 b23a28baf9c2a2b7c36f4b58434ae01abf89f086770426a31ab164dc62dd4fd3403f9f904feeaec84a3b4152244c3464bc0174264b6731850052eab0b1d30744 WHIRLPOOL 4401e6c98f48a92ebf02f6b743abe32e2a76147247fdba159578ed09d287d623b7be19858a0ed89195dae323d1a8f47db447494fe13790b0a846af21fcd66440
-MISC ChangeLog 100354 SHA256 4094730236afe7f8181a7ce9a99c6d68d2fe44f3f80723d068894031121b04be SHA512 5f879667e64fc35fb00046deb5c493a5f6f91da79adcd1094869f5b0e162325154dbc17275c04342e8ab6377ba67287f5acf636f97190809d7fbbe258e94585b WHIRLPOOL d3926ef486672efc8ccd6472e771ce563e11d53858f2dcd291c4d9a82c3e5ba8c24d800ee014ef1d7d872a187c8b1e112e91fdefedb6ceb571d4cd75cfc4c340
+MISC ChangeLog 100553 SHA256 6ffe16611093ba33ec54d0d7b72ce5d76e79370142bf5113fc0d22a473b890d4 SHA512 adfc95aa204bf39930ee0462e908f010cb28ac1632f91754c1ac77b7815d3c9307cdcf4824108bb52ff057706ac75fffe814af645529de0e2e96e33011820569 WHIRLPOOL 5e8379003e660d4ecf5793e74f4ed2c3cb4e5901e3eb59ba6c83c104eab9446b5b20c413500893aa672fc5fc2214ac946c01ee20bc628983377c036bf8115997
 MISC metadata.xml 1514 SHA256 c10deb71703017ec67f4e5bac297d9b4581fec3d8b5549b6aea2a43bda642bc0 SHA512 9e67e8f7e0c972046e32bf4539142559c24183d6c3469e5af2f901728a3c02a9fbfd50e948a9fd414107fd0cb2a8de709ffe3fc5bf3372c77a4a3db6dc622ecc WHIRLPOOL ec92ea6a1b03e70c791670e97e7d9e07e6bdb82c24ed08c186e786afcd009ab63fbee7d481a4cdc394632ad312e58a2048dae3ff333f6f7a1ad19add55e2c8f8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlJRblYACgkQVWmRsqeSphO3igCfcSbUbJN4MDMkLCW3SvaBZfML
-5EwAn0MPgYKFtIOwnVlxamdmxK5dP5pe
-=85vO
+iQIcBAEBCAAGBQJSUYq8AAoJEPiazRVxLXTFW9wQAL81gDi/owVAhC5UwqdzdZEi
+VxQcGcwjBPHwbftTW5rTzaVHPZYPSGdQGyeeEdCUFyTdxpsgCBB1cJOfnp+C+O9l
+I7Tvbd/e2/ZFnoXvTWcS6Nrdc6LJr+Q9bcBEHxJn5EY5O6L6QsUpeSl3HK7kfkl6
+IkG2BQS0gZUK84Fl7WI+xvPGGTwAdFy833OppZibYlcHOkSG67X4hpBhwdvq7uZB
+SrO7ESJhbNVX/zC80p4EOREfsi8Ruki44RrNPPSrWcvTSpx8wDDL7Clvw6lzKqP1
+jkehJXBhgGKypTKXbR9VLDhD5iNkYpV0YXhECJC+XB5IzkoVsZp0qmvkCItIVeFy
+3LRYQi1AkMpC25Vjxjst2/ZaPSYWl0vnWht0fN+Uxg3JeeUBNT7L7YqhESnM3+Ou
+Jcfn6sF+plvvLKdZ8eJ0mkCT5J4emGUhixRMlpIBAq9eTstGshs3j8xNchFeFO+p
+vkKTx0gLpbSIYXgj2tEwQImb9j+PLpXmiEUw7XKh97uHiHltE8TMy0E7DKmXKiJ6
+VXJ6CyxawaA20URHRC2gffzRSjY0XaVNRsaglRo3M5y9jSkrtwM+9PTVaaO16sYO
+GT/1wWZaTP6Z+yF9uL3gM6X2n5zDYpjMxPikdywfWGfovM4O2HcWiY7LKcXYehlX
+LdD+ZPV2JBv2GAD8mnIv
+=bQyJ
 -----END PGP SIGNATURE-----
diff --git a/net-fs/samba/samba-3.6.19.ebuild b/net-fs/samba/samba-3.6.19.ebuild
index ebcde3cdd221..1644ca2f157d 100644
--- a/net-fs/samba/samba-3.6.19.ebuild
+++ b/net-fs/samba/samba-3.6.19.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.19.ebuild,v 1.4 2013/10/06 14:06:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.19.ebuild,v 1.5 2013/10/06 16:07:23 polynomial-c Exp $
 
 EAPI=4
 
-inherit pam versionator multilib eutils systemd
+inherit pam versionator multilib eutils flag-o-matic systemd
 
 MY_PV=${PV/_/}
 MY_P="${PN}-${MY_PV}"
@@ -131,6 +131,11 @@ src_configure() {
 	# Filter out -fPIE
 	[[ ${CHOST} == *-*bsd* ]] && myconf+=" --disable-pie"
 
+	#Allowing alpha/s390/sh to build
+	if use alpha || use s390 || use sh ; then
+		replace-flags -O? -O1
+	fi
+
 	# http://wiki.samba.org/index.php/CTDB_Setup
 	use cluster && myconf+=" --disable-pie"