Bump ebuild + stable x86, bug 90595.

Package-Manager: portage-2.0.51.21

7 files changed, 19 insertions, 107 deletions

diff --git a/media-gfx/graphicsmagick/ChangeLog b/media-gfx/graphicsmagick/ChangeLog
index 72dd709b7cda..25f9ff3c6703 100644
--- a/media-gfx/graphicsmagick/ChangeLog
+++ b/media-gfx/graphicsmagick/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/graphicsmagick
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.17 2005/04/20 07:35:14 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.18 2005/05/03 22:44:04 kloeri Exp $
+
+*graphicsmagick-1.1.6 (03 May 2005)
+
+  03 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  -graphicsmagick-1.0.6.ebuild, -graphicsmagick-1.1.4.ebuild,
+  +graphicsmagick-1.1.6.ebuild:
+  Bump ebuild + stable x86, bug 90595.
 
 *graphicsmagick-1.1.5-r1 (20 Apr 2005)
 
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index e32e14447201..f5f2713c5914 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 296e9aa2c9199d59524efac749e9e1c7 ChangeLog 2531
+MD5 e55a4a0c731ea407ee01adc403bc8ba2 ChangeLog 2755
 MD5 eae2172901a7cc6b7a6e37fc9267a2b9 metadata.xml 197
 MD5 f28ab825c8f582c4ffa270c04678251f graphicsmagick-1.1.5.ebuild 2365
-MD5 9432eb97c523f15353e0cda9c180b98e graphicsmagick-1.0.6.ebuild 2483
+MD5 1896b5c7abc42fb5933ba787f535d40e graphicsmagick-1.1.6.ebuild 2435
 MD5 ded8cc3796c1c2d79702b832850518dc graphicsmagick-1.1.5-r1.ebuild 2437
-MD5 62924c1f84e7a912661f4542346d5007 graphicsmagick-1.1.4.ebuild 2366
 MD5 c07ee30f29005c8130ae5639813149b7 files/digest-graphicsmagick-1.1.5 74
-MD5 e603f0e8f5061bf69c4ea7384ee6fa73 files/digest-graphicsmagick-1.1.4 74
 MD5 c07ee30f29005c8130ae5639813149b7 files/digest-graphicsmagick-1.1.5-r1 74
