Make sure we use zlib/minizip from the system #387837 by Diego Elio Pettenò.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

4 files changed, 44 insertions, 18 deletions

diff --git a/net-im/vacuum/ChangeLog b/net-im/vacuum/ChangeLog
index ad9e90fb1582..1170f181f318 100644
--- a/net-im/vacuum/ChangeLog
+++ b/net-im/vacuum/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/vacuum
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/vacuum/ChangeLog,v 1.5 2011/12/29 08:18:49 maksbotan Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/vacuum/ChangeLog,v 1.6 2012/03/10 20:20:13 vapier Exp $
+
+  10 Mar 2012; Mike Frysinger <vapier@gentoo.org> vacuum-1.1.2.ebuild,
+  vacuum-9999.ebuild:
+  Make sure we use zlib/minizip from the system #387837 by Diego Elio Pettenò.
 
 *vacuum-1.1.2 (29 Dec 2011)
 
diff --git a/net-im/vacuum/Manifest b/net-im/vacuum/Manifest
index 94a6cbd4abb2..221d0659c62a 100644
--- a/net-im/vacuum/Manifest
+++ b/net-im/vacuum/Manifest
@@ -1,9 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX vacuum-1.1.1-minizip.patch 1723 RMD160 2e70eca4db75ca3f32155bdf004cab85b95adac5 SHA1 38ec695df0754346ff98c0a88ca954f17fd9cc8e SHA256 b93dd50385a9b0739253a84b0e17d0686b4807e574a7065a8c95d690ae1ce596
 AUX vacuum-1.1.1-zlib.patch 1506 RMD160 969807819a5acc4b3b36d11a7bacffad5e7ffa7a SHA1 f3a059343eb9bbc1b105b5b9fc8ebab85fc087c1 SHA256 9f74f3f54ec82715b919ce6ade4c8f121c1d80238847484653d19ac766d2126e
 DIST vacuum-1.1.1.tar.xz 1507204 RMD160 d7635bf5ab46f8dd223bd77404a0d8b07a2a317c SHA1 3f64f96d3924bf7acbfc197fe222b920c815bce9 SHA256 9158c69915e0f35116b6a994070bb98c1cd45c14e3672bcfd21da19eb2204ee2
 DIST vacuum-1.1.2.tar.xz 1507976 RMD160 3b597f9bda2aabf01f0d2d39c2b759d192705587 SHA1 a7dd1a471c9037e9d6085c0461b55c89750037dc SHA256 451dde9b3587503b035fa1ddd2c99f2052a0b17a603491c59e8c47a8bcd4746d
 EBUILD vacuum-1.1.1.ebuild 2159 RMD160 0103e193fb5700e28f171a4adcb33c8134e3d9f4 SHA1 bec2233ab928be13fb699b2d5df21805fa642cbe SHA256 8f457a4c2a879eb36d24747d9e4cf2c1aa7bdccb96ab6e82053a77853fbfd450
-EBUILD vacuum-1.1.2.ebuild 2125 RMD160 0d814a2dbdc17e5e44be225bc30caaac5bc1042c SHA1 7bc10f7d9633e001fa31113463bf60033e322289 SHA256 785dc15b3303ee5244962a4d5e9e7fce8c6b071dc426f9fd331807d4ff3efe4f
-EBUILD vacuum-9999.ebuild 2333 RMD160 5cadb4b60a7c7911ed002b041ee2431f8295cb69 SHA1 7061c63c5d4782e2b59885d9493c7bbdc396e81d SHA256 ee3c9e2ba2b41e15bfd334832901d15e0b0fda1f604138a07793023a5c87dd3a
-MISC ChangeLog 1196 RMD160 e4ba17679a71da9df278a9d16605aa4009a975b5 SHA1 0d200d16e9e32cd0f9c82fcb10189ced7b861f42 SHA256 e18824e57d8ae03a2edb1f5d460cf8974da7eb1af3e9dfd3e2227febae768351
+EBUILD vacuum-1.1.2.ebuild 2217 RMD160 3337e8dbfc0fb3e10a009050170735e5a268f5bb SHA1 369157fc2ca5d2cdf0260c3cdcc31728b644369d SHA256 596e01c02260fe68e8036138d1d9c0e0ea1474af5cea120480d0385d214eed02
+EBUILD vacuum-9999.ebuild 2324 RMD160 c177c02122f2fdcc9b20ce5d9fcb2b958a2edc0c SHA1 6b8002452e16fb2b68e364738390792d5b31ad2d SHA256 82dae8ca3e30057e5a1633137b578466b6c2cec2f2f2088e69188a593312cbf7
+MISC ChangeLog 1367 RMD160 dab587339946e1f9c5d4119a416e6a964f9e70b8 SHA1 ea193913a1af1393c67d8fe5f23bffeb5d24f621 SHA256 b3d62fb675a5d68059f915d4f21bdf242d6cae976a853e1e0a6dc4d7a3daf246
 MISC metadata.xml 3615 RMD160 314147a18770b45f0caa1caa0758f07e07ca0042 SHA1 bd42ce92f005c1d3b97f311c6585cc88bac06b6d SHA256 dae4c083bdabb69966518e96b25d390daed13fac59c80027f832ae5e898b2b48
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPW7eEAAoJELEHsLL7fEFW+gwP/j/lPenFHo0gwbcvhMFDcIlJ
+BamzZn9UM0+qJj+0fCiIT73pV9iAZYdGN7WE6qt9+xzZxZcAGB/MKb2qh2OIs1TQ
+1lwEPymciYWbPTDAc6LfpYEYWeB4POGMntOcKgRsc6kEi1fzo+1/9KXbyLFLJWhB
+yZKH+GDuODEdeFuSO4b+WibX/zAJm001eyzQaN51oLe844hX//1hSl4CqKy2BgMR
+DPfBIy1mgNzvvgaXR+zXxYmmEtZuq490fozSo+9x/1x2+0NTHP0L6+EETJmiBC93
+hp0qgm28oNTQP9OoSe3TjtXrl6ZZegdy1K1QwbnYeV9sw35shO+VuWurLagZraw0
+goTeYt41XAQQURSD3LgaVliov+F94Q18g1Z6iKeIV3ixjwJFX9k+0v54d+HYk1Df
+Ac5cT0v9c1VxuO2SBbhJROKbAiHoT8/ik15KXYlUjStvy58qlT3Cyhh5mdjlLy3t
+abpw3V/NoDxRSVi3p6gG7GfRngRVL6ZEfVsjmxLwaeQorTMVNL0XS8MqtU24+Ck3
+6aeAqedhC1ARgb5OEQuJGvP1Qe1olIhSiWGfdRxE/ytgJVRlXD+zni51YCr2kR5N
+w83BroYyR329NE7D2kS6RZLeEZP/n/PTskNCUNR9uyHZeB6Qvc2vT1b089otIesP
+dqXny2LXOaKpXSvjm16Z
+=u8N9
+-----END PGP SIGNATURE-----
diff --git a/net-im/vacuum/vacuum-1.1.2.ebuild b/net-im/vacuum/vacuum-1.1.2.ebuild
index 7194f9f7f804..cee814082f11 100644
--- a/net-im/vacuum/vacuum-1.1.2.ebuild
+++ b/net-im/vacuum/vacuum-1.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/vacuum/vacuum-1.1.2.ebuild,v 1.1 2011/12/29 08:18:49 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/vacuum/vacuum-1.1.2.ebuild,v 1.2 2012/03/10 20:20:13 vapier Exp $
 
 EAPI="4"
 LANGS="de pl ru uk"
