Version bump. Remove old.

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

4 files changed, 11 insertions, 56 deletions

diff --git a/app-text/wv2/ChangeLog b/app-text/wv2/ChangeLog
index 771aa38a796b..9f3305e2610a 100644
--- a/app-text/wv2/ChangeLog
+++ b/app-text/wv2/ChangeLog
@@ -1,6 +1,13 @@
 # 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.56 2009/09/29 17:40:23 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wv2/ChangeLog,v 1.57 2009/10/09 15:50:01 scarabeus Exp $
+
+*wv2-0.4.1 (09 Oct 2009)
+
+  09 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  files/0.4.0-cmake.patch, -wv2-0.4.0.ebuild, -files/wv2-0.4.0-elif.patch,
+  +wv2-0.4.1.ebuild:
+  Version bump. Remove old.
 
   29 Sep 2009; Hanno Boeck <hanno@gentoo.org> wv2-0.4.0.ebuild,
   +files/wv2-0.4.0-elif.patch:
diff --git a/app-text/wv2/files/0.4.0-cmake.patch b/app-text/wv2/files/0.4.0-cmake.patch
index 0f5828da765b..78af5bcf6054 100644
--- a/app-text/wv2/files/0.4.0-cmake.patch
+++ b/app-text/wv2/files/0.4.0-cmake.patch
@@ -27,28 +27,3 @@ diff -urN wv2-0.4.0.old/CMakeLists.txt wv2-0.4.0/CMakeLists.txt
  
  #
  # 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/files/wv2-0.4.0-elif.patch b/app-text/wv2/files/wv2-0.4.0-elif.patch
deleted file mode 100644
index d4f352f6d739..000000000000
--- a/app-text/wv2/files/wv2-0.4.0-elif.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/ustring.cpp.old	2009-09-23 01:05:50.750887617 +0400
-+++ src/ustring.cpp	2009-09-23 01:08:17.317619492 +0400
-@@ -78,9 +78,9 @@
- {
- #if defined(HAVE_FUNC_ISINF)
-   return (isinf(d) == 1);
--#elif HAVE_FUNC_FINITE
-+#elif defined(HAVE_FUNC_FINITE)
-   return finite(d) == 0 && d == d; // ### can we distinguish between + and - ?
--#elif HAVE_FUNC__FINITE
-+#elif defined(HAVE_FUNC__FINITE)
-   return _finite(d) == 0 && d == d; // ###
- #else
-   return false;
-@@ -91,9 +91,9 @@
- {
- #if defined(HAVE_FUNC_ISINF)
-   return (isinf(d) == -1);
--#elif HAVE_FUNC_FINITE
-+#elif defined(HAVE_FUNC_FINITE)
-   return finite(d) == 0 && d == d; // ###
--#elif HAVE_FUNC__FINITE
-+#elif defined(HAVE_FUNC__FINITE)
-   return _finite(d) == 0 && d == d; // ###
- #else
-   return false;
diff --git a/app-text/wv2/wv2-0.4.0.ebuild b/app-text/wv2/wv2-0.4.1.ebuild
index 1c78a5e91346..9455897a8b90 100644
--- a/app-text/wv2/wv2-0.4.0.ebuild
+++ b/app-text/wv2/wv2-0.4.1.ebuild
@@ -1,6 +1,6 @@
 # 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.4.0.ebuild,v 1.2 2009/09/29 17:40:23 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wv2/wv2-0.4.1.ebuild,v 1.1 2009/10/09 15:50:01 scarabeus Exp $
 
 EAPI=1
 
@@ -25,8 +25,7 @@ RDEPEND=">=gnome-extra/libgsf-1.8
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PV}-cmake.patch
-	"${FILESDIR}"/${P}-elif.patch
+	"${FILESDIR}"/0.4.0-cmake.patch
 )
 
 src_configure() {
@@ -38,5 +37,5 @@ src_configure() {
 
 src_install() {
 	cmake-utils_src_install
-	dodoc AUTHORS ChangeLog README RELEASE THANKS TODO
+	dodoc AUTHORS ChangeLog README RELEASE THANKS TODO || die "dodoc failed"
 }