Remove old+unused patch. Drop deps that are not directly named in cmakelists. Add kde as backup herd.

(Portage version: 2.2_rc48/cvs/Linux x86_64)

5 files changed, 10 insertions, 83 deletions

diff --git a/app-text/wv2/ChangeLog b/app-text/wv2/ChangeLog
index 85f50e57aeef..c1efafdb5cab 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.58 2009/11/07 13:29:07 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wv2/ChangeLog,v 1.59 2009/11/08 19:16:43 scarabeus Exp $
+
+  08 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/0.4.0-cmake.patch, -wv2-0.4.1.ebuild, wv2-0.4.2.ebuild,
+  metadata.xml:
+  Remove old+unused patch. Drop deps that are not directly named in
+  cmakelists. Add kde as backup herd.
 
 *wv2-0.4.2 (07 Nov 2009)
 
diff --git a/app-text/wv2/files/0.4.0-cmake.patch b/app-text/wv2/files/0.4.0-cmake.patch
deleted file mode 100644
index 78af5bcf6054..000000000000
--- a/app-text/wv2/files/0.4.0-cmake.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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 --git a/app-text/wv2/metadata.xml b/app-text/wv2/metadata.xml
index 21ff3a538481..8c09950e238d 100644
--- a/app-text/wv2/metadata.xml
+++ b/app-text/wv2/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<herd>kde</herd>
 	<herd>tex</herd>
 </pkgmetadata>
diff --git a/app-text/wv2/wv2-0.4.1.ebuild b/app-text/wv2/wv2-0.4.1.ebuild
deleted file mode 100644
index 9455897a8b90..000000000000
--- a/app-text/wv2/wv2-0.4.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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.1.ebuild,v 1.1 2009/10/09 15:50:01 scarabeus Exp $
-
-EAPI=1
-
-inherit cmake-utils
-
-DESCRIPTION="Excellent MS Word filter lib, used in most Office suites"
-HOMEPAGE="http://wvware.sourceforge.net"
-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="zlib"
-
-RDEPEND=">=gnome-extra/libgsf-1.8
-	media-libs/freetype:2
-	media-libs/libpng
-	media-gfx/imagemagick
-	virtual/libiconv
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/0.4.0-cmake.patch
-)
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with zlib)
-	"
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc AUTHORS ChangeLog README RELEASE THANKS TODO || die "dodoc failed"
-}
diff --git a/app-text/wv2/wv2-0.4.2.ebuild b/app-text/wv2/wv2-0.4.2.ebuild
index 5319bd37aa4e..7faaad9506b3 100644
--- a/app-text/wv2/wv2-0.4.2.ebuild
+++ b/app-text/wv2/wv2-0.4.2.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.2.ebuild,v 1.1 2009/11/07 13:29:07 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wv2/wv2-0.4.2.ebuild,v 1.2 2009/11/08 19:16:43 scarabeus Exp $
 
 EAPI=1
 
@@ -16,17 +16,12 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="zlib"
 
 RDEPEND=">=gnome-extra/libgsf-1.8
-	media-libs/freetype:2
-	media-libs/libpng
-	media-gfx/imagemagick
 	virtual/libiconv
 	zlib? ( sys-libs/zlib )
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/0.4.0-cmake.patch
-)
+DOCS="AUTHORS ChangeLog README RELEASE THANKS TODO"
 
 src_configure() {
 	mycmakeargs="${mycmakeargs}
@@ -34,8 +29,3 @@ src_configure() {
 	"
 	cmake-utils_src_configure
 }
-
-src_install() {
-	cmake-utils_src_install
-	dodoc AUTHORS ChangeLog README RELEASE THANKS TODO || die "dodoc failed"
-}