Make imagemagick switchable with graphicsmagick, bug #309047.

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

4 files changed, 14 insertions, 106 deletions

diff --git a/gnome-extra/libgsf/ChangeLog b/gnome-extra/libgsf/ChangeLog
index 7032b574e502..7f6afda3ec78 100644
--- a/gnome-extra/libgsf/ChangeLog
+++ b/gnome-extra/libgsf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/libgsf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.154 2010/02/14 23:55:38 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.155 2010/03/31 21:01:39 eva Exp $
+
+  31 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -libgsf-1.14.16.ebuild, libgsf-1.14.17.ebuild:
+  Make imagemagick switchable with graphicsmagick, bug #309047.
 
 *libgsf-1.14.17 (14 Feb 2010)
 
diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
index 78148c4f487e..b6ea5b4e6d97 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -5,17 +5,15 @@ AUX libgsf-1.14.16-automake-fixes.patch 618 RMD160 6426795391ab582106f9f6c131974
 AUX libgsf-1.14.16-gconf-automagic.patch 2201 RMD160 0a7f63db3fd9dd740f37de0d2cb42f6f75294a75 SHA1 4636e593872ec761b79921e9e935725541f4edb6 SHA256 9171232083d44e581918872f2eb3bf9b3571cde63b434caa9a04ff7c8b0c93f7
 DIST gnome-mplayer-0.9.6-gconf-2.m4.tgz 763 RMD160 cdf17b11dea5da26cc9a17fff953480ee1c39a0f SHA1 e0403cd21c59e305ae26e2d511740a9b1ea17be1 SHA256 d392f4cdb99f398ffb67674a2f0e64debcc4574f5ea203c1c25e91532fce894f
 DIST libgsf-1.14.15.tar.bz2 589878 RMD160 804601e912c75fb5f433a445cf19b55c70712144 SHA1 813f039274a08104da2eabb3074f59d254e96bed SHA256 4a0f500b05d826390f01d5230049d3005fa0a1210f31463910717f3f46338836
-DIST libgsf-1.14.16.tar.bz2 599091 RMD160 ca9e6cafb2a2a1ba02e57a0e378471b1c5ecde6e SHA1 9461d816c283e977d88916932def678560f9c8d5 SHA256 11fd8fca1bdbcfa426276a124ad083cca9632f03cf766523bcdfb2fca0b08908
 DIST libgsf-1.14.17.tar.bz2 612455 RMD160 8e4d7c0e21f6681c6312f83b324a5817a832ebcc SHA1 a1ea6d5e02b7f68cdc61977ec8eaf169e3b8abaf SHA256 10c6b69149e424ac5f325eb247fdf640ddd949952f21b99a890e73f9d4276876
 EBUILD libgsf-1.14.15.ebuild 1766 RMD160 27d8bcf8db5405b74d465b9ca9ba228d8ffebb15 SHA1 4fdbd57e3e81bcac8bef7dd740eb8a7c4a04a3f4 SHA256 44f8da46a3dff1c08300f89b18e5209e8d72c094b42f85183bd55e5326bd8851
