new release

(Portage version: 2.1_pre4-r1)

6 files changed, 92 insertions, 61 deletions

diff --git a/app-text/wv/ChangeLog b/app-text/wv/ChangeLog
index 4dad79be108a..9971aca49cb6 100644
--- a/app-text/wv/ChangeLog
+++ b/app-text/wv/ChangeLog
@@ -1,6 +1,13 @@
 # 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.27 2005/10/31 13:12:47 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wv/ChangeLog,v 1.28 2006/04/15 11:37:02 foser Exp $
+
+*wv-1.2.1 (15 Apr 2006)
+
+  15 Apr 2006; Marinus Schraal <foser@gentoo.org> wv-1.2.1.ebuild :
+  New release (#129830)
+  Remove internal header install
+  API breakage, add preserve_old_lib*
 
 *wv-1.2.0 (31 Oct 2005)
 
diff --git a/app-text/wv/Manifest b/app-text/wv/Manifest
index 9a1dd05d8154..a8aec98f6699 100644
--- a/app-text/wv/Manifest
+++ b/app-text/wv/Manifest
@@ -1,11 +1,39 @@
 MD5 d66c1dcde786d780c9aef11f87253f7c ChangeLog 3059
+RMD160 59e754ddf3c4cd8d9b7223fcac2fa67b33069c8e ChangeLog 3059
+SHA256 560ae1ae945c6aa896ecf10675c0572a9e14ae435b33e333c54c3994d6f4cc71 ChangeLog 3059
 MD5 97079efa2a5256ad07ada6260b7ec298 files/digest-wv-1.0.0-r1 60
+RMD160 9fd232c2d46efb815fb72e6117f9f2a1db98fc97 files/digest-wv-1.0.0-r1 60
+SHA256 c04c1437a3162ae7672de19643664e3ab40e7869badde541e3ab30150ab8e30b files/digest-wv-1.0.0-r1 60
 MD5 79e495e6bfc4b192499c4d28f631ea01 files/digest-wv-1.0.3-r1 60
+RMD160 776e17c6e42503f92aba0686fd3c443cb68ac531 files/digest-wv-1.0.3-r1 60
+SHA256 e2b29a04d3bb6da61c560b93fec0bbf9977e9a37a13ddafd79d010087b177669 files/digest-wv-1.0.3-r1 60
 MD5 46b9432b004237ad01179545e665cb16 files/digest-wv-1.2.0 60
+RMD160 dbfadb207618e435b4f76a72e8bc8d3bd444d9e2 files/digest-wv-1.2.0 60
+SHA256 f1582ced69147ae4ced75692696bdf04e3aad89e3e33e67651b1dc717e0850b5 files/digest-wv-1.2.0 60
+MD5 f359296e1c5d5f6ab0d9c9d5a2369468 files/digest-wv-1.2.1 226
+RMD160 7d4b3adbe029f4c8ec0199706e2443d3ff222205 files/digest-wv-1.2.1 226
+SHA256 e907c0be9f68654cc5165a511b838d24db10d8ce67d6c8599973c2ec015e44c6 files/digest-wv-1.2.1 226
 MD5 29b026d4ff443552a80797b397d37ec6 files/wv-1.0.0-fix_overflow.patch 1693
+RMD160 f5e100431c1609668e38eef07e40d1397bedd024 files/wv-1.0.0-fix_overflow.patch 1693
+SHA256 5ea11a2222793f1ed42defaa3c8261dfa6fa455ab1cbdd58a92303f0528e4681 files/wv-1.0.0-fix_overflow.patch 1693
 MD5 a1897cf5f55250ffef22b746b2b277f7 files/wv-1.0.3-gcc4.patch 1131
+RMD160 4bb2a379e56eefed64f55ae7be244a8c5807dbce files/wv-1.0.3-gcc4.patch 1131
+SHA256 1d8bc67d909107f403ddb1c42f40afdccc8866fb472fdd15d55b14d0af78b833 files/wv-1.0.3-gcc4.patch 1131
 MD5 f7e6bc9c507c536f3b48679fe2dfafba files/wv-1.0.3-libole2-readonly.patch 1053
+RMD160 98d18c46dfb7eeb55fdfba7ffc64c27ab5620435 files/wv-1.0.3-libole2-readonly.patch 1053
+SHA256 96a3dbbdc435b68edbb8c80471b22e4c99236b1f9318bcc4702a35eefed49bd9 files/wv-1.0.3-libole2-readonly.patch 1053
 MD5 525c7299058f839eff524bc25c39267e metadata.xml 345
+RMD160 f9916ca9ebb4af81b9863c42ae578387a8cd7302 metadata.xml 345
+SHA256 03578e3f79bd61f731e83a3f66fa4aaed4a23f3cd98cd4a4aefb84a4e40cc9c9 metadata.xml 345
 MD5 6335e6111535a1ebd438e329cee9694e wv-1.0.0-r1.ebuild 1052
+RMD160 66474fcb7dceeb083e0f45033660db47690a4d78 wv-1.0.0-r1.ebuild 1052
+SHA256 cafc27169de4b5f3b81791d553be9b8b9546f298258aa80c4f6169263d26bfff wv-1.0.0-r1.ebuild 1052
 MD5 0577e093bf220e56cb0c3072451c3f0b wv-1.0.3-r1.ebuild 1213
+RMD160 0de03afcd5e431e46ebb448664086c95dfb0d79c wv-1.0.3-r1.ebuild 1213
+SHA256 c75ccff5e876a18dba971ef25f2f3484e44e0e9f35420d4f565a6a3ebeb9988b wv-1.0.3-r1.ebuild 1213
 MD5 d6f866ea0fe1fe6b4dad96618dc07724 wv-1.2.0.ebuild 1037
+RMD160 a619279479b09ecb716f48afd8c19211de846820 wv-1.2.0.ebuild 1037
+SHA256 d1f23062ffe8ae5a1f726e162b5b72e6d76ea1eafc7310c472a57157e0540bc3 wv-1.2.0.ebuild 1037
+MD5 d6f866ea0fe1fe6b4dad96618dc07724 wv-1.2.1.ebuild 1037
+RMD160 a619279479b09ecb716f48afd8c19211de846820 wv-1.2.1.ebuild 1037
+SHA256 d1f23062ffe8ae5a1f726e162b5b72e6d76ea1eafc7310c472a57157e0540bc3 wv-1.2.1.ebuild 1037
diff --git a/app-text/wv/files/digest-wv-1.0.3-r1 b/app-text/wv/files/digest-wv-1.0.3-r1
deleted file mode 100644
index a4593f850e7f..000000000000
--- a/app-text/wv/files/digest-wv-1.0.3-r1
+++ /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.1 b/app-text/wv/files/digest-wv-1.2.1
new file mode 100644
index 000000000000..d021552de444
--- /dev/null
+++ b/app-text/wv/files/digest-wv-1.2.1
@@ -0,0 +1,3 @@
+MD5 d757080af4595839d5d82a1a573c692c wv-1.2.1.tar.gz 628027
+RMD160 92e1ee9ea7b35ad383cd904afd32516f051ef0c7 wv-1.2.1.tar.gz 628027
+SHA256 a32ba44b9c1120f753359834037d6573b3e14aa2baf8f94f400c532ad196c732 wv-1.2.1.tar.gz 628027
diff --git a/app-text/wv/wv-1.0.3-r1.ebuild b/app-text/wv/wv-1.0.3-r1.ebuild
deleted file mode 100644
index 0fde0267243d..000000000000
--- a/app-text/wv/wv-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,59 +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-r1.ebuild,v 1.1 2005/10/06 22:14:51 dsd 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
-
-	# Open file as readonly
-	epatch ${FILESDIR}/${P}-libole2-readonly.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.1.ebuild b/app-text/wv/wv-1.2.1.ebuild
new file mode 100644
index 000000000000..2c9b5ff3837d
--- /dev/null
+++ b/app-text/wv/wv-1.2.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/wv/wv-1.2.1.ebuild,v 1.1 2006/04/15 11:37:02 foser 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="wmf"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+RDEPEND=">=dev-libs/glib-2
+	>=gnome-extra/libgsf-1.13
+	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"
+
+	preserve_old_lib /usr/$(get_libdir)/libwv-1.2.so.0
+	preserve_old_lib /usr/$(get_libdir)/libwv-1.0.so.0
+
+}
+
+src_install () {
+
+	make DESTDIR="${D}" install || die "Installation failed"
+
+	dodoc README
+
+	rm -f ${D}/usr/share/man/man1/wvConvert.1
+	dosym  /usr/share/man/man1/wvWare.1 /usr/share/man/man1/wvConvert.1
+
+}
+
+pkg_postinst() {
+
+	preserve_old_lib_notify /usr/$(get_libdir)/libwv-1.2.so.0
+	preserve_old_lib_notify /usr/$(get_libdir)/libwv-1.0.so.0
+
+}