Fix SRC_URI and version bump (bug #110958). Pruning old ebuild.

(Portage version: 2.0.53_rc7)

7 files changed, 76 insertions, 65 deletions

diff --git a/media-gfx/pstoedit/ChangeLog b/media-gfx/pstoedit/ChangeLog
index 369e197b8f1a..a69a05a6b577 100644
--- a/media-gfx/pstoedit/ChangeLog
+++ b/media-gfx/pstoedit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/pstoedit
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/ChangeLog,v 1.21 2005/06/22 16:47:08 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/ChangeLog,v 1.22 2005/11/02 12:53:58 leonardop Exp $
+
+*pstoedit-3.42 (02 Nov 2005)
+
+  02 Nov 2005; Leonardo Boshell <leonardop@gentoo.org>
+  pstoedit-3.40.ebuild, +pstoedit-3.42.ebuild:
+  Fix SRC_URI in version 3.40 (bug #110958). Version bump to 3.42.
 
   22 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> pstoedit-3.40.ebuild:
   Stable on sparc
diff --git a/media-gfx/pstoedit/Manifest b/media-gfx/pstoedit/Manifest
index cf2c06adb505..341338b49447 100644
--- a/media-gfx/pstoedit/Manifest
+++ b/media-gfx/pstoedit/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 MD5 b9015542befa7a7c9826a7809c9ad029 ChangeLog 3017
-MD5 0187a9702c0fb3b0b8beae436a0bb9c0 pstoedit-3.33.ebuild 1465
-MD5 52272c0756916c6c2cd89a12f17fd21b pstoedit-3.40.ebuild 1563
-MD5 1ce4852bb9edab1d50bfb22232e706ce pstoedit-3.32.ebuild 1004
-MD5 31054e5cc9324907446fa0eebf1438ca files/digest-pstoedit-3.32 65
-MD5 b4ab64e60b0732f6b73230e7834dc110 files/digest-pstoedit-3.40 65
 MD5 a907639a46bec91770facf3dda3db0b6 files/digest-pstoedit-3.33 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCuZYaKRy60XGEcJIRAro9AJwPwxcPx6t86kezaUlqPrTVCYLKkgCdHXYq
-kSX9nwOZRihjc8w8dZhHRmA=
-=muMo
------END PGP SIGNATURE-----
+MD5 b4ab64e60b0732f6b73230e7834dc110 files/digest-pstoedit-3.40 65
+MD5 0ab11abda10b4e03161ae0fe955f4bdc files/digest-pstoedit-3.42 65
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+MD5 0187a9702c0fb3b0b8beae436a0bb9c0 pstoedit-3.33.ebuild 1465
+MD5 a790f9b05c0be0e24064426a88f86c04 pstoedit-3.40.ebuild 1525
+MD5 924ad4144f240bffea4a1d025ff88282 pstoedit-3.42.ebuild 1539
diff --git a/media-gfx/pstoedit/files/digest-pstoedit-3.32 b/media-gfx/pstoedit/files/digest-pstoedit-3.32
deleted file mode 100644
index 4030460baaaf..000000000000
--- a/media-gfx/pstoedit/files/digest-pstoedit-3.32
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3cc02f27c6030448f7b3705f85cba34e pstoedit-3.32.tar.gz 625117
diff --git a/media-gfx/pstoedit/files/digest-pstoedit-3.42 b/media-gfx/pstoedit/files/digest-pstoedit-3.42
new file mode 100644
index 000000000000..a0d04573d761
--- /dev/null
+++ b/media-gfx/pstoedit/files/digest-pstoedit-3.42
@@ -0,0 +1 @@
+MD5 be262030dd15bc18cac03fda98f9871b pstoedit-3.42.tar.gz 807598
diff --git a/media-gfx/pstoedit/pstoedit-3.32.ebuild b/media-gfx/pstoedit/pstoedit-3.32.ebuild
deleted file mode 100644
index 79d444f429d0..000000000000
--- a/media-gfx/pstoedit/pstoedit-3.32.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# 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.14 2005/02/21 14:50:54 usata Exp $
-
-inherit libtool
-
-DESCRIPTION="translates PostScript and PDF graphics into other vector formats"
-SRC_URI="http://home.t-online.de/home/helga.glunz/wglunz/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.pstoedit.net/pstoedit"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE="flash"
-KEYWORDS="x86 ppc"
-
-DEPEND="media-libs/libpng
-	media-libs/libexif
-	sys-libs/zlib
-	flash? ( media-libs/ming )"
-
-RDEPEND="${DEPEND}
-	virtual/ghostscript"
-
-src_unpack() {
-
-	unpack ${A}; cd ${S}
-	# remove the -pedantic flag, see bug #39557
-	sed -i -e "s/\-pedantic//" configure
-
-}
-
-src_compile() {
-	elibtoolize
-	econf || die "econf failed"
-	make || die
-}
-
-src_install () {
-
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc readme.txt copying
-	dohtml changelog.htm index.html doc/pstoedit.htm
-	doman doc/pstoedit.1
-
-}
diff --git a/media-gfx/pstoedit/pstoedit-3.40.ebuild b/media-gfx/pstoedit/pstoedit-3.40.ebuild
index 8a3608ccb170..0e81951a9525 100644
--- a/media-gfx/pstoedit/pstoedit-3.40.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.40.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.40.ebuild,v 1.7 2005/06/22 16:47:08 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.40.ebuild,v 1.8 2005/11/02 12:53:58 leonardop Exp $
 
 inherit libtool
 
@@ -12,7 +12,7 @@ inherit libtool
 IUSE="plotutils"
 
 DESCRIPTION="translates PostScript and PDF graphics into other vector formats"
-SRC_URI="http://home.t-online.de/home/helga.glunz/wglunz/${PN}/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 HOMEPAGE="http://www.pstoedit.net/pstoedit"
 
 SLOT="0"
diff --git a/media-gfx/pstoedit/pstoedit-3.42.ebuild b/media-gfx/pstoedit/pstoedit-3.42.ebuild
new file mode 100644
index 000000000000..dfacd25a93fa
--- /dev/null
+++ b/media-gfx/pstoedit/pstoedit-3.42.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.42.ebuild,v 1.1 2005/11/02 12:53:58 leonardop Exp $
+
+inherit libtool
+
+# see bug #29724. please don't re-enable flash support until
+# ming has the patches applied <obz@gentoo.org>
+# secondly, we're not enabling libemf via a use flag, until it's
+# actually switchable via configure, see bug #39557
+# IUSE="flash libemf"
+IUSE="plotutils"
+
+DESCRIPTION="translates PostScript and PDF graphics into other vector formats"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.pstoedit.net/pstoedit"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="sys-libs/zlib
+	media-libs/libemf
+	media-libs/libpng
+	media-libs/libexif
+	plotutils? ( media-libs/plotutils )"
+#	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
+	[ -f /usr/include/libEMF/emf.h ] \
+		&& myconf="${myconf} --with-libemf-include=/usr/include/libEMF"
+
+	elibtoolize
+	econf ${myconf} $(use_with plotutils libplot) || die "econf failed"
+	make || die
+
+}
+
+src_install () {
+
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc readme.txt copying
+	dohtml changelog.htm index.htm doc/pstoedit.htm
+	doman doc/pstoedit.1
+
+}