old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 13 insertions, 180 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 7d928b398fd6..788d0c67c8ba 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.556 2014/05/14 17:13:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.557 2014/05/14 17:15:20 ssuominen Exp $
+
+  14 May 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -imagemagick-6.8.8.10.ebuild:
+  old
 
   14 May 2014; Samuli Suominen <ssuominen@gentoo.org>
   imagemagick-6.8.8.10-r1.ebuild:
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 65feefde6108..a704a3d4a1df 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -5,17 +5,16 @@ AUX imagemagick-6.8.8.10-LIBOPENJP2_DELEGATE_not_JP2_DELEGATE.patch 727 SHA256 0
 AUX imagemagick-6.8.8.8-openjpeg-2.0.0-has-no-opj_stream_destroy_v3.patch 2317 SHA256 7e50934e70666b14956d90f2054f246eba36479d6def83ae4b378f8fefb0082a SHA512 83404ba9c240a8d911567beb894ebfc42887a06f06e91f0346adab6e8c1b1a50114819c0dd902452a1cad3c92dbbde50a1888fdc15e79367bb8f8a32fa477cd9 WHIRLPOOL 420bd8a9825220875cae3f692590d37935ddf44dafac48ab951b779add88b0ed1fdf0ad79b444f14a38ead4e8797c4929bede5fa0699bc02a052752b64b19865
 DIST ImageMagick-6.8.8-10.tar.xz 7530504 SHA256 f31c7771ed0b8050837289f0c7b55303172e31acc005b0ee0d120727e2572d33 SHA512 2f4a9c5297b025ac78332843b8cfa81ef498c038edff6f91cc80a1e762492a933892ab38c81671ba7f57453213d37addf98e875253c5c328162983c1d89c5825 WHIRLPOOL e2572ba553f6fcf0de9adcbbaa82ccdd5b6d748cac9f9d8c07e5eb940083fd9aba9ac8cba3a2efa11aa4db53705905019931d45b13b8587451f97eed01415ee0
 EBUILD imagemagick-6.8.8.10-r1.ebuild 5064 SHA256 ec7eff91d78ec883e36d54e05b367f3eaca926db693bd782db0925d625912092 SHA512 3f8fcfb21a233efb78a0411540cf6d50bdda999a272ac02855cd1ec5d9d1d48da4dc528b94db851fe6a708daeeb32f4682d92b2d888fad368cd942f389dba3df WHIRLPOOL 7e682b7e8f9d39a7c475502227d3950008b0d895254b7a9a99871e03dd2791d37e36b6462922adc9d9d13f54cd0c92f0399787cfc9e95445798cff8fc8cc044c