-MD5 28bcb1e625a5c8fa5f3b40d749c0a52f files/digest-graphicsmagick-1.0.6 74
+MD5 0ae4b45e8525b3c84deeae402fd11c79 files/digest-graphicsmagick-1.1.6 74
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCZgZKKf2g/qXtneoRAt9EAKCak64x/doTPZkqjZIj+eOq+JXxVQCdGs1t
-N7643Oj+ukGuPBVB0G5aGUE=
-=QHHN
+iD8DBQFCd/6/Kf2g/qXtneoRAvxXAJ453ln8NPdAte+JMBT1XkjrJLwMOQCfQErV
+jmUFCK2c12i9VYwTPiMQxis=
+=Pdac
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.0.6 b/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.0.6
deleted file mode 100644
index 46366486f760..000000000000
--- a/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c6d7de88526dae16100e88702fbf09e9 GraphicsMagick-1.0.6.tar.bz2 3732039
diff --git a/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.4 b/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.4
deleted file mode 100644
index 9e49bc279800..000000000000
--- a/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0814fe447caa0a4d540e44a27dbaece7 GraphicsMagick-1.1.4.tar.bz2 4857952
diff --git a/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.6 b/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.6
new file mode 100644
index 000000000000..40f2fb17c113
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.6
@@ -0,0 +1 @@
+MD5 ee85aef3cde13432a3f2e5604b758f9c GraphicsMagick-1.1.6.tar.bz2 4959704
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.0.6.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.0.6.ebuild
deleted file mode 100644
index d5dc48e652df..000000000000
--- a/media-gfx/graphicsmagick/graphicsmagick-1.0.6.ebuild
+++ /dev/null
@@ -1,93 +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/graphicsmagick/graphicsmagick-1.0.6.ebuild,v 1.7 2005/01/24 21:58:57 kloeri Exp $
-
-inherit libtool flag-o-matic perl-module
-replace-flags k6-3 i586
-replace-flags k6-2 i586
-replace-flags k6 i586
-
-IUSE="X gs jbig jp2 jpeg lcms lzw perl png tiff truetype wmf xml2"
-
-MY_PN=GraphicsMagick
-MY_P=${MY_PN}-${PV}
-
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A collection of tools and libraries for many image formats"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.graphicsmagick.org/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~x86 ~ppc"
-
-DEPEND=">=sys-apps/sed-4
-	>=app-arch/bzip2-1
-	sys-libs/zlib
-	X? ( virtual/x11 )
-	gs?   ( virtual/ghostscript )
-	jbig? ( media-libs/jbigkit )
-	jp2? ( 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 )
-	xml2? ( >=dev-libs/libxml2-2.4.10 )
-	truetype? ( =media-libs/freetype-2* )
-	wmf? ( >=media-libs/libwmf-0.2.5 )"
-
-src_compile() {
-	local myconf=""
-	use X    || myconf="${myconf} --with-x=no"
-	use jbig || myconf="${myconf} --without-jbig"
-	use jp2 || myconf="${myconf} --without-jp2"
-	use jpeg || myconf="${myconf} --without-jpeg"
-	use lcms || myconf="${myconf} --without-lcms"
-	use lzw && myconf="${myconf} --enable-lzw"
-	use png || myconf="${myconf} --with-png=no"
-	use tiff || myconf="${myconf} --without-tiff"
-	use truetype || myconf="${myconf} --without-ttf"
-	use wmf || myconf="${myconf} --without-wmf"
-	use xml2 || myconf="${myconf} --without-xml"
-
-	# Netscape is still used ?  More people should have Mozilla
-	sed -i 's:netscape:mozilla:g' configure
-
-	econf \
-		--enable-shared \
-		--with-quantum-depth=16 \
-		--with-threads \
-		--with-bzlib \
-		--without-perl \
-		${myconf} || die
-
-	# make PerlMagick using portage tools instead of Makefile to avoid sandbox issues
-	if use perl ; then
-		cd PerlMagick
-		perl-module_src_prep
-		perl-module_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
-
-	mydoc="*.txt"
-
-	rm -f ${D}/usr/share/GraphicsMagick/*.txt
-
-	dosed "s:-I/usr/include ::" /usr/bin/GraphicsMagick-config
-	dosed "s:-I/usr/include ::" /usr/bin/GraphicsMagick++-config
-}
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.1.4.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.1.6.ebuild
index 5cc98c0f82e4..0e07726c6c03 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.1.4.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.1.6.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/graphicsmagick/graphicsmagick-1.1.4.ebuild,v 1.5 2005/01/24 21:58:57 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.1.6.ebuild,v 1.1 2005/05/03 22:44:04 kloeri Exp $
 
 inherit libtool flag-o-matic perl-module
 replace-flags k6-3 i586
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.graphicsmagick.org/"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ppc"
+KEYWORDS="x86 ~ppc"
 
 DEPEND=">=sys-apps/sed-4
 	>=app-arch/bzip2-1
@@ -47,7 +47,7 @@ src_compile() {
 	myconf="${myconf} $(use_enable lzw)"
 	myconf="${myconf} $(use_with png)"
 	myconf="${myconf} $(use_with tiff)"
-	myconf="${myconf} $(use_with ttf)"
+	myconf="${myconf} $(use_with truetype ttf)"
 	myconf="${myconf} $(use_with wmf)"
 	myconf="${myconf} $(use_with xml2 xml)"
 
@@ -55,6 +55,7 @@ src_compile() {
 	sed -i 's:netscape:mozilla:g' configure
 
 	econf \
+		--with-gs-font-dir=/usr/share/fonts/default/ghostscript \
 		--enable-shared \
 		--with-quantum-depth=16 \
 		--with-threads \