Fix building with GCC 4.6 by not passing broken LDFLAGS (bug #381005). Do not link...

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

diff --git a/app-shells/sash/ChangeLog b/app-shells/sash/ChangeLog
index 19ab414bf59436377360cee0e7d94824e2f341fb..f386c5acd5b6e0f0ad2c4f691bf64d36984d3733 100644 (file)
--- a/app-shells/sash/ChangeLog
+++ b/app-shells/sash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/sash
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/ChangeLog,v 1.39 2011/02/06 22:02:34 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/ChangeLog,v 1.40 2011/08/29 06:26:39 flameeyes Exp $
+
+  29 Aug 2011; Diego E. Pettenò <flameeyes@gentoo.org> sash-3.7-r2.ebuild:
+  Fix building with GCC 4.6 by not passing broken LDFLAGS (bug #381005). Do not
+  link statically unconditionally. Use latest EAPI.
 
   06 Feb 2011; Mart Raudsepp <leio@gentoo.org> sash-3.7-r1.ebuild:
   Drop to ~mips

diff --git a/app-shells/sash/Manifest b/app-shells/sash/Manifest
index db896f94a85ba3d8332cb79e6e48c3b50f62191e..7f02d921c66376be77a4841ad964db61a5e71c51 100644 (file)
--- a/app-shells/sash/Manifest
+++ b/app-shells/sash/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX sash-3.6-fix-includes.patch 334 RMD160 1dc9eabed8c403d583608692077af056745101b8 SHA1 f44c8307485b479396cb9b3c9c9fa202427b6711 SHA256 6c96aa180fac902ab54b338e172b9b6608c0406f6e1740c580c8e3184461375b
 AUX sash-3.6-readline.patch 7510 RMD160 42f25f4d5f3fc7fb36da580eafbf66dbdab9ab06 SHA1 2e181cc6517bcb190fd143e78e55ba903ea66508 SHA256 804325d211f536382046385b6635736519cdfda84ad543d278b26c75eb81e4d1
 AUX sash-3.7-builtin.patch 465 RMD160 c0061ff9f1a5aad5bc69d68cbd522f06ebf73f8a SHA1 4cb38daff63bbc0c74efdcdc47eb774f6dd044cf SHA256 ce968bfe95a2444fae473f678e4394b4acea2b7510b48ba63b554d2537de1bf1
 DIST sash-3.7.tar.gz 50337 RMD160 d89a4798e451215f8505d5033b07f1cf173d3823 SHA1 3dd22cb5387966184dbd5404319a9cac1d39192e SHA256 352726adb9736ba5a9b459d5c8a7d7c3b2c36cc99363adccc25a8a991d719c7f
 EBUILD sash-3.7-r1.ebuild 1139 RMD160 54a082e5bdeefbb82137f790bc5518a040687a15 SHA1 9f44b0db72d462790611bdff0f335cd7a69997b5 SHA256 8617fdd5ca4d210b7da595dbd64ae44c55b8054e117ec7117a89f859d93853b4
-EBUILD sash-3.7-r2.ebuild 1176 RMD160 415d093d90f846fd84a4a8a3e7b9a29b679ddde7 SHA1 2ead406c1eb3a276c326950ff9e28e54ff336cb3 SHA256 2591af5e2f8c4f559ce9eaedc6f524521f375fb499fb44410e87f67d16dd8064
-MISC ChangeLog 4524 RMD160 460bba5e06f7af882238fed947959303b7e67800 SHA1 1f615d9f7d18da9650cdabe8a59f76ef54f21518 SHA256 fdeded9f27c418ccf00055f23ac5d999c85216a34654e647489dc60b4a090215
+EBUILD sash-3.7-r2.ebuild 1230 RMD160 d0e07acfa83ba275b17d225c2d78f024d0f17c44 SHA1 b165b33cb6b35c58a453fef07d6d3d279417eb67 SHA256 e47ad95990ebdabf44d92e638b87cf092fb5e52a6db525681c951bfb992d4448
+MISC ChangeLog 4738 RMD160 80754474a0402b9a2e5554599a5c53fd2c7cd452 SHA1 4a0dfb3fb10e6f5a76315844c38b12ba106e5aba SHA256 5e03b375fb3a4a5cb466d96421bbdbb11c7d107f4e722e48404ba2c5c0ba3ba6
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk5bMRgACgkQAiZjviIA2Xg55gCgsjuQgvOzN6Ttd+oZjC3Nn8wC
+wMwAoL+prTcxk4qxbx4HGZkx8c3h7i5T
+=Fh1Z
+-----END PGP SIGNATURE-----

diff --git a/app-shells/sash/sash-3.7-r2.ebuild b/app-shells/sash/sash-3.7-r2.ebuild
index fdc39adef9ecd9fc5eab2cc761ffeedf01db2e78..685af94f965681b6d464c52bc9996f8c4537b74e 100644 (file)
--- a/app-shells/sash/sash-3.7-r2.ebuild
+++ b/app-shells/sash/sash-3.7-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/sash-3.7-r2.ebuild,v 1.1 2010/09/06 01:13:45 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/sash-3.7-r2.ebuild,v 1.2 2011/08/29 06:26:39 flameeyes Exp $
 
-EAPI=2
+EAPI=4
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs flag-o-matic
 
 DESCRIPTION="A small static UNIX Shell with readline support"
 HOMEPAGE="http://www.canb.auug.org.au/~dbell/ http://dimavb.st.simbirsk.su/vlk/"
@@ -13,12 +13,15 @@ SRC_URI="http://www.canb.auug.org.au/~dbell/programs/${P}.tar.gz"
 LICENSE="freedist"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="readline"
+IUSE="readline static"
 
 DEPEND=">=sys-libs/zlib-1.2.3
        readline? (
                >=sys-libs/readline-4.1
-               || ( <sys-libs/ncurses-5.7-r4 >=sys-libs/ncurses-5.7-r4[static-libs] )
+               sys-libs/ncurses
+               static? (
+                       || ( <sys-libs/ncurses-5.7-r4 >=sys-libs/ncurses-5.7-r4[static-libs] )
+               )
        )"
 RDEPEND=""
 
@@ -29,17 +32,18 @@ src_prepare() {
 
        sed -i \
                -e "s:-O3:${CFLAGS}:" \
-               -e "/^LDFLAGS /s: -s$: ${LDFLAGS}:" \
                Makefile || die "sed failed"
 }
 
 src_compile() {
-       emake CC="$(tc-getCC)" || die
+       use static && append-ldflags -static
+
+       emake LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
 }
 
 src_install() {
        into /
-       dobin sash || die
-       doman sash.1 || die
-       dodoc README || die
+       dobin sash
+       doman sash.1
+       dodoc README
 }