Now installs all documentation, and a man page. Removed -pedantic flag which causes errors with libEMF

4 files changed, 36 insertions, 13 deletions

diff --git a/media-gfx/pstoedit/ChangeLog b/media-gfx/pstoedit/ChangeLog
index a050724a09b0..4d651bb0da94 100644
--- a/media-gfx/pstoedit/ChangeLog
+++ b/media-gfx/pstoedit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/pstoedit
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/ChangeLog,v 1.7 2003/12/09 17:49:35 lanius Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/ChangeLog,v 1.8 2004/01/31 09:58:47 obz Exp $
+
+  31 Jan 2004; Mike Gardiner <obz@gentoo.org> pstoedit-3.32.ebuild,
+  pstoedit-3.33.ebuild:
+  Now installs all documentation, and a man page. Removed -pedantic flag which
+  causes errors with libEMF
 
   09 Dec 2003; Heinrich Wendel <lanius@gentoo.org> pstoedit-3.32.ebuild,
   pstoedit-3.33.ebuild:
diff --git a/media-gfx/pstoedit/Manifest b/media-gfx/pstoedit/Manifest
index 1012d4b197a1..0b14e69a3bec 100644
--- a/media-gfx/pstoedit/Manifest
+++ b/media-gfx/pstoedit/Manifest
@@ -1,6 +1,6 @@
-MD5 a49fe6514e7099e257b019fac0189713 pstoedit-3.32.ebuild 812
-MD5 93c3b31db2ba251b417aecbf4719cd12 ChangeLog 1597
+MD5 858b7c9c1e54893d31f361cd5c05723d pstoedit-3.32.ebuild 987
+MD5 51bc052a306c47275b37e518970e38d9 ChangeLog 1794
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 33016bfcc51a471b0cc77c0899d8cc66 pstoedit-3.33.ebuild 1129
+MD5 9728fb21716d03ee390df3ee0a245192 pstoedit-3.33.ebuild 1287
 MD5 31054e5cc9324907446fa0eebf1438ca files/digest-pstoedit-3.32 65
 MD5 a907639a46bec91770facf3dda3db0b6 files/digest-pstoedit-3.33 65
diff --git a/media-gfx/pstoedit/pstoedit-3.32.ebuild b/media-gfx/pstoedit/pstoedit-3.32.ebuild
index 3d97b9bdacee..7ea2ee6a95c2 100644
--- a/media-gfx/pstoedit/pstoedit-3.32.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.32.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.32.ebuild,v 1.7 2003/12/09 17:49:35 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.32.ebuild,v 1.8 2004/01/31 09:58:47 obz Exp $
 
 inherit libtool
 
@@ -22,6 +22,14 @@ DEPEND="media-libs/libpng
 RDEPEND="${DEPEND}
 	virtual/ghostscript"
 
+src_unpack() {
+
+	unpack ${A}; cd ${S}
+	# remove the -pedantic flag, see bug #39575
+	sed -i -e "s/\-pedantic//" configure
+
+}
+
 src_compile() {
 	elibtoolize
 	econf
@@ -29,7 +37,10 @@ src_compile() {
 }
 
 src_install () {
+
 	make DESTDIR=${D} install || die "make install failed"
 	dodoc readme.txt copying
-	dodoc changelog.htm
+	dohtml changelog.htm index.html doc/pstoedit.htm
+	doman doc/pstoedit.1
+
 }
diff --git a/media-gfx/pstoedit/pstoedit-3.33.ebuild b/media-gfx/pstoedit/pstoedit-3.33.ebuild
index 629bb346165f..c6295ac16112 100644
--- a/media-gfx/pstoedit/pstoedit-3.33.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.33.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.33.ebuild,v 1.4 2003/12/09 17:49:35 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.33.ebuild,v 1.5 2004/01/31 09:58:47 obz Exp $
 
 inherit libtool
 
@@ -19,17 +19,23 @@ KEYWORDS="x86 ~ppc"
 
 DEPEND="media-libs/libpng
 	sys-libs/zlib"
-
 #	flash? ( media-libs/ming )"
 
 RDEPEND="${DEPEND}
 	virtual/ghostscript"
 
+src_unpack() {
+
+	unpack ${A}; cd ${S}
+	# need to remove the pedantic flag, see bug #39557
+	sed -i -e "s/\-pedantic//" configure
+
+}
+
 src_compile() {
 
 	local myconf=""
 	# checking if libemf is previously installed, bug #29724
-	# <obz@gentoo.org>
 	[ -f /usr/include/libEMF/emf.h ] \
 		&& myconf="${myconf} --with-libemf-include=/usr/include/libEMF"
 
@@ -43,6 +49,7 @@ src_install () {
 
 	make DESTDIR=${D} install || die "make install failed"
 	dodoc readme.txt copying
-	dodoc changelog.htm
+	dohtml changelog.htm index.htm doc/pstoedit.htm
+	doman doc/pstoedit.1
 
 }