change gimp ebuild to use gnome2 eclass and fix automagic on curl

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.4 i686

3 files changed, 40 insertions, 47 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 793fdb9b2129..1511241e1e9d 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.255 2008/06/02 13:28:21 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.256 2008/06/21 18:53:45 hanno Exp $
+
+  21 Jun 2008; Hanno Boeck <hanno@gentoo.org> gimp-2.4.6.ebuild:
+  Use gnome2 eclass and fix automagic curl dep.
 
 *gimp-2.4.6 (02 Jun 2008)
 
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 0c7def6c193d..61286c9d31d9 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -10,14 +10,14 @@ DIST gimp-2.4.6.tar.bz2 18365363 RMD160 17d61da426950f8a7286f7e82259d23b46adb1fd
 EBUILD gimp-2.3.19.ebuild 3420 RMD160 6b764050ce4a20bc249fdf34246b9036c9498f4b SHA1 0f394608c2b25669ad886ee13b61407c474bc02c SHA256 0550dc8499e285dcaff590f31f014d5e5303ee6e03978f80eb49a810d3dbec7b
 EBUILD gimp-2.4.2.ebuild 3687 RMD160 3663e7a85f32416c99a4c7a83b6f81962f4e7f7f SHA1 7c499615c56d63ea10208e2d692789f6440471d9 SHA256 2f60b463680e951cb810436f5da1c99f9793b8a8365658cffad3dae70843ffd8
 EBUILD gimp-2.4.5.ebuild 4094 RMD160 22126076fb55e569bad57f2548aa9156ccf520de SHA1 b53dd03cf15de7b1f419ec1249cf19f627d00b23 SHA256 400da58ee6f1acca0cc3e6fafeab0b576b658874729c1e3b256fc1667d57c480
-EBUILD gimp-2.4.6.ebuild 4094 RMD160 63bb9aacc99f3fd9566494ad13635a71278089ce SHA1 2a6b3c3be503a5057faa58c08bd619ce3be5777a SHA256 7e10ac32dd5aae19581113fec98c64a3adcaf83d5fc8ebc2ef88de980ac2b5d6
+EBUILD gimp-2.4.6.ebuild 3851 RMD160 d93b6cfb499daa95f4af0927f616d2da12b79a15 SHA1 28ed04411ba22fa444fae08b66c3ecd60578feea SHA256 779beeff3058fa1e0fdcab70dfbb36cdfe3b44fdd7b11cfef3c22f76b5a19d02
 EBUILD gimp-9999.ebuild 3765 RMD160 4eb85d08786ba8d73536e5bb60118fe2f9b42382 SHA1 c8a20283d95e2e8d274bde17cb97bb2a255a56b4 SHA256 b24670ec12036af85fab20131f8a0c0e377dd889a4d7bc8168ad124af187f464
-MISC ChangeLog 34793 RMD160 560985f5dede623114ba8f067ddd9bfd79103d4f SHA1 b81731a73013fb2b2e59fb072067bddd14f62e2a SHA256 5836f06c1bf53394ce82490359e7b6ea6c519bb52e29f4ab15413a806e0833cb
+MISC ChangeLog 34907 RMD160 6792fa145681f90355dc03b04c480fe889fa3d33 SHA1 afe3cab7a3c72878b1db9b6124d9ea830b0a845f SHA256 c4080677623d97f26308209f5e69a0c667a1e8e3c617c317e38fc622c412334f
 MISC metadata.xml 220 RMD160 a49072631c03f8ac3685b12169abeef3b34ad3d6 SHA1 9614887db749b0a3c17016da5b3ec0e42b908ad3 SHA256 c893488c84e6da8039f2b473982f03e934ec12f8fe2c1ace770f9e34969db081
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhD9X0ACgkQr2QksT29OyA1qwCfRzF3Qe/lvMeFXkeFPUZrGRYE
-vOQAn09kICGNjiKcYEfyLPgzWoZ/DQk9
-=yBGB
+iEYEARECAAYFAkhdTkUACgkQr2QksT29OyDsAwCaAwlGdRzLMVinNbR/uFDAyhDW
+QPAAn3gmMKTYVBTmVxZ+8MIm6/dX/XPt
+=G6Rt
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gimp/gimp-2.4.6.ebuild b/media-gfx/gimp/gimp-2.4.6.ebuild
index c88bb3a6559e..99933046d991 100644
--- a/media-gfx/gimp/gimp-2.4.6.ebuild
+++ b/media-gfx/gimp/gimp-2.4.6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.4.6.ebuild,v 1.1 2008/06/02 13:28:21 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.4.6.ebuild,v 1.2 2008/06/21 18:53:45 hanno Exp $
 
