From cc5ad70d47610b2f4e054f78af6372bca3ac7766 Mon Sep 17 00:00:00 2001 From: "Marcus D. Hanwell" Date: Thu, 15 Mar 2007 08:53:41 +0000 Subject: [PATCH] Patched to fix compilation issue, thanks to Andreas Ntaflos for the patch. Closes bug 171004. Also cleaned out old version. Package-Manager: portage-2.1.2.2 --- app-text/kbibtex/ChangeLog | 10 +++++-- app-text/kbibtex/Manifest | 27 +++++++++---------- app-text/kbibtex/files/digest-kbibtex-0.1.5 | 3 --- .../files/kbibtex-0.1.5-compile-fix.patch | 13 +++++++++ app-text/kbibtex/kbibtex-0.1.5-r1.ebuild | 11 +++----- app-text/kbibtex/kbibtex-0.1.5.ebuild | 22 --------------- 6 files changed, 37 insertions(+), 49 deletions(-) delete mode 100644 app-text/kbibtex/files/digest-kbibtex-0.1.5 create mode 100644 app-text/kbibtex/files/kbibtex-0.1.5-compile-fix.patch delete mode 100644 app-text/kbibtex/kbibtex-0.1.5.ebuild diff --git a/app-text/kbibtex/ChangeLog b/app-text/kbibtex/ChangeLog index e65ce4e81adc..631bf5359f7a 100644 --- a/app-text/kbibtex/ChangeLog +++ b/app-text/kbibtex/ChangeLog @@ -1,6 +1,12 @@ # 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.16 2006/11/14 17:54:12 caleb Exp $ +# 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 $ + + 15 Mar 2007; Marcus D. Hanwell + +files/kbibtex-0.1.5-compile-fix.patch, -kbibtex-0.1.5.ebuild, + kbibtex-0.1.5-r1.ebuild: + Patched to fix compilation issue, thanks to Andreas Ntaflos + for the patch. Closes bug 171004. Also cleaned out old version. *kbibtex-0.1.5-r1 (14 Nov 2006) diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest index 80907582b72a..dd551332ba63 100644 --- a/app-text/kbibtex/Manifest +++ b/app-text/kbibtex/Manifest @@ -1,27 +1,24 @@ +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-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 DIST kbibtex-0.1.5.tar.bz2 556109 RMD160 7a7c6ce9ff4b392104e0b35eb888eaa7e7a20383 SHA1 a89331c3d9621995d9cd8f91fae470237ea2eca4 SHA256 588cbd5055c0baea950263c8d768c13c69ef72c54543137dea4d88fb7e4f8f13 -EBUILD kbibtex-0.1.5-r1.ebuild 706 RMD160 7681caee02d21f13df1229ef9b6e94b3d6c73acd SHA1 a89d6ce2dfad34f936f65651667f1166d5141baa SHA256 a26e6f095d265e22831c5ec2b4dfb598fb222cb069d6367adee5ff825b4714c3 -MD5 827020f7048fd34be1609d21d35a598b kbibtex-0.1.5-r1.ebuild 706 -RMD160 7681caee02d21f13df1229ef9b6e94b3d6c73acd kbibtex-0.1.5-r1.ebuild 706 -SHA256 a26e6f095d265e22831c5ec2b4dfb598fb222cb069d6367adee5ff825b4714c3 kbibtex-0.1.5-r1.ebuild 706 -EBUILD kbibtex-0.1.5.ebuild 608 RMD160 d4624b04e45a01b29006ddd2730ecfc46eb7c030 SHA1 2e7e1de516b868858c5bab5afd4a471ca82a2049 SHA256 03cf818bd0f61dc3feef27b17d86ac817caa9fc742fcabcfd7cdf2660ecc5c1a -MD5 d154867580ab80723240f15d97b7e6b7 kbibtex-0.1.5.ebuild 608 -RMD160 d4624b04e45a01b29006ddd2730ecfc46eb7c030 kbibtex-0.1.5.ebuild 608 -SHA256 03cf818bd0f61dc3feef27b17d86ac817caa9fc742fcabcfd7cdf2660ecc5c1a kbibtex-0.1.5.ebuild 608 -MISC ChangeLog 2557 RMD160 5a73f1027694c96b4ac30e6ff8b0c9d205f5d132 SHA1 d04811d5bf9dae332dc9db67fc8060f53f258835 SHA256 ed1e4c3ed3520b1e9caee349102b8c932c0c2f8ce87f3540ff6f5a8acf3c33dc -MD5 8c0ecd434a015d77420c168f68a035e2 ChangeLog 2557 -RMD160 5a73f1027694c96b4ac30e6ff8b0c9d205f5d132 ChangeLog 2557 -SHA256 ed1e4c3ed3520b1e9caee349102b8c932c0c2f8ce87f3540ff6f5a8acf3c33dc ChangeLog 2557 +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 MISC metadata.xml 408 RMD160 5ef8f5474f5f8f6120ad041015ba55ec8d890ca9 SHA1 7a8f9ffd0bc2878e664289478b887c57c32561e4 SHA256 46b1b928281ac18a06115173b246580b95e0cc9724ec7e9a9dfc757925bfb0b6 MD5 636e395cdc2eb9b72ab00fa7ea45ad0f metadata.xml 408 RMD160 5ef8f5474f5f8f6120ad041015ba55ec8d890ca9 metadata.xml 408 SHA256 46b1b928281ac18a06115173b246580b95e0cc9724ec7e9a9dfc757925bfb0b6 metadata.xml 408 -MD5 d43c6632ddec01532dd535c7502de8e5 files/digest-kbibtex-0.1.5 244 -RMD160 edfde7c0e0b295fb9ed762450ced06986ca78cfb files/digest-kbibtex-0.1.5 244 -SHA256 8abf5b53527bc6f0e26c7025014a20420a7f91e9ef37f5677a4c5044823ee8a3 files/digest-kbibtex-0.1.5 244 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 diff --git a/app-text/kbibtex/files/digest-kbibtex-0.1.5 b/app-text/kbibtex/files/digest-kbibtex-0.1.5 deleted file mode 100644 index c1bbfb4304e4..000000000000 --- a/app-text/kbibtex/files/digest-kbibtex-0.1.5 +++ /dev/null @@ -1,3 +0,0 @@ -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-compile-fix.patch b/app-text/kbibtex/files/kbibtex-0.1.5-compile-fix.patch new file mode 100644 index 000000000000..9f961e083227 --- /dev/null +++ b/app-text/kbibtex/files/kbibtex-0.1.5-compile-fix.patch @@ -0,0 +1,13 @@ +# Patch from Andreas Ntaflos to fix compilation issue +# 15 Mar 2007 Marcus D. Hanwell 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 +@@ -39,7 +39,7 @@ + ~FileImporter(); + + File* load ( const QString& text ); +- virtual File* load( QIODevice *iodevice ) = NULL; ++ virtual File* load( QIODevice *iodevice ) = 0; + + static bool guessCanDecode( const QString & ) { return FALSE; }; + diff --git a/app-text/kbibtex/kbibtex-0.1.5-r1.ebuild b/app-text/kbibtex/kbibtex-0.1.5-r1.ebuild index 243052f147ad..c1cb6fab5c77 100644 --- a/app-text/kbibtex/kbibtex-0.1.5-r1.ebuild +++ b/app-text/kbibtex/kbibtex-0.1.5-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# 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-r1.ebuild,v 1.1 2006/11/14 17:54:12 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/kbibtex/kbibtex-0.1.5-r1.ebuild,v 1.2 2007/03/15 08:53:41 cryos Exp $ inherit kde eutils @@ -21,8 +21,5 @@ RDEPEND="${DEPEND} need-kde 3.3 -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/kbibtex-0.1.5-viewdocument.patch -} +PATCHES="${FILESDIR}/kbibtex-0.1.5-viewdocument.patch + ${FILESDIR}/kbibtex-0.1.5-compile-fix.patch" diff --git a/app-text/kbibtex/kbibtex-0.1.5.ebuild b/app-text/kbibtex/kbibtex-0.1.5.ebuild deleted file mode 100644 index 7abf8e8094b7..000000000000 --- a/app-text/kbibtex/kbibtex-0.1.5.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# 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.5.ebuild,v 1.1 2006/10/07 01:54:38 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 -- 2.26.2