Version Bump

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

6 files changed, 84 insertions, 23 deletions

diff --git a/dev-libs/quazip/ChangeLog b/dev-libs/quazip/ChangeLog
index 0f9c278c68f8..a65f5c8fa3fa 100644
--- a/dev-libs/quazip/ChangeLog
+++ b/dev-libs/quazip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/quazip
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/quazip/ChangeLog,v 1.10 2011/11/04 12:25:42 naota Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/quazip/ChangeLog,v 1.11 2012/02/13 12:22:50 jlec Exp $
+
+*quazip-0.4.4 (13 Feb 2012)
+
+  13 Feb 2012; Justin Lecher <jlec@gentoo.org> quazip-0.4.3-r1.ebuild,
+  +quazip-0.4.4.ebuild, +files/quazip-0.4.4-zlib.patch, metadata.xml:
+  Version Bump
 
   04 Nov 2011; Naohiro Aota <naota@gentoo.org> quazip-0.4.3-r1.ebuild:
   Add ~x86-fbsd
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index f6a30e173ac9..193e7212ee52 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX quazip-0.4.3-zlib.patch 821 RMD160 c0000efba772dd8b436398ea39d494ea11012ec2 SHA1 ba618f834628c63b1b2573236bc814f340debb5a SHA256 33295a7f6d21ec6a6bbc2b1900f1d1c34ec4895ab1b806058dedd96bcd577eaf
+AUX quazip-0.4.4-zlib.patch 811 RMD160 b8423af000d31650eaf3dbc5e016a496a18808e0 SHA1 a8efb7fef372ee7938724af0fb4233b98643c93a SHA256 0a5b839a2481319e8636151db48157413bb7b7cb928c2625dad4789c36d07a3f
 DIST quazip-0.2.3.tar.gz 298712 RMD160 a648a37e965040d134c843bee15410bca2a5d12b SHA1 a091dcc3a4d57c2112bff65c2cac70f9f99fcded SHA256 355536fb47d822d705df5125db893f63eeae1148a45739786dbbfbafe9bad995
 DIST quazip-0.3.tar.gz 161359 RMD160 0ac2b821937688b0c32547721332f1a7b41ec468 SHA1 dbb08bf3edf0d81771b373e2154d4f258070277e SHA256 a947889b9cfa15458e6f57739fb53ec4e3d6ff2d264c52036906bfa1121549c8
 DIST quazip-0.4.3.tar.gz 268597 RMD160 04079ca71406814871b495fe0cf9348bc062a711 SHA1 c52e7d8ca1f667255636be4ad385d7dcfaa85454 SHA256 ef6353108149a11108087351f9f380b73b6cdc173be4f5442b9d0ae4fda5abad
+DIST quazip-0.4.4.tar.gz 301733 RMD160 d1119262e01ec4220e34ca293c5895f151624ef3 SHA1 0bd196856debfe4510a1efe35cca26b76668fb94 SHA256 63e8ffba784a4673bc3c340fa4df79e2980f6849ba9eea0a7cd52c3071deb0b6
 EBUILD quazip-0.2.3.ebuild 766 RMD160 42ba54e1b2cd0eea44c9bd2047879170f32330b1 SHA1 10a596816eb7209ecd250494aedfa54e6743d31b SHA256 c9c22fe2b395944e36bf413ba39bdafb536ae1e20e79e2cdb9285d75d1fd8e98
 EBUILD quazip-0.3.ebuild 759 RMD160 809c8785e0e338e8051aa14513203895b30299a1 SHA1 44053c6ff974962c5bc51fa46f9918d6ab75ab8f SHA256 96fe715ad5d8a2b24dca4addcde5edab28452ea671e74451cabd23d539aa4f9f
