Security bump, bug 71573.

7 files changed, 35 insertions, 116 deletions

diff --git a/media-gfx/graphicsmagick/ChangeLog b/media-gfx/graphicsmagick/ChangeLog
index 3eefd3116508..c6c155c05f28 100644
--- a/media-gfx/graphicsmagick/ChangeLog
+++ b/media-gfx/graphicsmagick/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/graphicsmagick
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.9 2004/11/02 01:39:20 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.10 2004/11/18 03:25:39 kloeri Exp $
+
+*graphicsmagick-1.1.4 (18 Nov 2004)
+
+  18 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  -graphicsmagick-1.1.2.ebuild, -graphicsmagick-1.1.3.ebuild,
+  +graphicsmagick-1.1.4.ebuild:
+  Security bump, bug 71573.
 
   01 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
   graphicsmagick-1.0.6.ebuild, graphicsmagick-1.1.2.ebuild,
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index acc5a64756af..7445edd02b4f 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,8 +1,16 @@
-MD5 405a692754fe883694c778a1f184c3ae ChangeLog 1448
-MD5 001d284881e98d84e233af6e02359473 graphicsmagick-1.0.6.ebuild 2494
-MD5 0ba9b6a237f8716ddff3cf6d308528db graphicsmagick-1.1.2.ebuild 2489
-MD5 d2a72e3269e6e76d55b4e2be4c4dbc8a graphicsmagick-1.1.3.ebuild 2489
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ae4187ef25c05fbd85ed7b096ad1de17 ChangeLog 1659
 MD5 eae2172901a7cc6b7a6e37fc9267a2b9 metadata.xml 197
+MD5 7a2a04e99d3420b873f60fa7992b4c8b graphicsmagick-1.1.4.ebuild 2370
+MD5 001d284881e98d84e233af6e02359473 graphicsmagick-1.0.6.ebuild 2494
 MD5 28bcb1e625a5c8fa5f3b40d749c0a52f files/digest-graphicsmagick-1.0.6 74
-MD5 e8a8eb8d32898a5a8bd3bafca30f35cf files/digest-graphicsmagick-1.1.2 74
-MD5 96b73807d1e5b4a44a2807fd0f5f7fdc files/digest-graphicsmagick-1.1.3 74
+MD5 e603f0e8f5061bf69c4ea7384ee6fa73 files/digest-graphicsmagick-1.1.4 74
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBnBY+ugEuf3OQ0akRAjpfAJoDbJUvGhM4NaCV92SzKo/octtAtgCghxBN
+ux0kdE3s4M4VskuZTjfIk/E=
+=5V6P
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.2 b/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.2
deleted file mode 100644
index b03585e85cf5..000000000000
--- a/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bd2941c4512c9162267044898fe72d9f GraphicsMagick-1.1.2.tar.bz2 4827803
diff --git a/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.3 b/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.3
deleted file mode 100644
index 2dd972784496..000000000000
--- a/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fec44e95ce028bbd48d3f4b27c20ea11 GraphicsMagick-1.1.3.tar.bz2 4852809
diff --git a/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.4 b/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.4
new file mode 100644
index 000000000000..9e49bc279800
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.4
@@ -0,0 +1 @@
+MD5 0814fe447caa0a4d540e44a27dbaece7 GraphicsMagick-1.1.4.tar.bz2 4857952
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.1.3.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.1.3.ebuild
deleted file mode 100644
index 874e47c08d96..000000000000
--- a/media-gfx/graphicsmagick/graphicsmagick-1.1.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.1.3.ebuild,v 1.2 2004/11/02 01:39:20 spyderous 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"
-
-DEPEND=">=sys-apps/sed-4
-	>=app-arch/bzip2-1
-	sys-libs/zlib
-	X? ( virtual/x11 )
-	gs?   ( >=app-text/ghostscript-7.05 )
-	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.2.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.1.4.ebuild
index 32db4815f74c..992bea6ec582 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.1.2.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.1.2.ebuild,v 1.4 2004/11/02 01:39:20 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.1.4.ebuild,v 1.1 2004/11/18 03:25:39 kloeri Exp $
 
 inherit libtool flag-o-matic perl-module
 replace-flags k6-3 i586
@@ -39,17 +39,17 @@ DEPEND=">=sys-apps/sed-4
 
 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"
+	myconf="${myconf} $(use_with X x)"
+	myconf="${myconf} $(use_with jbig)"
+	myconf="${myconf} $(use_with jp2)"
+	myconf="${myconf} $(use_with jpeg)"
+	myconf="${myconf} $(use_with lcms)"
+	myconf="${myconf} $(use_enable lzw)"
+	myconf="${myconf} $(use_with png)"
+	myconf="${myconf} $(use_with tiff)"
+	myconf="${myconf} $(use_with ttf)"
+	myconf="${myconf} $(use_with wmf)"
+	myconf="${myconf} $(use_with xml2 xml)"
 
 	# Netscape is still used ?  More people should have Mozilla
 	sed -i 's:netscape:mozilla:g' configure
@@ -84,8 +84,6 @@ src_install() {
 
 	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