Add patch to build with Qt 3.3.5, thanks to 'spiritus' in bug #155308.

Package-Manager: portage-2.1.2_rc1-r7

diff --git a/net-ftp/nvemftp/ChangeLog b/net-ftp/nvemftp/ChangeLog
index 070ad0f5ee4bb49e76a19c4c52e13201784013c8..c374769cdc4cf8724efb1ca584ec4422ee96006d 100644 (file)
--- a/net-ftp/nvemftp/ChangeLog
+++ b/net-ftp/nvemftp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/nvemftp
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/nvemftp/ChangeLog,v 1.7 2006/07/22 09:46:46 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/nvemftp/ChangeLog,v 1.8 2006/11/16 14:22:31 flameeyes Exp $
+
+  16 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/nvemftp-0.1.3+qt-3.3.5.patch, nvemftp-0.1.3.ebuild:
+  Add patch to build with Qt 3.3.5, thanks to 'spiritus' in bug #155308.
 
   22 Jul 2006; Simon Stelling <blubb@gentoo.org> nvemftp-0.1.3.ebuild:
   marking -amd64 per bug 131750

diff --git a/net-ftp/nvemftp/Manifest b/net-ftp/nvemftp/Manifest
index 72ff623bc9d1c33c592021b097fe951bd085e54c..d86fe2abca3b54b60ece50819789ba77a8c85a4a 100644 (file)
--- a/net-ftp/nvemftp/Manifest
+++ b/net-ftp/nvemftp/Manifest
@@ -1,12 +1,19 @@
-DIST nvemftp-0.1.3.tar.gz 124536 RMD160 f4ca9f55580d314cf79b4570aef70d71bb6f2509 SHA256 c8ba91cab7801f6ad7987533705e9136b3de5fdab2707ceb9acd1b68894655d7
-EBUILD nvemftp-0.1.3.ebuild 665 RMD160 b07770a7fb03fe55e5a9b5dde7b34c0865369228 SHA1 0294602a7606b658d729fa006c0a6a59fe4ff99b SHA256 8689f823be47e5088a9e3b254ff7b27d71a14187dc897b4fb1b70b2cd0931061
-MD5 f7b34db31de0a20edc54a53b0cf8ef98 nvemftp-0.1.3.ebuild 665
-RMD160 b07770a7fb03fe55e5a9b5dde7b34c0865369228 nvemftp-0.1.3.ebuild 665
-SHA256 8689f823be47e5088a9e3b254ff7b27d71a14187dc897b4fb1b70b2cd0931061 nvemftp-0.1.3.ebuild 665
-MISC ChangeLog 1006 RMD160 e4e56b7d59f9ac7cefd06d58a342281fe59f2bdf SHA1 40c560510fd08b07af5c50c2288a98c57beab914 SHA256 b5eb28946c91ac86c1d97068ed6a6d4a3e27b79c9ceb2c5f139d29b74a7c78b7
-MD5 7fb3689fea0faee6e33a97bb84260636 ChangeLog 1006
-RMD160 e4e56b7d59f9ac7cefd06d58a342281fe59f2bdf ChangeLog 1006
-SHA256 b5eb28946c91ac86c1d97068ed6a6d4a3e27b79c9ceb2c5f139d29b74a7c78b7 ChangeLog 1006
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX nvemftp-0.1.3+qt-3.3.5.patch 998 RMD160 9fab1328824361588c115571b4f7bbe2c2b378a5 SHA1 b8ad44cc13d2938687cdf3853f985b5dd3a097ac SHA256 feccf19a10a3c72371235d7a2617492289359651ae9ef10ab9c4f02dde875489
+MD5 fbe01ae16888ff8bc8a99e732c8fe968 files/nvemftp-0.1.3+qt-3.3.5.patch 998
+RMD160 9fab1328824361588c115571b4f7bbe2c2b378a5 files/nvemftp-0.1.3+qt-3.3.5.patch 998
+SHA256 feccf19a10a3c72371235d7a2617492289359651ae9ef10ab9c4f02dde875489 files/nvemftp-0.1.3+qt-3.3.5.patch 998
+DIST nvemftp-0.1.3.tar.gz 124536 RMD160 f4ca9f55580d314cf79b4570aef70d71bb6f2509 SHA1 342f7c66e711cf5cde959492d76999fb3928a455 SHA256 c8ba91cab7801f6ad7987533705e9136b3de5fdab2707ceb9acd1b68894655d7
+EBUILD nvemftp-0.1.3.ebuild 712 RMD160 82c8a97eecd5b0e6d66521a6f6041f6744e1501c SHA1 045d08bf1fcad5a58a0a2c4d412edaa216a98e26 SHA256 e498621fa3d07fe6947bab2797a0d9aec802bf2eb2c725306e90abbe3965bc5c
+MD5 a1691826d35a806928e128f3311b4d54 nvemftp-0.1.3.ebuild 712
+RMD160 82c8a97eecd5b0e6d66521a6f6041f6744e1501c nvemftp-0.1.3.ebuild 712
+SHA256 e498621fa3d07fe6947bab2797a0d9aec802bf2eb2c725306e90abbe3965bc5c nvemftp-0.1.3.ebuild 712
+MISC ChangeLog 1198 RMD160 851f8bac97b980414a96e3805233f0ef73182a3c SHA1 71ef5c2f966a3664dce52f503ce15aa8e68ad817 SHA256 80f4f5d207a2ef082356b2fdecdc36839032ff54f234679f7cf2c12b25c20b71
+MD5 1e53516dfe37ee72e323b59747f4d4ab ChangeLog 1198
+RMD160 851f8bac97b980414a96e3805233f0ef73182a3c ChangeLog 1198
+SHA256 80f4f5d207a2ef082356b2fdecdc36839032ff54f234679f7cf2c12b25c20b71 ChangeLog 1198
 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
