Fix build issue, bug #387985 thank Nikolaj Sjujskij for report and Rion for fix.

Package-Manager: portage-2.1.10.27/cvs/Linux x86_64

5 files changed, 41 insertions, 32 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index 2a62055f2219..f69e0397d7f3 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/psi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.219 2011/10/23 11:33:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.220 2011/10/25 10:13:42 pva Exp $
+
+  25 Oct 2011; Peter Volkov <pva@gentoo.org> psi-0.14-r4.ebuild,
+  files/psi-0.14-minizip-detection.patch, psi-9999.ebuild:
+  Fix build issue, bug #387985 thank Nikolaj Sjujskij for report and Rion for
+  fix.
 
   23 Oct 2011; Markus Meier <maekke@gentoo.org> psi-0.14-r4.ebuild:
   x86 stable, bug #384227
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 09ed173bb2c5..3b096cab0e53 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX psi-0.14-drop-debug-cflags.patch 1098 RMD160 519c2c7dfc4e72ac1e3fe910f9663a9d3bc9f2fe SHA1 f4c88403c01b670d763878538d58bd54d6bccdd0 SHA256 ca7878131af3697275fe7b83ffdbd89886ba6cea27a38aff495b0eb60c5ca5e6
 AUX psi-0.14-input-validation.patch 7440 RMD160 74d1fdcacd3481fcebae9107ba4b185946a2bb82 SHA1 8eb19e4e5b86f59e8adf5d5b98464017d811120d SHA256 4f8f52b6846b238586d8584d8ca5a62b56bd5bfad328765eb157dc95c83bf017
-AUX psi-0.14-minizip-detection.patch 6539 RMD160 4fa6e4991e338ee8a69c766675798655e7827153 SHA1 4052c6f01380a5fcf0879266b76e0bfaeae9d33a SHA256 04ac9f7b908c60a1288e1446625038a45637fabf387848cd135f20a4b71529c3
+AUX psi-0.14-minizip-detection.patch 6587 RMD160 50a69ac0ccb43bed814811468093f72757bb594c SHA1 eee7c1944118c90a9a33012464c5f8418f3b37a4 SHA256 7aba10692d2bd371f0c009abc8e99d2267f47a1ac15765294e232bd0ecd15f31
 AUX psi-0.14-qt-compat.patch 1492 RMD160 eafdbe9391496bfd2198eaf6aa0637b569331c4a SHA1 5639a2078b1cbe318a4ba7d930fead6101766b59 SHA256 1af6ebbe01094519fcdbbe442a3c5798d499da134a08787648e71783e7b0ba60
 DIST psi-0.14.tar.bz2 2168801 RMD160 0c4a07726c2f9819da0f8aa8f1982e939f1fc20f SHA1 f5f8e1a427339a4e9113b5fa513b01a42ae1be4b SHA256 aa014a20d59beb23ce2e853fac3d1d70b4b029591627ae0f0a6a3b9f7150a4c0
 DIST psi-0.14_langpack_for_packagers_2009-12-02.zip 2553616 RMD160 4c3ea59043b91d607a3e30f3cec574e5787a0553 SHA1 6c9ce5717bd3a46a0d1f5eabb3b4756099590435 SHA256 27e5cec1847454c9ac3726122b204d923e87c11e1e37e8960c49c17fd4d74dc2
@@ -11,14 +11,14 @@ DIST psi-extra-iconsets-r1428.tar.bz2 3214991 RMD160 5aba49e65ca39209a4791c6e5eb
 DIST psi-extra-patches-r1428.tar.bz2 131700 RMD160 071eadf3a174f392cfb7202a85d2082b3256c76e SHA1 78cfe1f6b8a15852b9ed72c0dd569c9b4e6d9fac SHA256 a458f44773c53abe369b174d220038d3b1dce6bbab981d6baf7ca48ec211cf48
 EBUILD psi-0.14-r1.ebuild 4668 RMD160 7e3aed2859dc2880471640af3a1c6296df848889 SHA1 37c58876124c1696b1111d8c11ee140ba93ee86d SHA256 7e7bf643317bc775d0e0e9d747e307edd6cba96a8f2a1162e62565fd383334bb
 EBUILD psi-0.14-r2.ebuild 4767 RMD160 8577968b92ca9e9c23222b2caaa8b70c86b41ce4 SHA1 4282e29358296d6f44e99d1fb88618dc107a82e9 SHA256 0933ae51870de2849f0b3543c1826a7784016ed40d21fd3e46db4a192f4c235b
