Added a fix for #104251.

Package-Manager: portage-1.589-cvs

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index c5f06f4d49445dbc9934b422c7db1785f1ffcd6f..1a11db5dd95ac960df7aded28d6f693c9b1f061f 100644 (file)
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.44 2005/09/02 19:42:33 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.45 2005/09/08 12:40:45 spock Exp $
+
+  08 Sep 2005; Michał Januszewski <spock@gentoo.org>
+  splashutils-1.1.9.9-r1.ebuild:
+  Added a fix for bug #104251 -- try to support gcc built with the 'vanilla' 
+  USE flag.
 
   02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
   splashutils-1.1.9.8.ebuild:

diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 4c92ff003f70977681195b4f4d039bab954863f0..7f6b52aafc1120be4dc00b94f63e291737732f3a 100644 (file)
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -1,15 +1,25 @@
-MD5 23acdfce9aac94f23826ec8615f71924 splashutils-1.1.9.9-r1.ebuild 5892
-MD5 cfe1b5f88cc51ac6ffc42809178d2a06 metadata.xml 221
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 98fd11c248eba6f1f945bc2d7e530664 splashutils-1.1.9.9.ebuild 6323
+MD5 4180e756570d9f26db82b36b42c8cbc3 splashutils-1.1.9.8.ebuild 6287
 MD5 1409e15605d9e85ecd9e151911beacfd splashutils-1.1.9.6-r1.ebuild 6008
-MD5 588bb1f46b99244b95ea20a8ea105917 ChangeLog 9869
 MD5 13b41917218dff90a78e1d3a582b86f7 splashutils-0.9.1.ebuild 3195
+MD5 e66992d176526bbd60376ec9e876cd29 ChangeLog 10046
 MD5 d2366bbd1460487cfbd09faa5df47e68 splashutils-1.1.9.7.ebuild 6271
-MD5 4180e756570d9f26db82b36b42c8cbc3 splashutils-1.1.9.8.ebuild 6287
-MD5 98fd11c248eba6f1f945bc2d7e530664 splashutils-1.1.9.9.ebuild 6323
-MD5 d4d393d10196781338f83d0a795065ae files/digest-splashutils-0.9.1 378
-MD5 742f8fdebf8589f4a4c6af91fffc7fae files/digest-splashutils-1.1.9.7 547
-MD5 4646a20554f880fbb3fb47bb823f724b files/digest-splashutils-1.1.9.9-r1 483
+MD5 cfe1b5f88cc51ac6ffc42809178d2a06 metadata.xml 221
+MD5 22e863641b5190904118af97c19945f0 splashutils-1.1.9.9-r1.ebuild 6104
 MD5 ae39d33c3d0a3a91709b168706326abf files/digest-splashutils-1.1.9.6-r1 547
-MD5 c9591cbde5eca614a8e1694ee01c315f files/splashutils-1.1.9.9-external-klibc.patch 10294
-MD5 227086af2d5e8360c3e2f23cdbfb97eb files/digest-splashutils-1.1.9.9 548
+MD5 4646a20554f880fbb3fb47bb823f724b files/digest-splashutils-1.1.9.9-r1 483
+MD5 742f8fdebf8589f4a4c6af91fffc7fae files/digest-splashutils-1.1.9.7 547
 MD5 c55d25b2df1c791c0fa802c0de31af73 files/digest-splashutils-1.1.9.8 547
+MD5 227086af2d5e8360c3e2f23cdbfb97eb files/digest-splashutils-1.1.9.9 548
+MD5 d4d393d10196781338f83d0a795065ae files/digest-splashutils-0.9.1 378
+MD5 c9591cbde5eca614a8e1694ee01c315f files/splashutils-1.1.9.9-external-klibc.patch 10294
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIDFychej4aZK9/cRAsWlAJ9B48keeAV3icCWs73hAsrhMdHRaQCeLFvD
+LUQbICirw8xVE7DydSWOkI4=
+=E8nG
+-----END PGP SIGNATURE-----

diff --git a/media-gfx/splashutils/splashutils-1.1.9.9-r1.ebuild b/media-gfx/splashutils/splashutils-1.1.9.9-r1.ebuild
index c315537d280f28eb978705b6d3d241d0bf6f3e27..f5bf5ad50091c9987fff73a544379d9997c89e82 100644 (file)
--- a/media-gfx/splashutils/splashutils-1.1.9.9-r1.ebuild
+++ b/media-gfx/splashutils/splashutils-1.1.9.9-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/media-gfx/splashutils/splashutils-1.1.9.9-r1.ebuild,v 1.1 2005/08/28 19:33:33 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.9-r1.ebuild,v 1.2 2005/09/08 12:40:45 spock Exp $
 
 inherit eutils multilib linux-mod
 
@@ -96,8 +96,13 @@ src_unpack() {
                spl_conf yes CONFIG_FBSPLASH
        fi
 
-       # This should make splashutils compile on systems with hardened GCC.
-       sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i ${S}/Makefile
+       if built_with_use gcc vanilla ; then
+               ewarn "Your GCC was built with the 'vanilla' flag set. If you can't compile"
+               ewarn "splashutils, you're on your own, as this configuration is not supported."
+       else
+               # This should make splashutils compile on systems with hardened GCC.
+               sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i ${S}/Makefile
+       fi
 
        mkdir ${S}/kernel