Add USE flags for default color depth selection, bug 140341.

Package-Manager: portage-2.1.1_pre5-r1

4 files changed, 127 insertions, 5 deletions

diff --git a/media-gfx/graphicsmagick/ChangeLog b/media-gfx/graphicsmagick/ChangeLog
index 07ca74e98866..7861651dbf91 100644
--- a/media-gfx/graphicsmagick/ChangeLog
+++ b/media-gfx/graphicsmagick/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/graphicsmagick
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.33 2006/08/16 20:44:08 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.34 2006/08/16 21:18:32 kloeri Exp $
+
+*graphicsmagick-1.1.7-r2 (16 Aug 2006)
+
+  16 Aug 2006; Bryan Østergaard <kloeri@gentoo.org>
+  +graphicsmagick-1.1.7-r2.ebuild:
+  Add USE flags for default color depth selection, bug 140341.
 
   16 Aug 2006; Bryan Østergaard <kloeri@gentoo.org> Manifest:
   Kill old, vulnerable versions.
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 849bf556ed9f..519978df906c 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -15,14 +15,18 @@ EBUILD graphicsmagick-1.1.7-r1.ebuild 2566 RMD160 1c1efc7049c747b9a62809d8b4d9ad
 MD5 d3d5ab92ecc248229b92351372799cb6 graphicsmagick-1.1.7-r1.ebuild 2566
 RMD160 1c1efc7049c747b9a62809d8b4d9ade4d5febea0 graphicsmagick-1.1.7-r1.ebuild 2566
 SHA256 3bb95efecf385c0c7892ff16c09e31400d2203fe42bc169f86daa235bbd48144 graphicsmagick-1.1.7-r1.ebuild 2566
+EBUILD graphicsmagick-1.1.7-r2.ebuild 2649 RMD160 00fca0ace9e060fa4a3a14fcc0fe2b0264224a7d SHA1 ff454cd995754ee74ffab33ee5e0da28321c6947 SHA256 acda5f6cd7ee608bfb43521d9a6db8410ad733e641ca70b1efda9e159d4a1eb4
+MD5 4605bbde6f555c71863b23a8554c6eca graphicsmagick-1.1.7-r2.ebuild 2649
+RMD160 00fca0ace9e060fa4a3a14fcc0fe2b0264224a7d graphicsmagick-1.1.7-r2.ebuild 2649
+SHA256 acda5f6cd7ee608bfb43521d9a6db8410ad733e641ca70b1efda9e159d4a1eb4 graphicsmagick-1.1.7-r2.ebuild 2649
 EBUILD graphicsmagick-1.1.7.ebuild 2520 RMD160 4a0c0699d44cdd407c58d4b2dc4683a1095e6a90 SHA1 e62dc9c9a63ac0a79ad91f3ca6f9f1024a82790a SHA256 e02a1a115e127af22941ba2081fbbb6aa20d38c766399f9fd170b74c11cd079a
 MD5 4147eb1bad543a0b36d59c03fd1fc8a2 graphicsmagick-1.1.7.ebuild 2520
 RMD160 4a0c0699d44cdd407c58d4b2dc4683a1095e6a90 graphicsmagick-1.1.7.ebuild 2520
 SHA256 e02a1a115e127af22941ba2081fbbb6aa20d38c766399f9fd170b74c11cd079a graphicsmagick-1.1.7.ebuild 2520
-MISC ChangeLog 5278 RMD160 0e09f6aa0d99443eb06ff7c5b3df2b99089a1880 SHA1 bbe9794c1a48b332d740d3ccad13fbb11da9dc3d SHA256 19749f1536dec4fd79103a65049710210f1809e9800e2fc810d7a2685402a32c
-MD5 41c6b87bfa5f9239a48d26a1cdfbf606 ChangeLog 5278
-RMD160 0e09f6aa0d99443eb06ff7c5b3df2b99089a1880 ChangeLog 5278
-SHA256 19749f1536dec4fd79103a65049710210f1809e9800e2fc810d7a2685402a32c ChangeLog 5278
+MISC ChangeLog 5470 RMD160 6c5b0c1cea8df1be5484b628e3d9a21037d86530 SHA1 2528e7a1724284e4cb6b6bfd9d8f2c114fad3985 SHA256 c1a5fc1cf99fe0bdd22d6a5679b7df1efdba1d52264c449373d78e11490d1318
+MD5 ebbc333599b3338c072171f88067621d ChangeLog 5470
+RMD160 6c5b0c1cea8df1be5484b628e3d9a21037d86530 ChangeLog 5470
+SHA256 c1a5fc1cf99fe0bdd22d6a5679b7df1efdba1d52264c449373d78e11490d1318 ChangeLog 5470
 MISC metadata.xml 197 RMD160 45fece5f76f3776dd119fe5b124d815caced375f SHA1 bd1ad5337092280854cc444f6444402bfe9f38ed SHA256 a42685246e78553ec390823695d12279e70c7d4ebdd9d9af36cc5932374c95e9
 MD5 eae2172901a7cc6b7a6e37fc9267a2b9 metadata.xml 197
 RMD160 45fece5f76f3776dd119fe5b124d815caced375f metadata.xml 197