-EBUILD quazip-0.4.3-r1.ebuild 742 RMD160 b35fc1bb9031013574b1ee2968514676f61e6854 SHA1 ba26348229a39d7e27cfdf0fae13e43a6c9abd51 SHA256 d908029fee7b21057b5c6d0ea2046afc71770366b6c713fa7e6755d918a48739
-MISC ChangeLog 1448 RMD160 c0071d8196865d5338bf17d76fd2d7846086b0fa SHA1 1d7a89cdf56b2c403730e7fbb7eabbbb1e806eb9 SHA256 2b9b89935c60d3fd7c3d46b8653f28aaf1a8f905c7b5125a2483706f0212866c
-MISC metadata.xml 223 RMD160 0a01492a98435d0e6253aa712cdef8b0ad3422a2 SHA1 38dcb1297138e3539be360de7401fd091b49c1cb SHA256 070a9dafb8f5cbcfacc3921af8689ed008b6d8c845ddb2e4b475916f92ed4e0d
+EBUILD quazip-0.4.3-r1.ebuild 673 RMD160 a7d49bd9d98747acd74dd1a11664c4bc2ba5beb5 SHA1 e7e32e956d5e221daa0283169d34fcc605b1f4a1 SHA256 d07ddd1003ae9e1017aad66853f267a919ec0aea3a2e38e28d57d03618e3d823
+EBUILD quazip-0.4.4.ebuild 670 RMD160 4bc2c80fd9aa028a973b12f4915bf67da6d95e4a SHA1 28cc251a4d0062da6dcc95145263a9650df6c780 SHA256 49deb0406b6f80967312bec34b00730dbc39c87365a41573c3a0e7493d2cc57b
+MISC ChangeLog 1633 RMD160 605e9e9e1459e565d274d5f5dbe62a4c9d6a55ef SHA1 c14a4a52242cdf4afdfec0a274fd7e7a3c8f43d0 SHA256 6c0dbfcbe92a86522de877f495092e4b550a7c35e6fb3e243d8f8078e89ad440
+MISC metadata.xml 218 RMD160 5dcdfc9ffbff78c3625f6ee6cd8242c0130bba48 SHA1 e7d6721263f31430e0dd04b17f16c27ebac78a89 SHA256 45420c665fb7a061ce85d5300ea7ed5a034a812dc286e2c87540b90d1388d79d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (FreeBSD)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6z2dYACgkQGpDnPLSHuMBv/ACghXm2IzBUIAf2NL5A0+Xi+NXd
-CzcAoOmNyLFNnLJPiEkBwNuL9o3il3Ec
-=UcMB
+iEYEAREKAAYFAk85AJ8ACgkQgAnW8HDreRb1aQCfdrcOXdJJDxBv2DPS6iZx2x/A
+zPcAnAufCCtHVokfcgXmsZKyjs/tZeSk
+=wex5
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/quazip/files/quazip-0.4.4-zlib.patch b/dev-libs/quazip/files/quazip-0.4.4-zlib.patch
new file mode 100644
index 000000000000..a84dcab8c376
--- /dev/null
+++ b/dev-libs/quazip/files/quazip-0.4.4-zlib.patch
@@ -0,0 +1,27 @@
+From f7d821a6837b4cc9defa02f271256796394fd8c3 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Wed, 21 Sep 2011 14:37:31 +0200
+Subject: [PATCH] Allow compilation with zlib-1.2.5.1-r1
+
+---
+ quazip/ioapi.h |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/quazip/ioapi.h b/quazip/ioapi.h
+index 716dd4b..a4ac8d7 100644
+--- a/quazip/ioapi.h
++++ b/quazip/ioapi.h
+@@ -37,6 +37,10 @@
+ extern "C" {
+ #endif
+ 
++#ifndef OF
++# define OF(x) x
++#endif
++
+ typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, voidpf file, int mode));
+ typedef uLong  (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+ typedef uLong  (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
+-- 
+1.7.6.1
+
diff --git a/dev-libs/quazip/metadata.xml b/dev-libs/quazip/metadata.xml
index 4bf6dbc6b1ea..d747d72a25b4 100644
--- a/dev-libs/quazip/metadata.xml
+++ b/dev-libs/quazip/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <maintainer>
-    <email>sci@gentoo.org</email>
-  </maintainer>
+	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/quazip/quazip-0.4.3-r1.ebuild b/dev-libs/quazip/quazip-0.4.3-r1.ebuild
index 9d9dc6ff9316..a72147cb49a4 100644
--- a/dev-libs/quazip/quazip-0.4.3-r1.ebuild
+++ b/dev-libs/quazip/quazip-0.4.3-r1.ebuild
@@ -1,10 +1,10 @@
-# 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/dev-libs/quazip/quazip-0.4.3-r1.ebuild,v 1.6 2011/11/04 12:25:42 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/quazip/quazip-0.4.3-r1.ebuild,v 1.7 2012/02/13 12:22:50 jlec Exp $
 
 EAPI=4
 
-inherit eutils multilib cmake-utils
+inherit cmake-utils
 
 DESCRIPTION="A simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
 HOMEPAGE="http://quazip.sourceforge.net/"
@@ -15,15 +15,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
-DEPEND="sys-libs/zlib
-	x11-libs/qt-gui:4"
+DEPEND="
+	sys-libs/zlib
+	x11-libs/qt-core:4"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${P}
 
 DOCS="NEWS README.txt"
 
-src_prepare() {
-	# Support zlib-1.2.5.1-r1 (bug #383309)
-	epatch "${FILESDIR}"/${P}-zlib.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-zlib.patch )
diff --git a/dev-libs/quazip/quazip-0.4.4.ebuild b/dev-libs/quazip/quazip-0.4.4.ebuild
new file mode 100644
index 000000000000..2f621bff7a9f
--- /dev/null
+++ b/dev-libs/quazip/quazip-0.4.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/quazip/quazip-0.4.4.ebuild,v 1.1 2012/02/13 12:22:50 jlec Exp $
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="A simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
+HOMEPAGE="http://quazip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="
+	sys-libs/zlib
+	x11-libs/qt-core:4"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${P}
+
+DOCS="NEWS README.txt"
+
+PATCHES=( "${FILESDIR}"/${P}-zlib.patch )