Applied various patches from upstream, previous patch was already present upstream...

Package-Manager: portage-2.1.2.2

diff --git a/app-text/kbibtex/ChangeLog b/app-text/kbibtex/ChangeLog
index 631bf5359f7aeae12f56ec457ac79b7a2d0342fe..f61adcb669aa0eb3f33e71a8e6b125c30a9158f1 100644 (file)
--- a/app-text/kbibtex/ChangeLog
+++ b/app-text/kbibtex/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-text/kbibtex
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kbibtex/ChangeLog,v 1.17 2007/03/15 08:53:41 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kbibtex/ChangeLog,v 1.18 2007/03/15 13:41:05 cryos Exp $
+
+*kbibtex-0.1.5-r2 (15 Mar 2007)
+
+  15 Mar 2007; Marcus D. Hanwell <cryos@gentoo.org>
+  -files/kbibtex-0.1.5-compile-fix.patch,
+  +files/kbibtex-0.1.5-filteredselection.patch,
+  +files/kbibtex-0.1.5-gcc4.2.patch,
+  +files/kbibtex-0.1.5-storesearchurls.patch,
+  +files/kbibtex-0.1.5-webquerypubmedmultiplequeries.patch,
+  +kbibtex-0.1.5-r2.ebuild:
+  Applied various patches from upstream, previous patch was already present
+  upstream and so replaced it with their patch for consistency.
 
   15 Mar 2007; Marcus D. Hanwell <cryos@gentoo.org>
   +files/kbibtex-0.1.5-compile-fix.patch, -kbibtex-0.1.5.ebuild,

diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index d20f5d766b867980b5fa3e5bcfa6bc1665b9483c..ac389b8334ff358cd02d409dfadbeaa635137ace 100644 (file)
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,23 +1,39 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX kbibtex-0.1.5-compile-fix.patch 545 RMD160 5b5702af45da6de1b568ba909beae09f4bc224db SHA1 77b376a8f2153137d85f99e7123efe1efce6f33e SHA256 795d98246066291cf934ee116edaff92bd3a0ab097eda8b3a69add41d160225a
-MD5 b0a9d69db841325fb8451bc7acd1a425 files/kbibtex-0.1.5-compile-fix.patch 545
-RMD160 5b5702af45da6de1b568ba909beae09f4bc224db files/kbibtex-0.1.5-compile-fix.patch 545
-SHA256 795d98246066291cf934ee116edaff92bd3a0ab097eda8b3a69add41d160225a files/kbibtex-0.1.5-compile-fix.patch 545
+AUX kbibtex-0.1.5-filteredselection.patch 1533 RMD160 6e14a391d76bf79d08d63771ed4349b5b45c5aa8 SHA1 971be8064bed3cc6e5c77c1477854b9342dcd811 SHA256 a9ce7c7a71d1bfaf5f3b4ccc31a4203b6111c33605b095724a7e1693d042a29c
+MD5 bb97a4924c4bea973ea02800e699d701 files/kbibtex-0.1.5-filteredselection.patch 1533
+RMD160 6e14a391d76bf79d08d63771ed4349b5b45c5aa8 files/kbibtex-0.1.5-filteredselection.patch 1533
+SHA256 a9ce7c7a71d1bfaf5f3b4ccc31a4203b6111c33605b095724a7e1693d042a29c files/kbibtex-0.1.5-filteredselection.patch 1533
+AUX kbibtex-0.1.5-gcc4.2.patch 454 RMD160 dfc2b4a00ac2aba668f15ec94eedd7855449a1f5 SHA1 91c32ab2ae04867e6d37674cc28e9b60a19c40ce SHA256 349f8d55150956dc65fd8acf0e7d3fd5f3c94d7a9e1b915d0b830768a329529c
+MD5 2d94fa24173073a02948d66946df60c0 files/kbibtex-0.1.5-gcc4.2.patch 454
+RMD160 dfc2b4a00ac2aba668f15ec94eedd7855449a1f5 files/kbibtex-0.1.5-gcc4.2.patch 454
+SHA256 349f8d55150956dc65fd8acf0e7d3fd5f3c94d7a9e1b915d0b830768a329529c files/kbibtex-0.1.5-gcc4.2.patch 454
+AUX kbibtex-0.1.5-storesearchurls.patch 733 RMD160 8eb5b280b9f4f729dc0b36c2bd6ee0e059c6e40b SHA1 12916b9e77c03d7d35f43cfde0b8418947624a26 SHA256 b9a4769e135a3fdea0b727bcf4529735f57e84742c7876104017cdf8f27e9ecd
+MD5 66f878f3eeec862d5417a68d94fc538e files/kbibtex-0.1.5-storesearchurls.patch 733
+RMD160 8eb5b280b9f4f729dc0b36c2bd6ee0e059c6e40b files/kbibtex-0.1.5-storesearchurls.patch 733
+SHA256 b9a4769e135a3fdea0b727bcf4529735f57e84742c7876104017cdf8f27e9ecd files/kbibtex-0.1.5-storesearchurls.patch 733
 AUX kbibtex-0.1.5-viewdocument.patch 2446 RMD160 21e847435e775e8a22df68e1c099c66a5e61a79a SHA1 ca29fa5428494c9509d924543b0e915c07281075 SHA256 cd3bac08ce1d01bc0c37181ffaca63769e4cb702bb8a3fc57efd3dacaf4e2631
 MD5 afe161f8783346b3606dfd5a337918ac files/kbibtex-0.1.5-viewdocument.patch 2446
 RMD160 21e847435e775e8a22df68e1c099c66a5e61a79a files/kbibtex-0.1.5-viewdocument.patch 2446
 SHA256 cd3bac08ce1d01bc0c37181ffaca63769e4cb702bb8a3fc57efd3dacaf4e2631 files/kbibtex-0.1.5-viewdocument.patch 2446