@@ -42,20 +42,22 @@ RDEPEND="
 	adiummessagestyle? ( >=x11-libs/qt-webkit-4.5:4 )
 	net-dns/libidn
 	x11-libs/libXScrnSaver
+	sys-libs/zlib[minizip]
 "
 DEPEND="${RDEPEND}"
 
 DOCS="AUTHORS CHANGELOG README TRANSLATORS"
 
 src_prepare() {
-	default
+	# Force usage of system libraries
+	rm -rf src/thirdparty/{idn,minizip,zlib}
 
 	epatch "${FILESDIR}"/${PN}-1.1.1-zlib.patch
 }
 
 src_configure() {
 	# linguas
-	local langs="none;"
+	local langs="none;" x
 	for x in ${LANGS}; do
 		use linguas_${x} && langs+="${x};"
 	done
@@ -65,7 +67,7 @@ src_configure() {
 		-DINSTALL_SDK=ON
 		-DLANGS="${langs}"
 		-DINSTALL_DOCS=OFF
-		-DFORCE_BUNDLED_MINIZIP=ON
+		-DFORCE_BUNDLED_MINIZIP=OFF
 	)
 
 	for x in ${PLUGINS}; do
diff --git a/net-im/vacuum/vacuum-9999.ebuild b/net-im/vacuum/vacuum-9999.ebuild
index d6e54bf3126c..c84f4a79f71b 100644
--- a/net-im/vacuum/vacuum-9999.ebuild
+++ b/net-im/vacuum/vacuum-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/vacuum/vacuum-9999.ebuild,v 1.3 2011/12/04 22:09:03 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/vacuum/vacuum-9999.ebuild,v 1.4 2012/03/10 20:20:13 vapier Exp $
 
 EAPI="4"
 LANGS="de pl ru uk"
@@ -42,20 +42,20 @@ RDEPEND="
 	adiummessagestyle? ( >=x11-libs/qt-webkit-4.5:4 )
 	net-dns/libidn
 	x11-libs/libXScrnSaver
+	sys-libs/zlib[minizip]
 "
 DEPEND="${RDEPEND}"
 
 DOCS="AUTHORS CHANGELOG README TRANSLATORS"
 
-pkg_setup() {
-	if use vcs-revision; then
-		ewarn "Anyone will be able to see your VCS revision of ${PN}, it is insecure."
-	fi
+src_prepare() {
+	# Force usage of system libraries
+	rm -rf src/thirdparty/{idn,minizip,zlib}
 }
 
 src_configure() {
 	# linguas
-	local langs="none;"
+	local langs="none;" x
 	for x in ${LANGS}; do
 		use linguas_${x} && langs+="${x};"
 	done
@@ -65,7 +65,7 @@ src_configure() {
 		-DINSTALL_SDK=ON
 		-DLANGS="${langs}"
 		-DINSTALL_DOCS=OFF
-		-DFORCE_BUNDLED_MINIZIP=ON
+		-DFORCE_BUNDLED_MINIZIP=OFF
 	)
 
 	for x in ${PLUGINS}; do