-EBUILD psi-0.14-r4.ebuild 4760 RMD160 3873cdb82eb9c1c5528a25a466f52132ee4914f5 SHA1 5fe5dc8e52d167a9e702ee58cd4c2e710e852a96 SHA256 c04474970af1b10581322034195ce803f8e3abd7c1c95604bc483f59cfa89ab8
-EBUILD psi-9999.ebuild 6274 RMD160 4990e95378f6436e54381205ada5a12c7cb5a028 SHA1 f585c22d9434ea63cb6e2355f736a0ab5dcfd175 SHA256 ce57eabc0adf28ef23d2cf77b2e0c6efa8fb9ffe84a97918611954e561cdfedd
-MISC ChangeLog 32514 RMD160 a473d306cb52d3d73826ff5a8e404afa480515f0 SHA1 d59b6cd8fd19fa881dcf3e70c075548a8a4d794e SHA256 3311bbf29f40113844934f583caab64c64b8142e5cf2620fdbbd9b0871f7b704
+EBUILD psi-0.14-r4.ebuild 4825 RMD160 e08fc3c2c885d3bdd9dc990af84908812a4a2876 SHA1 d8658cf08bdf70facbf76735045568a715e5dbcc SHA256 1fa927acd441de298f31eeceb2476dea630a74c6c38f233113ee091306a64e16
+EBUILD psi-9999.ebuild 6344 RMD160 0ac90b59fa1871002bfdd3cc434a7928d4352019 SHA1 e165d3b284e1b96a45c8ebff35f1d159efdb2d34 SHA256 215248637d2de3a1b3aa309ed4afa38765249b7425540e8b5aa74370b119efb8
+MISC ChangeLog 32721 RMD160 bf6230bc7196e19b13ee2b75e5c72c2bf1639a1c SHA1 f3386d8b157bdbe04fdd81d5b29d3bf19db6660d SHA256 4ac46844036b5132d78b614c480d5c6e1c306a8bd875ba909ae9bf51f08b81b6
 MISC metadata.xml 1045 RMD160 41a67d4b456737917e90945bfd1ca1798603b7dd SHA1 38066b4c6e461321d33471202cc212d56aa8f463 SHA256 2d2db4b3989de29ab27080da8e7d4301b4b6a85a1f55a405a17de10d93a92be2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6j++gACgkQkKaRLQcq0GLF0wCgo8787MLYcuo6Jol0IgTjjtte
-BKgAoLNj7sX50aJI3Jfp2i0QvB6yl2iI
-=Vwh+
+iF4EAREIAAYFAk6mi2UACgkQGrk+8vGYmwcidAEA7ULfFVCbL+CPwh4OqfBgJTBE
+APsoI39Q/y1nNVvfhYEBAMyAUuZ0PKcuVBp7AEtYHgKlKXOpA3nzZQx1UqUxpEwV
+=WmIh
 -----END PGP SIGNATURE-----
diff --git a/net-im/psi/files/psi-0.14-minizip-detection.patch b/net-im/psi/files/psi-0.14-minizip-detection.patch
index 61ad4114f308..1eff6dadec4d 100644
--- a/net-im/psi/files/psi-0.14-minizip-detection.patch
+++ b/net-im/psi/files/psi-0.14-minizip-detection.patch
@@ -1,6 +1,6 @@
 === modified file 'conf_windows.pri'
---- conf_windows.pri	2011-10-04 06:27:15 +0000
-+++ conf_windows.pri	2011-10-04 06:27:28 +0000
+--- conf_windows.pri	2011-10-25 10:03:42 +0000
++++ conf_windows.pri	2011-10-25 10:04:13 +0000
 @@ -5,7 +5,7 @@
  #CONFIG += qca-static
  