+AUX kbibtex-0.1.5-webquerypubmedmultiplequeries.patch 453 RMD160 738e5e6ff7efa291a2021857dcce70fe369ce52e SHA1 53f40f37e075595a73fab1286b03c08cc37e09b1 SHA256 0b89bdd5afef25ebb3c2d38c7140cb3ef810dd04643ab748c7ac7793629e67ec
+MD5 c51fc05e590018b1035c60a3f0154e87 files/kbibtex-0.1.5-webquerypubmedmultiplequeries.patch 453
+RMD160 738e5e6ff7efa291a2021857dcce70fe369ce52e files/kbibtex-0.1.5-webquerypubmedmultiplequeries.patch 453
+SHA256 0b89bdd5afef25ebb3c2d38c7140cb3ef810dd04643ab748c7ac7793629e67ec files/kbibtex-0.1.5-webquerypubmedmultiplequeries.patch 453
 DIST kbibtex-0.1.5.tar.bz2 556109 RMD160 7a7c6ce9ff4b392104e0b35eb888eaa7e7a20383 SHA1 a89331c3d9621995d9cd8f91fae470237ea2eca4 SHA256 588cbd5055c0baea950263c8d768c13c69ef72c54543137dea4d88fb7e4f8f13
 EBUILD kbibtex-0.1.5-r1.ebuild 712 RMD160 07c1dab8fec9f6d0a88432f5a30d07f2f79cc0e8 SHA1 4b36562a587ac8e08b48ed632f98e7c977ed3a4f SHA256 d5a136c5dc2b93f5f2c46dd0a12e2b3b2798ca5cf603beaa4a171ae21b342aae
 MD5 b6dd2e4f66411d305ce9a9041fa63187 kbibtex-0.1.5-r1.ebuild 712
 RMD160 07c1dab8fec9f6d0a88432f5a30d07f2f79cc0e8 kbibtex-0.1.5-r1.ebuild 712
 SHA256 d5a136c5dc2b93f5f2c46dd0a12e2b3b2798ca5cf603beaa4a171ae21b342aae kbibtex-0.1.5-r1.ebuild 712
