[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/files/, media-gfx/ufraw/

2021-07-25 Thread Sam James
commit: 699a7159a7d6c00cc571191e2a8ccd884e8fb670
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 26 02:33:02 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 26 02:33:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=699a7159

media-gfx/ufraw: treeclean

Bug: https://bugs.gentoo.org/312935
Bug: https://bugs.gentoo.org/341923
Bug: https://bugs.gentoo.org/629050
Bug: https://bugs.gentoo.org/739984
Bug: https://bugs.gentoo.org/775761
Bug: https://bugs.gentoo.org/777534
Signed-off-by: Sam James  gentoo.org>

 media-gfx/ufraw/Manifest   |  1 -
 .../ufraw/files/ufraw-0.17-cfitsio-automagic.patch | 28 --
 .../ufraw/files/ufraw-0.22-CVE-2015-8366.patch | 17 
 .../ufraw/files/ufraw-0.22-CVE-2018-19655.patch| 44 --
 media-gfx/ufraw/files/ufraw-0.22-crashfix.patch| 15 
 .../files/ufraw-0.22-drop_superfluous_abs.patch| 16 
 media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch  | 26 --
 .../ufraw/files/ufraw-0.22-fix-unsigned-char.patch | 20 -
 media-gfx/ufraw/files/ufraw-0.22-gcc9.patch| 97 -
 media-gfx/ufraw/files/ufraw-0.22-glib-2.68.patch   | 19 -
 .../ufraw/files/ufraw-0.22-jasper-automagic.patch  | 21 -
 media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch   | 32 ---
 media-gfx/ufraw/metadata.xml   | 13 ---
 media-gfx/ufraw/ufraw-0.22-r4.ebuild   | 99 --
 14 files changed, 448 deletions(-)

diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
deleted file mode 100644
index 94b0dbea86e..000
--- a/media-gfx/ufraw/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ufraw-0.22.tar.gz 1103554 BLAKE2B 
5ffa4c660602553853221d7b31bfb78b02644bfeb4461cf752186d83ed8087b7905e414c7d741916ca9460c05849ab679b2f3098c99e5246f54a49b6a915268f
 SHA512 
a42eff5052c18afec90245cf97ceeade78e3f288186cf697ac4abf2e8290d4081db8ac4de3ae47b3774f30a6cb4cbda392099e6fd2125fe751abb40d9b065ad2

diff --git a/media-gfx/ufraw/files/ufraw-0.17-cfitsio-automagic.patch 
b/media-gfx/ufraw/files/ufraw-0.17-cfitsio-automagic.patch
deleted file mode 100644
index aff7c5a2593..000
--- a/media-gfx/ufraw/files/ufraw-0.17-cfitsio-automagic.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ru ufraw-0.17.orig/configure.ac ufraw-0.17/configure.ac
 ufraw-0.17.orig/configure.ac   2010-04-02 16:16:08.0 +0200
-+++ ufraw-0.17/configure.ac2010-04-02 16:19:33.0 +0200
-@@ -246,11 +246,19 @@
-   [ have_png=no
- AC_MSG_RESULT($LIBPNG_PKG_ERRORS) ] )
- 
--PKG_CHECK_MODULES(CFITSIO, cfitsio,
--  [ have_cfitsio=yes
--AC_DEFINE(HAVE_LIBCFITSIO, 1, have the cfitsio library) ],
--  [ have_cfitsio=no
--AC_MSG_RESULT($CFITSIO_PKG_ERRORS) ] )
-+AC_ARG_WITH([cfitsio],
-+  [AS_HELP_STRING([--with-cfitsio],
-+  [build fits support @<:@default=check@:>@])],
-+  [],
-+  [with_cfitsio=check])
-+
-+have_cfitsio=no
-+AS_IF([test "x$with_cfitsio" != xno],
-+  [PKG_CHECK_MODULES(CFITSIO, cfitsio,
-+[ have_cfitsio=yes
-+  AC_DEFINE(HAVE_LIBCFITSIO, 1, have the cfitsio library) ],
-+[ have_cfitsio=no
-+  AC_MSG_RESULT($CFITSIO_PKG_ERRORS) ] ) ] )
- 
- PKG_CHECK_MODULES(EXIV2, exiv2 >= 0.16,
-   [ have_exiv2=yes

diff --git a/media-gfx/ufraw/files/ufraw-0.22-CVE-2015-8366.patch 
b/media-gfx/ufraw/files/ufraw-0.22-CVE-2015-8366.patch
deleted file mode 100644
index 9d59ca413fb..000
--- a/media-gfx/ufraw/files/ufraw-0.22-CVE-2015-8366.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fix a buffer overflow bug.  See
-https://github.com/LibRaw/LibRaw/commit/89d065424f09b788f443734d44857289489ca9e2
-
 a/dcraw.cc
-+++ b/dcraw.cc
-@@ -3013,7 +3013,10 @@
-   diff = diff ? -diff : 0x80;
- if (ftell(ifp) + 12 >= (int) seg[1][1])
-   diff = 0;
--raw_image[pix] = pred[pix & 1] += diff;
-+if(pix>=raw_width*raw_height)
-+  derror();
-+else
-+  raw_image[pix] = pred[pix & 1] += diff;
- if (!(pix & 1) && HOLE(pix / raw_width)) pix += 2;
-   }
-   maximum = 0xff;

diff --git a/media-gfx/ufraw/files/ufraw-0.22-CVE-2018-19655.patch 
b/media-gfx/ufraw/files/ufraw-0.22-CVE-2018-19655.patch
deleted file mode 100644
index 78b46b4452e..000
--- a/media-gfx/ufraw/files/ufraw-0.22-CVE-2018-19655.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: stack-based buffer overflow bug
-Bug-Debian: https://bugs.debian.org/890086
-Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2018-19655
-Author: Filip Hroch 
-Reviewed-by: Salvatore Bonaccorso 
-Last-Update: 2018-12-02
-
 a/dcraw.cc
-+++ b/dcraw.cc
-@@ -8505,9 +8505,15 @@ float CLASS find_green (int bps, int bit
- {
-   UINT64 bitbuf=0;
-   int vbits, col, i, c;
--  ushort img[2][2064];
-+  ushort *img;
-   double sum[]={0,0};
- 
-+#define IMG2D(row,col) \
-+  img[(row)*width+(col)]
-+
-+  img = (ushort *) malloc(2*width*sizeof(ushort));
-+  merror (img, "find_green()");
-+
-   FORC(2) {
- fseek (ifp, c ? off1:off0, SEEK_SET);
-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/files/, media-gfx/ufraw/

2021-04-18 Thread Matt Turner
commit: dd9edb33d1b4949330bb07661f39d76df84519f3
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Apr 19 03:16:23 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Apr 19 03:16:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd9edb33

media-gfx/ufraw: Fix build with glib-2.68

Closes: https://bugs.gentoo.org/777534
Signed-off-by: Matt Turner  gentoo.org>

 media-gfx/ufraw/files/ufraw-0.22-glib-2.68.patch | 19 +++
 media-gfx/ufraw/ufraw-0.22-r4.ebuild |  1 +
 2 files changed, 20 insertions(+)

diff --git a/media-gfx/ufraw/files/ufraw-0.22-glib-2.68.patch 
b/media-gfx/ufraw/files/ufraw-0.22-glib-2.68.patch
new file mode 100644
index 000..c2499fa16bf
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.22-glib-2.68.patch
@@ -0,0 +1,19 @@
+--- a/uf_glib.h2021-04-18 23:14:11.346861061 -0400
 b/uf_glib.h2021-04-18 23:14:20.180520873 -0400
+@@ -13,13 +13,13 @@
+ #ifndef _UF_GLIB_H
+ #define _UF_GLIB_H
+ 
++#include 
++#include 
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
+-#include 
+-#include 
+-
+ // g_win32_locale_filename_from_utf8 is needed only on win32
+ #ifdef _WIN32
+ #define uf_win32_locale_filename_from_utf8(__some_string__) \

diff --git a/media-gfx/ufraw/ufraw-0.22-r4.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r4.ebuild
index 0400a1d39a7..1be3077ba8e 100644
--- a/media-gfx/ufraw/ufraw-0.22-r4.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r4.ebuild
@@ -46,6 +46,7 @@ PATCHES=(
"${FILESDIR}"/${P}-gcc9.patch
"${FILESDIR}"/${P}-CVE-2015-8366.patch
"${FILESDIR}"/${P}-CVE-2018-19655.patch
+   "${FILESDIR}"/${P}-glib-2.68.patch
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2020-11-08 Thread Sam James
commit: b0853f38e1cb1dd7652999d86768aaf854d62e39
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Wed Nov  4 22:20:07 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov  8 11:53:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0853f38

media-gfx/ufraw: switch media-gfx/gimp-2.10 to SLOT="0/2"

Signed-off-by: Sergey Torokhov  yandex.ru>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/ufraw/{ufraw-0.22-r3.ebuild => ufraw-0.22-r4.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/ufraw/ufraw-0.22-r3.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r4.ebuild
similarity index 98%
rename from media-gfx/ufraw/ufraw-0.22-r3.ebuild
rename to media-gfx/ufraw/ufraw-0.22-r4.ebuild
index 23f139c7fab..0400a1d39a7 100644
--- a/media-gfx/ufraw/ufraw-0.22-r3.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r4.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
media-libs/tiff
virtual/jpeg:0=
fits? ( sci-libs/cfitsio:= )
-   gimp? ( >=media-gfx/gimp-2 )
+   gimp? ( media-gfx/gimp:0/2 )
gnome? ( >=gnome-base/gconf-2 )
gtk? (
>=media-gfx/gtkimageview-1.5



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2020-07-22 Thread Kent Fredric
commit: c1383134cd104e7f9a1df3aa416892d2d7b5d112
Author: Kent Fredric  gentoo  org>
AuthorDate: Thu Jul 23 04:52:14 2020 +
Commit: Kent Fredric  gentoo  org>
CommitDate: Thu Jul 23 05:13:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1383134

media-gfx/ufraw: Drop solaris prefixes re bug #690140

Depends:
- media-gfx/gimp
 - media-libs/gegl
  - media-video/ffmpeg
   - net-misc/wget
- dev-perl/IO-Socket-SSL

Bug: https://bugs.gentoo.org/690140
Package-Manager: Portage-2.3.103, Repoman-2.3.22
Signed-off-by: Kent Fredric  gentoo.org>

 media-gfx/ufraw/ufraw-0.22-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/ufraw/ufraw-0.22-r3.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
index 9d1ace9d197..23f139c7fab 100644
--- a/media-gfx/ufraw/ufraw-0.22-r3.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux"
 IUSE="contrast fits gimp gnome gtk openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2019-11-01 Thread Mikle Kolyada
commit: 08216880dda5b227caf8b003c49d0358e60ff892
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Nov  1 10:22:28 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Nov  1 10:22:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08216880

media-gfx/ufraw: Drop insecure

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Mikle Kolyada  gentoo.org>

 media-gfx/ufraw/ufraw-0.22-r2.ebuild | 94 
 1 file changed, 94 deletions(-)

diff --git a/media-gfx/ufraw/ufraw-0.22-r2.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
deleted file mode 100644
index dad267d3cd3..000
--- a/media-gfx/ufraw/ufraw-0.22-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils toolchain-funcs xdg-utils
-
-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 ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="contrast fits gimp gnome gtk openmp timezone"
-
-REQUIRED_USE="gimp? ( gtk )"
-
-RDEPEND="
-   dev-libs/glib:2=
-   >=media-gfx/exiv2-0.11:0=
-   media-libs/lcms:2=
-   >=media-libs/lensfun-0.2.5:=
-   media-libs/libpng:0=
-   media-libs/tiff:0=
-   virtual/jpeg:0=
-   fits? ( sci-libs/cfitsio:0= )
-   gimp? ( >=media-gfx/gimp-2 )
-   gnome? ( >=gnome-base/gconf-2 )
-   gtk? (
-   >=media-gfx/gtkimageview-1.5
-   >=x11-libs/gtk+-2.6:2
-   )
-"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch
-   "${FILESDIR}"/${P}-jasper-automagic.patch
-   "${FILESDIR}"/${P}-crashfix.patch
-   "${FILESDIR}"/${P}-drop_superfluous_abs.patch
-   "${FILESDIR}"/${P}-fix-unsigned-char.patch
-   "${FILESDIR}"/${P}-jpeg9.patch
-   "${FILESDIR}"/${P}-exiv2-0.27.patch
-)
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(use_enable contrast) \
-   $(use_with fits cfitsio) \
-   $(use_with gimp) \
-   $(use_enable gnome mime) \
-   $(use_with gtk) \
-   --disable-jasper \
-   $(use_enable openmp) \
-   $(use_enable timezone dst-correction)
-}
-
-src_compile() {
-   emake AR="$(tc-getAR)"
-}
-
-src_install() {
-   emake DESTDIR="${D}" schemasdir=/etc/gconf/schemas install
-   einstalldocs
-}
-
-pkg_preinst() {
-   if use gnome; then
-   gnome2_gconf_savelist
-   fi
-}
-
-pkg_postinst() {
-   if use gnome; then
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-   gnome2_gconf_install
-   fi
-}
-
-pkg_postrm() {
-   if use gnome; then
-   xdg_desktop_database_update
-   xdg_mimeinfo_database_update
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2019-11-01 Thread Mikle Kolyada
commit: 7cca0142ac789aff0d9f9da6cd9522dbefd963ba
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Nov  1 10:20:41 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Nov  1 10:20:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cca0142

media-gfx/ufraw: arm stable wrt bug #694532

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada  gentoo.org>

 media-gfx/ufraw/ufraw-0.22-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/ufraw/ufraw-0.22-r3.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
index 165cf72d214..364bb452b7e 100644
--- a/media-gfx/ufraw/ufraw-0.22-r3.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="contrast fits gimp gnome gtk openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2019-10-13 Thread Matt Turner
commit: 2daf81b383834b25d9157b3bba086fc0fd882d4f
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Oct 14 02:46:06 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Oct 14 02:46:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2daf81b3

media-gfx/ufraw: Drop to ~alpha, bug 694532

Signed-off-by: Matt Turner  gentoo.org>

 media-gfx/ufraw/ufraw-0.22-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/ufraw/ufraw-0.22-r2.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
index 0b2b7c889c2..dad267d3cd3 100644
--- a/media-gfx/ufraw/ufraw-0.22-r2.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="contrast fits gimp gnome gtk openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2019-10-07 Thread Agostino Sarubbo
commit: 203d10eb72d04ea7e9fad60dd2787c0e3d559012
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Oct  7 10:49:19 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Oct  7 10:49:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=203d10eb

media-gfx/ufraw: ia64 stable wrt bug #694532

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/ufraw/ufraw-0.22-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/ufraw/ufraw-0.22-r3.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
index 1d79cbaa41a..03f463505c4 100644
--- a/media-gfx/ufraw/ufraw-0.22-r3.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="contrast fits gimp gnome gtk openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2019-10-07 Thread Agostino Sarubbo
commit: c916b6c5b15982166594355928b1417f879d02e8
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Oct  7 09:52:11 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Oct  7 09:52:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c916b6c5

media-gfx/ufraw: ppc64 stable wrt bug #694532

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/ufraw/ufraw-0.22-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/ufraw/ufraw-0.22-r3.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
index 299e0fa7758..adf92380074 100644
--- a/media-gfx/ufraw/ufraw-0.22-r3.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="contrast fits gimp gnome gtk openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2019-10-06 Thread Thomas Deutschmann
commit: e6234a56a142ba53e816b483908c91b233195ede
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Oct  6 21:08:28 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Oct  6 21:18:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6234a56

media-gfx/ufraw: x86 stable (bug #694532)

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-gfx/ufraw/ufraw-0.22-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/ufraw/ufraw-0.22-r3.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
index f3126840467..809b3adafa4 100644
--- a/media-gfx/ufraw/ufraw-0.22-r3.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="contrast fits gimp gnome gtk openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/files/, media-gfx/ufraw/

2019-09-15 Thread Andreas Sturmlechner
commit: 35c276a51e96fd25c976d70a762e76dd2e048331
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep 15 23:34:26 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep 15 23:46:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35c276a5

media-gfx/ufraw: Fix CVE-2015-8366 and CVE-2018-19655

Thanks to openSUSE for the patches.

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../ufraw/files/ufraw-0.22-CVE-2015-8366.patch | 17 +
 .../ufraw/files/ufraw-0.22-CVE-2018-19655.patch| 44 ++
 media-gfx/ufraw/ufraw-0.22-r3.ebuild   |  2 +
 3 files changed, 63 insertions(+)

diff --git a/media-gfx/ufraw/files/ufraw-0.22-CVE-2015-8366.patch 
b/media-gfx/ufraw/files/ufraw-0.22-CVE-2015-8366.patch
new file mode 100644
index 000..9d59ca413fb
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.22-CVE-2015-8366.patch
@@ -0,0 +1,17 @@
+Fix a buffer overflow bug.  See
+https://github.com/LibRaw/LibRaw/commit/89d065424f09b788f443734d44857289489ca9e2
+
+--- a/dcraw.cc
 b/dcraw.cc
+@@ -3013,7 +3013,10 @@
+   diff = diff ? -diff : 0x80;
+ if (ftell(ifp) + 12 >= (int) seg[1][1])
+   diff = 0;
+-raw_image[pix] = pred[pix & 1] += diff;
++if(pix>=raw_width*raw_height)
++  derror();
++else
++  raw_image[pix] = pred[pix & 1] += diff;
+ if (!(pix & 1) && HOLE(pix / raw_width)) pix += 2;
+   }
+   maximum = 0xff;

diff --git a/media-gfx/ufraw/files/ufraw-0.22-CVE-2018-19655.patch 
b/media-gfx/ufraw/files/ufraw-0.22-CVE-2018-19655.patch
new file mode 100644
index 000..78b46b4452e
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.22-CVE-2018-19655.patch
@@ -0,0 +1,44 @@
+Description: stack-based buffer overflow bug
+Bug-Debian: https://bugs.debian.org/890086
+Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2018-19655
+Author: Filip Hroch 
+Reviewed-by: Salvatore Bonaccorso 
+Last-Update: 2018-12-02
+
+--- a/dcraw.cc
 b/dcraw.cc
+@@ -8505,9 +8505,15 @@ float CLASS find_green (int bps, int bit
+ {
+   UINT64 bitbuf=0;
+   int vbits, col, i, c;
+-  ushort img[2][2064];
++  ushort *img;
+   double sum[]={0,0};
+ 
++#define IMG2D(row,col) \
++  img[(row)*width+(col)]
++
++  img = (ushort *) malloc(2*width*sizeof(ushort));
++  merror (img, "find_green()");
++
+   FORC(2) {
+ fseek (ifp, c ? off1:off0, SEEK_SET);
+ for (vbits=col=0; col < width; col++) {
+@@ -8516,13 +8522,14 @@ float CLASS find_green (int bps, int bit
+   for (i=0; i < bite; i+=8)
+ bitbuf |= (unsigned) (fgetc(ifp) << i);
+   }
+-  img[c][col] = bitbuf << (64-bps-vbits) >> (64-bps);
++  IMG2D(c,col) = bitbuf << (64-bps-vbits) >> (64-bps);
+ }
+   }
+   FORC(width-1) {
+-sum[ c & 1] += ABS(img[0][c]-img[1][c+1]);
+-sum[~c & 1] += ABS(img[1][c]-img[0][c+1]);
++sum[ c & 1] += ABS(IMG2D(0,c)-IMG2D(1,c+1));
++sum[~c & 1] += ABS(IMG2D(1,c)-IMG2D(0,c+1));
+   }
++  free(img);
+   return 100 * log(sum[0]/sum[1]);
+ }
+ 

diff --git a/media-gfx/ufraw/ufraw-0.22-r3.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
index b43d97d6022..f3126840467 100644
--- a/media-gfx/ufraw/ufraw-0.22-r3.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
@@ -44,6 +44,8 @@ PATCHES=(
"${FILESDIR}"/${P}-jpeg9.patch
"${FILESDIR}"/${P}-exiv2-0.27.patch
"${FILESDIR}"/${P}-gcc9.patch
+   "${FILESDIR}"/${P}-CVE-2015-8366.patch
+   "${FILESDIR}"/${P}-CVE-2018-19655.patch
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/files/, media-gfx/ufraw/

2019-09-15 Thread Andreas Sturmlechner
commit: 12faa1f3969c1f632a6f939f46e4377c08c37fab
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep 15 23:26:33 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep 15 23:46:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12faa1f3

media-gfx/ufraw: Fix build with gcc-9, EAPI-7 bump

Thanks to openSUSE for the patch.

Closes: https://bugs.gentoo.org/685138
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/ufraw/files/ufraw-0.22-gcc9.patch | 97 +
 media-gfx/ufraw/ufraw-0.22-r3.ebuild| 96 
 2 files changed, 193 insertions(+)

diff --git a/media-gfx/ufraw/files/ufraw-0.22-gcc9.patch 
b/media-gfx/ufraw/files/ufraw-0.22-gcc9.patch
new file mode 100644
index 000..f2cf1dc88a8
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.22-gcc9.patch
@@ -0,0 +1,97 @@
+From ac8c74699cba65d65f918b3f4cba2de64e039ada Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= 
+Date: Thu, 14 Feb 2019 03:26:02 +
+Subject: [PATCH] Fix GCC 9 OpenMP issues by drop default(none)
+
+---
+ dcraw_api.cc  | 4 ++--
+ dcraw_indi.c  | 4 
+ ufraw_ufraw.c | 6 +++---
+ 3 files changed, 5 insertions(+), 9 deletions(-)
+
+diff --git a/dcraw_api.cc b/dcraw_api.cc
+index c3d2902..6096cb7 100644
+--- a/dcraw_api.cc
 b/dcraw_api.cc
+@@ -686,7 +686,7 @@ extern "C" {
+ rgbWB[3] = rgbWB[1];
+ if (dark) {
+ #ifdef _OPENMP
+-#pragma omp parallel for schedule(static) default(none) \
++#pragma omp parallel for schedule(static) \
+ shared(h,dark,rgbWB)
+ #endif
+ for (int i = 0; i < pixels; i++) {
+@@ -699,7 +699,7 @@ extern "C" {
+ }
+ } else {
+ #ifdef _OPENMP
+-#pragma omp parallel for schedule(static) default(none) \
++#pragma omp parallel for schedule(static) \
+ shared(h,dark,rgbWB)
+ #endif
+ for (int i = 0; i < pixels; i++) {
+diff --git a/dcraw_indi.c b/dcraw_indi.c
+index a291af2..777ce39 100644
+--- a/dcraw_indi.c
 b/dcraw_indi.c
+@@ -137,12 +137,10 @@ void CLASS wavelet_denoise_INDI(ushort(*image)[4], const 
int black,
+ #ifdef _OPENMP
+ #if defined(__sun) && !defined(__GNUC__)  /* Fix bug #3205673 - NKBJ */
+ #pragma omp parallel for  \
+-default(none) \
+ shared(nc,image,size,noise)   \
+ private(c,i,hpass,lev,lpass,row,col,thold,fimg,temp)
+ #else
+ #pragma omp parallel for  \
+-default(none) \
+ shared(nc,image,size) \
+ private(c,i,hpass,lev,lpass,row,col,thold,fimg,temp)
+ #endif
+@@ -413,7 +411,6 @@ void CLASS vng_interpolate_INDI(ushort(*image)[4], const 
unsigned filters,
+ progress(PROGRESS_INTERPOLATE, -height);
+ #ifdef _OPENMP
+ #pragma omp parallel  \
+-default(none) \
+ shared(image,code,prow,pcol,h)\
+ 
private(row,col,g,brow,rowtmp,pix,ip,gval,diff,gmin,gmax,thold,sum,color,num,c,t)
+ #endif
+@@ -496,7 +493,6 @@ void CLASS ppg_interpolate_INDI(ushort(*image)[4], const 
unsigned filters,
+ 
+ #ifdef _OPENMP
+ #pragma omp parallel  \
+-default(none) \
+ shared(image,dir,diff)\
+ private(row,col,i,d,c,pix,guess)
+ #endif
+diff --git a/ufraw_ufraw.c b/ufraw_ufraw.c
+index ce9d262..48a0d91 100644
+--- a/ufraw_ufraw.c
 b/ufraw_ufraw.c
+@@ -1043,7 +1043,7 @@ static void ufraw_shave_hotpixels(ufraw_data *uf, 
dcraw_image_type *img,
+ delta = rgbMax / (uf->conf->hotpixel + 1.0);
+ count = 0;
+ #ifdef _OPENMP
+-#pragma omp parallel for schedule(static) default(none) \
++#pragma omp parallel for schedule(static) \
+ shared(uf,img,width,height,colors,rgbMax,delta) \
+ reduction(+:count) \
+ private(h,p,w,c,t,v,hi,i)
+@@ -1365,7 +1365,7 @@ static void ufraw_convert_reverse_wb(ufraw_data *uf, 
UFRawPhase phase)
+ mul[i] = (guint64)0x1 * 0x1 / uf->developer->rgbWB[i];
+ size = img->height * img->width;
+ #ifdef _OPENMP
+-#pragma omp parallel for schedule(static) default(none) \
++#pragma omp parallel for schedule(static) \
+ shared(uf,phase,img,mul,size) \
+ private(i,p16,c,px)
+ #endif
+@@ -1390,7 +1390,7 @@ static void ufraw_convert_image_tca(ufraw_data *uf, 
ufraw_image_data *img,
+ return;
+ int y;
+ #ifdef _OPENMP
+-#pragma omp parallel for schedule(static) default(none) \
++#pragma omp parallel for schedule(static) \
+ shared(uf,img,outimg,area)
+ #endif
+ for (y = area->y; y < area->y + area->height; y++) {

diff --git a/media-gfx/ufraw/ufraw-0.22-r3.ebuild 
b/medi

[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/files/

2019-09-15 Thread Andreas Sturmlechner
commit: f40350f459b1d6c6e2715031cb59bf22720d3fd8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep 15 23:15:50 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep 15 23:16:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f40350f4

media-gfx/ufraw: Fix build with >=media-libs/exiv2-0.27.1

Closes: https://bugs.gentoo.org/688540
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch 
b/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch
index b5b4140fff8..2cd888ebc09 100644
--- a/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch
+++ b/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch
@@ -1,6 +1,6 @@
 a/ufraw_exiv2.cc   2015-06-16 05:58:38.0 +0200
-+++ b/ufraw_exiv2.cc   2018-12-29 22:51:23.291894430 +0100
-@@ -15,9 +15,7 @@
+--- a/ufraw_exiv2.cc
 b/ufraw_exiv2.cc
+@@ -15,9 +15,8 @@
  #include "ufraw.h"
  
  #ifdef HAVE_EXIV2
@@ -8,10 +8,11 @@
 -#include 
 -#include 
 +#include 
++#include 
  #include 
  #include 
  
-@@ -67,7 +65,11 @@
+@@ -67,7 +66,11 @@ extern "C" int ufraw_exif_read_input(ufraw_data *uf)
  if (exifData.empty()) {
  std::string error(uf->filename);
  error += ": No Exif data found in the file";



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2019-08-28 Thread David Seifert
commit: a2e7eb7fc3ed8a5ea70370020a091bce3cf62bad
Author: David Seifert  gentoo  org>
AuthorDate: Wed Aug 28 08:19:01 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Aug 28 08:19:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2e7eb7f

media-gfx/ufraw: [QA] Remove media-libs/jasper dep

Bug: https://bugs.gentoo.org/689784
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: David Seifert  gentoo.org>

 media-gfx/ufraw/ufraw-0.22-r2.ebuild | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/media-gfx/ufraw/ufraw-0.22-r2.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
index 9bbc7e77121..f791b1bfa2d 100644
--- a/media-gfx/ufraw/ufraw-0.22-r2.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone"
+IUSE="contrast fits gimp gnome gtk openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"
 
@@ -31,7 +31,6 @@ RDEPEND="
>=media-gfx/gtkimageview-1.5
>=x11-libs/gtk+-2.6:2
)
-   jpeg2k? ( media-libs/jasper:= )
 "
 DEPEND="${RDEPEND}
virtual/pkgconfig
@@ -59,7 +58,7 @@ src_configure() {
$(use_with gimp) \
$(use_enable gnome mime) \
$(use_with gtk) \
-   $(use_enable jpeg2k jasper) \
+   --disable-jasper \
$(use_enable openmp) \
$(use_enable timezone dst-correction)
 }



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/files/, media-gfx/ufraw/

2018-12-29 Thread Andreas Sturmlechner
commit: 47eba01d3895bd74c7fffc56025c32827c817af2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec 29 21:54:38 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec 29 22:02:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47eba01d

media-gfx/ufraw: Fix build with exiv2-0.27

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch | 25 +++
 media-gfx/ufraw/ufraw-0.22-r2.ebuild  |  3 ++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch 
b/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch
new file mode 100644
index 000..b5b4140fff8
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch
@@ -0,0 +1,25 @@
+--- a/ufraw_exiv2.cc   2015-06-16 05:58:38.0 +0200
 b/ufraw_exiv2.cc   2018-12-29 22:51:23.291894430 +0100
+@@ -15,9 +15,7 @@
+ #include "ufraw.h"
+ 
+ #ifdef HAVE_EXIV2
+-#include 
+-#include 
+-#include 
++#include 
+ #include 
+ #include 
+ 
+@@ -67,7 +65,11 @@
+ if (exifData.empty()) {
+ std::string error(uf->filename);
+ error += ": No Exif data found in the file";
++#if EXIV2_TEST_VERSION(0,27,0)
++throw Exiv2::Error(Exiv2::kerErrorMessage, error);
++#else
+ throw Exiv2::Error(1, error);
++#endif
+ }
+ 
+ /* List of tag names taken from exiv2's printSummary() in actions.cpp 
*/

diff --git a/media-gfx/ufraw/ufraw-0.22-r2.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
index 53994be42a8..9bbc7e77121 100644
--- a/media-gfx/ufraw/ufraw-0.22-r2.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -44,6 +44,7 @@ PATCHES=(
"${FILESDIR}"/${P}-drop_superfluous_abs.patch
"${FILESDIR}"/${P}-fix-unsigned-char.patch
"${FILESDIR}"/${P}-jpeg9.patch
+   "${FILESDIR}"/${P}-exiv2-0.27.patch
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2018-05-20 Thread Andreas Sturmlechner
commit: 7c67a07bf53ed999b9dc3a2b96cfcb1f53be7f02
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May 20 16:31:27 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 20 19:09:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c67a07b

media-gfx/ufraw: Drop old

Closes: https://bugs.gentoo.org/646982
Package-Manager: Portage-2.3.38, Repoman-2.3.9

 media-gfx/ufraw/ufraw-0.22.ebuild | 80 ---
 1 file changed, 80 deletions(-)

diff --git a/media-gfx/ufraw/ufraw-0.22.ebuild 
b/media-gfx/ufraw/ufraw-0.22.ebuild
deleted file mode 100644
index e3800851789..000
--- a/media-gfx/ufraw/ufraw-0.22.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils gnome2-utils toolchain-funcs xdg-utils
-
-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 
~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="contrast fits gimp gnome gtk openmp timezone"
-
-REQUIRED_USE="gimp? ( gtk )"
-
-RDEPEND="
-   dev-libs/glib:2=
-   >=media-gfx/exiv2-0.11:0=
-   media-libs/lcms:2=
-   >=media-libs/lensfun-0.2.5:=
-   media-libs/libpng:0=
-   media-libs/tiff:0=
-   virtual/jpeg:0=
-   fits? ( sci-libs/cfitsio:0= )
-   gnome? ( >=gnome-base/gconf-2 )
-   gtk? ( >=x11-libs/gtk+-2.6:2
-   >=media-gfx/gtkimageview-1.5 )
-   gimp? ( >=media-gfx/gimp-2 )
-"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-src_prepare() {
-   epatch "${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(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)
-}
-
-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
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-   gnome2_gconf_install
-   fi
-}
-
-pkg_postrm() {
-   if use gnome; then
-   xdg_desktop_database_update
-   xdg_mimeinfo_database_update
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2018-04-20 Thread David Seifert
commit: fd7d57ec8381f2e11cd2437625cd3e34bc7dd702
Author: Marty E. Plummer  startmail  com>
AuthorDate: Tue Apr 10 03:49:48 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Apr 20 19:43:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd7d57ec

media-gfx/ufraw: fdo-mime->xdg-utils

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 media-gfx/ufraw/ufraw-0.22.ebuild | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/media-gfx/ufraw/ufraw-0.22.ebuild 
b/media-gfx/ufraw/ufraw-0.22.ebuild
index a33821caf15..e3800851789 100644
--- a/media-gfx/ufraw/ufraw-0.22.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools eutils fdo-mime gnome2-utils toolchain-funcs
+
+inherit autotools eutils gnome2-utils toolchain-funcs xdg-utils
 
 DESCRIPTION="RAW Image format viewer and GIMP plugin"
 HOMEPAGE="http://ufraw.sourceforge.net/";
@@ -65,15 +66,15 @@ pkg_preinst() {
 
 pkg_postinst() {
if use gnome; then
-   fdo-mime_mime_database_update
-   fdo-mime_desktop_database_update
+   xdg_mimeinfo_database_update
+   xdg_desktop_database_update
gnome2_gconf_install
fi
 }
 
 pkg_postrm() {
if use gnome; then
-   fdo-mime_desktop_database_update
-   fdo-mime_mime_database_update
+   xdg_desktop_database_update
+   xdg_mimeinfo_database_update
fi
 }



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2018-04-15 Thread Andreas Sturmlechner
commit: 9e625400d07e8a375a70ea423808039035b714be
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 15 16:50:33 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 15 17:15:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e625400

media-gfx/ufraw: Drop 0.22-r1

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 media-gfx/ufraw/ufraw-0.22-r1.ebuild | 92 
 1 file changed, 92 deletions(-)

diff --git a/media-gfx/ufraw/ufraw-0.22-r1.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
deleted file mode 100644
index 8cc78457166..000
--- a/media-gfx/ufraw/ufraw-0.22-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools 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 ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 
~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone"
-
-REQUIRED_USE="gimp? ( gtk )"
-
-RDEPEND="
-   dev-libs/glib:2=
-   >=media-gfx/exiv2-0.11:0=
-   media-libs/lcms:2=
-   >=media-libs/lensfun-0.2.5:=
-   media-libs/libpng:0=
-   media-libs/tiff:0=
-   virtual/jpeg:0=
-   fits? ( sci-libs/cfitsio:0= )
-   gimp? ( >=media-gfx/gimp-2 )
-   gnome? ( >=gnome-base/gconf-2 )
-   gtk? (
-   >=media-gfx/gtkimageview-1.5
-   >=x11-libs/gtk+-2.6:2
-   )
-   jpeg2k? ( media-libs/jasper:= )
-"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch
-   "${FILESDIR}"/${P}-jasper-automagic.patch
-   "${FILESDIR}"/${P}-crashfix.patch
-   "${FILESDIR}"/${P}-drop_superfluous_abs.patch
-   "${FILESDIR}"/${P}-fix-unsigned-char.patch
-)
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(use_enable contrast) \
-   $(use_with fits cfitsio) \
-   $(use_with gimp) \
-   $(use_enable gnome mime) \
-   $(use_with gtk) \
-   $(use_enable jpeg2k jasper) \
-   $(use_enable openmp) \
-   $(use_enable timezone dst-correction)
-}
-
-src_compile() {
-   emake AR="$(tc-getAR)"
-}
-
-src_install() {
-   emake DESTDIR="${D}" schemasdir=/etc/gconf/schemas install
-   einstalldocs
-}
-
-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
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2018-04-04 Thread Sergei Trofimovich
commit: e9ed617d882083add6ab5bac6f6daec25a860fba
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Apr  4 22:34:39 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Apr  4 22:34:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9ed617d

media-gfx/ufraw: stable 0.22-r2 for ppc, bug #646982

Package-Manager: Portage-2.3.28, Repoman-2.3.9
RepoMan-Options: --include-arches="ppc"

 media-gfx/ufraw/ufraw-0.22-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/ufraw/ufraw-0.22-r2.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
index 0c33b6448d3..53994be42a8 100644
--- a/media-gfx/ufraw/ufraw-0.22-r2.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2018-04-02 Thread Markus Meier
commit: 3bfdae30db245324b4c9f77dbf3032e8839cb1d8
Author: Markus Meier  gentoo  org>
AuthorDate: Mon Apr  2 08:32:12 2018 +
Commit: Markus Meier  gentoo  org>
CommitDate: Mon Apr  2 08:32:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bfdae30

media-gfx/ufraw: arm stable, bug #646982

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="arm"

 media-gfx/ufraw/ufraw-0.22-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/ufraw/ufraw-0.22-r2.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
index d301e9c5658..0c33b6448d3 100644
--- a/media-gfx/ufraw/ufraw-0.22-r2.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2018-04-01 Thread Matt Turner
commit: da45ab48728d73dc4e31e59a29c080c5fe001e72
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Apr  2 06:22:59 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Apr  2 06:22:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da45ab48

media-gfx/ufraw-0.22-r2: added ~mips

 media-gfx/ufraw/ufraw-0.22-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/ufraw/ufraw-0.22-r2.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
index 5b4db181b2e..d301e9c5658 100644
--- a/media-gfx/ufraw/ufraw-0.22-r2.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2018-03-31 Thread Sergei Trofimovich
commit: 7fb215efc11e883aaf9be239fa0ede4e2ac91ae6
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Mar 31 10:46:07 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Mar 31 10:46:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fb215ef

media-gfx/ufraw: stable 0.22-r2 for ppc64, bug #646982

Package-Manager: Portage-2.3.27, Repoman-2.3.9
RepoMan-Options: --include-arches="ppc64"

 media-gfx/ufraw/ufraw-0.22-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/ufraw/ufraw-0.22-r2.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
index 8d52ba4acf8..5b4db181b2e 100644
--- a/media-gfx/ufraw/ufraw-0.22-r2.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2018-03-05 Thread Tobias Klausmann
commit: 8f047e9f81c43918bad2be062acaac47d10f00ff
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Mon Mar  5 10:36:12 2018 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Mon Mar  5 10:36:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f047e9f

media-gfx/ufraw-0.22-r2: alpha stable

Gentoo-Bug: http://bugs.gentoo.org/646982

 media-gfx/ufraw/ufraw-0.22-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/ufraw/ufraw-0.22-r2.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
index e9712874cb7..39d7c57421d 100644
--- a/media-gfx/ufraw/ufraw-0.22-r2.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc ~x86 
~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc ~x86 
~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2018-02-25 Thread Sergei Trofimovich
commit: 343288dd442cd6c742b91b62c5d5752d8adad02b
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Feb 26 07:24:28 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Feb 26 07:36:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=343288dd

media-gfx/ufraw: stable 0.22-r2 for sparc, bug #646982

Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="sparc"

 media-gfx/ufraw/ufraw-0.22-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/ufraw/ufraw-0.22-r2.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
index 24ef57c29e1..e9712874cb7 100644
--- a/media-gfx/ufraw/ufraw-0.22-r2.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc ~x86 
~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2018-02-18 Thread Jason Zaman
commit: 30e7d615fb2694da615d293e37e95e1c6188005c
Author: Jason Zaman  gentoo  org>
AuthorDate: Sun Feb 18 17:50:59 2018 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Sun Feb 18 17:50:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30e7d615

media-gfx/ufraw: amd64 stable

Gentoo-bug: 646982
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-gfx/ufraw/ufraw-0.22-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/ufraw/ufraw-0.22-r2.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
index bea35d4e64d..24ef57c29e1 100644
--- a/media-gfx/ufraw/ufraw-0.22-r2.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2018-02-18 Thread Sergei Trofimovich
commit: 171fa70ed1eeae0b5c5a1b0981e5d0f702798d83
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Feb 18 10:35:49 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Feb 18 10:36:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=171fa70e

media-gfx/ufraw: stable 0.22-r2 for ia64, bug #646982

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ia64"

 media-gfx/ufraw/ufraw-0.22-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/ufraw/ufraw-0.22-r2.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
index 4df5995e535..bea35d4e64d 100644
--- a/media-gfx/ufraw/ufraw-0.22-r2.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/, media-gfx/ufraw/files/

2018-02-03 Thread Andreas Sturmlechner
commit: 99f327c67cf7ff29d8ef4608f21ad75285a435ad
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb  3 16:42:55 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb  3 16:42:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99f327c6

media-gfx/ufraw: Fix build w/ jpeg-9, migrate to xdg-utils

Bug: https://bugs.gentoo.org/540872
Closes: https://bugs.gentoo.org/520882
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch | 32 ++
 media-gfx/ufraw/ufraw-0.22-r2.ebuild | 94 
 2 files changed, 126 insertions(+)

diff --git a/media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch 
b/media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch
new file mode 100644
index 000..dca3834cbe8
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch
@@ -0,0 +1,32 @@
+Fix build with >=jpeg-9
+Thanks-to: Moran Z. 
+
+--- a/dcraw.cc 2014-09-02 07:50:38.0 +0300
 b/dcraw.cc 2015-02-21 04:54:13.957561352 +0200
+@@ -2330,7 +2330,7 @@ 
+ #endif
+   cinfo->src->next_input_byte = jpeg_buffer;
+   cinfo->src->bytes_in_buffer = nbytes;
+-  return TRUE;
++  return boolean(TRUE);
+ }
+ 
+ void CLASS kodak_jpeg_load_raw()
+@@ -2346,7 +2346,7 @@ 
+   jpeg_create_decompress (&cinfo);
+   jpeg_stdio_src (&cinfo, ifp);
+   cinfo.src->fill_input_buffer = fill_input_buffer;
+-  jpeg_read_header (&cinfo, TRUE);
++  jpeg_read_header (&cinfo, boolean(TRUE));
+   jpeg_start_decompress (&cinfo);
+   if ((cinfo.output_width  != width  ) ||
+   (cinfo.output_height*2   != height ) ||
+@@ -2419,7 +2419,7 @@ 
+ if (tile_length < INT_MAX)
+   fseek (ifp, get4(), SEEK_SET);
+ jpeg_stdio_src (&cinfo, ifp);
+-jpeg_read_header (&cinfo, TRUE);
++jpeg_read_header (&cinfo, boolean(TRUE));
+ jpeg_start_decompress (&cinfo);
+ buf = (*cinfo.mem->alloc_sarray)
+   ((j_common_ptr) &cinfo, JPOOL_IMAGE, cinfo.output_width*3, 1);

diff --git a/media-gfx/ufraw/ufraw-0.22-r2.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
new file mode 100644
index 000..4df5995e535
--- /dev/null
+++ b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils toolchain-funcs xdg-utils
+
+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 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone"
+
+REQUIRED_USE="gimp? ( gtk )"
+
+RDEPEND="
+   dev-libs/glib:2=
+   >=media-gfx/exiv2-0.11:0=
+   media-libs/lcms:2=
+   >=media-libs/lensfun-0.2.5:=
+   media-libs/libpng:0=
+   media-libs/tiff:0=
+   virtual/jpeg:0=
+   fits? ( sci-libs/cfitsio:0= )
+   gimp? ( >=media-gfx/gimp-2 )
+   gnome? ( >=gnome-base/gconf-2 )
+   gtk? (
+   >=media-gfx/gtkimageview-1.5
+   >=x11-libs/gtk+-2.6:2
+   )
+   jpeg2k? ( media-libs/jasper:= )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch
+   "${FILESDIR}"/${P}-jasper-automagic.patch
+   "${FILESDIR}"/${P}-crashfix.patch
+   "${FILESDIR}"/${P}-drop_superfluous_abs.patch
+   "${FILESDIR}"/${P}-fix-unsigned-char.patch
+   "${FILESDIR}"/${P}-jpeg9.patch
+)
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable contrast) \
+   $(use_with fits cfitsio) \
+   $(use_with gimp) \
+   $(use_enable gnome mime) \
+   $(use_with gtk) \
+   $(use_enable jpeg2k jasper) \
+   $(use_enable openmp) \
+   $(use_enable timezone dst-correction)
+}
+
+src_compile() {
+   emake AR="$(tc-getAR)"
+}
+
+src_install() {
+   emake DESTDIR="${D}" schemasdir=/etc/gconf/schemas install
+   einstalldocs
+}
+
+pkg_preinst() {
+   if use gnome; then
+   gnome2_gconf_savelist
+   fi
+}
+
+pkg_postinst() {
+   if use gnome; then
+   xdg_mimeinfo_database_update
+   xdg_desktop_database_update
+   gnome2_gconf_install
+   fi
+}
+
+pkg_postrm() {
+   if use gnome; then
+   xdg_desktop_database_update
+   xdg_mimeinfo_database_update
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2018-01-20 Thread Sergei Trofimovich
commit: e3e8e75cf19501eddf0aeadfc5635703376d55ea
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jan 20 21:45:34 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jan 20 21:45:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3e8e75c

media-gfx/ufraw: stable 0.22-r1 for ppc, bug #636670 (thanks to ernsteiswuerfel)

Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc"

 media-gfx/ufraw/ufraw-0.22-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/ufraw/ufraw-0.22-r1.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
index 56b7ff454fd..8cc78457166 100644
--- a/media-gfx/ufraw/ufraw-0.22-r1.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ppc64 ~s390 ~sh ~sparc x86 
~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 
~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2018-01-17 Thread Markus Meier
commit: c6a566f505b81a176284aa75d9ab473b5628665e
Author: Markus Meier  gentoo  org>
AuthorDate: Wed Jan 17 18:00:34 2018 +
Commit: Markus Meier  gentoo  org>
CommitDate: Wed Jan 17 18:00:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6a566f5

media-gfx/ufraw: arm stable, bug #636670

Package-Manager: Portage-2.3.13, Repoman-2.3.3
RepoMan-Options: --include-arches="arm"

 media-gfx/ufraw/ufraw-0.22-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/ufraw/ufraw-0.22-r1.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
index 1cf5b9478b7..56b7ff454fd 100644
--- a/media-gfx/ufraw/ufraw-0.22-r1.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 ~s390 ~sh ~sparc x86 
~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ppc64 ~s390 ~sh ~sparc x86 
~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2017-12-29 Thread Sergei Trofimovich
commit: 8693caac7872d4940772083266a94fd88ea3c792
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Dec 29 18:18:02 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Dec 29 18:18:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8693caac

media-gfx/ufraw: stable 0.22-r1 for ppc64, bug #636670

Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc64"

 media-gfx/ufraw/ufraw-0.22-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/ufraw/ufraw-0.22-r1.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
index 0429211c459..1cf5b9478b7 100644
--- a/media-gfx/ufraw/ufraw-0.22-r1.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 
~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 ~s390 ~sh ~sparc x86 
~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2017-12-16 Thread Sergei Trofimovich
commit: 0d299e1ba4b49dad6724db7566bc27446178c274
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Dec 16 13:11:40 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Dec 16 13:24:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d299e1b

media-gfx/ufraw: stable 0.22-r1 for ia64, bug #636670

Package-Manager: Portage-2.3.18, Repoman-2.3.6
RepoMan-Options: --include-arches="ia64"

 media-gfx/ufraw/ufraw-0.22-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/ufraw/ufraw-0.22-r1.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
index 4ae83245d0b..0429211c459 100644
--- a/media-gfx/ufraw/ufraw-0.22-r1.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc 
x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 
~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2017-12-14 Thread Jason Zaman
commit: be54282e5391283ee947ca3a6059447549cfdcb5
Author: Jason Zaman  gentoo  org>
AuthorDate: Thu Dec 14 11:17:04 2017 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Thu Dec 14 11:17:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be54282e

media-gfx/ufraw: amd64 stable

Gentoo-bug: 636670
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 media-gfx/ufraw/ufraw-0.22-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/ufraw/ufraw-0.22-r1.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
index 4959a4c2165..4ae83245d0b 100644
--- a/media-gfx/ufraw/ufraw-0.22-r1.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc 
x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc 
x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2017-12-08 Thread Thomas Deutschmann
commit: 4106bda54c1f5a001baae4843b3cf083f507d314
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Dec  8 20:08:52 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Dec  8 20:08:52 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4106bda5

media-gfx/ufraw: x86 stable (bug #636670)

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 media-gfx/ufraw/Manifest | 2 +-
 media-gfx/ufraw/ufraw-0.22-r1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
index de09e896d61..94b0dbea86e 100644
--- a/media-gfx/ufraw/Manifest
+++ b/media-gfx/ufraw/Manifest
@@ -1 +1 @@
-DIST ufraw-0.22.tar.gz 1103554 SHA256 
f7abd28ce587db2a74b4c54149bd8a2523a7ddc09bedf4f923246ff0ae09a25e SHA512 
a42eff5052c18afec90245cf97ceeade78e3f288186cf697ac4abf2e8290d4081db8ac4de3ae47b3774f30a6cb4cbda392099e6fd2125fe751abb40d9b065ad2
 WHIRLPOOL 
5cb53f83d2f2baccd0752a0898eb894b8e15ad234962f3e3cc4ae2166309cd68893dceef28d32018aa486da1a09c64df378a2569f764a42f8251f5a568c14e5f
+DIST ufraw-0.22.tar.gz 1103554 BLAKE2B 
5ffa4c660602553853221d7b31bfb78b02644bfeb4461cf752186d83ed8087b7905e414c7d741916ca9460c05849ab679b2f3098c99e5246f54a49b6a915268f
 SHA512 
a42eff5052c18afec90245cf97ceeade78e3f288186cf697ac4abf2e8290d4081db8ac4de3ae47b3774f30a6cb4cbda392099e6fd2125fe751abb40d9b065ad2

diff --git a/media-gfx/ufraw/ufraw-0.22-r1.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
index c0ccf38a72d..4959a4c2165 100644
--- a/media-gfx/ufraw/ufraw-0.22-r1.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc 
x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2017-08-31 Thread Tim Harder
commit: 47b3cd186f4e6b8aaf64e63137d096bdbc659db0
Author: Tim Harder  gentoo  org>
AuthorDate: Thu Aug 31 12:19:26 2017 +
Commit: Tim Harder  gentoo  org>
CommitDate: Thu Aug 31 12:19:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47b3cd18

media-gfx/ufraw: use single lines for USE flag metadata

 media-gfx/ufraw/metadata.xml | 12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/media-gfx/ufraw/metadata.xml b/media-gfx/ufraw/metadata.xml
index c97daa62203..284cb404dd5 100644
--- a/media-gfx/ufraw/metadata.xml
+++ b/media-gfx/ufraw/metadata.xml
@@ -6,15 +6,9 @@
Gentoo Graphics Project


-   
-   enable contrast setting option
-   
-   
-   Enable support for the FITS image format through 
sci-libs/cfitsio
-   
-   
-   enable DST correction for file timestamps
-   
+   enable contrast setting option
+   Enable support for the FITS image format 
through sci-libs/cfitsio
+   enable DST correction for file 
timestamps


ufraw



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/, media-gfx/ufraw/files/

2017-08-31 Thread Tim Harder
commit: 5e188d57a4d15b54693f00ab812279ea1b9544c7
Author: Tim Harder  gentoo  org>
AuthorDate: Thu Aug 31 12:20:39 2017 +
Commit: Tim Harder  gentoo  org>
CommitDate: Thu Aug 31 12:20:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e188d57

media-gfx/ufraw: remove old

 media-gfx/ufraw/Manifest   |  1 -
 .../ufraw/files/ufraw-0.21-CVE-2015-3885.patch | 52 --
 media-gfx/ufraw/ufraw-0.21-r1.ebuild   | 80 --
 3 files changed, 133 deletions(-)

diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
index 751154ec8ef..de09e896d61 100644
--- a/media-gfx/ufraw/Manifest
+++ b/media-gfx/ufraw/Manifest
@@ -1,2 +1 @@
-DIST ufraw-0.21.tar.gz 1016298 SHA256 
2a6a1bcc633bdc8e15615cf726befcd7f27ab00e7c2a518469a24e1a96964d87 SHA512 
e1fbfcf7b6f15089d51626a3e2d3dc694aa79edfc0bdfe4a8be6f684d4a31a91c56502942174c0708de91413fe907acb5d2fa2ad9d1a5404eb66b14764909ae9
 WHIRLPOOL 
84e96894f9ecc9d3a81f96f7c58165e095553b9bab69343754c8a89ef18480f751745cb48e8846ea5db26d1077ace4104ef18d0c0546b2b54439819b81ee3a7c
 DIST ufraw-0.22.tar.gz 1103554 SHA256 
f7abd28ce587db2a74b4c54149bd8a2523a7ddc09bedf4f923246ff0ae09a25e SHA512 
a42eff5052c18afec90245cf97ceeade78e3f288186cf697ac4abf2e8290d4081db8ac4de3ae47b3774f30a6cb4cbda392099e6fd2125fe751abb40d9b065ad2
 WHIRLPOOL 
5cb53f83d2f2baccd0752a0898eb894b8e15ad234962f3e3cc4ae2166309cd68893dceef28d32018aa486da1a09c64df378a2569f764a42f8251f5a568c14e5f

diff --git a/media-gfx/ufraw/files/ufraw-0.21-CVE-2015-3885.patch 
b/media-gfx/ufraw/files/ufraw-0.21-CVE-2015-3885.patch
deleted file mode 100644
index c17c66c41ab..000
--- a/media-gfx/ufraw/files/ufraw-0.21-CVE-2015-3885.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 6b4ff65c6fc1a88eaa7bfc1ee5a25413d171b5f7 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen 
-Date: Thu, 21 May 2015 13:47:29 +0200
-Subject: [PATCH] patch: CVE-2015-3885
-
-Squashed commit of the following:
-
-commit 8f2a2348638f74e059069d98a6329fcc656ae4b5
-Author: Nils Philippsen 
-Date:   Tue May 19 11:36:57 2015 +0200
-
-CVE-2015-3885: avoid overflowing array
-
-When reading raw image files containing lossless JPEG data, headers
-could be manipulated to make the signed int variable 'len' negative
-which specifies how much actual data follows. Interpreted as unsigned,
-this could lead to reading file data past the 64k boundary of the array
-used for storing it. To avoid that, make 'len' unsigned short, and bail
-out early if its value would become invalid (i.e. <= 0).

- dcraw.cc | 8 +---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/dcraw.cc b/dcraw.cc
-index 75ea121..d9f96ff 100644
 a/dcraw.cc
-+++ b/dcraw.cc
-@@ -934,7 +934,8 @@ struct jhead {
- 
- int CLASS ljpeg_start (struct jhead *jh, int info_only)
- {
--  int c, tag, len;
-+  int c, tag;
-+  ushort len;
-   uchar data[0x1];
-   const uchar *dp;
- 
-@@ -945,8 +946,9 @@ int CLASS ljpeg_start (struct jhead *jh, int info_only)
-   do {
- fread (data, 2, 2, ifp);
- tag =  data[0] << 8 | data[1];
--len = (data[2] << 8 | data[3]) - 2;
--if (tag <= 0xff00) return 0;
-+len = (data[2] << 8 | data[3]);
-+if (tag <= 0xff00 || len <= 2) return 0;
-+len -= 2;
- fread (data, 1, len, ifp);
- switch (tag) {
-   case 0xffc3:
--- 
-2.4.1
-

diff --git a/media-gfx/ufraw/ufraw-0.21-r1.ebuild 
b/media-gfx/ufraw/ufraw-0.21-r1.ebuild
deleted file mode 100644
index d5fd804c5dc..000
--- a/media-gfx/ufraw/ufraw-0.21-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="contrast fits gimp gnome gtk openmp timezone"
-
-REQUIRED_USE="gimp? ( gtk )"
-
-RDEPEND="
-   dev-libs/glib:2=
-   >=media-gfx/exiv2-0.11:0=
-   media-libs/lcms:2=
-   >=media-libs/lensfun-0.2.5:=
-   media-libs/libpng:0=
-   media-libs/tiff:0=
-   virtual/jpeg:0=
-   fits? ( sci-libs/cfitsio:0= )
-   gnome? ( >=gnome-base/gconf-2 )
-   gtk? ( >=x11-libs/gtk+-2.6:2
-   >=media-gfx/gtkimageview-1.5 )
-   gimp? ( >=media-gfx/gimp-2 )
-"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-src_prepare() {
-   epatch "${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch
-   epatch "${FILESDIR}"/${P}-CVE-2015-3885.patch
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(use_enable contrast) \
-   $(use_with fits cfitsio) \
-   $(use_with gimp) \
-   

[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2017-07-19 Thread Alexis Ballier
commit: 4eac1bfc594029a132104712aefbe5a6c876144d
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Jul 19 20:32:31 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Jul 19 21:30:27 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eac1bfc

media-gfx/ufraw: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 media-gfx/ufraw/ufraw-0.22-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/ufraw/ufraw-0.22-r1.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
index e8bb0325f6c..c0ccf38a72d 100644
--- a/media-gfx/ufraw/ufraw-0.22-r1.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
@@ -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 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/, media-gfx/ufraw/files/

2017-07-19 Thread Alexis Ballier
commit: 9ae1b0b7ad1fc87873e6e74fa008a498cb37aec7
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Jul 19 11:49:18 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Jul 19 11:49:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ae1b0b7

media-gfx/ufraw: Add patch to fix build on arm. Bug #622484

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 .../ufraw/files/ufraw-0.22-fix-unsigned-char.patch   | 20 
 media-gfx/ufraw/ufraw-0.22-r1.ebuild |  1 +
 2 files changed, 21 insertions(+)

diff --git a/media-gfx/ufraw/files/ufraw-0.22-fix-unsigned-char.patch 
b/media-gfx/ufraw/files/ufraw-0.22-fix-unsigned-char.patch
new file mode 100644
index 000..a5397260ffb
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.22-fix-unsigned-char.patch
@@ -0,0 +1,20 @@
+Description: Fix unsigned char declaration of src[]
+Author: John Paul Adrian Glaubitz 
+Last-Update: 2017-02-27
+
+https://bugs.gentoo.org/show_bug.cgi?id=622484
+https://sourceforge.net/p/ufraw/bugs/417/
+https://src.fedoraproject.org/cgit/rpms/ufraw.git/tree/05_fix_build_due_to_unsigned_char.patch
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=856227
+
+--- ufraw-0.22.orig/dcraw.cc
 ufraw-0.22/dcraw.cc
+@@ -2285,7 +2285,7 @@ void CLASS quicktake_100_load_raw()
+ 
+ void CLASS kodak_radc_load_raw()
+ {
+-  static const char src[] = {
++  static const signed char src[] = {
+ 1,1, 2,3, 3,4, 4,2, 5,7, 6,5, 7,6, 7,8,
+ 1,0, 2,1, 3,3, 4,4, 5,2, 6,7, 7,6, 8,5, 8,8,
+ 2,1, 2,3, 3,0, 3,2, 3,4, 4,6, 5,5, 6,7, 6,8,

diff --git a/media-gfx/ufraw/ufraw-0.22-r1.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
index 155af1ce170..e8bb0325f6c 100644
--- a/media-gfx/ufraw/ufraw-0.22-r1.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
@@ -41,6 +41,7 @@ PATCHES=(
"${FILESDIR}"/${P}-jasper-automagic.patch
"${FILESDIR}"/${P}-crashfix.patch
"${FILESDIR}"/${P}-drop_superfluous_abs.patch
+   "${FILESDIR}"/${P}-fix-unsigned-char.patch
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/files/, media-gfx/ufraw/

2017-06-18 Thread Alexis Ballier
commit: d4658e180df072cdcb4102bc79b8b5b08558df60
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sun Jun 18 09:51:06 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sun Jun 18 09:51:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4658e18

media-gfx/ufraw: Fix build with gcc 7.

Patch by Johannes Hirte, bug #618068

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../ufraw/files/ufraw-0.22-drop_superfluous_abs.patch| 16 
 media-gfx/ufraw/ufraw-0.22-r1.ebuild |  1 +
 2 files changed, 17 insertions(+)

diff --git a/media-gfx/ufraw/files/ufraw-0.22-drop_superfluous_abs.patch 
b/media-gfx/ufraw/files/ufraw-0.22-drop_superfluous_abs.patch
new file mode 100644
index 000..8c11f664978
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.22-drop_superfluous_abs.patch
@@ -0,0 +1,16 @@
+Fixes build with gcc 7, by Johannes Hirte.
+https://bugs.gentoo.org/show_bug.cgi?id=618068
+
+diff --git a/../old/dcraw.cc b/dcraw.cc
+index 88c8068..cedf86b 100644
+--- a/../old/dcraw.cc
 b/dcraw.cc
+@@ -9242,7 +9242,7 @@ canon_a5:
+ if (make[0] == 'O') {
+   i = find_green (12, 32, 1188864, 3576832);
+   c = find_green (12, 32, 2383920, 2387016);
+-  if (abs(i) < abs(c)) {
++  if (i < c) {
+   SWAP(i,c);
+   load_flags = 24;
+   }

diff --git a/media-gfx/ufraw/ufraw-0.22-r1.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
index 22543e4..155af1ce170 100644
--- a/media-gfx/ufraw/ufraw-0.22-r1.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
@@ -40,6 +40,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch
"${FILESDIR}"/${P}-jasper-automagic.patch
"${FILESDIR}"/${P}-crashfix.patch
+   "${FILESDIR}"/${P}-drop_superfluous_abs.patch
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/files/, media-gfx/ufraw/

2017-04-04 Thread Andreas Sturmlechner
commit: 2da389e51d92dbe277d6e7b5cfd8194d5cae4ec3
Author: Christophe Lermytte  lermytte  be>
AuthorDate: Sun Nov 27 23:07:16 2016 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Apr  4 15:41:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2da389e5

media-gfx/ufraw: add explicit jpeg2k support

Upstream links to libjasper when available. This commit patches
configure.ac to make libjasper support explicit and adds a jpeg2k
USE flag to enable/disable it.

Gentoo-bug: 470836
Package-Manager: portage-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/2939

 .../ufraw/files/ufraw-0.22-jasper-automagic.patch   | 21 +
 media-gfx/ufraw/ufraw-0.22-r1.ebuild|  5 -
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/media-gfx/ufraw/files/ufraw-0.22-jasper-automagic.patch 
b/media-gfx/ufraw/files/ufraw-0.22-jasper-automagic.patch
new file mode 100644
index 000..93e1d691af1
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.22-jasper-automagic.patch
@@ -0,0 +1,21 @@
+--- a/configure.ac
 b/configure.ac
+@@ -159,8 +159,16 @@
+ have_jpeg=${ac_cv_lib_jpeg_jpeg_CreateCompress:-no}
+ 
+ # Check for libjasper.
+-AC_CHECK_LIB(jasper, jas_image_decode)
+-have_jasper=${ac_cv_lib_jasper_jas_image_decode:-no}
++AC_ARG_ENABLE([jasper],
++  AS_HELP_STRING([--enable-jasper], [enable JPEG2000 support]))
++
++have_jasper=no
++AS_IF([test "x$enable_jasper" = "xyes"], [
++  AC_SEARCH_LIBS([jas_image_decode], [jasper], [have_jasper=yes], [
++AC_MSG_ERROR([unable to find the jas_image_decode() function])
++  ])
++])
++
+ 
+ # Check for tiff headers and library.
+ PKG_CHECK_MODULES(LIBTIFF, libtiff-4,

diff --git a/media-gfx/ufraw/ufraw-0.22-r1.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
index 7f16fe8192f..22543e4 100644
--- a/media-gfx/ufraw/ufraw-0.22-r1.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
@@ -12,7 +12,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 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="contrast fits gimp gnome gtk openmp timezone"
+IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"
 
@@ -31,12 +31,14 @@ RDEPEND="
>=media-gfx/gtkimageview-1.5
>=x11-libs/gtk+-2.6:2
)
+   jpeg2k? ( media-libs/jasper:= )
 "
 DEPEND="${RDEPEND}
virtual/pkgconfig"
 
 PATCHES=(
"${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch
+   "${FILESDIR}"/${P}-jasper-automagic.patch
"${FILESDIR}"/${P}-crashfix.patch
 )
 
@@ -52,6 +54,7 @@ src_configure() {
$(use_with gimp) \
$(use_enable gnome mime) \
$(use_with gtk) \
+   $(use_enable jpeg2k jasper) \
$(use_enable openmp) \
$(use_enable timezone dst-correction)
 }



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/files/, media-gfx/ufraw/

2017-04-04 Thread Andreas Sturmlechner
commit: d2edd6edf8547ceb157094dba0fff6d2b08588b2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Apr  4 15:19:34 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Apr  4 15:41:27 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2edd6ed

media-gfx/ufraw: Fix runtime crash

Gentoo-bug: 608100

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-gfx/ufraw/files/ufraw-0.22-crashfix.patch | 15 +
 media-gfx/ufraw/ufraw-0.22-r1.ebuild| 87 +
 2 files changed, 102 insertions(+)

diff --git a/media-gfx/ufraw/files/ufraw-0.22-crashfix.patch 
b/media-gfx/ufraw/files/ufraw-0.22-crashfix.patch
new file mode 100644
index 000..76fe83fa8f2
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.22-crashfix.patch
@@ -0,0 +1,15 @@
+--- a/ufraw_ufraw.c2015-06-16 04:58:38.0 +0100
 b/ufraw_ufraw.c2016-12-18 00:55:45.794466747 +
+@@ -767,8 +767,10 @@ void ufraw_close(ufraw_data *uf)
+ g_free(uf->displayProfile);
+ g_free(uf->RawHistogram);
+ #ifdef HAVE_LENSFUN
+-lf_modifier_destroy(uf->TCAmodifier);
+-lf_modifier_destroy(uf->modifier);
++if (uf->TCAmodifier != NULL)
++lf_modifier_destroy(uf->TCAmodifier);
++if (uf->modifier != NULL)
++lf_modifier_destroy(uf->modifier);
+ #endif
+ ufobject_delete(uf->conf->ufobject);
+ g_free(uf->conf);

diff --git a/media-gfx/ufraw/ufraw-0.22-r1.ebuild 
b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
new file mode 100644
index 000..7f16fe8192f
--- /dev/null
+++ b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools 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 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="contrast fits gimp gnome gtk openmp timezone"
+
+REQUIRED_USE="gimp? ( gtk )"
+
+RDEPEND="
+   dev-libs/glib:2=
+   >=media-gfx/exiv2-0.11:0=
+   media-libs/lcms:2=
+   >=media-libs/lensfun-0.2.5:=
+   media-libs/libpng:0=
+   media-libs/tiff:0=
+   virtual/jpeg:0=
+   fits? ( sci-libs/cfitsio:0= )
+   gimp? ( >=media-gfx/gimp-2 )
+   gnome? ( >=gnome-base/gconf-2 )
+   gtk? (
+   >=media-gfx/gtkimageview-1.5
+   >=x11-libs/gtk+-2.6:2
+   )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch
+   "${FILESDIR}"/${P}-crashfix.patch
+)
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(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)
+}
+
+src_compile() {
+   emake AR="$(tc-getAR)"
+}
+
+src_install() {
+   emake DESTDIR="${D}" schemasdir=/etc/gconf/schemas install
+   einstalldocs
+}
+
+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
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/files/

2017-04-04 Thread Andreas Sturmlechner
commit: 56b5e63cb2a7677345ef6fe565e6c2c59ab1dad9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Apr  4 15:35:25 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Apr  4 15:41:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56b5e63c

media-gfx/ufraw: Drop unused patch

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-gfx/ufraw/files/ufraw-0.20-gimp.patch | 24 
 1 file changed, 24 deletions(-)

diff --git a/media-gfx/ufraw/files/ufraw-0.20-gimp.patch 
b/media-gfx/ufraw/files/ufraw-0.20-gimp.patch
deleted file mode 100644
index 8d81007ee6b..000
--- a/media-gfx/ufraw/files/ufraw-0.20-gimp.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-http://ufraw.cvs.sourceforge.net/viewvc/ufraw/ufraw/ufraw-gimp.c?r1=1.82&r2=1.83&diff_format=u
-https://sourceforge.net/p/ufraw/bugs/392/
-https://bugs.gentoo.org/show_bug.cgi?id=527836
-
 ufraw-gimp.c   2014/01/07 13:00:08 1.82
-+++ ufraw-gimp.c   2014/10/20 04:00:10 1.83
-@@ -79,12 +79,16 @@
-load_args,
-load_return_vals);
- 
-+#if HAVE_GIMP_2_9
- gimp_register_magic_load_handler("file_ufraw_load",
-  (char *)raw_ext,
-  "",
-  "0,string,II*\\0,"
-  "0,string,MM\\0*,"
-  "0,string,

[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2017-02-22 Thread Aaron Bauman
commit: 95460730f1c169d4e08ed670ce10929e46d3b540
Author: Aaron Bauman  gentoo  org>
AuthorDate: Wed Feb 22 10:37:26 2017 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Wed Feb 22 10:37:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95460730

media-gfx/ufraw: cleanup vulnerable wrt bug #549344

Package-Manager: portage-2.3.3

 media-gfx/ufraw/Manifest |  1 -
 media-gfx/ufraw/ufraw-0.20-r1.ebuild | 81 
 media-gfx/ufraw/ufraw-0.21.ebuild| 80 ---
 3 files changed, 162 deletions(-)

diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
index 1bc5165f71..751154ec8e 100644
--- a/media-gfx/ufraw/Manifest
+++ b/media-gfx/ufraw/Manifest
@@ -1,3 +1,2 @@
-DIST ufraw-0.20.tar.gz 1086969 SHA256 
6dcd30f73238f56641ec87ae07807a6ebeab141a1a481aafe3ddab6f3db8a1e0 SHA512 
d18ecc257f9d88c77fca0e7a8641ee1e78abd28e73c34bd98def2d0dbd65f8fbaa677deca34ac4ed3ce7775764b6baca2896a023d690573057e4659de6dc3b1a
 WHIRLPOOL 
fedecf66ef22bdffe667408ac0b8106ec99ee2a1dd29fab53877229ec375bdeab37cc6fe942d7e3ef2c3de38a5770eaf4f49c44367ca1677acfda13bb4c85a1d
 DIST ufraw-0.21.tar.gz 1016298 SHA256 
2a6a1bcc633bdc8e15615cf726befcd7f27ab00e7c2a518469a24e1a96964d87 SHA512 
e1fbfcf7b6f15089d51626a3e2d3dc694aa79edfc0bdfe4a8be6f684d4a31a91c56502942174c0708de91413fe907acb5d2fa2ad9d1a5404eb66b14764909ae9
 WHIRLPOOL 
84e96894f9ecc9d3a81f96f7c58165e095553b9bab69343754c8a89ef18480f751745cb48e8846ea5db26d1077ace4104ef18d0c0546b2b54439819b81ee3a7c
 DIST ufraw-0.22.tar.gz 1103554 SHA256 
f7abd28ce587db2a74b4c54149bd8a2523a7ddc09bedf4f923246ff0ae09a25e SHA512 
a42eff5052c18afec90245cf97ceeade78e3f288186cf697ac4abf2e8290d4081db8ac4de3ae47b3774f30a6cb4cbda392099e6fd2125fe751abb40d9b065ad2
 WHIRLPOOL 
5cb53f83d2f2baccd0752a0898eb894b8e15ad234962f3e3cc4ae2166309cd68893dceef28d32018aa486da1a09c64df378a2569f764a42f8251f5a568c14e5f

diff --git a/media-gfx/ufraw/ufraw-0.20-r1.ebuild 
b/media-gfx/ufraw/ufraw-0.20-r1.ebuild
deleted file mode 100644
index c50d10ecb6..00
--- a/media-gfx/ufraw/ufraw-0.20-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 
~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
-   >=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}-gimp.patch
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(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.21.ebuild 
b/media-gfx/ufraw/ufraw-0.21.ebuild
deleted file mode 100644
index 92cf1308cd..00
--- a/media-gfx/ufraw/ufraw-0.21.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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

[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2017-01-31 Thread Jeroen Roovers
commit: 5c753f8cdb05c4db288ef9d40e8aef6c703f7493
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Jan 31 14:42:34 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Jan 31 14:42:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c753f8c

media-gfx/ufraw: Stable for HPPA (bug #591210).

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --ignore-arches

 media-gfx/ufraw/ufraw-0.22.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/ufraw/ufraw-0.22.ebuild 
b/media-gfx/ufraw/ufraw-0.22.ebuild
index 831f46f..628ab00 100644
--- a/media-gfx/ufraw/ufraw-0.22.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22.ebuild
@@ -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 
~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd 
~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="contrast fits gimp gnome gtk openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2016-12-20 Thread Tobias Klausmann
commit: d3c201bbf8b5d93c7bd50c0c21d408875f79cc33
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Tue Dec 20 13:44:01 2016 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Tue Dec 20 14:03:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3c201bb

media-gfx/ufraw-0.22-r0: stable on amd64

Gentoo-Bug: 591210

 media-gfx/ufraw/ufraw-0.22.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/ufraw/ufraw-0.22.ebuild 
b/media-gfx/ufraw/ufraw-0.22.ebuild
index ca37a68..b2f68e0 100644
--- a/media-gfx/ufraw/ufraw-0.22.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22.ebuild
@@ -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"
 
 REQUIRED_USE="gimp? ( gtk )"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2016-11-15 Thread Tobias Klausmann
commit: 850acd7dbb061b8ca49455674d27b4bf44e947c8
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Tue Nov 15 15:34:00 2016 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Tue Nov 15 15:34:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=850acd7d

media-gfx/ufraw-0.22-r0: stable on alpha

Gentoo-Bug: 591210

 media-gfx/ufraw/ufraw-0.22.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/ufraw/ufraw-0.22.ebuild 
b/media-gfx/ufraw/ufraw-0.22.ebuild
index 3921ded..ca37a68 100644
--- a/media-gfx/ufraw/ufraw-0.22.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22.ebuild
@@ -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"
 
 REQUIRED_USE="gimp? ( gtk )"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/

2016-11-13 Thread Markus Meier
commit: 0e8b879dd1a11fec3c6b80ee95e3d50126e1b039
Author: Markus Meier  gentoo  org>
AuthorDate: Sun Nov 13 08:44:55 2016 +
Commit: Markus Meier  gentoo  org>
CommitDate: Sun Nov 13 08:44:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e8b879d

media-gfx/ufraw: arm stable, bug #591210

Package-Manager: portage-2.3.2
RepoMan-Options: --include-arches="arm"

 media-gfx/ufraw/ufraw-0.22.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/ufraw/ufraw-0.22.ebuild 
b/media-gfx/ufraw/ufraw-0.22.ebuild
index 4ddf348..3921ded 100644
--- a/media-gfx/ufraw/ufraw-0.22.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -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"
 
 REQUIRED_USE="gimp? ( gtk )"