Support libp2edrvswf (and media-libs/ming) again wrt #238803 by Martin Mokrejš.

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

11 files changed, 102 insertions, 121 deletions

diff --git a/media-gfx/pstoedit/ChangeLog b/media-gfx/pstoedit/ChangeLog
index 6d9884988638..5b1bac14a9a0 100644
--- a/media-gfx/pstoedit/ChangeLog
+++ b/media-gfx/pstoedit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/pstoedit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/ChangeLog,v 1.67 2010/07/06 10:08:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/ChangeLog,v 1.68 2010/07/10 19:17:25 ssuominen Exp $
+
+*pstoedit-3.50-r1 (10 Jul 2010)
+
+  10 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +pstoedit-3.50-r1.ebuild, +files/pstoedit-3.50-swf.patch:
+  Support libp2edrvswf (and media-libs/ming) again wrt #238803 by Martin Mokrejš.
 
   06 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> pstoedit-3.50.ebuild:
   ppc64 stable wrt #294109
diff --git a/media-gfx/pstoedit/Manifest b/media-gfx/pstoedit/Manifest
index def088303d85..9d8128b9ad2a 100644
--- a/media-gfx/pstoedit/Manifest
+++ b/media-gfx/pstoedit/Manifest
@@ -1,11 +1,8 @@
-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
+AUX pstoedit-3.50-parallel.patch 1913 RMD160 0589216baca35730b2bbb42f2fe08875cd4e7215 SHA1 aa7fce1110ddb3cff99cfd32e2064112eb1b3a95 SHA256 306e4dc9068834df6a99ad8b4d10fc63157bf895ad2be32211d507001ecea13c
+AUX pstoedit-3.50-plugin-close.patch 178 RMD160 b411a3be19c29a625be1a79902484d9294d003a9 SHA1 3343fc51cdc7daf7791554f2e9ba5cfcddadd9e7 SHA256 1e44d86f4184e9dd0d0a02c352af9a849f92fb5ee974e5dc3fc933d2debf515c
+AUX pstoedit-3.50-swf.patch 673 RMD160 23570d31892528794a6dbc61e106ec04c689ea3e SHA1 278738ba2da3930678d7191faca3738a913f2e54 SHA256 e8e12b859cc87f8df628f653381d1b999d4dfe0603fcd91ba3e789d089fe2268
 DIST pstoedit-3.50.tar.gz 894115 RMD160 ba9be28424ced48464d93dd8bca60107d181a1c3 SHA1 5685bef29fa00aae7cc314d3a1dd21612a98eb2b SHA256 22b16452d7538358f8ecdff1fec29a8b6d4da49dffec9ae436f60bd95d105711
-EBUILD pstoedit-3.45-r1.ebuild 1673 RMD160 faf5ff19d4419dea2001eb4c1c9ea502f536b92a SHA1 350651b5ff08d22d7e0b7afa6a069fcab2067495 SHA256 c84e4160d78bf676b0039b67ec9afd5f40e47f109a3ec8c14cc123257ec9d2ad
+EBUILD pstoedit-3.50-r1.ebuild 1401 RMD160 ddfdfbf412f9767f8d0d6f752d1f7f04311e25bc SHA1 605ffb28fc9f9bedeed7f8c00ab7fe5ed900c37f SHA256 f6022d7f35bc28b383e1a082afc0ecd15af63b72110626f582610d39b2a7bc52
 EBUILD pstoedit-3.50.ebuild 1362 RMD160 73f32623d49976c1e44b157df5d7c766be9158d9 SHA1 aec6cc873e0692887ee03c8af84ccefec7ed00a6 SHA256 4e58480592879ab95d15cdc5de065b8be41993f629e993fa80fd3741977da1c7