-EBUILD imagemagick-6.8.8.10.ebuild 4850 SHA256 305ab6d1d3479a1c3f67b91df05057dc538715a322a650d5e654b56646677f72 SHA512 4d9b4581183135f572187226d347edf1ea093056aa569d1fed2b9765171c40225684bac5bc82ce1569ecc49dbaaae8fbfbd41b7443d3cad3ff22611969a5a9f7 WHIRLPOOL 38ea8b35def8250e784e3441c862da91c30a3eecddd0e5f9c4facd7b9448f48f129a4ce62a1b3d96b393254da08e31c8cfbd480cb8758c3997f5434ec31ebd3a
-MISC ChangeLog 82122 SHA256 fcd221a66edaefc131394384bdd2820693e3d9e1cb116855fbf873c5791bc3fd SHA512 266001e9900f8abc4405f945d0d48be7504727239a251b68d9a4de90958024d411a35b329559ea64bd63f46103b871382ed784a9b66d9e606ff7a252690fc1c6 WHIRLPOOL 1c13247a8168a32ad46b074ea576ad18097e9bb1c6e354dafcf37d9c8d7d8f3e846cb22efa0db534209b83f0dafff1d60694caf8dda098a82acaf6d787fdc74b
+MISC ChangeLog 82215 SHA256 2b8f74df63f8b4de2245369f3f5253fd8039c728a1b7a83f541ac9a50ce7979a SHA512 53789f068c23ba92dd40406e4ede8a18a57d7f21838ef7ddde6f06caa12a04f3a7430d0a2e6a309bd64d89d94a1fc218de093654f14826d10d05e6ffc3d2a3c9 WHIRLPOOL 78fb81c2669c3e09cfbde26b504a04cb38671e7384dfa53ec1ef69b0105bacb28c16ae94f5faafac9533cfdbafcd6aa119422d3742c801820e492b71543c5c60
 MISC metadata.xml 1050 SHA256 c7fad295a9ca9207454a88d9794902dd76f732f01a439d29f94372ce9ae4af7d SHA512 d502e1038cd08123b1a0d25dccee6a4134bd8fc768c228042b546c8ee226432430107f76b506e946eb5a9b358c13115e5c6e7a1c80f3fe5b4061885263b0dbd7 WHIRLPOOL 675922fbabfacc2660f9572b61a3cee8bb0967b0df0e6e211271399dcb6edc050246344e5251e6a4a4411f8671f3c625d07f3606531662ab5b278fdcff692010
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTc6P8AAoJEEdUh39IaPFNF4UH/1rg2w1tFnxPPZQJ6wCf2Fs9
-rBUj52D24Je43YMGyFWDxbp1X/IuLzNHQk9f3N6xhf8kJSHx7A1sbW7F52ZChTbt
-EerMFkbYnrnHKWx+9fWQQJw3b7qGAdTiS/SFNxJAX067YYyjvhEWWobHmmS0tifa
-14Lw/io9nf7Px4tFxRjsJM8hAUxK42xEgcV9dRC9ZccBkuE7PLud1md1FpOsTuXZ
-PnZmYMON4NF82K1gZokI+62CX/eAGdQCsHhVO/EoswHbVv+I1k3kcfHWzD2p0Qrc
-mtrI524srpG40SW0f5K0G/spZldFrz08uFSyI5/bMkUI2lRKjhvGHIsEALdRItQ=
-=90pQ
+iQEcBAEBCAAGBQJTc6RqAAoJEEdUh39IaPFNAf0H/R8QUyw///iDcZdzKn6FXi1F
+qbSe3kSzv94r4D+lqldQO85TjsiqyQFaed0004ar7r52P7gG2z7pyXmKOvZxbmk9
+Z1cw5Q7KPCGCVmh+usLKrWC0i+iSnw3IYM79UudadZKL8Op958TRWCzDBoYz31LJ
+NCCx1p/u3A5hoLeih/lyQmlPYgE/yJpA5WilwxStzOPbo0Ibdan9zBejnS8Jmtdo
+QuJA93mWSJEUPxDvzN7qLZLSKP3iRizPHM/8aCRr/PDUsBatseM/Y2dq2q2o371t
+Ud4UWJRyhmH8anGd8vCm32NHB59CB9RZIbmY1/JNL4Okr7YfpV2SQGkaqEneC0o=
+=jmef
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.8.8.10.ebuild b/media-gfx/imagemagick/imagemagick-6.8.8.10.ebuild
deleted file mode 100644
index 8d48e6b75890..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.8.8.10.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10.ebuild,v 1.12 2014/05/14 16:10:13 ago Exp $
-
-EAPI=5
-inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
-
-MY_P=ImageMagick-$(replace_version_separator 3 '-')
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.imagemagick.org/"
-SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RESTRICT="perl? ( userpriv )"
-
-RDEPEND=">=sys-devel/libtool-2.2.6b
-	autotrace? ( >=media-gfx/autotrace-0.31.1 )
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	jbig? ( media-libs/jbigkit )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2 )
-	lcms? ( media-libs/lcms:2 )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-gfx/ufraw )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0 )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2 )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-proto/xextproto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-6.8.8.8-openjpeg-2.0.0-has-no-opj_stream_destroy_v3.patch
-
-	epatch_user
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see http://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	shopt -s nullglob
-	cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${cards}"; then
-		addpredict "${cards}"
-	fi
-	shopt -u nullglob
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-	use q64 && depth=64
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable hdri) \
-		$(use_enable opencl) \
-		--with-threads \
-		--with-modules \
-		--with-quantum-depth=${depth} \
-		$(use_with cxx magick-plus-plus) \
-		$(use_with perl) \
-		--with-perl-options='INSTALLDIRS=vendor' \
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts \
-		$(use_with bzip2 bzlib) \
-		$(use_with X x) \
-		$(use_with zlib) \
-		$(use_with autotrace) \
-		$(use_with postscript dps) \
-		$(use_with djvu) \
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu \
-		$(use_with fftw) \
-		$(use_with fpx) \
-		$(use_with fontconfig) \
-		$(use_with truetype freetype) \
-		$(use_with postscript gslib) \
-		$(use_with graphviz gvc) \
-		$(use_with jbig) \
-		$(use_with jpeg) \
-		$(use_with jpeg2k openjp2) \
-		--without-lcms \
-		$(use_with lcms lcms2) \
-		$(use_with lqr) \
-		$(use_with lzma) \
-		--without-mupdf \
-		$(use_with openexr) \
-		$(use_with pango) \
-		$(use_with png) \
-		$(use_with svg rsvg) \
-		$(use_with tiff) \
-		$(use_with webp) \
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) \
-		$(use_with wmf) \
-		$(use_with xml) \
-		--${openmp}-openmp
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
-	emake -j1 check
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/dri/card"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-}