Version bump.

(Portage version: 2.2_rc38/cvs/Linux i686)

3 files changed, 80 insertions, 6 deletions

diff --git a/app-text/wv2/ChangeLog b/app-text/wv2/ChangeLog
index cdca5cb45309..91f456795607 100644
--- a/app-text/wv2/ChangeLog
+++ b/app-text/wv2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/wv2
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wv2/ChangeLog,v 1.54 2009/06/15 01:18:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wv2/ChangeLog,v 1.55 2009/09/29 09:33:55 scarabeus Exp $
+
+*wv2-0.4.0 (29 Sep 2009)
+
+  29 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/0.4.0-cmake.patch, -wv2-0.3.0.ebuild, +wv2-0.4.0.ebuild:
+  Version bump.
 
   15 Jun 2009; Jeroen Roovers <jer@gentoo.org> wv2-0.3.1.ebuild:
   Stable for HPPA (bug #271967).
diff --git a/app-text/wv2/files/0.4.0-cmake.patch b/app-text/wv2/files/0.4.0-cmake.patch
new file mode 100644
index 000000000000..0f5828da765b
--- /dev/null
+++ b/app-text/wv2/files/0.4.0-cmake.patch
@@ -0,0 +1,54 @@
+diff -urN wv2-0.4.0.old/CMakeLists.txt wv2-0.4.0/CMakeLists.txt
+--- wv2-0.4.0.old/CMakeLists.txt	2009-08-26 23:46:40.000000000 +0200
++++ wv2-0.4.0/CMakeLists.txt	2009-09-29 11:21:50.000000000 +0200
+@@ -29,10 +29,10 @@
+   SET( ICONV_REQUIRES_CONST ${ICONV_SECOND_ARGUMENT_IS_CONST} )
+ ENDIF( ICONV_FOUND )
+ 
+-OPTION( WITHOUT_ZLIB "Build wv2 without zlib (without compression features)" OFF )
+-IF( NOT WITHOUT_ZLIB )
++OPTION( WITH_ZLIB "Build wv2 with zlib (with compression features)" ON )
++IF( WITH_ZLIB )
+   FIND_PACKAGE( ZLIB REQUIRED )
+-ENDIF( NOT WITHOUT_ZLIB )
++ENDIF( WITH_ZLIB )
+ 
+ INCLUDE_DIRECTORIES( ${GLIB2_INCLUDE_DIR} ${LIBGSF_INCLUDE_DIR} ${ICONV_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
+ 
+@@ -129,9 +129,9 @@
+   TRY_RUN( MODERN_ZLIB_RUN MODERN_ZLIB_COMPILE ${wvWare_BINARY_DIR}/CMakeTmp ${wvWare_SOURCE_DIR}/cmake/TestModernZlib.c )
+ ENDIF( ZLIB_HAS_INFLATE )
+ 
+-IF( MODERN_ZLIB_RUN GREATER 0 AND NOT WITHOUT_ZLIB )
++IF( MODERN_ZLIB_RUN GREATER 0 AND WITH_ZLIB )
+   MESSAGE( FATAL_ERROR "Your version of zlib is too old for wv2" )
+-ENDIF( MODERN_ZLIB_RUN GREATER 0 AND NOT WITHOUT_ZLIB )
++ENDIF( MODERN_ZLIB_RUN GREATER 0 AND WITH_ZLIB )
+ 
+ #
+ # Set cflags and ldflags
+diff -urN wv2-0.4.0.old/src/CMakeLists.txt wv2-0.4.0/src/CMakeLists.txt
+--- wv2-0.4.0.old/src/CMakeLists.txt	2009-08-26 23:46:40.000000000 +0200
++++ wv2-0.4.0/src/CMakeLists.txt	2009-09-29 11:20:05.000000000 +0200
+@@ -90,11 +90,11 @@
+ INSTALL( TARGETS wv2
+     EXPORT wvWare
+     RUNTIME DESTINATION bin
+-    LIBRARY DESTINATION lib
+-    ARCHIVE DESTINATION lib/static
++    LIBRARY DESTINATION lib${LIB_SUFFIX}
++    ARCHIVE DESTINATION lib${LIB_SUFFIX}/static
+ )
+ 
+-INSTALL( EXPORT wvWare DESTINATION lib/wvWare FILE wv2.cmake )
++INSTALL( EXPORT wvWare DESTINATION lib${LIB_SUFFIX}/wvWare FILE wv2.cmake )
+ 
+ INSTALL( FILES ${wv2_HEADERS}
+   DESTINATION include/wv2
+@@ -103,5 +103,5 @@
+ # libtool files are useless for Visual C++ and Borland C++
+ IF( NOT MSVC AND NOT BORLAND )
+   INCLUDE( ${wvWare_SOURCE_DIR}/cmake/MacroCreateLibtoolFile.cmake )
+-  CREATE_LIBTOOL_FILE( wv2 /lib )
++  CREATE_LIBTOOL_FILE( wv2 /lib${LIB_SUFFIX} )
+ ENDIF( NOT MSVC AND NOT BORLAND )
diff --git a/app-text/wv2/wv2-0.3.0.ebuild b/app-text/wv2/wv2-0.4.0.ebuild
index 7e1967d53627..4035e2348723 100644
--- a/app-text/wv2/wv2-0.3.0.ebuild
+++ b/app-text/wv2/wv2-0.4.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wv2/wv2-0.3.0.ebuild,v 1.1 2009/02/19 11:30:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wv2/wv2-0.4.0.ebuild,v 1.1 2009/09/29 09:33:55 scarabeus Exp $
 
 EAPI=1
 
-inherit eutils
+inherit cmake-utils
 
 DESCRIPTION="Excellent MS Word filter lib, used in most Office suites"
 HOMEPAGE="http://wvware.sourceforge.net"
@@ -13,15 +13,29 @@ SRC_URI="mirror://sourceforge/wvware/${P}.tar.bz2"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
+IUSE="zlib"
 
 RDEPEND=">=gnome-extra/libgsf-1.8
 	media-libs/freetype:2
 	media-libs/libpng
-	media-gfx/imagemagick"
+	media-gfx/imagemagick
+	virtual/libiconv
+	zlib? ( sys-libs/zlib )
+"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-cmake.patch
+)
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_with zlib)
+	"
+	cmake-utils_src_configure
+}
+
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	cmake-utils_src_install
 	dodoc AUTHORS ChangeLog README RELEASE THANKS TODO
 }