@@ -33,3 +37,6 @@ SHA256 6065e62de7dbdee3f8edc0812d75cd47131ae835ea21c9680c9a05b306b9c8a2 files/di
 MD5 21b9a3101ccf785dfe7c6703f62adc3f files/digest-graphicsmagick-1.1.7-r1 268
 RMD160 79582430aaa177324cbafb5eaae828cd12d07b74 files/digest-graphicsmagick-1.1.7-r1 268
 SHA256 6065e62de7dbdee3f8edc0812d75cd47131ae835ea21c9680c9a05b306b9c8a2 files/digest-graphicsmagick-1.1.7-r1 268
+MD5 21b9a3101ccf785dfe7c6703f62adc3f files/digest-graphicsmagick-1.1.7-r2 268
+RMD160 79582430aaa177324cbafb5eaae828cd12d07b74 files/digest-graphicsmagick-1.1.7-r2 268
+SHA256 6065e62de7dbdee3f8edc0812d75cd47131ae835ea21c9680c9a05b306b9c8a2 files/digest-graphicsmagick-1.1.7-r2 268
diff --git a/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.7-r2 b/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.7-r2
new file mode 100644
index 000000000000..9a72057947c2
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.7-r2
@@ -0,0 +1,3 @@
+MD5 f75d830ca623bf10385b3ad62c48437a GraphicsMagick-1.1.7.tar.bz2 4957394
+RMD160 9193ab3b109df6ce4b80cb2c1602c86ca36e3043 GraphicsMagick-1.1.7.tar.bz2 4957394
+SHA256 95f85e8bb84cc7ad05e84988f4cd93432ab2d4b300827fef34d1ada5e69196cc GraphicsMagick-1.1.7.tar.bz2 4957394
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.1.7-r2.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.1.7-r2.ebuild
new file mode 100644
index 000000000000..fae18fd27dfc
--- /dev/null
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.1.7-r2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.1.7-r2.ebuild,v 1.1 2006/08/16 21:18:32 kloeri Exp $
+
+inherit libtool flag-o-matic perl-app
+
+MY_PN="GraphicsMagick"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.graphicsmagick.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X gs jbig jpeg2k jpeg lcms lzw perl png tiff truetype wmf xml doc depth16 depth32"
+
+RDEPEND="app-arch/bzip2
+	sys-libs/zlib
+	X? ( || (
+		( x11-libs/libXext x11-libs/libXt x11-libs/libX11 x11-libs/libICE x11-libs/libSM )
+		virtual/x11
+	) )
+	gs?   ( virtual/ghostscript )
+	jbig? ( media-libs/jbigkit )
+	jpeg2k? ( media-libs/jasper )
+	jpeg? ( >=media-libs/jpeg-6b )
+	lcms? ( >=media-libs/lcms-1.06 )
+	perl? ( dev-lang/perl )
+	png? ( media-libs/libpng )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	xml? ( >=dev-libs/libxml2-2.4.10 )
+	truetype? ( =media-libs/freetype-2* )
+	wmf? ( >=media-libs/libwmf-0.2.5 )"
+DEPEND="${RDEPEND}
+	X? ( || ( ( x11-proto/xextproto x11-proto/xproto ) virtual/x11 ) )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-overflow.patch
+	epatch "${FILESDIR}"/${PN}-libpng.patch
+
+	# Netscape is still used ?  More people should have Mozilla
+	sed -i 's:netscape:mozilla:g' configure
+}
+
+src_compile() {
+	DEPTH=8
+	use depth16 && DEPTH=16
+	use depth32 && DEPTH=32
+	econf \
+		--with-gs-font-dir=/usr/share/fonts/default/ghostscript \
+		--enable-shared \
+		--with-threads \
+		--with-bzlib \
+		--without-perl \
+		$(use_with X x) \
+		$(use_with jbig) \
+		$(use_with jpeg2k) \
+		$(use_with jpeg) \
+		$(use_with lcms) \
+		$(use_enable lzw) \
+		$(use_with png) \
+		$(use_with tiff) \
+		$(use_with truetype ttf) \
+		$(use_with wmf) \
+		$(use_with xml xml) \
+		--with-quantum-depth=${DEPTH} \
+		|| die
+
+	# make PerlMagick using portage tools instead of Makefile to avoid sandbox issues
+	if use perl ; then
+		cd PerlMagick
+		perl-app_src_prep
+		perl-app_src_compile
+		cd ..
+	fi
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	if use perl ; then
+		cd PerlMagick
+		perl-module_src_install
+		cd ..
+	fi
+
+	dosym /usr/lib/${MY_P}/ /usr/lib/GraphicsMagick
+
+	rm -f "${D}"/usr/share/GraphicsMagick/*.txt
+	rm -rf "${D}"/usr/share/${MY_P}/www
+
+	if use doc ; then
+	    dohtml -r www/*
+	fi
+
+	dosed "s:-I/usr/include ::" /usr/bin/GraphicsMagick-config
+	dosed "s:-I/usr/include ::" /usr/bin/GraphicsMagick++-config
+}