New release: 1.2.0 (bug #110986).

(Portage version: 2.0.53_rc7)

6 files changed, 54 insertions, 74 deletions

diff --git a/app-text/wv/ChangeLog b/app-text/wv/ChangeLog
index 4bbd214464da..4dad79be108a 100644
--- a/app-text/wv/ChangeLog
+++ b/app-text/wv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/wv
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wv/ChangeLog,v 1.26 2005/10/06 22:14:51 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wv/ChangeLog,v 1.27 2005/10/31 13:12:47 leonardop Exp $
+
+*wv-1.2.0 (31 Oct 2005)
+
+  31 Oct 2005; Leonardo Boshell <leonardop@gentoo.org> +wv-1.2.0.ebuild:
+  New version (bug #110986).
 
 *wv-1.0.3-r1 (06 Oct 2005)
 
diff --git a/app-text/wv/Manifest b/app-text/wv/Manifest
index 4476c3fdf916..202e6c3942d7 100644
--- a/app-text/wv/Manifest
+++ b/app-text/wv/Manifest
@@ -1,21 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6335e6111535a1ebd438e329cee9694e wv-1.0.0-r1.ebuild 1052
-MD5 0577e093bf220e56cb0c3072451c3f0b wv-1.0.3-r1.ebuild 1213
-MD5 4e910ed161d84f6c609edce01a082529 wv-1.0.3.ebuild 1140
+MD5 25ad4c868925752d0ebdfba380cfb80f .wv-1.2.0.ebuild.swp 12288
 MD5 dadfa1fe3e6969fbbf48893d177fc5a0 ChangeLog 2925
-MD5 525c7299058f839eff524bc25c39267e metadata.xml 345
 MD5 97079efa2a5256ad07ada6260b7ec298 files/digest-wv-1.0.0-r1 60
 MD5 79e495e6bfc4b192499c4d28f631ea01 files/digest-wv-1.0.3-r1 60
+MD5 46b9432b004237ad01179545e665cb16 files/digest-wv-1.2.0 60
 MD5 29b026d4ff443552a80797b397d37ec6 files/wv-1.0.0-fix_overflow.patch 1693
 MD5 a1897cf5f55250ffef22b746b2b277f7 files/wv-1.0.3-gcc4.patch 1131
 MD5 f7e6bc9c507c536f3b48679fe2dfafba files/wv-1.0.3-libole2-readonly.patch 1053
-MD5 79e495e6bfc4b192499c4d28f631ea01 files/digest-wv-1.0.3 60
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDRaHsTOXg++0VvJQRAu1HAJ4h6Bk4WqtE5IawsmHsl+O60hKV9wCeO9ZJ
-T0rY+ygPcD5Sp95Qi8idWWo=
-=Uxhm
------END PGP SIGNATURE-----
+MD5 525c7299058f839eff524bc25c39267e metadata.xml 345
+MD5 6335e6111535a1ebd438e329cee9694e wv-1.0.0-r1.ebuild 1052
+MD5 0577e093bf220e56cb0c3072451c3f0b wv-1.0.3-r1.ebuild 1213
+MD5 888e5cb1bf7d168e687358ef6b688fa0 wv-1.2.0.ebuild 1269
diff --git a/app-text/wv/files/digest-wv-1.0.3 b/app-text/wv/files/digest-wv-1.0.3
deleted file mode 100644
index a4593f850e7f..000000000000
--- a/app-text/wv/files/digest-wv-1.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 71e42aa9af1e03cc8c608bbbdcb43af8 wv-1.0.3.tar.gz 857412
diff --git a/app-text/wv/files/digest-wv-1.2.0 b/app-text/wv/files/digest-wv-1.2.0
new file mode 100644
index 000000000000..8e6e5b18f422
--- /dev/null
+++ b/app-text/wv/files/digest-wv-1.2.0
@@ -0,0 +1 @@
+MD5 b6319d5e75611fe2210453b5feb82c0c wv-1.2.0.tar.gz 627912
diff --git a/app-text/wv/wv-1.0.3.ebuild b/app-text/wv/wv-1.0.3.ebuild
deleted file mode 100644
index 453722cae36d..000000000000
--- a/app-text/wv/wv-1.0.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wv/wv-1.0.3.ebuild,v 1.3 2005/04/26 09:14:49 azarah Exp $
-
-inherit eutils
-
-DESCRIPTION="Tool for conversion of MSWord doc and rtf files to something readable"
-SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
-HOMEPAGE="http://wvware.sourceforge.net"
-
-IUSE="xml2 wmf"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~amd64 ~ppc64"
-SLOT="0"
-LICENSE="GPL-2"
-
-RDEPEND="sys-libs/zlib
-	dev-libs/glib
-	media-libs/libpng
-	wmf? ( >=media-libs/libwmf-0.2.2 )
-	xml2? ( dev-libs/libxml2 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	# Fix building with gcc4 (namespace collide with libxml2)
-	epatch ${FILESDIR}/${P}-gcc4.patch
-
-}
-
-src_compile() {
-
-	econf \
-		`use_with xml2 libxml2` \
-		`use_with wmf libwmf` \
-		--with-docdir=/usr/share/doc/${PF} \
-		|| die
-
-	make || die
-
-}
-
-src_install () {
-
-	einstall
-
-	insinto /usr/include
-	doins wvinternal.h
-
-	rm -f ${D}/usr/share/man/man1/wvConvert.1
-	dosym  /usr/share/man/man1/wvWare.1 /usr/share/man/man1/wvConvert.1
-
-}
diff --git a/app-text/wv/wv-1.2.0.ebuild b/app-text/wv/wv-1.2.0.ebuild
new file mode 100644
index 000000000000..2d80d28173b3
--- /dev/null
+++ b/app-text/wv/wv-1.2.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/wv/wv-1.2.0.ebuild,v 1.1 2005/10/31 13:12:47 leonardop Exp $
+
+DESCRIPTION="Tool for conversion of MSWord doc and rtf files to something readable"
+SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
+HOMEPAGE="http://wvware.sourceforge.net/"
+
+IUSE="wmf"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+RDEPEND=">=dev-libs/glib-2
+	>=gnome-extra/libgsf-1
+	sys-libs/zlib
+	media-libs/libpng
+	dev-libs/libxml2
+	wmf? ( >=media-libs/libwmf-0.2.2 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9"
+
+
+src_compile() {
+	econf `use_with wmf libwmf` || die "./configure failed"
+
+	emake || die "Compilation failed"
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die "Installation failed"
+
+	dodoc README
+
+	insinto /usr/include
+	doins wvinternal.h
+
+	rm -f ${D}/usr/share/man/man1/wvConvert.1
+	dosym  /usr/share/man/man1/wvWare.1 /usr/share/man/man1/wvConvert.1
+}