-MISC ChangeLog 9463 RMD160 8cdc2f9297c56724b1a4e84ef7b084592c575cd9 SHA1 4118b41a78f1895b1a1cc62df00125ab1786c91f SHA256 8a16357714c514f6fa83a566eb7df898e1b4907bf14acd066cef35b3bfe81d6a
-MISC metadata.xml 266 RMD160 405ece9efc9a19d31ca7394a9c159a51309a3bec SHA1 7cb5575a9c14679a2f6bbeb1f11333918dda2368 SHA256 5fe90f8eb0d17c47a5e85afd6f31144f68a86e4819c1a43f11b53789f6015c57
+MISC ChangeLog 9694 RMD160 2629b613e6c4dc1055935f507ac9bfaa141a4175 SHA1 0e638a11855e2bcea1c0b16060896dccc7248edd SHA256 a58a84ba5ffc83bf14d1231f4d04b467fd732f2bbd20d32bb53c43bb52b53aad
+MISC metadata.xml 347 RMD160 9e423c815bde1901d77b949a473ab84356442606 SHA1 e90865b7aa10f25cd154d24f965d34e0ac874772 SHA256 5b861bace315a6efb12cc13969af4a4c7bf18e35edc79c47e169011666393063
diff --git a/media-gfx/pstoedit/files/pstoedit-3.45-am_path_pstoedit.patch b/media-gfx/pstoedit/files/pstoedit-3.45-am_path_pstoedit.patch
deleted file mode 100644
index bc4909abc2c8..000000000000
--- a/media-gfx/pstoedit/files/pstoedit-3.45-am_path_pstoedit.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.gentoo.org/175679
-
-diff --git a/config/pstoedit.m4 b/config/pstoedit.m4
-index b6fa407..67b923b 100644
---- a/config/pstoedit.m4
-+++ b/config/pstoedit.m4
-@@ -5,6 +5,11 @@ dnl AM_PATH_PSTOEDIT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]
- dnl Test to see if libpstoedit is installed, and define PSTOEDIT_CFLAGS, LIBS
- dnl
- 
-+AC_DEFUN([AM_PATH_PSTOEDIT],
-+[dnl
-+dnl Get the cflags and libraries from the pstoedit-config script
-+dnl
-+
- AC_ARG_WITH(pstoedit-prefix,[  --with-pstoedit-prefix=PFX   Prefix where Pstoedit is installed (optional)],
-             pstoedit_prefix="$withval", pstoedit_prefix="")
- AC_ARG_WITH(pstoedit-exec-prefix,[  --with-pstoedit-exec-prefix=PFX Exec prefix where Pstoedit is installed (optional)],
diff --git a/media-gfx/pstoedit/files/pstoedit-3.45-gcc-4.3.patch b/media-gfx/pstoedit/files/pstoedit-3.45-gcc-4.3.patch
deleted file mode 100644
index 3bec05e69e6e..000000000000
--- a/media-gfx/pstoedit/files/pstoedit-3.45-gcc-4.3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/cppcomp.h
-+++ src/cppcomp.h
-@@ -122,6 +122,8 @@
- #define I_iomanip		<iomanip>
- #define I_ios			<ios>
- #define I_iostream		<iostream>
-+#include <cstdlib>
-+#include <cstring>
- 
- #if (defined (_MSC_VER) && _MSC_VER >= 1100)
- // 1100 is version 5.0
diff --git a/media-gfx/pstoedit/files/pstoedit-3.45-gcc-4.4.patch b/media-gfx/pstoedit/files/pstoedit-3.45-gcc-4.4.patch
deleted file mode 100644
index 9a41271fbaa4..000000000000
--- a/media-gfx/pstoedit/files/pstoedit-3.45-gcc-4.4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/dynload.cpp	2009-04-05 21:52:11.000000000 -0400
-+++ src/dynload.cpp	2009-04-05 21:53:09.000000000 -0400
-@@ -138,7 +138,7 @@
- 		dlclose(handle);
- #elif defined(_WIN32)
- 		(void) WINFREELIB((HINSTANCE) handle);
--#elif
-+#else
- #error "system unsupported so far"
- #endif
- 		handle = 0;
diff --git a/media-gfx/pstoedit/files/pstoedit-3.50-parallel.patch b/media-gfx/pstoedit/files/pstoedit-3.50-parallel.patch
index 4f1f73b04528..480efd7250c9 100644
--- a/media-gfx/pstoedit/files/pstoedit-3.50-parallel.patch
+++ b/media-gfx/pstoedit/files/pstoedit-3.50-parallel.patch
@@ -1,7 +1,5 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index d6178df..66f377b 100755
---- a/src/Makefile.am
-+++ b/src/Makefile.am
+--- src/Makefile.am
++++ src/Makefile.am
 @@ -86,6 +86,7 @@ libp2edrvstd_la_SOURCES=			\
          $(sample_drivers_src)                   
  libp2edrvstd_la_LIBADD=-L. libpstoedit.la
diff --git a/media-gfx/pstoedit/files/pstoedit-3.50-plugin-close.patch b/media-gfx/pstoedit/files/pstoedit-3.50-plugin-close.patch
index 6787d6aefd4a..df2aa7c47d05 100644
--- a/media-gfx/pstoedit/files/pstoedit-3.50-plugin-close.patch
+++ b/media-gfx/pstoedit/files/pstoedit-3.50-plugin-close.patch
@@ -1,9 +1,7 @@
 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
+--- src/dynload.cpp
++++ src/dynload.cpp
 @@ -147,7 +147,6 @@ void DynLoader::close()
  
  DynLoader::~DynLoader()
diff --git a/media-gfx/pstoedit/files/pstoedit-3.50-swf.patch b/media-gfx/pstoedit/files/pstoedit-3.50-swf.patch
new file mode 100644
index 000000000000..36500935ec11
--- /dev/null
+++ b/media-gfx/pstoedit/files/pstoedit-3.50-swf.patch
@@ -0,0 +1,25 @@
+http://bugs.gentoo.org/238803
+
+--- configure.ac
++++ configure.ac
+@@ -181,7 +181,7 @@
+ 	[LIBMING_CFLAGS="-DHAVE_LIBMING"])
+ if test -n "${LIBMING_LDFLAGS}" && test -n "${LIBMING_CFLAGS}"; then
+    HAVE_LIBMING=yes
+-   AC_CHECK_HEADER(util/png2dbl.c,[LIBMING_CFLAGS="$LIBMING_CFLAGS -DHAVE_LIBMINGUTIL"])
++   AC_CHECK_HEADER(util/png2dbl.c,[LIBMING_CFLAGS="$LIBMING_CFLAGS -DHAVE_LIBMINGUTIL -DUSE_PNG"])
+ else
+    LIBMING_LDFLAGS=
+    LIBMING_CFLAGS=
+--- src/drvswf.cpp
++++ src/drvswf.cpp
+@@ -31,8 +31,7 @@
+ //static bool trace = false;
+ //static bool cubic = false;
+ 
+-#include "mingpp.h"
+-#include "ming_config.h"
++#include <mingpp.h>
+ 
+ #if defined(_WIN32)
+ extern "C" {
diff --git a/media-gfx/pstoedit/metadata.xml b/media-gfx/pstoedit/metadata.xml
index 37a303c5fe8c..798d53450a33 100644
--- a/media-gfx/pstoedit/metadata.xml
+++ b/media-gfx/pstoedit/metadata.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
-<herd>printing</herd>
-<use>
-	<flag name='emf'>
-		enables <pkg>media-libs/libemf</pkg> support
-	</flag>
-</use>
+  <herd>tex</herd>
+  <herd>printing</herd>
+  <use>
+    <flag name='emf'>Enable <pkg>media-libs/libemf</pkg> support</flag>
+    <flag name='flash'>Enable <pkg>media-libs/ming</pkg> SWF support</flag>
+  </use>
 </pkgmetadata>
diff --git a/media-gfx/pstoedit/pstoedit-3.45-r1.ebuild b/media-gfx/pstoedit/pstoedit-3.45-r1.ebuild
deleted file mode 100644
index a2b97b871e9f..000000000000
--- a/media-gfx/pstoedit/pstoedit-3.45-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.45-r1.ebuild,v 1.4 2010/05/27 10:54:29 maekke Exp $
-
-EAPI="2"
-
-inherit base eutils
-
-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="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-
-# Add flash when media-libs/ming-0.3 gets out of package.mask
-IUSE="emf imagemagick plotutils"
-
-# Strangely when emerging with --as-needed libpng is not needed
-DEPEND="media-libs/libpng
-		app-text/ghostscript-gpl
-		media-libs/gd
-		emf? ( >=media-libs/libemf-1.0.3 )
-		imagemagick? ( media-gfx/imagemagick[cxx] )
-		plotutils? ( media-libs/plotutils )"
-#flash? ( >=media-libs/ming-0.3 )
-
-src_prepare() {
-	# Fails due to imagemagick having 'long long' in its headers (at least in
-	# 6.3.9.8).
-	sed -i -e "s/-pedantic //" configure
-	epatch "${FILESDIR}"/${P}-am_path_pstoedit.patch # bug 175679 (fixed in	3.50)
-	epatch "${FILESDIR}/${P}-gcc-4.3.patch"
-	epatch "${FILESDIR}/${P}-gcc-4.4.patch"
-}
-
-src_configure() {
-	#$(use_with flash swf)
-	# --without-swf for bug https://bugs.gentoo.org/show_bug.cgi?id=137204
-	econf $(use_with emf) --without-swf $(use_with imagemagick magick) \
-		  $(use_with plotutils libplot) || die 'econf failed'
-}
-
-src_compile() {
-	# bug #278417
-	emake -j1 || die 'compilation failed'
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die 'make install failed'
-	cd doc
-	dodoc readme.txt || die
-	dohtml *.htm || die
-	doman pstoedit.1 || die
-}
diff --git a/media-gfx/pstoedit/pstoedit-3.50-r1.ebuild b/media-gfx/pstoedit/pstoedit-3.50-r1.ebuild
new file mode 100644
index 000000000000..167e79eac8cb
--- /dev/null
+++ b/media-gfx/pstoedit/pstoedit-3.50-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.50-r1.ebuild,v 1.1 2010/07/10 19:17:25 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="Translate PostScript and PDF graphics into other vector formats"
+HOMEPAGE="http://sourceforge.net/projects/pstoedit/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="emf flash imagemagick plotutils"
+
+RDEPEND=">=media-libs/libpng-1.4.3
+	>=media-libs/gd-2.0.35-r1
+	>=app-text/ghostscript-gpl-8.71-r1
+	emf? ( >=media-libs/libemf-1.0.3 )
+	flash? ( >=media-libs/ming-0.4.3 )
+	imagemagick? ( >=media-gfx/imagemagick-6.6.1.2[cxx] )
+	plotutils? ( media-libs/plotutils )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	sed -i \
+		-e '/CXXFLAGS="-g"/d' \
+		-e 's:-pedantic::' \
+		configure.ac || die
+
+	epatch "${FILESDIR}"/${P}-parallel.patch \
+		"${FILESDIR}"/${P}-plugin-close.patch \
+		"${FILESDIR}"/${P}-swf.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_with emf) \
+		$(use_with imagemagick magick) \
+		$(use_with plotutils libplot) \
+		$(use_with flash swf)
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die
+	doman doc/pstoedit.1 || die
+	dodoc doc/*.txt
+	dohtml doc/*.htm
+}