@@ -12,8 +12,8 @@
  qca-static {
 
 === modified file 'configure'
---- configure	2011-10-04 06:27:15 +0000
-+++ configure	2011-10-04 06:27:38 +0000
+--- configure	2011-10-25 10:03:42 +0000
++++ configure	2011-10-25 10:04:13 +0000
 @@ -955,41 +955,68 @@
  	{
  #ifdef Q_OS_WIN
@@ -115,8 +115,8 @@
  #endif
 
 === modified file 'qcm/zlib.qcm'
---- qcm/zlib.qcm	2011-10-04 06:27:15 +0000
-+++ qcm/zlib.qcm	2011-10-04 06:27:38 +0000
+--- qcm/zlib.qcm	2011-10-25 10:03:42 +0000
++++ qcm/zlib.qcm	2011-10-25 10:04:13 +0000
 @@ -26,41 +26,68 @@
  	{
  #ifdef Q_OS_WIN
@@ -218,8 +218,8 @@
  #endif
 
 === modified file 'src/conf_iris.pri'
---- src/conf_iris.pri	2011-10-04 06:27:15 +0000
-+++ src/conf_iris.pri	2011-10-04 06:27:28 +0000
+--- src/conf_iris.pri	2011-10-25 10:03:42 +0000
++++ src/conf_iris.pri	2011-10-25 10:04:13 +0000
 @@ -13,11 +13,6 @@
  	CONFIG += crypto
  }
@@ -234,8 +234,8 @@
  	qc_universal:contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {
 
 === modified file 'src/libpsi/tools/zip/zip.cpp'
---- src/libpsi/tools/zip/zip.cpp	2011-10-04 06:27:15 +0000
-+++ src/libpsi/tools/zip/zip.cpp	2011-10-04 06:27:43 +0000
+--- src/libpsi/tools/zip/zip.cpp	2011-10-25 10:03:42 +0000
++++ src/libpsi/tools/zip/zip.cpp	2011-10-25 10:04:13 +0000
 @@ -22,7 +22,11 @@
  #include <QStringList>
  #include <QFile>
@@ -250,25 +250,28 @@
  class UnZipPrivate
 
 === modified file 'src/libpsi/tools/zip/zip.pri'
---- src/libpsi/tools/zip/zip.pri	2011-10-04 06:27:15 +0000
-+++ src/libpsi/tools/zip/zip.pri	2011-10-04 06:29:25 +0000
-@@ -2,17 +2,21 @@
+--- src/libpsi/tools/zip/zip.pri	2011-10-25 10:03:42 +0000
++++ src/libpsi/tools/zip/zip.pri	2011-10-25 10:04:13 +0000
+@@ -2,17 +2,20 @@
  	$$PWD/zip.h
  
  SOURCES += \
 -	$$PWD/zip.cpp \
 -	$$PWD/minizip/unzip.c
+-
+-INCLUDEPATH += $$PWD
+-DEPENDPATH  += $$PWD
+-
+-win32: {
 + 	$$PWD/zip.cpp
 + 
 +psi-minizip {
 +	SOURCES += $$PWD/minizip/unzip.c
 +	DEFINES += PSIMINIZIP
++	INCLUDEPATH += $$PWD
++	DEPENDPATH  += $$PWD
 +}
- 
- INCLUDEPATH += $$PWD
- DEPENDPATH  += $$PWD
- 
--win32: {
++
 +psi-winzlib {
  	INCLUDEPATH += $$PWD/minizip/win32
  	DEPENDPATH  += $$PWD/minizip/win32
diff --git a/net-im/psi/psi-0.14-r4.ebuild b/net-im/psi/psi-0.14-r4.ebuild
index 3b14c6650353..890e17097900 100644
--- a/net-im/psi/psi-0.14-r4.ebuild
+++ b/net-im/psi/psi-0.14-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild,v 1.5 2011/10/23 11:33:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild,v 1.6 2011/10/25 10:13:42 pva Exp $
 
 EAPI=4
 
@@ -36,7 +36,8 @@ RDEPEND=">=x11-libs/qt-gui-4.4:4[qt3support,dbus?]
 	spell? ( >=app-text/enchant-1.3.0 )
 	xscreensaver? ( x11-libs/libXScrnSaver )
 	extras? ( webkit? ( x11-libs/qt-webkit ) )
-	app-arch/unzip"
+	app-arch/unzip
+	|| ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 )"
 
 DEPEND="${RDEPEND}
 	extras? ( sys-devel/qconf )
@@ -76,8 +77,6 @@ src_prepare() {
 		sed -e 's/\(^#define PROG_CAPS_NODE	\).*/\1"http:\/\/psi-dev.googlecode.com\/caps";/' \
 			-e 's:\(^#define PROG_NAME "Psi\):\1+:' \
 				-i src/applicationinfo.cpp || die
-
-		qconf || die "Failed to create ./configure."
 	else
 		if use webkit; then
 			ewarn "Webkit support disabled as it is only available in Psi+"
@@ -85,6 +84,7 @@ src_prepare() {
 		fi
 	fi
 
+	qconf || die "Failed to create ./configure."
 	rm -rf third-party/qca || die # We use system libraries.
 }
 
diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild
index 99745830c952..5005ca9d61ec 100644
--- a/net-im/psi/psi-9999.ebuild
+++ b/net-im/psi/psi-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.12 2011/06/30 09:23:16 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.13 2011/10/25 10:13:42 pva Exp $
 
 EAPI="4"
 
@@ -41,6 +41,7 @@ RDEPEND="
 	xscreensaver? ( x11-libs/libXScrnSaver )
 	extras? ( webkit? ( x11-libs/qt-webkit:4 ) )
 	app-arch/unzip
+	|| ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 )
 "
 DEPEND="${RDEPEND}
 	extras? (