Version bump. Removed security patches, applied upstream. Leave global use flags to the users (removed the +), misc ebuild cleaning.

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

4 files changed, 152 insertions, 3 deletions

diff --git a/media-gfx/graphicsmagick/ChangeLog b/media-gfx/graphicsmagick/ChangeLog
index dcbbbadc8b4b..a0debc1e613c 100644
--- a/media-gfx/graphicsmagick/ChangeLog
+++ b/media-gfx/graphicsmagick/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/graphicsmagick
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.53 2010/01/12 20:51:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.54 2010/01/26 06:17:18 bicatali Exp $
+
+*graphicsmagick-1.3.8 (26 Jan 2010)
+
+  26 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  +graphicsmagick-1.3.8.ebuild, metadata.xml:
+  Version bump. Removed security patches, applied upstream. Leave global use
+  flags to the users (removed the +), misc ebuild cleaning.
 
 *graphicsmagick-1.3.7-r2 (12 Jan 2010)
 
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 21f5adba9824..b66ee0eda4ea 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX graphicsmagick-1.3.7-CVE-2009-1882.patch 19819 RMD160 2f011c693e18233354ea5d3e1cf7b5e639f08996 SHA1 8b61f70bbe3e6aadc6ec61e7765a2cb12918ee05 SHA256 e0a64d87ebdabedb6df39a97df31f96792a10464c16d432cc10cf8503fd6a260
 AUX graphicsmagick-1.3.7-CVE-2009-3736.patch 702 RMD160 1501640ef81023b93672eea2ff4c25c1f65abe22 SHA1 93274cac801e1e76bd2406d48d220c8244296e1d SHA256 f55c8ce74c05500432b7c65a1ec66b5c0e405b79264534c6c6b4353879b628c6
 AUX graphicsmagick-1.3.7-debian-fixed.patch 14493 RMD160 cbeccbd775d60da7f2b498540fdef8b08189eeb6 SHA1 2da7acdf46401cbc294170919c592cb842ab2afa SHA256 da17fbb6e30ca42b2d07871cc730de8f5ad61df9387cf22948fe1dcb72263b8c
 AUX graphicsmagick-1.3.7-perl-ldflags.patch 991 RMD160 e234224a939892f04a82b83e48ef475318183b28 SHA1 5e5c89d808bd3040945c64a60e1f8df35c03053d SHA256 f1ff9bf3009b1e353089ed27067bee2895b4e7f0d9e15100abdebac20bef8644
 DIST GraphicsMagick-1.3.7.tar.bz2 6581207 RMD160 56a7408d2f3fc15be2859a0d5b3c42e0549faf0c SHA1 e65c4d799704245216821374f66de5796795c263 SHA256 0d2e8f81574efc7e16c05b72fc9a62a2ba333d6fa196bdb72f8fda8ce7a585fc
+DIST GraphicsMagick-1.3.8.tar.bz2 6686688 RMD160 81e9e8a587fd02cfa5a2143a6761e1491bb92f9b SHA1 ea283293986bbf3f2173bcdcdaaea6f38bd11215 SHA256 2b7f248db9d789de017f08b34d8cf03d3d4c5293543c44ebb5892a9182eea64e
 EBUILD graphicsmagick-1.3.7-r2.ebuild 3666 RMD160 028d897f644725ca514e42d7962b252e68a890ec SHA1 c82fa7a707aede2ddf60b4c604d573e83bcbdced SHA256 ac4bb2a45f50b598358d0c260f677ea466ce6331045b851b8e883252186b960f
