version bumps and cleanups, stable x86 bump

6 files changed, 26 insertions, 9 deletions

diff --git a/app-text/wpd2sxw/ChangeLog b/app-text/wpd2sxw/ChangeLog
index 17509a88d53f..53f291081e89 100644
--- a/app-text/wpd2sxw/ChangeLog
+++ b/app-text/wpd2sxw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/wpd2sxw
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wpd2sxw/ChangeLog,v 1.4 2004/06/24 22:55:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wpd2sxw/ChangeLog,v 1.5 2004/07/31 05:10:33 squinky86 Exp $
+
+*wpd2sxw-0.6.1 (31 Jul 2004)
+
+  31 Jul 2004; Jon Hood <squinky86@gentoo.org> wpd2sxw-0.6.0-r1.ebuild,
+  -wpd2sxw-0.6.0.ebuild, +wpd2sxw-0.6.1.ebuild:
+  stable x86 and unstable version bumps
 
 *wpd2sxw-0.6.0-r1 (11 Jun 2004)
 
diff --git a/app-text/wpd2sxw/Manifest b/app-text/wpd2sxw/Manifest
index 6306e824cb6f..1e68834b250f 100644
--- a/app-text/wpd2sxw/Manifest
+++ b/app-text/wpd2sxw/Manifest
@@ -1,6 +1,8 @@
 MD5 d378e950383ba6c2bf697b72d86294eb wpd2sxw-0.6.0.ebuild 641
+MD5 e450292d565b8c5d164c4cc0f2a05fb9 wpd2sxw-0.6.1.ebuild 812
 MD5 ba78dad0ea62a2edd52cefde8d3de6d9 ChangeLog 605
 MD5 fd687f26b47d4c53d2ed805ad8b0f310 metadata.xml 227
 MD5 e450292d565b8c5d164c4cc0f2a05fb9 wpd2sxw-0.6.0-r1.ebuild 812
 MD5 dd5eb804ddf97afb8974ab5847ee7e46 files/digest-wpd2sxw-0.6.0-r1 123
 MD5 a313e0b8bc35fc9f27f61c5257caddff files/digest-wpd2sxw-0.6.0 65
+MD5 408bd707e9f005f6f1b610a0772dd798 files/digest-wpd2sxw-0.6.1 123
diff --git a/app-text/wpd2sxw/files/digest-wpd2sxw-0.6.0 b/app-text/wpd2sxw/files/digest-wpd2sxw-0.6.0
deleted file mode 100644
index 7ab7d8abaab4..000000000000
--- a/app-text/wpd2sxw/files/digest-wpd2sxw-0.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8447e89c580d302e5b13e6eb6064a2ab wpd2sxw-0.6.0.tar.gz 314557
diff --git a/app-text/wpd2sxw/files/digest-wpd2sxw-0.6.1 b/app-text/wpd2sxw/files/digest-wpd2sxw-0.6.1
new file mode 100644
index 000000000000..addb6e4c71ce
--- /dev/null
+++ b/app-text/wpd2sxw/files/digest-wpd2sxw-0.6.1
@@ -0,0 +1,2 @@
+MD5 6fb158c6e89a7ed7f323028f27b8e2f0 wpd2sxw-0.6.1.tar.gz 220217
+MD5 05bd3b2c8bbc04eda500893eaaece1df wpd2sxwbatch.pl 5892
diff --git a/app-text/wpd2sxw/wpd2sxw-0.6.0-r1.ebuild b/app-text/wpd2sxw/wpd2sxw-0.6.0-r1.ebuild
index 90d013881f91..1f29c5b0f897 100644
--- a/app-text/wpd2sxw/wpd2sxw-0.6.0-r1.ebuild
+++ b/app-text/wpd2sxw/wpd2sxw-0.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wpd2sxw/wpd2sxw-0.6.0-r1.ebuild,v 1.2 2004/06/24 22:55:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wpd2sxw/wpd2sxw-0.6.0-r1.ebuild,v 1.3 2004/07/31 05:10:33 squinky86 Exp $
 
 DESCRIPTION="WordPerfect Document (wpd) to OpenOffice.org (sxw) converter"
 HOMEPAGE="http://libwpd.sf.net"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libwpd/${P}.tar.gz
 RESTRICT="nomirror"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE="perl"
 DEPEND="gnome-extra/libgsf
 	>=app-text/libwpd-0.7.1
diff --git a/app-text/wpd2sxw/wpd2sxw-0.6.0.ebuild b/app-text/wpd2sxw/wpd2sxw-0.6.1.ebuild
index 6c5e9196c4c6..7f0f74762f6a 100644
--- a/app-text/wpd2sxw/wpd2sxw-0.6.0.ebuild
+++ b/app-text/wpd2sxw/wpd2sxw-0.6.1.ebuild
@@ -1,17 +1,24 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wpd2sxw/wpd2sxw-0.6.0.ebuild,v 1.5 2004/06/24 22:55:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wpd2sxw/wpd2sxw-0.6.1.ebuild,v 1.1 2004/07/31 05:10:33 squinky86 Exp $
 
 DESCRIPTION="WordPerfect Document (wpd) to OpenOffice.org (sxw) converter"
 HOMEPAGE="http://libwpd.sf.net"
-SRC_URI="mirror://sourceforge/libwpd/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/libwpd/${P}.tar.gz
+	perl? ( http://libwpd.sourceforge.net/wpd2sxwbatch.pl )"
 RESTRICT="nomirror"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE=""
+KEYWORDS="~x86 ~ppc"
+IUSE="perl"
 DEPEND="gnome-extra/libgsf
-	>=app-text/libwpd-0.7.1"
+	>=app-text/libwpd-0.7.1
+	perl? ( dev-lang/perl )"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+}
 
 src_compile() {
 	econf || die "configure failed"
@@ -20,4 +27,5 @@ src_compile() {
 
 src_install() {
 	einstall || die "install failed"
+	dobin ${DISTDIR}/wpd2sxwbatch.pl
 }