old

Package-Manager: portage-2.2_rc67/cvs/Linux i686

6 files changed, 9 insertions, 296 deletions

diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog
index a6d0f0c0713c..c633c86f2d9b 100644
--- a/media-gfx/hugin/ChangeLog
+++ b/media-gfx/hugin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/hugin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.92 2010/05/25 21:15:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.93 2010/05/27 10:42:34 maekke Exp $
+
+  27 May 2010; Markus Meier <maekke@gentoo.org> -hugin-2009.2.0.ebuild,
+  -hugin-2009.4.0.ebuild:
+  old
 
   25 May 2010; Pacho Ramos <pacho@gentoo.org> hugin-2010.0.0.ebuild:
   stable amd64, bug 320411
diff --git a/media-gfx/hugin/hugin-2009.2.0.ebuild b/media-gfx/hugin/hugin-2009.2.0.ebuild
deleted file mode 100644
index 15eb53b6f71d..000000000000
--- a/media-gfx/hugin/hugin-2009.2.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2009.2.0.ebuild,v 1.4 2010/01/07 19:57:28 ranger Exp $
-
-EAPI="2"
-WX_GTK_VER="2.8"
-
-inherit cmake-utils wxwidgets versionator
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-LANGS=" bg ca cs de en_GB es fr hu it ja ko nl pl pt_BR ru sk sl sv uk zh_CN zh_TW"
-IUSE="lapack +sift $(echo ${LANGS//\ /\ linguas_})"
-
-DEPEND="
-	!!dev-util/cocom
-	app-arch/zip
-	>=dev-libs/boost-1.35.0-r5
-	>=media-gfx/enblend-3.0_p20080807
-	media-gfx/exiv2
-	media-libs/jpeg
-	>=media-libs/libpano13-2.9.14
-	media-libs/libpng
-	media-libs/openexr
-	media-libs/tiff
-	sys-libs/zlib
-	x11-libs/wxGTK:2.8[opengl,-odbc]
-	lapack? ( virtual/lapack )
-	sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${DEPEND}
-	media-libs/exiftool"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
-
-pkg_setup() {
-	DOCS="AUTHORS README TODO"
-	mycmakeargs="$(cmake-utils_use_enable lapack)"
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	for lang in ${LANGS} ; do
-		case ${lang} in
-			ca) dir=ca_ES;;
-			cs) dir=cs_CZ;;
-			*) dir=${lang};;
-		esac
-		use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
-	done
-}
diff --git a/media-gfx/hugin/hugin-2009.4.0.ebuild b/media-gfx/hugin/hugin-2009.4.0.ebuild
deleted file mode 100644
index 205d3f5d9c3c..000000000000
--- a/media-gfx/hugin/hugin-2009.4.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2009.4.0.ebuild,v 1.2 2010/02/17 17:41:48 maekke Exp $
-
-EAPI="2"
-WX_GTK_VER="2.8"
-
-inherit cmake-utils wxwidgets versionator
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-LANGS=" bg ca cs de en_GB es fr hu it ja ko nl pl pt_BR ru sk sl sv uk zh_CN zh_TW"
-IUSE="lapack +sift $(echo ${LANGS//\ /\ linguas_})"
-
-DEPEND="
-	!!dev-util/cocom
-	app-arch/zip
-	>=dev-libs/boost-1.35.0-r5
-	>=media-gfx/enblend-3.0_p20080807
-	media-gfx/exiv2
-	media-libs/jpeg
-	>=media-libs/libpano13-2.9.14
-	media-libs/libpng
-	media-libs/openexr
-	media-libs/tiff
-	sys-libs/zlib
-	virtual/glut
-	x11-libs/wxGTK:2.8[opengl,-odbc]
-	lapack? ( virtual/lapack )
-	sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${DEPEND}
-	media-libs/exiftool"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
-
-pkg_setup() {
-	DOCS="AUTHORS README TODO"
-	mycmakeargs="$(cmake-utils_use_enable lapack)"
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	for lang in ${LANGS} ; do
-		case ${lang} in
-			ca) dir=ca_ES;;
-			cs) dir=cs_CZ;;
-			*) dir=${lang};;
-		esac
-		use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
-	done
-}
diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index f7f6dcf2a0cf..c924c0c8749d 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.401 2010/05/25 21:16:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.402 2010/05/27 10:47:15 maekke Exp $
+
+  27 May 2010; Markus Meier <maekke@gentoo.org> -imagemagick-6.5.8.8.ebuild:
+  old
 
   25 May 2010; Pacho Ramos <pacho@gentoo.org> imagemagick-6.6.1.2.ebuild:
   stable amd64, bug 319195
