bug 70570

(Portage version: 2.0.51.19)

4 files changed, 114 insertions, 18 deletions

diff --git a/dev-perl/perlmagick/ChangeLog b/dev-perl/perlmagick/ChangeLog
index 27d1eb29e208..6ff86e244dc6 100644
--- a/dev-perl/perlmagick/ChangeLog
+++ b/dev-perl/perlmagick/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for dev-perl/perlmagick
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/perlmagick/ChangeLog,v 1.58 2005/03/08 06:56:46 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/perlmagick/ChangeLog,v 1.59 2005/03/13 22:24:43 mcummings Exp $
+
+*perlmagick-6.2.0.4-r1 (13 Mar 2005)
+
+  13 Mar 2005; Michael Cummings <mcummings@gentoo.org>
+  +perlmagick-6.2.0.4-r1.ebuild:
+  Changes in this ebuild over time have made it impossible to emerge on a
+  system without X, as highlighted in bug 70570. The problem is that if you
+  don't run the base configure for imagemagick, the Makefile for the
+  perlmagick portion is left at the default. This new ebuild adds back in the
+  conf process, so that it is a duplicate of the conf used by imagemagick so
+  that perlmagick is built in a completely compatible fashion. Thanks to Neil
+  Katin <gentoo@askneil.com> for working through this and providing users with
+  a working ebuild in the interim. As this functionality change is a mirror of
+  what is in the imagemagick ebuild, a dependancy for being able to install
+  perlmagick, I am retaining the KEYWORDS as is, since for this to fail
+  imagemagick would need to fail as well.
 
   08 Mar 2005; Olivier Crête <tester@gentoo.org> perlmagick-6.2.0.4.ebuild:
   Stable on x86 per security bug #83542
diff --git a/dev-perl/perlmagick/Manifest b/dev-perl/perlmagick/Manifest
index db761061cda7..7078d5ec5b17 100644
--- a/dev-perl/perlmagick/Manifest
+++ b/dev-perl/perlmagick/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 9849672fec7d49fc2b325aaa7da04e34 ChangeLog 8518
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 a4152927ae5f877507ec65b9ccd84159 perlmagick-6.1.3.4.ebuild 999
-MD5 dccea008c90820468418f27cb2472e0c perlmagick-6.2.0.4.ebuild 1000
 MD5 0015e363dbbf96d1777d9780941b9791 perlmagick-6.1.3.2.ebuild 999
+MD5 a4152927ae5f877507ec65b9ccd84159 perlmagick-6.1.3.4.ebuild 999
 MD5 9ac57feabcaf2f74f6fb436990a6bddf perlmagick-6.1.6.0.ebuild 1006
-MD5 5853e1ed10c9273bd247e2c163509868 ChangeLog 7591
 MD5 bbca613cd3c1a3b9a720957a8fcad63f perlmagick-6.1.8.8.ebuild 1000
-MD5 42fd34630ded62400ed31be1426e3b32 files/digest-perlmagick-6.1.8.8 73
-MD5 b5fd28bb0167a5ab5f5422e7335a5c11 files/digest-perlmagick-6.2.0.4 72
-MD5 88435dc2f0a4064ae49313f41419695d files/digest-perlmagick-6.1.3.4 73
+MD5 29d3d145d98b1bcd8e54f9ac1e4ed0d8 perlmagick-6.2.0.4-r1.ebuild 2120
+MD5 dccea008c90820468418f27cb2472e0c perlmagick-6.2.0.4.ebuild 1000
 MD5 2dd9ba895922b7d6bb513572bb851254 files/digest-perlmagick-6.1.3.2 73
-MD5 edbc2be86318f2676c55ce64e47ea2f6 files/perlpatch.diff 1598
+MD5 88435dc2f0a4064ae49313f41419695d files/digest-perlmagick-6.1.3.4 73
 MD5 4dbe04f2c27a20911e1080d591674997 files/digest-perlmagick-6.1.6.0 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCLUzWmOfEJZHYOKcRAoyMAJ4rC1Fn871POYF3FMAJB0lPs6iX7gCfR7f0
