From ccc1f6a146a4c3fdca6dc78411b6946f4c02c6fa Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sun, 9 Oct 2011 07:34:15 +0000 Subject: [PATCH] Fix gconf schema installation wrt #295083 by "PiotrAF" and Francisco Javier Package-Manager: portage-2.2.0_alpha63/cvs/Linux x86_64 --- media-gfx/ufraw/ChangeLog | 5 ++++- media-gfx/ufraw/Manifest | 20 ++++++++++---------- media-gfx/ufraw/ufraw-0.18.ebuild | 24 +++++++++++++++--------- 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/media-gfx/ufraw/ChangeLog b/media-gfx/ufraw/ChangeLog index 22d1374c85be..377a7d0772e5 100644 --- a/media-gfx/ufraw/ChangeLog +++ b/media-gfx/ufraw/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-gfx/ufraw # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ChangeLog,v 1.87 2011/05/22 03:22:07 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ChangeLog,v 1.88 2011/10/09 07:34:14 ssuominen Exp $ + + 09 Oct 2011; Samuli Suominen ufraw-0.18.ebuild: + Fix gconf schema installation wrt #295083 by "PiotrAF" and Francisco Javier 22 May 2011; Tim Harder ufraw-0.16.ebuild, ufraw-0.17.ebuild, ufraw-0.18.ebuild: diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest index ba848c190bb3..b66c943518ce 100644 --- a/media-gfx/ufraw/Manifest +++ b/media-gfx/ufraw/Manifest @@ -7,17 +7,17 @@ DIST ufraw-0.17.tar.gz 1158114 RMD160 785d46e6936f176220dbf77f86dd373ef0250a79 S DIST ufraw-0.18.tar.gz 1219440 RMD160 faeb20a5c5eeba2ba91d5737efaa019c5f223c8e SHA1 41c9ad7aa7f1cbb63a6b0b330b3599b18a7e8cd2 SHA256 24fe739c61e9e14de1900008477c8662553e93427569c1d595556d440e6b9205 EBUILD ufraw-0.16.ebuild 1680 RMD160 67e8f922a3e32dd8f71761b2f7b2fa1a99e9038d SHA1 6b893570cf658fa2d283140123820e8307d0d185 SHA256 2930d74105060352b2f57466fdaedeb0444078e83a829850b76bc377c6cb04d6 EBUILD ufraw-0.17.ebuild 1726 RMD160 8cafc49b98c65a05bfbed1b6ddd892c118a8c91b SHA1 2227fcbfc6a8ca3152afe056160375dab270f5e9 SHA256 cc0a6225d721d582c3b1b9c81b05ad63e854ee8ad35dd5ac864622fa288aa549 -EBUILD ufraw-0.18.ebuild 1732 RMD160 b4f554d1049edfd646d9548b7bd06bad555ccba1 SHA1 9b0027ee32a1bc8b6762c3641ebe6cee5a436cc5 SHA256 f274f3c32d6a147047b0b363815aa06b7f34bf284d17cf79916a58e9545de22a -MISC ChangeLog 11740 RMD160 a6f06e4da350742bd1a766bf513c242437b790f8 SHA1 0ec9bd2a7a308d8769b2596cf4aa702e86360485 SHA256 b60aeabdf5ee6b401c6839cf0522825768e7aa700a0ccd800cf583b89159b93b +EBUILD ufraw-0.18.ebuild 1813 RMD160 1d531bad36a3e68aef154e91f96561ec81472fe5 SHA1 72ed8425a7ebd4823910e3d51a803b63ad8a80ab SHA256 7b4379db1086ee867530048cac3ec2f4ba405ed54dce31685e4bba8c53669a5a +MISC ChangeLog 11892 RMD160 a2769383181c47ffc65e2a0372b1493802e316a0 SHA1 7e3e85ad23075c4a377c4c1c29e0cdbad7111785 SHA256 4397072592f9fdb733b805509f01cfe4947085e57d8586b87a0ddaf82ffa3e88 MISC metadata.xml 585 RMD160 60e7b9d7522fe5fb746986f8ac5c40acfb281eba SHA1 558183b73a8c78e37560063b945110195e9640bc SHA256 a1626014c8e6f43d3c19ec1b41a78e740b5565d5cb1da80c2b6ba5e69e5635dd -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJN2IFlAAoJEEqz6FtPBkyjRkYH/jEARUunuDDawOkrqvNYB/2e -nEIySCpWaFN4d45j2QYeBE3PEHgOE9n+TgYjFcuapJQT3Nb4cYuGInlayoEd2hOQ -Bi0fpKLYnQUBq+L/Z4sfasr0IEp7G49qZO+GCQN+kVE0Dl1huqBfBq8ayhdwUx1i -jc+BzzYLLRwAt0eF7ILk/3auitzQTZSx8I5DbPrDbCU1CIyTCDSmRaATTZvC0YbC -AnUZnS80WZlDzUZMyiCsnjAso6X3d8kGFijU+wGkovaM9LwwApRekTl08yk2hn/h -vU3YDSNf5EiSYiK0Mc4KsYdaVYOAWPY3lG4TUSeVaLDIAuqQdQtBJG2iWZiz0to= -=WX4D +iQEcBAEBAgAGBQJOkU6RAAoJEEdUh39IaPFNpNgH/A+exNJ0QQbwWsYV3wgSflPU +I7JD4M4lSxXin4W9iNv72vOLF31vLM/KIxu90hJ1ubSdjrogyMgmk87LTKtQFaKg +XJFMS2uraDpsK48AFPXv1BKfio6M85qPcoKjfFuOP0mPYKeiT9JWYCEjFVY3f7ld +sE3sw76q0YpIpf9Rzc3Fu2KCssgWxAhSkbhpJL3wHAgERvVti2BUMEEe66IUO4u4 +3AWUmqeOs0jr2a2o7iscmKFsf+8hTIc6LWhl68r/LFOIMAVEZ7Er68UH6ez5dngj +edj4DgUoyXPS1UDORthHhFuJgHvvSThUF5gev8NkVkDjQ8O3wPbMIuBzEldhJBk= +=ut6d -----END PGP SIGNATURE----- diff --git a/media-gfx/ufraw/ufraw-0.18.ebuild b/media-gfx/ufraw/ufraw-0.18.ebuild index 5a9dcb17c1a5..cc04dbf8855e 100644 --- a/media-gfx/ufraw/ufraw-0.18.ebuild +++ b/media-gfx/ufraw/ufraw-0.18.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ufraw-0.18.ebuild,v 1.2 2011/05/22 03:22:07 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ufraw-0.18.ebuild,v 1.3 2011/10/09 07:34:15 ssuominen Exp $ -EAPI=2 -inherit fdo-mime gnome2-utils eutils autotools +EAPI=4 +inherit autotools eutils fdo-mime gnome2-utils DESCRIPTION="RAW Image format viewer and GIMP plugin" HOMEPAGE="http://ufraw.sourceforge.net/" @@ -21,12 +21,12 @@ RDEPEND="dev-libs/glib:2 >=media-libs/lensfun-0.2.5 media-libs/tiff fits? ( sci-libs/cfitsio ) - gnome? ( gnome-base/gconf ) + gnome? ( >=gnome-base/gconf-2 ) gtk? ( >=x11-libs/gtk+-2.6:2 - >=media-gfx/gtkimageview-1.5.0 ) + >=media-gfx/gtkimageview-1.5 ) gimp? ( >=x11-libs/gtk+-2.6:2 - >=media-gfx/gtkimageview-1.5.0 - >=media-gfx/gimp-2.0 )" + >=media-gfx/gtkimageview-1.5 + >=media-gfx/gimp-2 )" DEPEND="${RDEPEND} dev-util/pkgconfig" @@ -52,8 +52,14 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die - dodoc README TODO || die + emake DESTDIR="${D}" schemasdir=/etc/gconf/schemas install + dodoc README TODO +} + +pkg_preinst() { + if use gnome; then + gnome2_gconf_savelist + fi } pkg_postinst() { -- 2.26.2