Version bump. Remove old.

Package-Manager: portage-2.2_rc44/cvs/Linux i686

5 files changed, 18 insertions, 64 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/Manifest b/app-text/wv2/Manifest
index 3e23812e5890..abc922c0e09d 100644
--- a/app-text/wv2/Manifest
+++ b/app-text/wv2/Manifest
@@ -1,22 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 0.4.0-cmake.patch 2144 RMD160 ba2ea8dd28ef694bf3e7657e90fceec73e48a648 SHA1 af282981bb528869f5ff099a4924fd83a329b3a5 SHA256 acc5ee2ed35a06ddcdac56d2ae3ea7c27ecb048399b4dd338bb657d21ec68f4a
+AUX 0.4.0-cmake.patch 1178 RMD160 cd609b66a1a27267dd5ed0ba31e3f778d9786942 SHA1 a287606439cd5fb6a8539f03dea57e00067869cf SHA256 566e56c18115f80fe2de6c56050702754cb3e9946bd3764c1b80bb23432d3963
 AUX wv2-0.2.3-gcc43.patch 431 RMD160 409fcdf68a2c71c415f70c4fa1d006368e01c9a0 SHA1 3ec74d1c118c516b5c2c3320c12268646e39a02c SHA256 d159e8b62d03b6196551f050cbfebae023fbe7804071dd0a2cb6a54ab3898793
 AUX wv2-0.2.3-respectflags.patch 353 RMD160 cc706bf3cb533d9a11f647cb4d282d3bc6ef3727 SHA1 557aab31e363f8b6f11bd42567b94671f5624fc4 SHA256 342498eceb4f653a943d8fd44fa6553fb83c3105850fbcf2f698efdb1b0946dc
-AUX wv2-0.4.0-elif.patch 764 RMD160 a034178b212846c099d964dba1f838cb6f21994b SHA1 63c823946dbc3834d34fe65dc69bbcef3d30aa8d SHA256 390306de37028ea3f96fc3d072fc2d92ab549206a5fbb593cf085e64e807f501
 DIST wv2-0.2.3.tar.bz2 908983 RMD160 0534ddb23ec5a6e222cbbc76e695f8ea5cf532c7 SHA1 8378f43806bc2614ccea2b265159ce0548192601 SHA256 8f2cf24a5eddb6711d7ba49c05c7b5dddc08ce0af564aba098f516c7cbb8b560
 DIST wv2-0.3.1.tar.bz2 1094203 RMD160 9e64fb57178daca5e917201e591845227ea75de9 SHA1 97349769b01fa4506cc608d80ca3a749a5203d64 SHA256 896ff8ec59e280e8cb1ef9a953b364845dd65de1cdf8e4ed8a7e045a3f81c546
-DIST wv2-0.4.0.tar.bz2 452586 RMD160 e38c3dda8ae41e68132b23d02b2a1f1c99570940 SHA1 610f807b5010645f1dab7b7602d761b3f4241bcb SHA256 0c6595e16cf9c5ec33ba0d653d3a980ac9df96f12f416645e01119bb299525d1
+DIST wv2-0.4.1.tar.bz2 452150 RMD160 7dec77ee6188c84c3b8ea8ad7a30c2ccb9871655 SHA1 efa9df874a7f84592461d7339a7a0f844da02ba1 SHA256 96e385a2a084ea3e5344c6b23a6cdadb91de721f06981168fea21d0a31cf9a41
 EBUILD wv2-0.2.3.ebuild 891 RMD160 1c77a4e224ef2ed535a16bfe321d71b17a1d8efd SHA1 4a87f166dfee0d419a018457cbdcb2f4b4afe017 SHA256 9c76873dc07e5087a6f56cecac50c58684b8abd9a01a6aee9fd005a174b99954
 EBUILD wv2-0.3.1.ebuild 748 RMD160 69ccee0f123250b79c658927df9c615266c68a4d SHA1 36a41777375c0928938eb1506b878e6a19521f64 SHA256 e2da122ca1e49985286521f6748a4283dbbbd1afbb871715a0a0ccab2382dfaa
-EBUILD wv2-0.4.0.ebuild 962 RMD160 e77126f7f0e4cee9faf1fb40960cb5fc4050fc58 SHA1 00f20b400029fbb95268adf411cad520e16af2f3 SHA256 711ef63c1f21ce70b512e2914fafaa44c3db38587f72e7d96ddd7b0e6069cc29
-MISC ChangeLog 6569 RMD160 fac314117b3f0b9bb6f4fbcaab003b5826e967bf SHA1 a302621c8f46aa4cdc43294b4f7f0315ba329631 SHA256 05ecd1cff1673cf6048f28f0ea7275648f260b2d0f85b9151dc658508ba8f942
+EBUILD wv2-0.4.1.ebuild 957 RMD160 134be5e3f6b9a396967c09f5039f0b67b139dced SHA1 ced289efc62037b0b3b67ae75f0666cbea3387a6 SHA256 09ae9e319152c6dfaaa1d5468dbef11c9b180176c99ce50d068eba15e3596015
+MISC ChangeLog 6779 RMD160 1c297277c34dd46dfba37aa8ae045c08543df204 SHA1 64344416f5c251460432ccd6ba489ba4f4f3d796 SHA256 d876ec54a8d8260812a3a02376f739aa67dd3b4ee7ab594069d89159790af212
 MISC metadata.xml 157 RMD160 e666a9e73ee48e70d6fc6ea78049d38b1fcde7c2 SHA1 43a0c32101f0c6ffd8fa1aa620c8032d194a9e3a SHA256 18238fb417d8677a0495cdaba9b043526174ba63b51494b88b10aa7dd903124c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkrCRogACgkQr2QksT29OyD/SACcCOaAa1SCEB750FNqPesgyZsP
-qB8AmgKL7nr3rItz20SHU8zq/QpzoIQu
-=02zc
+iEYEARECAAYFAkrPW7kACgkQHB6c3gNBRYextACeOJcH2UzwbiTNQPloDyoZx9zS
+k+YAoLAnS0VJDnP103Xot9UQMOEO0bsY
+=wKw2
 -----END PGP SIGNATURE-----
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"
 }