-/pudzX+7kZkX6NE9tfPeoQY=
-=vA/Y
------END PGP SIGNATURE-----
+MD5 42fd34630ded62400ed31be1426e3b32 files/digest-perlmagick-6.1.8.8 73
+MD5 edbc2be86318f2676c55ce64e47ea2f6 files/perlpatch.diff 1598
+MD5 b5fd28bb0167a5ab5f5422e7335a5c11 files/digest-perlmagick-6.2.0.4-r1 72
+MD5 b5fd28bb0167a5ab5f5422e7335a5c11 files/digest-perlmagick-6.2.0.4 72
diff --git a/dev-perl/perlmagick/files/digest-perlmagick-6.2.0.4-r1 b/dev-perl/perlmagick/files/digest-perlmagick-6.2.0.4-r1
new file mode 100644
index 000000000000..0044820296a6
--- /dev/null
+++ b/dev-perl/perlmagick/files/digest-perlmagick-6.2.0.4-r1
@@ -0,0 +1 @@
+MD5 121af7abaa9b0997ab64af1cafc30f6a ImageMagick-6.2.0-4.tar.gz 5656116
diff --git a/dev-perl/perlmagick/perlmagick-6.2.0.4-r1.ebuild b/dev-perl/perlmagick/perlmagick-6.2.0.4-r1.ebuild
new file mode 100644
index 000000000000..b4d83684f36a
--- /dev/null
+++ b/dev-perl/perlmagick/perlmagick-6.2.0.4-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/perlmagick/perlmagick-6.2.0.4-r1.ebuild,v 1.1 2005/03/13 22:24:43 mcummings Exp $
+
+inherit perl-module eutils flag-o-matic libtool
+
+# Left this the same as ImageMagick for the sake of simplicity
+MY_PN=ImageMagick
+MY_P=${MY_PN}-${PV%.*}
+MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.}
+
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="A Perl module to harness the powers of ImageMagick"
+HOMEPAGE="http://www.imagemagick.org/"
+SRC_URI="mirror://sourceforge/imagemagick/${MY_P2}.tar.gz"
+
+# 2004.09.06 rac
+# i think this license needs changing, as does imagemagick. the
+# website says "an apache-style license".
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="x86 ppc sparc ~alpha ~hppa amd64 ~mips ppc64 ~ia64"
+IUSE="X cups jpeg lcms mpeg png truetype tiff xml2 wmf jbig perl graphviz fpx"
+
+DEPEND="=media-gfx/imagemagick-${PV}*
+	>=sys-apps/sed-4
+	app-arch/bzip2
+	sys-libs/zlib
+	X? ( virtual/x11 )
+	cups?   ( virtual/ghostscript )
+	lcms? ( >=media-libs/lcms-1.06 )
+	mpeg? ( >=media-video/mpeg2vidcodec-12 )
+	png? ( media-libs/libpng )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	xml2? ( >=dev-libs/libxml2-2.4.10 )
+	truetype? ( =media-libs/freetype-2* )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	jbig? ( media-libs/jbigkit )
+	jpeg? ( >=media-libs/jpeg-6b )
+	dev-lang/perl
+	graphviz? ( media-gfx/graphviz )
+	fpx? ( media-libs/libfpx )"
+
+RDEPEND="${DEPEND}
+		>=sys-devel/libtool-1.5.2-r6"
+
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	chmod +x config.sub
+}
+
+src_compile() {
+	econf \
+		--with-gs-font-dir=/usr/share/fonts/default/ghostscript \
+		--enable-shared \
+		--enable-lzw \
+		--without-hdf \
+		--with-threads \
+		--with-bzlib \
+		--with-modules \
+		--with-zlib \
+		$(use_with X x) \
+		$(use_with wmf) \
+		$(use_with fpx) \
+		$(use_with perl) \
+		$(use_with jbig) \
+		$(use_with tiff) \
+		$(use_with lcms) \
+		$(use_with xml2 xml) \
+		$(use_with jpeg jp2) \
+		$(use_with jpeg jpeg) \
+		$(use_with mpeg mpeg2) \
+		$(use_with cups gslib) \
+		$(use_with graphviz dot) \
+		$(use_with truetype ttf) || die "econf failed"
+
+	cd PerlMagick
+	perl-module_src_prep
+	perl-module_src_compile
+}
+
+src_install() {
+	cd PerlMagick
+	perl-module_src_install
+}