-inherit fdo-mime flag-o-matic multilib python eutils autotools
+inherit gnome2 fdo-mime flag-o-matic multilib python eutils autotools
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="http://www.gimp.org/"
@@ -52,6 +52,8 @@ DEPEND="${RDEPEND}
 	>=sys-devel/gettext-0.17
 	doc? ( >=dev-util/gtk-doc-1 )"
 
+DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
+
 pkg_setup() {
 	if use pdf && ! built_with_use app-text/poppler-bindings gtk; then
 		eerror "This package requires app-text/poppler-bindings compiled with GTK+ support."
@@ -61,40 +63,13 @@ pkg_setup() {
 		eerror "This package requires media-libs/alsa-lib compiled with midi support."
 		die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."
 	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/gimp-web-browser.patch"
-
-	# Workaround for MIME-type, this is fixed in gimp trunk, so we can
-	# remove this with >= 2.5
-	use svg && epatch "${FILESDIR}/gimp-svg.diff"
-
-	eautoreconf
-}
-
-src_compile() {
-	# workaround portage variable leakage
-	local AA=
-
-	# gimp uses inline functions (e.g. plug-ins/common/grid.c) (#23078)
-	# gimp uses floating point math, needs accuracy (#98685)
-	filter-flags "-fno-inline" "-ffast-math"
-	# gimp assumes char is signed (fixes preview corruption)
-	if use ppc || use ppc64; then
-		append-flags "-fsigned-char"
-	fi
 
-	econf --enable-default-binary \
+	G2CONF="--enable-default-binary \
 		--with-x \
 		$(use_with aalib aa) \
 		$(use_with alsa) \
 		$(use_enable altivec) \
-		$(use_with curl) \
-		$(use_enable debug) \
-		$(use_enable doc gtk-doc) \
+		$(use_with curl libcurl) \
 		$(use_with dbus) \
 		$(use_with hal) \
 		$(use_with gnome gnomevfs) \
@@ -111,21 +86,37 @@ src_compile() {
 		$(use_enable sse) \
 		$(use_with svg librsvg) \
 		$(use_with tiff libtiff) \
-		$(use_with wmf) \
-		|| die "econf failed"
+		$(use_with wmf)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+	epatch "${FILESDIR}/gimp-web-browser.patch"
 
-	emake || die "emake failed"
+	# Workaround for MIME-type, this is fixed in gimp trunk, so we can
+	# remove this with >= 2.5
+	use svg && epatch "${FILESDIR}/gimp-svg.diff"
+
+	eautoreconf
 }
 
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+src_compile() {
+	# workaround portage variable leakage
+	local AA=
+
+	# gimp uses inline functions (e.g. plug-ins/common/grid.c) (#23078)
+	# gimp uses floating point math, needs accuracy (#98685)
+	filter-flags "-fno-inline" "-ffast-math"
+	# gimp assumes char is signed (fixes preview corruption)
+	if use ppc || use ppc64; then
+		append-flags "-fsigned-char"
+	fi
 
-	dodoc AUTHORS ChangeLog* HACKING NEWS README*
+	gnome2_src_compile
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	gnome2_pkg_postinst
 
 	elog
 	elog "If you want Postscript file support, emerge ghostscript."
@@ -136,8 +127,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	gnome2_pkg_postrm
 	python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
 		/usr/$(get_libdir)/gimp/2.0/plug-ins
 }