-EBUILD libgsf-1.14.16.ebuild 2493 RMD160 9601476e335038106a24af026e84f636bfba0751 SHA1 a3e530215a040493865ad29dbd1eb15de46ef1b5 SHA256 4edcbde9780dba0649ed1ff506248a6eda406640e6720c88b47c8a552f8242bd
-EBUILD libgsf-1.14.17.ebuild 2511 RMD160 65c0a4880f244ccacadab26ef91b5da6f0bb4c87 SHA1 9c74d659e72d29cfe2a6fc89622dcd4776b15d59 SHA256 a6ff44b5c35bbb00fd7a9c27ec6eb2ee58bb9294662a817f2a82e3805a1ed826
-MISC ChangeLog 19382 RMD160 444ab980bcac05461af9d8b3b083cec555e2408b SHA1 8f15415f1ed5d67f46f23d9b919022b5fc468131 SHA256 983c7bc67b687590ae07a25df539d2c31e47036eea97c5ff8a3c6c8d395ee0bf
+EBUILD libgsf-1.14.17.ebuild 2558 RMD160 802fcd3285d3f82b27659c0dee94a960953d8504 SHA1 6c4c7d0e8e8a5ff8aa028680907e7a444beff98f SHA256 861d6f8674745db0ca84ab19926b833e52d6f711e322a12bba4d79ba1fab930a
+MISC ChangeLog 19550 RMD160 225f7d6fc85e72792372944053510506ccc9265d SHA1 49785dc4f58297a7bce103ebd15e95ae7aaec39a SHA256 8461121d6cc63311a55535cbf1d79b924be3a6d14149adf7263956aaf52cbd9f
 MISC metadata.xml 304 RMD160 266992ac9d503bb80b31164d13d394853fb72bcc SHA1 97b443e72047a31c18a881dd95cc0034a02c6fc0 SHA256 97dcc056bc6ee681e66294ff87260cba35805a12db640f00c08b8ee3f7e96005
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkt4jYYACgkQ1fmVwcYIWAYGEQCfSMnB4lCvifssKP43JIL6ezCy
-EwEAn3AjfN7VD2DGzCNA5fFA7uJ5hNFI
-=QxeH
+iEYEARECAAYFAkuzuEQACgkQ1fmVwcYIWAYDPACfflhGgdrkyCbALAYll6lmHrAR
+t1sAnikplDGdU7dQlRs9gozTR18fI+G9
+=7k92
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/libgsf/libgsf-1.14.16.ebuild b/gnome-extra/libgsf/libgsf-1.14.16.ebuild
deleted file mode 100644
index 63c633268616..000000000000
--- a/gnome-extra/libgsf/libgsf-1.14.16.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.16.ebuild,v 1.5 2010/01/13 22:57:48 eva Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2 python multilib
-
-DESCRIPTION="The GNOME Structured File Library"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gnome-mplayer-0.9.6-gconf-2.m4.tgz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc gnome gtk python thumbnail"
-
-RDEPEND="
-	>=dev-libs/glib-2.16
-	>=dev-libs/libxml2-2.4.16
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	gnome? (
-		>=gnome-base/libbonobo-2
-		>=gnome-base/gnome-vfs-2.2 )
-	gtk? ( >=x11-libs/gtk+-2 )
-	python? (
-		>=dev-python/pygobject-2.10
-		>=dev-python/pygtk-2.10 )
-	thumbnail? ( >=gnome-base/gconf-2 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.35.0
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-PDEPEND="gnome? ( media-gfx/imagemagick )"
-
-DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--with-gio
-		--disable-static
-		$(use_with bzip2 bz2)
-		$(use_with gnome gnome-vfs)
-		$(use_with gnome bonobo)
-		$(use_with python)
-		$(use_with gtk gdk-pixbuf)
-		$(use_with thumbnail gconf)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	cp "${WORKDIR}/gnome-mplayer-0.9.6-gconf-2.m4" m4/ \
-		|| die "failed to copy gconf macro"
-
-	# Fix gconf automagic, bug #289856
-	epatch "${FILESDIR}/${P}-gconf-automagic.patch"
-
-	# Fix useless variable in toplevel Makefile.am, bug #298813
-	epatch "${FILESDIR}/${P}-automake-fixes.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-	preserve_old_lib /usr/$(get_libdir)/libgsf-1.so.1
-	preserve_old_lib /usr/$(get_libdir)/libgsf-gnome-1.so.1
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if use python; then
-		python_need_rebuild
-		python_mod_optimize $(python_get_sitedir)/gsf
-	fi
-
-	preserve_old_lib_notify /usr/$(get_libdir)/libgsf-1.so.1
-	preserve_old_lib_notify /usr/$(get_libdir)/libgsf-gnome-1.so.1
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/gsf
-}
diff --git a/gnome-extra/libgsf/libgsf-1.14.17.ebuild b/gnome-extra/libgsf/libgsf-1.14.17.ebuild
index 7099afbf036a..869d8e5cf137 100644
--- a/gnome-extra/libgsf/libgsf-1.14.17.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.17.ebuild,v 1.1 2010/02/14 23:55:38 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.17.ebuild,v 1.2 2010/03/31 21:01:39 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -37,7 +37,9 @@ DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
 	doc? ( >=dev-util/gtk-doc-1 )"
 
-PDEPEND="gnome? ( media-gfx/imagemagick )"
+PDEPEND="gnome? ( || (
+	media-gfx/imagemagick
+	media-gfx/graphicsmagick[imagemagick] ) )"
 
 DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"