-MISC ChangeLog 2847 RMD160 f244f8cdea225b5d460c63bfa6105d52edd124ca SHA1 29a27be216031d35b4c2bb05c827a876cc1c67d9 SHA256 42be7a3ee4b8b19c137af9402d7af95faf7656d01de2a56b16a40bce3173819f
-MD5 71f4705c044a0e9fb440e273ec31af40 ChangeLog 2847
-RMD160 f244f8cdea225b5d460c63bfa6105d52edd124ca ChangeLog 2847
-SHA256 42be7a3ee4b8b19c137af9402d7af95faf7656d01de2a56b16a40bce3173819f ChangeLog 2847
+EBUILD kbibtex-0.1.5-r2.ebuild 870 RMD160 4a7ec9dc1bd93e7f36a4d137bbc406ad8475d41b SHA1 85c114602b94582ff8cd9b8020e7b5f7caf7797f SHA256 cd6950862834a6081ae700ea7e3316a028422fb2259ac5f59f46e1ffb59f0e70
+MD5 b849645287e9bf1f9db61d4ddbc34c15 kbibtex-0.1.5-r2.ebuild 870
+RMD160 4a7ec9dc1bd93e7f36a4d137bbc406ad8475d41b kbibtex-0.1.5-r2.ebuild 870
+SHA256 cd6950862834a6081ae700ea7e3316a028422fb2259ac5f59f46e1ffb59f0e70 kbibtex-0.1.5-r2.ebuild 870
+MISC ChangeLog 3334 RMD160 e2ca873a36dc279a193e3b3cc2a0d7ebeaf456e7 SHA1 31bee789cfeb8737ab4c5ab88a59897895c08f93 SHA256 eabe05959ee5051b6a18e201415d89ae3baea262c820f2cc33d87cc741e72eec
+MD5 dffd605f2389e2f715263a76e3a0f65d ChangeLog 3334
+RMD160 e2ca873a36dc279a193e3b3cc2a0d7ebeaf456e7 ChangeLog 3334
+SHA256 eabe05959ee5051b6a18e201415d89ae3baea262c820f2cc33d87cc741e72eec ChangeLog 3334
 MISC metadata.xml 408 RMD160 5ef8f5474f5f8f6120ad041015ba55ec8d890ca9 SHA1 7a8f9ffd0bc2878e664289478b887c57c32561e4 SHA256 46b1b928281ac18a06115173b246580b95e0cc9724ec7e9a9dfc757925bfb0b6
 MD5 636e395cdc2eb9b72ab00fa7ea45ad0f metadata.xml 408
 RMD160 5ef8f5474f5f8f6120ad041015ba55ec8d890ca9 metadata.xml 408
@@ -25,10 +41,13 @@ SHA256 46b1b928281ac18a06115173b246580b95e0cc9724ec7e9a9dfc757925bfb0b6 metadata
 MD5 d43c6632ddec01532dd535c7502de8e5 files/digest-kbibtex-0.1.5-r1 244
 RMD160 edfde7c0e0b295fb9ed762450ced06986ca78cfb files/digest-kbibtex-0.1.5-r1 244
 SHA256 8abf5b53527bc6f0e26c7025014a20420a7f91e9ef37f5677a4c5044823ee8a3 files/digest-kbibtex-0.1.5-r1 244
+MD5 d43c6632ddec01532dd535c7502de8e5 files/digest-kbibtex-0.1.5-r2 244
+RMD160 edfde7c0e0b295fb9ed762450ced06986ca78cfb files/digest-kbibtex-0.1.5-r2 244
+SHA256 8abf5b53527bc6f0e26c7025014a20420a7f91e9ef37f5677a4c5044823ee8a3 files/digest-kbibtex-0.1.5-r2 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF+QoyntT9W3vfTuoRAl/dAJ46nAinCnaS/2vB97RDnntAmKtoxACfUeDw
-OuWiEBUKGXXlhxVEqNoTRvs=
-=Wel7
+iD8DBQFF+U0AntT9W3vfTuoRAsGYAKCD9pYPD32l/SHKCgUAWuZdoGnkGACfV3dc
+36mjVKXMleCM76/rYZ0amUQ=
+=jy1x
 -----END PGP SIGNATURE-----