diff --git a/media-gfx/imagemagick/imagemagick-6.5.8.8.ebuild b/media-gfx/imagemagick/imagemagick-6.5.8.8.ebuild
deleted file mode 100644
index 0ec48b217ddd..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.5.8.8.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.5.8.8.ebuild,v 1.8 2010/03/29 08:29:59 jer Exp $
-
-EAPI="2"
-
-inherit eutils multilib perl-app toolchain-funcs versionator
-
-MY_PN=ImageMagick
-MY_P=${MY_PN}-${PV%.*}
-MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.}
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.imagemagick.org/"
-SRC_URI="mirror://imagemagick/${MY_P2}.tar.bz2
-		 mirror://imagemagick/legacy/${MY_P2}.tar.bz2"
-
-# perl tests fail with userpriv
-RESTRICT="perl? ( userpriv )"
-LICENSE="imagemagick"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE="autotrace bzip2 +corefonts djvu doc fftw fontconfig fpx graphviz gs hdri
-	jbig jpeg jpeg2k lcms lqr nocxx openexr openmp perl png q8 q32 raw svg tiff
-	truetype X wmf xml zlib"
-
-RDEPEND="
-	autotrace? ( >=media-gfx/autotrace-0.31.1 )
-	bzip2? ( app-arch/bzip2 )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( media-libs/libfpx )
-	graphviz? ( >=media-gfx/graphviz-2.6 )
-	gs? ( app-text/ghostscript-gpl )
-	jbig? ( media-libs/jbigkit )
-	jpeg? ( >=media-libs/jpeg-6b:0 )
-	jpeg2k? ( media-libs/jasper )
-	lcms? ( >=media-libs/lcms-1.06 )
-	lqr? ( >=media-libs/liblqr-0.1.0 )
-	openexr? ( media-libs/openexr )
-	perl? ( >=dev-lang/perl-5.8.6-r6 )
-	png? ( media-libs/libpng )
-	raw? ( media-gfx/ufraw )
-	tiff? ( >=media-libs/tiff-3.5.5 )
-	truetype? ( =media-libs/freetype-2*
-		corefonts? ( media-fonts/corefonts ) )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	xml? ( >=dev-libs/libxml2-2.4.10 )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libXext
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM
-		svg? ( >=gnome-base/librsvg-2.9.0 )
-	)
-	!dev-perl/perlmagick
-	!media-gfx/graphicsmagick[imagemagick]
-	!sys-apps/compare
-	>=sys-devel/libtool-1.5.2-r6"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	X? ( x11-proto/xextproto )"
-
-S="${WORKDIR}/${MY_P2}"
-
-pkg_setup() {
-	# for now, only build svg support when X is enabled, as librsvg
-	# pulls in quite some X dependencies.
-	if use svg && ! use X ; then
-		elog "the svg USE-flag requires the X USE-flag set."
-		elog "disabling svg support for now."
-	fi
-
-	if use corefonts && ! use truetype ; then
-		elog "corefonts USE-flag requires the truetype USE-flag to be set."
-		elog "disabling corefonts support for now."
-	fi
-}
-
-src_prepare() {
-	# fix doc dir, bug #91911
-	sed -i -e \
-		's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/${PF}":g' \
-		"${S}"/configure || die
-}
-
-src_configure() {
-	local myconf
-	if use q32 ; then
-		myconf="${myconf} --with-quantum-depth=32"
-	elif use q8 ; then
-		myconf="${myconf} --with-quantum-depth=8"
-	else
-		myconf="${myconf} --with-quantum-depth=16"
-	fi
-
-	if use X && use svg ; then
-		myconf="${myconf} --with-rsvg"
-	else
-		myconf="${myconf} --without-rsvg"
-	fi
-
-	# openmp support only works with >=sys-devel/gcc-4.3, bug #223825
-	if use openmp && version_is_at_least 4.3 $(gcc-version) ; then
-		if has_version =sys-devel/gcc-$(gcc-version)*[openmp] ; then
-			myconf="${myconf} --enable-openmp"
-		else
-			elog "disabling openmp support (requires >=sys-devel/gcc-4.3 with USE='openmp')"
-			myconf="${myconf} --disable-openmp"
-		fi
-	else
-		elog "disabling openmp support (requires >=sys-devel/gcc-4.3)"
-		myconf="${myconf} --disable-openmp"
-	fi
-
-	use truetype && myconf="${myconf} $(use_with corefonts windows-font-dir /usr/share/fonts/corefonts)"
-
-	econf \
-		${myconf} \
-		--without-included-ltdl \
-		--with-ltdl-include=/usr/include \
-		--with-ltdl-lib=/usr/$(get_libdir) \
-		--with-threads \
-		--with-modules \
-		$(use_with perl) \
-		--with-perl-options='INSTALLDIRS=vendor' \
-		--with-gs-font-dir=/usr/share/fonts/default/ghostscript \
-		$(use_enable hdri) \
-		$(use_with !nocxx magick-plus-plus) \
-		$(use_with autotrace) \
-		$(use_with bzip2 bzlib) \
-		$(use_with djvu) \
-		$(use_with fftw) \
-		$(use_with fontconfig) \
-		$(use_with fpx) \
-		$(use_with gs dps) \
-		$(use_with gs gslib) \
-		$(use_with graphviz gvc) \
-		$(use_with jbig) \
-		$(use_with jpeg jpeg) \
-		$(use_with jpeg2k jp2) \
-		$(use_with lcms) \
-		$(use_with openexr) \
-		$(use_with png) \
-		$(use_with svg rsvg) \
-		$(use_with tiff) \
-		$(use_with truetype freetype) \
-		$(use_with wmf) \
-		$(use_with xml) \
-		$(use_with zlib) \
-		$(use_with X x)
-}
-
-src_test() {
-	einfo "please note that the tests will only be run when the installed"
-	einfo "version and current emerging version are the same"
-
-	if has_version ~${CATEGORY}/${P} ; then
-		emake -j1 check || die "make check failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation of files into image failed"
-
-	# dont need these files with runtime plugins
-	rm -f "${D}"/usr/$(get_libdir)/*/*/*.{la,a}
-
-	use doc || rm -r "${D}"/usr/share/doc/${PF}/{www,images,index.html}
-	dodoc NEWS.txt ChangeLog AUTHORS.txt README.txt
-
-	# Fix perllocal.pod file collision
-	use perl && fixlocalpod
-}
diff --git a/media-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml
index 551466c8df94..94f6981802f4 100644
--- a/media-gfx/imagemagick/metadata.xml
+++ b/media-gfx/imagemagick/metadata.xml
@@ -7,10 +7,6 @@
 			use <pkg>media-gfx/autotrace</pkg> to convert bitmaps into vector
 			graphics
 		</flag>
-		<flag name='corefonts'>
-			pull in <pkg>media-fonts/corefonts</pkg>, which is required for some
-			commands
-		</flag>
 		<flag name='fpx'>
 			enable <pkg>media-libs/libfpx</pkg> support
 		</flag>