commit: 251326ab6c41c346327aad2d9e0d7e3cf8a618a0 Author: Markus Meier <maekke <AT> gentoo <DOT> org> AuthorDate: Mon Feb 2 22:33:43 2015 +0000 Commit: Markus Meier <maekke <AT> gentoo <DOT> org> CommitDate: Mon Feb 2 22:33:43 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=251326ab
sync media-gfx/ufraw with gentoo-x86 Package-Manager: portage-2.2.15 Manifest-Sign-Key: 072AD062 --- media-gfx/ufraw/Manifest | 11 ++-- media-gfx/ufraw/files/ufraw-0.19.2-clang.patch | 27 --------- media-gfx/ufraw/ufraw-0.19.2.ebuild | 82 -------------------------- media-gfx/ufraw/ufraw-0.20-r1.ebuild | 4 +- 4 files changed, 6 insertions(+), 118 deletions(-) diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest index fd05ad5..fbbe872 100644 --- a/media-gfx/ufraw/Manifest +++ b/media-gfx/ufraw/Manifest @@ -2,19 +2,16 @@ Hash: SHA256 AUX ufraw-0.17-cfitsio-automagic.patch 933 SHA256 d489abaa6da90a46f4b3b23e2e5400c1eeb7d2e5532835df4d5ad244167e7d18 SHA512 84aadb7dc41927a26ac37a801e136628380e79f032f87a925e737ec76c349c96c410750234f4870fe2fa61680085472a028e47c13cf01b2bd7fc7a55dad6de1b WHIRLPOOL 7815f44171243408468347a6acdadbda239931b2f2a810e4f0a8e98023506d9761e73f3db137aad7930dd5814f7ffcc2c670cf572d50caf394e88d85cafef03b -AUX ufraw-0.19.2-clang.patch 835 SHA256 3d3f18ddd382fcb311dde265ce9d510d57069e8549166f2f5fdccaab3dcb089a SHA512 5de7d191f5ed11c50725baab21c9949b752a0eabb750b42503a0e0376996aacb5abc05a95a20e1352790c893cdc28d632fa8003903f5bbd19d7f30fc818b3e98 WHIRLPOOL 224cfba0e3107654c1f31a841862e72633ae4dae477b38db0a571fa66d97aed103d019e6e6e4aabe7de2ab267d0042fbfacf2e58090f34f4bb4da0caadc0e112 AUX ufraw-0.20-gimp.patch 943 SHA256 8d1f64085455655b8a3e99d40403e2a3c7c40d633406e8b5f8f5ee1e717d23e4 SHA512 225d87467ba0ccf7a8c4a985c62ef94d89cb51166f37c2abc616bf280730aa1a214989a91a9e8a4bb3173413640dc1b2f8de410e4897e60dccc332e7a9536e29 WHIRLPOOL d16b677b0a0c54e65deb68a0427b5a65b3d8f428f4c3cb5e83b712a14eb260505acf487305eb9b83a39fb9375935cd7e3d137d4b990d83b9f6e501575c2f74b4 -DIST ufraw-0.19.2.tar.gz 980934 SHA256 73befe9f16f015a8c0f26cef3bb2e17cac9ae64aef2ade48c29aedb1ee51abd3 SHA512 fb104d51253b9db9242539fa63a184b1f3d30dd87ee173a061a8179ecb2b5db052569baf0d50ebb25b34f3930a3b2edf3e0061ca22ccbda510fe65672a4319b2 WHIRLPOOL 6ef89a1f9456ddb5865dee3a5485fef1b7f0c10f1d79fba14b3ce9be5858b800de860b86c973ac75812692c7b65096da2fa25224ff1c4f8eaf1d90da0af3bcfa DIST ufraw-0.20.tar.gz 1086969 SHA256 6dcd30f73238f56641ec87ae07807a6ebeab141a1a481aafe3ddab6f3db8a1e0 SHA512 d18ecc257f9d88c77fca0e7a8641ee1e78abd28e73c34bd98def2d0dbd65f8fbaa677deca34ac4ed3ce7775764b6baca2896a023d690573057e4659de6dc3b1a WHIRLPOOL fedecf66ef22bdffe667408ac0b8106ec99ee2a1dd29fab53877229ec375bdeab37cc6fe942d7e3ef2c3de38a5770eaf4f49c44367ca1677acfda13bb4c85a1d -EBUILD ufraw-0.19.2.ebuild 1912 SHA256 54668a6312d64122705ff7da57bba8ecb4d4a40c3a209343993a6545e0bf497c SHA512 9a3ef1df981b10a055f9669f8edf3c73bcfc72dfacec58f6b211e5d9b5bae8084500df829da82f8a943d7573e79eee636c761d52d5c1db8b62e3f3ec1945bc92 WHIRLPOOL 86de2a62d95b80a33ae49fcf2c80d3c1713618e7e473765669ceb3bbc24df1ae2a9c3422fd20d1923df7e1eb9cdc734522c53115c8603a4e95bb8b8b30e08d2c -EBUILD ufraw-0.20-r1.ebuild 1885 SHA256 44bb88666b2771fbc5c42fe9bef1f20b0c63a77f55a1fdc707eb520c070ae17e SHA512 c46bcd90111ac275c41efcd9966cd096b00ca6e84a9a5f5e896081ea5c6d87215350842e9297bca67130d7cd1f4a2d324db0b318f25a9d50791c612fd81342dc WHIRLPOOL 6a65ef1899167f88ccdb2e80fbec86d001d203be4be65b19de3443b85787fdd37f6934dc593a0266e098f6a2213339adc4f75c6a16ebf5d6b03b56293f821f9b +EBUILD ufraw-0.20-r1.ebuild 1884 SHA256 4b8b98e07982e1f9996e04667a9fc483e3c05fafc1d954e713ad170036315578 SHA512 f8767f44e376eecfc7be9285cf26ae344de39f03b597816c0f617da74e766aac2bbe7730a02136343ab75b96d348991be882fab49428bf31e3dcc86f6faef167 WHIRLPOOL cc4a4bd974b17d2a132bc8ef6560488cecf2ac136476eb823035a15aae700f7cbb4a3c210f598152cb965cffb5c051c40001cf5bc35816d9253b526f9ae005e6 EBUILD ufraw-9999.ebuild 1783 SHA256 a82f95ef4d3fccbb559754821bc2a09e9bf03e1b2d2b925d9e3498acc0084f08 SHA512 9947de270714bce9dc45b1cb3b15f5f2b6071df2148a2025aa269a4deb421af01dfe3969334e721eb1dcf1c50a38f29bbb118e70f9025fad5c865ea71d283a69 WHIRLPOOL 590e3075de9b54cc89e3d035845caa9edfc3d1fbe05157604f2209edce4e08b9bfbcb5599cd006b056540dd3ec7178998f2f549599eec1666faa98d7c4129c51 MISC ChangeLog 10748 SHA256 85eeb8faf237678885556506ae213edc99ed8354116ea18aaed0dabb80d2790e SHA512 e3f2e8f06277f1f224e318b7960ff9ad82b6cc2e1b83c11e1f4e73b96b155d478aebe81d77dd2b8a6da2dd6f8e50b11e32781b7ea3e71ab07189cb4146dc0d4f WHIRLPOOL 96c6192d4138a6caef7510e7f1b173e9bb23f96de319d97a28369eeedddfaca460585319e727eb0cf7af59f9cb2c2bcaf262c387c3e430bbf65ea521767b5997 MISC metadata.xml 437 SHA256 101562af2e68f9ce05d05494d48c03aaae046560eab55d6c5d472ae85fe3e4bc SHA512 be7071c107a374d39fc92eab5b1b0ca0be19dc3ec847241e7bc56acadca27d0bbd803beaaf4a40f12e44d581642d5338a65dfa7d37f78a3d75bc756ad6782446 WHIRLPOOL cab4d10b64bc1fbb4c2c72ba3d63b0ea46033bcd371472401e703304d1e6b76dfa8934e02192047b388b772da2af2dddc343067e225a1bd882943321524a3f3c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlRacwoACgkQkKaRLQcq0GIzxACfdBc2vOaGkU6IfrqZWnOsZpbK -LvQAni8CzjdKXvUkviViu9OppWq9Dpbi -=/CFy +iEYEAREIAAYFAlTP+0YACgkQkKaRLQcq0GLNJACfZ3XPKCW7w8CFbDGsDx015PHJ +ehoAn1BsS+3Q2rMqBnUBgljcv5MzqF2M +=h9QZ -----END PGP SIGNATURE----- diff --git a/media-gfx/ufraw/files/ufraw-0.19.2-clang.patch b/media-gfx/ufraw/files/ufraw-0.19.2-clang.patch deleted file mode 100644 index a95f98e..0000000 --- a/media-gfx/ufraw/files/ufraw-0.19.2-clang.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=513054 -http://sourceforge.net/p/ufraw/bugs/365/ - ---- ufraw.h.orig 2014-01-11 11:04:08.000000000 -0800 -+++ ufraw.h 2014-01-11 11:04:54.000000000 -0800 -@@ -41,6 +41,10 @@ - /* An impossible value for conf float values */ - #define NULLF -10000.0 - -+#ifdef __cplusplus -+extern "C" { -+#endif // __cplusplus -+ - /* Options, like auto-adjust buttons can be in 3 states. Enabled and disabled - * are obvious. Apply means that the option was selected and some function - * has to act accourdingly, before changing to one of the first two states */ -@@ -78,10 +82,6 @@ extern UFName ufRawImage; - extern UFName ufRawResources; - extern UFName ufCommandLine; - --#ifdef __cplusplus --extern "C" { --#endif // __cplusplus -- - UFObject *ufraw_image_new(); - #ifdef HAVE_LENSFUN - UFObject *ufraw_lensfun_new(); diff --git a/media-gfx/ufraw/ufraw-0.19.2.ebuild b/media-gfx/ufraw/ufraw-0.19.2.ebuild deleted file mode 100644 index 37d1f59..0000000 --- a/media-gfx/ufraw/ufraw-0.19.2.ebuild +++ /dev/null @@ -1,82 +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/ufraw/ufraw-0.19.2.ebuild,v 1.15 2014/06/15 10:16:57 maekke Exp $ - -EAPI=5 -inherit autotools eutils fdo-mime gnome2-utils toolchain-funcs - -DESCRIPTION="RAW Image format viewer and GIMP plugin" -HOMEPAGE="http://ufraw.sourceforge.net/"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -IUSE="contrast fits gimp gnome gtk openmp timezone" - -RDEPEND="dev-libs/glib:2 - >=media-gfx/exiv2-0.11:0= - media-libs/lcms:0 - >=media-libs/lensfun-0.2.5 - media-libs/libpng:0= - media-libs/tiff - virtual/jpeg - fits? ( sci-libs/cfitsio:0= ) - gnome? ( >=gnome-base/gconf-2 ) - gtk? ( >=x11-libs/gtk+-2.6:2 - >=media-gfx/gtkimageview-1.5 ) - gimp? ( >=x11-libs/gtk+-2.6:2 - >=media-gfx/gtkimageview-1.5 - >=media-gfx/gimp-2 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch \ - "${FILESDIR}"/${P}-clang.patch - eautoreconf -} - -src_configure() { - econf \ - --without-cinepaint \ - $(use_enable contrast) \ - $(use_with fits cfitsio) \ - $(use_with gimp) \ - $(use_enable gnome mime) \ - $(use_with gtk) \ - $(use_enable openmp) \ - $(use_enable timezone dst-correction) \ - $(usex gimp --with-gtk "") -} - -src_compile() { - emake AR="$(tc-getAR)" -} - -src_install() { - emake DESTDIR="${D}" schemasdir=/etc/gconf/schemas install - dodoc README TODO -} - -pkg_preinst() { - if use gnome; then - gnome2_gconf_savelist - fi -} - -pkg_postinst() { - if use gnome; then - fdo-mime_mime_database_update - fdo-mime_desktop_database_update - gnome2_gconf_install - fi -} - -pkg_postrm() { - if use gnome; then - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - fi -} diff --git a/media-gfx/ufraw/ufraw-0.20-r1.ebuild b/media-gfx/ufraw/ufraw-0.20-r1.ebuild index 508779a..8980a37 100644 --- a/media-gfx/ufraw/ufraw-0.20-r1.ebuild +++ b/media-gfx/ufraw/ufraw-0.20-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ufraw-0.20.ebuild,v 1.1 2014/09/27 11:27:29 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ufraw-0.20-r1.ebuild,v 1.2 2014/11/11 10:48:32 ago Exp $ EAPI=5 inherit autotools eutils fdo-mime gnome2-utils toolchain-funcs @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" IUSE="contrast fits gimp gnome gtk openmp timezone" RDEPEND="dev-libs/glib:2
