revision bump to fix serious libtool issues with this pkg

5 files changed, 20 insertions, 57 deletions

diff --git a/media-libs/libwmf/ChangeLog b/media-libs/libwmf/ChangeLog
index 6024560f2cf8..4bd8103c4416 100644
--- a/media-libs/libwmf/ChangeLog
+++ b/media-libs/libwmf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libwmf
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/ChangeLog,v 1.12 2003/03/05 00:29:31 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/ChangeLog,v 1.13 2003/03/19 20:02:43 liquidx Exp $
+
+*libwmf-0.2.7-r2 (19 Mar 2003)
+
+  19 Mar 2003; Alastair Tse <liquidx@gentoo.org> libwmf-0.2.7-r2.ebuild:
+  Libtool fix. Now works fine when upgrading from <libwmf-0.2.7. Resolves
+  #17730.
 
 *libwmf-0.2.7-r1 (05 Mar 2003)
 
diff --git a/media-libs/libwmf/files/digest-libwmf-0.2.7-r1 b/media-libs/libwmf/files/digest-libwmf-0.2.7-r1
deleted file mode 100644
index b0ab2708bc6e..000000000000
--- a/media-libs/libwmf/files/digest-libwmf-0.2.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2d60702587549c4cc4c7f8001a4ad0a9 libwmf-0.2.7.tar.gz 1610697
diff --git a/media-libs/libwmf/files/digest-libwmf-0.2.7 b/media-libs/libwmf/files/digest-libwmf-0.2.7-r2
index b0ab2708bc6e..b0ab2708bc6e 100644
--- a/media-libs/libwmf/files/digest-libwmf-0.2.7
+++ b/media-libs/libwmf/files/digest-libwmf-0.2.7-r2
diff --git a/media-libs/libwmf/libwmf-0.2.7-r1.ebuild b/media-libs/libwmf/libwmf-0.2.7-r2.ebuild
index 3e7954482472..f44191698afd 100644
--- a/media-libs/libwmf/libwmf-0.2.7-r1.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/libwmf-0.2.7-r1.ebuild,v 1.2 2003/03/05 01:04:24 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/libwmf-0.2.7-r2.ebuild,v 1.1 2003/03/19 20:02:44 liquidx Exp $
 
 inherit libtool
 
@@ -10,7 +10,6 @@ IUSE="jpeg X"
 #This will probably work, especially since the real one (6.50) in this case
 #is empty. However beware in case there is any trouble
 
-
 S=${WORKDIR}/${P}
 DESCRIPTION="library for converting WMF files"
 SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
@@ -31,7 +30,9 @@ DEPEND=">=app-text/ghostscript-6.50
 # plotutils are not really supported yet, so looks like that's it
 
 src_compile() {
-	elibtoolize
+	# Have to use the reverse-deps patch to prevent libwmf from
+    # linking an older installed version of libwmflite
+	elibtoolize --reverse-deps
 	
 	use jpeg || myconf="${myconf} --with-jpeg=no"
 	use X || myconf="${myconf} --with-x=no"
@@ -46,6 +47,13 @@ src_compile() {
 }
 
 src_install () {
-    make DESTDIR=${D} install || die
-	dodoc README AUTHORS COPYING CREDITS ChangeLog NEWS TODO
+	    
+	# Must use einstall because of stubborn libtool
+    einstall \
+		fontdir=${D}/usr/share/libwmf/fonts \
+		wmfonedocdir=${D}/usr/share/doc/${PF}/caolan \
+		wmfdocdir=${D}/usr/share/doc/${PF} \
+		libdir=${D}/usr/lib \
+		|| die
+    dodoc README AUTHORS COPYING CREDITS ChangeLog NEWS TODO
 }
diff --git a/media-libs/libwmf/libwmf-0.2.7.ebuild b/media-libs/libwmf/libwmf-0.2.7.ebuild
deleted file mode 100644
index 271574ead7ac..000000000000
--- a/media-libs/libwmf/libwmf-0.2.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/libwmf-0.2.7.ebuild,v 1.4 2003/02/13 12:51:44 vapier Exp $
-
-IUSE="jpeg X"
-
-#The configure script finds the 5.50 ghostscript Fontmap file while run.
-#This will probably work, especially since the real one (6.50) in this case
-#is empty. However beware in case there is any trouble
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="library for converting WMF files"
-SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
-HOMEPAGE="http://www.wvware.com/libwmf.html"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-LICENSE="GPL-2"
-
-DEPEND=">=app-text/ghostscript-6.50
-	dev-libs/expat
-	dev-libs/libxml2
-	>=media-libs/freetype-2.0.1
-	sys-libs/zlib
-	media-libs/libpng
-	jpeg? ( media-libs/jpeg )
-	X? ( virtual/x11 )"
-# plotutils are not really supported yet, so looks like that's it
-
-src_compile() {
-
-	use jpeg || myconf="${myconf} --with-jpeg=no"
-	use X || myconf="${myconf} --with-x=no"
-
-	econf \
-		${myconf} \
-		--with-gsfontdir=/usr/share/ghostscript/fonts \
-		--with-fontdir=/usr/share/libwmf/fonts/ \
-		--with-docdir=${D}/usr/share/doc/${PF} || die "./configure failed"
-
-	make || die
-}
-
-src_install () {
-	einstall \
-		fontdir=${D}/usr/share/libwmf/fonts || die
-
-	dodoc README AUTHORS COPYING CREDITS ChangeLog NEWS TODO
-}