@@ -14,3 +21,10 @@ SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 metadata
 MD5 eab9ef758e70922231273fb38bb93e8d files/digest-nvemftp-0.1.3 241
 RMD160 a2a21feacbda88e019c916b4084fd057734fddab files/digest-nvemftp-0.1.3 241
 SHA256 4a540dbad308d504b27db72f60a2517d5ca8055e3bec8e5b0da1ddc43c315668 files/digest-nvemftp-0.1.3 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFXHQ1AiZjviIA2XgRAsc0AJ9f20eUcBTgcGJNW3A6ukbMKUgCUACcDh9o
+yKol3eUb4UUuaJxe2UjHPHA=
+=fN63
+-----END PGP SIGNATURE-----

diff --git a/net-ftp/nvemftp/files/nvemftp-0.1.3+qt-3.3.5.patch b/net-ftp/nvemftp/files/nvemftp-0.1.3+qt-3.3.5.patch
new file mode 100644 (file)
index 0000000..ac6abb8
--- /dev/null
+++ b/net-ftp/nvemftp/files/nvemftp-0.1.3+qt-3.3.5.patch
@@ -0,0 +1,22 @@
+diff -ruB nvemftp-0.1.3.orig/plugins/nftp/nftpoptions.ui nvemftp-0.1.3/plugins/nftp/nftpoptions.ui
+--- nvemftp-0.1.3.orig/plugins/nftp/nftpoptions.ui     2006-11-16 04:33:33.000000000 +0500
++++ nvemftp-0.1.3/plugins/nftp/nftpoptions.ui  2006-11-16 04:35:14.000000000 +0500
+@@ -231,7 +231,4 @@
+     <function access="private" specifier="non virtual">init()</function>
+ </functions>
+ <layoutdefaults spacing="6" margin="11"/>
+-<includehints>
+-    <includehint>nvemoptionswidget.h</includehint>
+-</includehints>
+ </UI>
+diff -ruB nvemftp-0.1.3.orig/src/nvemftpoptions.ui nvemftp-0.1.3/src/nvemftpoptions.ui
+--- nvemftp-0.1.3.orig/src/nvemftpoptions.ui   2006-11-16 04:33:33.000000000 +0500
++++ nvemftp-0.1.3/src/nvemftpoptions.ui        2006-11-16 04:35:02.000000000 +0500
+@@ -805,7 +805,4 @@
+     <function access="private" specifier="non virtual">init()</function>
+ </functions>
+ <layoutdefaults spacing="6" margin="11"/>
+-<includehints>
+-    <includehint>nvemoptionswidget.h</includehint>
+-</includehints>
+ </UI>

diff --git a/net-ftp/nvemftp/nvemftp-0.1.3.ebuild b/net-ftp/nvemftp/nvemftp-0.1.3.ebuild
index 1f610913d14883ab0a717928ebdcf975f93a0889..925e9bba53df55719260940694ef7c8348ebd309 100644 (file)
--- a/net-ftp/nvemftp/nvemftp-0.1.3.ebuild
+++ b/net-ftp/nvemftp/nvemftp-0.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/nvemftp/nvemftp-0.1.3.ebuild,v 1.6 2006/07/22 09:46:46 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/nvemftp/nvemftp-0.1.3.ebuild,v 1.7 2006/11/16 14:22:31 flameeyes Exp $
 
 inherit kde
 
@@ -13,6 +13,8 @@ LICENSE="GPL-2"
 KEYWORDS="-amd64 ~sparc ~x86"
 IUSE=""
 
+PATCHES="${FILESDIR}/${P}+qt-3.3.5.patch"
+
 need-qt 3
 
 src_compile() {