Version bump and fix parallel build (bug #278417).

Package-Manager: portage-2.2_rc44/cvs/Linux x86_64

5 files changed, 130 insertions, 5 deletions

diff --git a/media-gfx/pstoedit/ChangeLog b/media-gfx/pstoedit/ChangeLog
index 09940156033a..f8b391a01e6f 100644
--- a/media-gfx/pstoedit/ChangeLog
+++ b/media-gfx/pstoedit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/pstoedit
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/ChangeLog,v 1.58 2009/09/18 22:47:33 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/ChangeLog,v 1.59 2009/10/10 08:04:27 dirtyepic Exp $
+
+*pstoedit-3.50 (10 Oct 2009)
+
+  10 Oct 2009; Ryan Hill <dirtyepic@gentoo.org> +pstoedit-3.50.ebuild,
+  +files/pstoedit-3.50-parallel.patch,
+  +files/pstoedit-3.50-plugin-close.patch:
+  Version bump and fix parallel build (bug #278417).
 
 *pstoedit-3.45-r1 (18 Sep 2009)
 
diff --git a/media-gfx/pstoedit/Manifest b/media-gfx/pstoedit/Manifest
index b82d23fe08fc..4290d285c881 100644
--- a/media-gfx/pstoedit/Manifest
+++ b/media-gfx/pstoedit/Manifest
@@ -4,14 +4,18 @@ Hash: SHA1
 AUX pstoedit-3.45-am_path_pstoedit.patch 750 RMD160 cecc99e65ab51d4cc346af62ceefaa97dde0d774 SHA1 5c83d10076c55b84e5bfea285615f85984774063 SHA256 2ff71c57df130ea0dfb946548a436e5fc042771cc507afc2b96cdbc881e7195e
 AUX pstoedit-3.45-gcc-4.3.patch 253 RMD160 5eea970d6f5936160f7c1bc7dd4ffa12b93b8de9 SHA1 7873231790e1d6cbaec5c79c151b7bd2e75c10bd SHA256 30ec4235d0551c752c5092790ef296440bac15113aafaaa7f28d6abed55217b8
 AUX pstoedit-3.45-gcc-4.4.patch 290 RMD160 712a204fae448b31da7284ac6731d321426c8cc2 SHA1 c6a143d391ce27b590fe32da815538b693e4c4eb SHA256 fa64304d920b4ab944148029f87830dd6c17d2d33baa1c54e2971a0573379cc9
+AUX pstoedit-3.50-parallel.patch 1994 RMD160 9d6ac711233cba48c013f4f4ac86ce065aa7bb82 SHA1 6e278b164d3e59fbb11e7fd5ae8ffb038932d69a SHA256 be0376fcddd408bc18adf392c48664eb1ccdc3eb36ca8ae1045d0cbb07f9ca70
+AUX pstoedit-3.50-plugin-close.patch 259 RMD160 3b38e0d68fb1c7d7e2165969a0afba438bc79e5a SHA1 54bbe019de66eb4cb8525371462595d21fbd074e SHA256 b579b146b2297d69329a7a61707d2cb28fd1506b01da556dfdbb58d12826b1d9
 DIST pstoedit-3.45.tar.gz 848922 RMD160 dbe610807dae3ece5d32979100795d3399beb23a SHA1 3eecd5efcd4f3d1752d13303a2d1b64346f74171 SHA256 a489e47e536c194d7fc3a8121a274156a3577d3d893ac4b54d79849bb29f7fd9
+DIST pstoedit-3.50.tar.gz 894115 RMD160 ba9be28424ced48464d93dd8bca60107d181a1c3 SHA1 5685bef29fa00aae7cc314d3a1dd21612a98eb2b SHA256 22b16452d7538358f8ecdff1fec29a8b6d4da49dffec9ae436f60bd95d105711
 EBUILD pstoedit-3.45-r1.ebuild 1674 RMD160 3f4086d1310ca9e8e4cd0d84cfe7f06f848bbf2f SHA1 6daa018073fe0c7fc3f5665b817b987f8e4368f5 SHA256 5441dc887a3ee46d2a7e442a0ecd53217d87386ceb0fd1beb7b6f59549f7239c
-MISC ChangeLog 8215 RMD160 3fadb32c0a4e38e61f74cd8a49ee44613084e845 SHA1 c0324e9d430763556e70dd57d3129bce4ef7f52b SHA256 10eb55563d18907e2a6b560e3bd562d6b643abaf99a257e3645b012ada406d5d
+EBUILD pstoedit-3.50.ebuild 1381 RMD160 c7879bcd54fff9eba47e344bfa3c04676c1d0bf8 SHA1 ec3851e169f5f049a8139365384bb707f09d1c38 SHA256 2257cc3792ba641f4fd4f2844cf1acbae33597d827b4d5d50f49e08616290682
+MISC ChangeLog 8452 RMD160 43314ab1cac1b11a364dc72c8f0f788df1a45a0f SHA1 1b25b25e6855f31d5f6098dde2f32361b74dd4ef SHA256 96b1a507011b1fd8a3ebc5eed2658e3db75cf8be8c2291bbbd114f8611ceeb9f
 MISC metadata.xml 266 RMD160 405ece9efc9a19d31ca7394a9c159a51309a3bec SHA1 7cb5575a9c14679a2f6bbeb1f11333918dda2368 SHA256 5fe90f8eb0d17c47a5e85afd6f31144f68a86e4819c1a43f11b53789f6015c57
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkq0DkwACgkQiqiDRvmkBmJPGwCgr0zM+oRGJpK73tk8R5xXFjmm
-NpcAnRNTS1yhP7np9tdvDCgQerBmfhcI
-=u6b4
+iEYEARECAAYFAkrQQFcACgkQiqiDRvmkBmIJXACgvJ8k38WX5EzWNkXrAjCjCVL2
+mw4AmQEUNIZMrGLscfiGmjPKHr6i1S3r
+=v9a9
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/pstoedit/files/pstoedit-3.50-parallel.patch b/media-gfx/pstoedit/files/pstoedit-3.50-parallel.patch
new file mode 100644
index 000000000000..4f1f73b04528
--- /dev/null
+++ b/media-gfx/pstoedit/files/pstoedit-3.50-parallel.patch
@@ -0,0 +1,47 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index d6178df..66f377b 100755
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -86,6 +86,7 @@ libp2edrvstd_la_SOURCES=			\
+         $(sample_drivers_src)                   
+ libp2edrvstd_la_LIBADD=-L. libpstoedit.la
+ libp2edrvstd_la_LDFLAGS=-no-undefined -module
++libp2edrvstd_la_DEPENDENCIES = libpstoedit.la
+ 
+ #libp2edrvplugins_la_SOURCES=drvmif.cpp drvcgm.cpp drvrtf.cpp drvwwmf.cpp
+ #libp2edrvplugins_la_LIBADD=
+@@ -95,15 +96,18 @@ libp2edrvstd_la_LDFLAGS=-no-undefined -module
+ libp2edrvlplot_la_SOURCES=drvlplot.cpp drvlplot.h initlibrary.cpp
+ libp2edrvlplot_la_LIBADD=$(LIBPLOTTER_LDFLAGS) -L. libpstoedit.la
+ libp2edrvlplot_la_LDFLAGS=-no-undefined -module
++libp2edrvlplot_la_DEPENDENCIES = libpstoedit.la
+ 
+ libp2edrvswf_la_SOURCES=drvswf.cpp drvswf.h initlibrary.cpp
+ libp2edrvswf_la_LIBADD=$(LIBMING_LDFLAGS) -L. libpstoedit.la
+ libp2edrvswf_la_LDFLAGS=-no-undefined -module
++libp2edrvswf_la_DEPENDENCIES = libpstoedit.la
+ 
+ # note the __ stand for ++ - automake treats all no alphanums chars as _
+ libp2edrvmagick___la_SOURCES=drvmagick++.cpp drvmagick++.h initlibrary.cpp
+ libp2edrvmagick___la_LIBADD=-L. libpstoedit.la
+ libp2edrvmagick___la_LDFLAGS=-no-undefined ${LIBMAGICK_LDFLAGS}  -module
++libp2edrvmagick___la_DEPENDENCIES = libpstoedit.la
+ # moved to configure.ac because needed only for g++ libp2edrvmagick___la_CPPFLAGS=$(LIBMAGICK_CFLAGS) $(AM_CPPFLAGS) -Wno-long-long
+ 
+ if USE_EMFBYSOURCE
+@@ -113,6 +117,7 @@ else
+ libp2edrvwmf_la_SOURCES=drvwmf.cpp drvwmf.h initlibrary.cpp
+ libp2edrvwmf_la_LDFLAGS=-no-undefined $(LIBEMF_LDFLAGS) -L. libpstoedit.la -module
+ endif
++libp2edrvwmf_la_DEPENDENCIES = libpstoedit.la
+ 
+ libpstoedit_la_SOURCES =			\
+ 	dynload.cpp dynload.h			\
+@@ -135,6 +140,7 @@ libpstoedit_la_LDFLAGS = -no-undefined
+ 
+ pstoedit_SOURCES = cmdmain.cpp
+ pstoedit_LDFLAGS = -no-undefined -L. libpstoedit.la ${LIBLD_LDFLAGS}
++pstoedit_DEPENDENCIES = libpstoedit.la
+ 
+ pkginclude_HEADERS =				\
+ 	pstoedit.h				\
diff --git a/media-gfx/pstoedit/files/pstoedit-3.50-plugin-close.patch b/media-gfx/pstoedit/files/pstoedit-3.50-plugin-close.patch
new file mode 100644
index 000000000000..6787d6aefd4a
--- /dev/null
+++ b/media-gfx/pstoedit/files/pstoedit-3.50-plugin-close.patch
@@ -0,0 +1,14 @@
+http://bugzilla.redhat.com/507035
+
+diff --git a/src/dynload.cpp b/src/dynload.cpp
+index c0db355..7c073ef 100644
+--- a/src/dynload.cpp
++++ b/src/dynload.cpp
+@@ -147,7 +147,6 @@ void DynLoader::close()
+ 
+ DynLoader::~DynLoader()
+ {
+-	close();
+ 	libname=0;
+ }
+ 
diff --git a/media-gfx/pstoedit/pstoedit-3.50.ebuild b/media-gfx/pstoedit/pstoedit-3.50.ebuild
new file mode 100644
index 000000000000..61012f69827d
--- /dev/null
+++ b/media-gfx/pstoedit/pstoedit-3.50.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.50.ebuild,v 1.1 2009/10/10 08:04:27 dirtyepic Exp $
+
+EAPI="2"
+
+inherit autotools eutils
+
+DESCRIPTION="Translate PostScript and PDF graphics into other vector formats"
+HOMEPAGE="http://www.pstoedit.net/pstoedit"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="emf imagemagick plotutils"
+
+RDEPEND="media-libs/libpng
+		media-libs/gd
+		virtual/ghostscript
+		emf?			( >=media-libs/libemf-1.0.3 )
+		imagemagick?	( media-gfx/imagemagick[-nocxx] )
+		plotutils?		( media-libs/plotutils )"
+#		swf?			( >=media-libs/ming-0.3 )" bug 238803
+
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig"
+
+src_prepare() {
+	sed -i -e 's:-pedantic ::' -e 's:CXXFLAGS="-g"::' "${S}"/configure.ac
+	epatch "${FILESDIR}"/${P}-parallel.patch
+	epatch "${FILESDIR}"/${P}-plugin-close.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with emf) \
+		$(use_with imagemagick magick) \
+		$(use_with plotutils libplot) \
+		--without-swf \
+		|| die 'econf failed'
+#		$(use_with swf) \ # bug 238803
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die 'make install failed'
+	cd doc
+	dodoc readme.txt || die
+	dohtml *.htm || die
+	doman pstoedit.1 || die
+}