Add a gcc-4.1 compile patch from bug #126951

Package-Manager: portage-2.1_pre7-r2

5 files changed, 39 insertions, 28 deletions

diff --git a/app-text/kbibtex/ChangeLog b/app-text/kbibtex/ChangeLog
index 3b15f654608b..961b80252afa 100644
--- a/app-text/kbibtex/ChangeLog
+++ b/app-text/kbibtex/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/kbibtex
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kbibtex/ChangeLog,v 1.7 2006/01/18 23:08:54 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kbibtex/ChangeLog,v 1.8 2006/03/31 14:27:08 caleb Exp $
+
+  31 Mar 2006; Caleb Tennis <caleb@gentoo.org>
+  -files/kbibtex-0.1.2-strings-fix.patch, +files/kbibtex-gcc-4.1.patch,
+  kbibtex-0.1.3.ebuild:
+  Add a gcc-4.1 compile patch from bug #126951
 
   18 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org>
   -kbibtex-0.1.2-r1.ebuild:
diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index 67c94b126cf8..ec041c7d5c59 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,15 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 31381bf2b0e43170d54f935421efd0a9 ChangeLog 1216
+MD5 e39a37a18adc680c1867ed77e3a34820 ChangeLog 1407
+RMD160 ccf73a1fa5c3ea8a338d85bbf90b0b63b276a718 ChangeLog 1407
+SHA256 b33238fbad2fe22433956c5f26bbb341e53730e12b8307012a87c66234b2ca13 ChangeLog 1407
 MD5 28265cf98171e85a67caa02a23491532 files/digest-kbibtex-0.1.3 66
-MD5 d73b24ac9d7c9901907110465a1d2d3f files/kbibtex-0.1.2-strings-fix.patch 428
-MD5 9226f3c970df369b61e2acca80b0dcfa kbibtex-0.1.3.ebuild 601
+RMD160 d00ced64157799820c75e0abc78a7a01893ba304 files/digest-kbibtex-0.1.3 66
+SHA256 b12f5673fa722b093ce2f43b449b3414af20d9454e1475d4bab77474e57169ae files/digest-kbibtex-0.1.3 66
+MD5 935b0bf61cfabd68d0e67d54686350a5 files/kbibtex-gcc-4.1.patch 405
+RMD160 7636098f7b01e890f6c58fcfd0bd442bc1ae7bba files/kbibtex-gcc-4.1.patch 405
+SHA256 ea44b09cdf7cd9892b59dca7d8502225ac94bd04989ae61a86ee059946da3324 files/kbibtex-gcc-4.1.patch 405
+MD5 b528abe3bad6d752dede0c61bf986b4a kbibtex-0.1.3.ebuild 684
+RMD160 f9e4a9dabdaffdfc05363d744099b27194805495 kbibtex-0.1.3.ebuild 684
+SHA256 fffa87c3f16b18542d96872f625849bfcf2323b8c4e6be2143c3fd40e6b19349 kbibtex-0.1.3.ebuild 684
 MD5 636e395cdc2eb9b72ab00fa7ea45ad0f metadata.xml 408
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDzsqSntT9W3vfTuoRAr3DAKCE+n0z2k3FUDCrMfmvOUNdnEbVdgCeIHfg
-9+6wEzADIgjfwcw/ox0gLP8=
-=7G0y
------END PGP SIGNATURE-----
+RMD160 5ef8f5474f5f8f6120ad041015ba55ec8d890ca9 metadata.xml 408
+SHA256 46b1b928281ac18a06115173b246580b95e0cc9724ec7e9a9dfc757925bfb0b6 metadata.xml 408
diff --git a/app-text/kbibtex/files/kbibtex-0.1.2-strings-fix.patch b/app-text/kbibtex/files/kbibtex-0.1.2-strings-fix.patch
deleted file mode 100644
index b2b19d747c5f..000000000000
--- a/app-text/kbibtex/files/kbibtex-0.1.2-strings-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur kbibtex-0.1.2_orig/src/bibtexstring.cpp kbibtex-0.1.2/src/bibtexstring.cpp
---- kbibtex-0.1.2_orig/src/bibtexstring.cpp	2005-09-30 17:12:30.000000000 +0200
-+++ kbibtex-0.1.2/src/bibtexstring.cpp	2005-09-30 17:12:48.000000000 +0200
-@@ -112,6 +112,7 @@
-             else result.append( "\"" );
- 
-             result.append( " }" );
-+            return result;
-         }
-         break;
-     case BibTeXFile::formatXML:
diff --git a/app-text/kbibtex/files/kbibtex-gcc-4.1.patch b/app-text/kbibtex/files/kbibtex-gcc-4.1.patch
new file mode 100644
index 000000000000..9ce661e4327e
--- /dev/null
+++ b/app-text/kbibtex/files/kbibtex-gcc-4.1.patch
@@ -0,0 +1,11 @@
+--- src/kbibtexlistview.h.orig	2005-11-29 13:43:15.000000000 +0100
++++ src/kbibtexlistview.h	2006-03-20 14:17:54.000000000 +0100
+@@ -62,7 +62,7 @@
+     //     BibTeX::BibTeXFile *selectedElements();
+ 
+     void enabledActions();
+-    bool KBibTeXListView::acceptDrag( QDropEvent *event ) const;
++    bool acceptDrag( QDropEvent *event ) const;
+ 
+ public slots:
+     void filterText( const QString&text );
diff --git a/app-text/kbibtex/kbibtex-0.1.3.ebuild b/app-text/kbibtex/kbibtex-0.1.3.ebuild
index 2c90e5729728..d746ed66637b 100644
--- a/app-text/kbibtex/kbibtex-0.1.3.ebuild
+++ b/app-text/kbibtex/kbibtex-0.1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kbibtex/kbibtex-0.1.3.ebuild,v 1.2 2005/12/17 15:49:07 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kbibtex/kbibtex-0.1.3.ebuild,v 1.3 2006/03/31 14:27:10 caleb Exp $
 
-inherit kde
+inherit kde eutils
 
 DESCRIPTION="BibTeX editor for KDE"
 HOMEPAGE="http://www.unix-ag.uni-kl.de/~fischer/kbibtex/"
@@ -19,4 +19,10 @@ RDEPEND="${DEPEND}
 	virtual/tetex
 	>=dev-tex/bibtex2html-1.70"
 
+src_unpack()
+{
+	kde_src_unpack
+	epatch ${FILESDIR}/kbibtex-gcc-4.1.patch
+}
+
 need-kde 3.3