Use CXXFLAGS instead of CFLAGS (bug #73164) and pass -fno-stack-protector (bug #72875...

diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index ebfb11ddca7a03977b17e96b30bab1c215ce9a23..9692731eb9e10263f5dd47a25ae36f95e61e6ef2 100644 (file)
--- a/app-office/lyx/ChangeLog
+++ b/app-office/lyx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/lyx
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.53 2004/11/17 13:01:47 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.54 2004/12/03 03:40:27 usata Exp $
+
+  03 Dec 2004; Mamoru KOMACHI <usata@gentoo.org> files/lyx.desktop,
+  lyx-1.3.5.ebuild:
+  Use CXXFLAGS instead of CFLAGS (bug #73164) and pass -fno-stack-protector
+  (bug #72875). Also corrected Desktop Entry for LyX (bug #72808).
 
   17 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> lyx-1.3.5.ebuild:
   Stable on sparc

diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 88e3fa6976cb679a5f5fddbc7fd01013324088f0..7c8fe43eae8fdb7cf332318960e53972fc371fc2 100644 (file)
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,11 +1,21 @@
-MD5 755c76fbd39a9312ab8a30a220889189 ChangeLog 8712
-MD5 643a993dd58f7b161f1a5de6cbbc886e lyx-1.3.4.ebuild 3103
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bba5889784061808e8eb5f567cd1cec9 ChangeLog 8941
+MD5 5cfed65c1ed96ad0dd318bd040a141ab lyx-1.3.5.ebuild 3348
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 5fe27ccef0a072c389030e0e74316b8e lyx-1.3.5.ebuild 3328
+MD5 643a993dd58f7b161f1a5de6cbbc886e lyx-1.3.4.ebuild 3103
+MD5 5ccd191a3dc796feeda9dcee291d2863 files/digest-lyx-1.3.5 239
 MD5 296163b72f99143379e73e616ce4e728 files/digest-lyx-1.3.4 239
+MD5 b86918456f67f911e357a76308cd0fdb files/lyx-1.3.4-gcc34.patch 6589
 MD5 f6bf30211847fb321f0000cd415d9e5b files/lyx-1.3.2-nomktex.patch 449
 MD5 363bfca924cf46b61d21faa4dbfcd43f files/lyx-1.3.3-configure-diff 1953
-MD5 4dc1e1cc2b4e056a629fbfd1334c390e files/lyx.desktop 188
-MD5 b86918456f67f911e357a76308cd0fdb files/lyx-1.3.4-gcc34.patch 6589
-MD5 5ccd191a3dc796feeda9dcee291d2863 files/digest-lyx-1.3.5 239
+MD5 962a15cb903b1048986422c10e21f058 files/lyx.desktop 188
 MD5 2a779b20a7425abd5eea3b5ee01698f7 files/lyx-1.3.5-boost.patch 655
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBr+AvVWNWqTUmv+0RAu9cAKCYD4B5XMu4kHUo3DAcFy4jQ/QrTQCfaXo3
+3Rrnw0i95fTZyEZDV/v1yvE=
+=MYER
+-----END PGP SIGNATURE-----

diff --git a/app-office/lyx/files/lyx.desktop b/app-office/lyx/files/lyx.desktop
index 1666fca5d3cabca01e94673916311f56425eadf4..1c1b33e8738eb5672607083aa8c30e79686de2b9 100644 (file)
--- a/app-office/lyx/files/lyx.desktop
+++ b/app-office/lyx/files/lyx.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Lyx
-Comment=Latex WYSIWYG Editor
+Comment=Latex WYSIWYM Editor
 Icon=/usr/share/lyx/images/lyx.xpm
 Exec=lyx
 Terminal=false

diff --git a/app-office/lyx/lyx-1.3.5.ebuild b/app-office/lyx/lyx-1.3.5.ebuild
index ea5b94f011d02a464b26fae1b0ec3916c3785c7a..7409eb0e95100c82ddf56d0ffc73f5d4bf19b75a 100644 (file)
--- a/app-office/lyx/lyx-1.3.5.ebuild
+++ b/app-office/lyx/lyx-1.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.5.ebuild,v 1.6 2004/11/17 13:01:47 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.5.ebuild,v 1.7 2004/12/03 03:40:27 usata Exp $
 
 inherit kde-functions eutils libtool
 
@@ -63,7 +63,7 @@ src_compile() {
 
        export WANT_AUTOCONF=2.5
 
-       local flags="${CFLAGS}"
+       local flags="${CXXFLAGS} -fno-stack-protector"
        unset CFLAGS
        unset CXXFLAGS
        econf \