-MISC ChangeLog 3807 RMD160 22f16a4d8cc4533dfab2a28291147b6bdefbb175 SHA1 9e46f687fac38718affc7c6e56cfe6d4db65c16f SHA256 e12d7b5f38b7278a6625289bfa6c11182fb6f5ae9c517492d36b0c2ec7b647bb
-MISC metadata.xml 853 RMD160 bb3d3012da09f154d18e1a932c61816aeb23f0cd SHA1 3831b33bc03074bc5b24ec0f55d07aafe676b2b4 SHA256 5f164c1783211b6441f9b2d714945aa69acd740160208ababef00b4d4a8f2562
+EBUILD graphicsmagick-1.3.8.ebuild 3383 RMD160 6414a7a040f8358a7e3ce3355a391c13a8c0e9f4 SHA1 ad2c7190be26a76ad89e34c519388316f1d2928c SHA256 2ba994e09e6e3437cfea25f13d45263e815e86d99076d65204523b1d8015ad78
+MISC ChangeLog 4083 RMD160 384ccfbaae42dd403601ee52a28b4656a72c104a SHA1 5eb101b015c68534a36b0515497a6c62d0983327 SHA256 9298417aa538d1d5b6f8dfb228e49ddaeefe39a681124dc4f56938bdd1450bad
+MISC metadata.xml 979 RMD160 0a2a8648f7f56281f4db1f845c37865b3cbb64df SHA1 5ddee256c96236652983e56ed0a991e09b9b6c7e SHA256 73b9a3ba1b91780cdfbe20744ad4101170ad271d6df529621406382f59cbf29f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkteiPcACgkQ1ycZbhPLE2BF+ACeIXWtqjQSxsvW5QSPHk7JMvS5
+BqMAn0W3A5Th0RgWFumrZt1LQIkFo48e
+=7sV4
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.8.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.8.ebuild
new file mode 100644
index 000000000000..59aede1b7565
--- /dev/null
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.8.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.3.8.ebuild,v 1.1 2010/01/26 06:17:18 bicatali Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs flag-o-matic perl-module
+
+MY_P=${P/graphicsm/GraphicsM}
+
+DESCRIPTION="Collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.graphicsmagick.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="bzip2 cxx debug doc fpx imagemagick jbig jpeg jpeg2k lcms openmp
+	perl png q16 q32 svg threads tiff truetype X wmf zlib"
+
+RDEPEND="app-text/ghostscript-gpl
+	bzip2? ( app-arch/bzip2 )
+	fpx? ( media-libs/libfpx )
+	jbig? ( media-libs/jbigkit )
+	jpeg? ( media-libs/jpeg )
+	jpeg2k? ( >=media-libs/jasper-1.701.0 )
+	lcms? ( media-libs/lcms )
+	perl? ( dev-lang/perl )
+	png? ( media-libs/libpng )
+	svg? ( dev-libs/libxml2 )
+	tiff? ( >=media-libs/tiff-3.8.2 )
+	truetype? ( >=media-libs/freetype-2.0 )
+	wmf? ( media-libs/libwmf )
+	X? ( x11-libs/libXext x11-libs/libSM )
+	imagemagick? ( !media-gfx/imagemagick )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use openmp &&
+		[[ $(tc-getCC)$ == *gcc* ]] &&
+		( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] ||
+			! built_with_use sys-devel/gcc openmp )
+	then
+		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 "
+		ewarn "If you want to build fftw with OpenMP, abort now,"
+		ewarn "and switch CC to an OpenMP capable compiler"
+		epause 5
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.3.7-perl-ldflags.patch"
+	epatch "${FILESDIR}/${PN}-1.3.7-debian-fixed.patch"
+}
+
+src_configure() {
+	local quantumDepth
+	if use q16 ; then
+		quantumDepth="16"
+	elif use q32 ; then
+		quantumDepth="32"
+	else
+		quantumDepth="8"
+	fi
+
+	use debug && filter-flags -fomit-frame-pointer
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--enable-shared \
+		--enable-largefile \
+		--without-included-ltdl \
+		--without-frozenpaths \
+		--without-gslib \
+		--with-modules \
+		--with-quantum-depth=${quantumDepth} \
+		--with-fontpath="/usr/share/fonts" \
+		--with-gs-font-dir="/usr/share/fonts/default/ghostscript" \
+		--with-windows-font-dir="/usr/share/fonts/corefonts" \
+		$(use_enable debug ccmalloc) \
+		$(use_enable debug prof) \
+		$(use_enable debug gcov) \
+		$(use_enable imagemagick magick-compat) \
+		$(use_enable openmp) \
+		$(use_with bzip2 bzlib) \
+		$(use_with cxx magick-plus-plus) \
+		$(use_with fpx) \
+		$(use_with jbig) \
+		$(use_with jpeg) \
+		$(use_with jpeg2k jp2) \
+		$(use_with lcms) \
+		$(use_with perl) \
+		$(use_with png) \
+		$(use_with svg xml) \
+		$(use_with threads) \
+		$(use_with tiff) \
+		$(use_with truetype ttf) \
+		$(use_with wmf) \
+		$(use_with X x) \
+		$(use_with zlib)
+}
+
+src_compile() {
+	emake || die "emake failed"
+	if use perl; then
+		emake perl-build || die "emake perl failed"
+	fi
+}
+
+src_test() {
+	emake check || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	if use perl; then
+		perl -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl
+		emake -C PerlMagick DESTDIR="${D}" \
+			install || die "emake perl install failed"
+		fixlocalpod
+	fi
+	use doc || rm -rf "${D}"usr/share/doc/${PF}/html
+}
diff --git a/media-gfx/graphicsmagick/metadata.xml b/media-gfx/graphicsmagick/metadata.xml
index be88fdd95e71..19e3ec4e5423 100644
--- a/media-gfx/graphicsmagick/metadata.xml
+++ b/media-gfx/graphicsmagick/metadata.xml
@@ -3,6 +3,10 @@
 <pkgmetadata>
 <maintainer>
   <email>bicatali@gentoo.org</email>
+  <description>
+    Not really a maitainer, just helping out. Feel free to do anything
+    with the package.
+  </description>
 </maintainer>
 <herd>graphics</herd>
 <longdescription lang='en'>