Version Bump

(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)

5 files changed, 73 insertions, 15 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/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 )