diff --git a/app-text/kbibtex/files/digest-kbibtex-0.1.5-r2 b/app-text/kbibtex/files/digest-kbibtex-0.1.5-r2
new file mode 100644 (file)
index 0000000..c1bbfb4
--- /dev/null
+++ b/app-text/kbibtex/files/digest-kbibtex-0.1.5-r2
@@ -0,0 +1,3 @@
+MD5 83a8c1cade06837431b6ebe79d13ef7b kbibtex-0.1.5.tar.bz2 556109
+RMD160 7a7c6ce9ff4b392104e0b35eb888eaa7e7a20383 kbibtex-0.1.5.tar.bz2 556109
+SHA256 588cbd5055c0baea950263c8d768c13c69ef72c54543137dea4d88fb7e4f8f13 kbibtex-0.1.5.tar.bz2 556109

diff --git a/app-text/kbibtex/files/kbibtex-0.1.5-filteredselection.patch b/app-text/kbibtex/files/kbibtex-0.1.5-filteredselection.patch
new file mode 100644 (file)
index 0000000..b5012d4
--- /dev/null
+++ b/app-text/kbibtex/files/kbibtex-0.1.5-filteredselection.patch
@@ -0,0 +1,41 @@
+Index: src/documentlistview.cpp
+===================================================================
+--- src/documentlistview.cpp   (Revision 301)
++++ src/documentlistview.cpp   (Revision 302)
+@@ -221,10 +221,13 @@
+         while ( it.current() )
+         {
+             DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
+-            m_bibtexFile->deleteElement( kblvi->element() );
+-            it++;
+-            takeItem( kblvi );
+-            delete ( kblvi );
++            if ( kblvi->isVisible() )
++            {
++                m_bibtexFile->deleteElement( kblvi->element() );
++                it++;
++                takeItem( kblvi );
++                delete ( kblvi );
++            }
+         }
+ 
+         if ( above )
+@@ -246,7 +249,7 @@
+         {
+             DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
+             BibTeX::Entry *entry = dynamic_cast<BibTeX::Entry*>( kblvi->element() );
+-            if ( entry != NULL )
++            if ( entry != NULL && kblvi->isVisible() )
+             {
+                 if ( !refs.isEmpty() )
+                     refs.append( "," );
+@@ -621,7 +624,8 @@
+         while ( it.current() )
+         {
+             DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
+-            exporter->save( &buffer, kblvi->element() );
++            if ( kblvi->isVisible() )
++                exporter->save( &buffer, kblvi->element() );
+             it++;
+         }
+         delete exporter;

diff --git a/app-text/kbibtex/files/kbibtex-0.1.5-compile-fix.patch b/app-text/kbibtex/files/kbibtex-0.1.5-gcc4.2.patch
similarity index 52%
rename from app-text/kbibtex/files/kbibtex-0.1.5-compile-fix.patch
rename to app-text/kbibtex/files/kbibtex-0.1.5-gcc4.2.patch
index 9f961e08322765b7b668ec319ea04e7d2c3c5966..56f5e721a6f32733dbea75c2d2a5cacf1ca8a245 100644 (file)
--- a/app-text/kbibtex/files/kbibtex-0.1.5-compile-fix.patch
+++ b/app-text/kbibtex/files/kbibtex-0.1.5-gcc4.2.patch
@@ -1,7 +1,7 @@
-# Patch from Andreas Ntaflos <daff@dword.org> to fix compilation issue
-# 15 Mar 2007 Marcus D. Hanwell <cryos@gentoo.org> from bug 171004.
---- src/fileimporter.h 2007-03-15 05:55:41.000000000 +0100
-+++ src/fileimporter.h.new     2007-03-15 05:56:45.000000000 +0100
+Index: src/fileimporter.h
+===================================================================
+--- src/fileimporter.h (Revision 307)
++++ src/fileimporter.h (Arbeitskopie)
 @@ -39,7 +39,7 @@
          ~FileImporter();
  

diff --git a/app-text/kbibtex/files/kbibtex-0.1.5-storesearchurls.patch b/app-text/kbibtex/files/kbibtex-0.1.5-storesearchurls.patch
new file mode 100644 (file)
index 0000000..205ca83
--- /dev/null
+++ b/app-text/kbibtex/files/kbibtex-0.1.5-storesearchurls.patch
@@ -0,0 +1,12 @@
+diff -Naur kbibtex-0.1.5_orig/src/settings.cpp kbibtex-0.1.5/src/settings.cpp
+--- kbibtex-0.1.5_orig/src/settings.cpp        2006-10-03 21:14:45.000000000 +0200
++++ kbibtex-0.1.5/src/settings.cpp     2007-02-27 13:20:13.000000000 +0100
+@@ -170,7 +170,7 @@
+ 
+         config->setGroup( "SearchURLs" );
+         int i = 1;
+-        for ( QValueList<SearchURL*>::ConstIterator it = searchURLs.begin(); it != searchURLs.end(); ++it )
++        for ( QValueList<SearchURL*>::ConstIterator it = searchURLs.begin(); it != searchURLs.end(); ++it, ++i )
+         {
+             config->writeEntry( QString( "SearchURLDescription%1" ).arg( i ), ( *it ) ->description );
+             config->writeEntry( QString( "SearchURL%1" ).arg( i ), ( *it ) ->url );

diff --git a/app-text/kbibtex/files/kbibtex-0.1.5-webquerypubmedmultiplequeries.patch b/app-text/kbibtex/files/kbibtex-0.1.5-webquerypubmedmultiplequeries.patch
new file mode 100644 (file)
index 0000000..30449f8
--- /dev/null
+++ b/app-text/kbibtex/files/kbibtex-0.1.5-webquerypubmedmultiplequeries.patch
@@ -0,0 +1,10 @@
+--- kbibtex-0.1.5_orig/src/webquerypubmed.cpp  2006-10-04 21:10:15.000000000 +0200
++++ kbibtex-0.1.5/src/webquerypubmed.cpp       2007-02-27 13:44:16.000000000 +0100
+@@ -206,6 +206,7 @@
+         doc.setContent( buffer );
+         QDomElement docElem = doc.documentElement();
+         ResultParser resultParser( m_listViewResults, doc.documentElement() );
++        buffer->close();
+ 
+         setEnabled( TRUE );
+         QApplication::restoreOverrideCursor();

diff --git a/app-text/kbibtex/kbibtex-0.1.5-r2.ebuild b/app-text/kbibtex/kbibtex-0.1.5-r2.ebuild
new file mode 100644 (file)
index 0000000..86468c5
--- /dev/null
+++ b/app-text/kbibtex/kbibtex-0.1.5-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/kbibtex/kbibtex-0.1.5-r2.ebuild,v 1.1 2007/03/15 13:41:05 cryos Exp $
+
+inherit kde eutils
+
+DESCRIPTION="BibTeX editor for KDE"
+HOMEPAGE="http://www.unix-ag.uni-kl.de/~fischer/kbibtex/"
+SRC_URI="http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/libxml2-2.6.22
+       >=dev-libs/libxslt-1.1.15"
+RDEPEND="${DEPEND}
+       virtual/tetex
+       >=dev-tex/bibtex2html-1.70"
+
+need-kde 3.3
+
+PATCHES="${FILESDIR}/kbibtex-0.1.5-viewdocument.patch
+       ${FILESDIR}/kbibtex-0.1.5-gcc4.2.patch
+       ${FILESDIR}/kbibtex-0.1.5-storesearchurls.patch
+       ${FILESDIR}/kbibtex-0.1.5-filteredselection.patch
+       ${FILESDIR}/kbibtex-0.1.5-webquerypubmedmultiplequeries.patch"