media-gfx/shotwell: bump to 0.30.2

Closes: https://bugs.gentoo.org/676644
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio@gentoo.org>

diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 4f585d4b3f75e593252097167e51cf9890c2a73a..234522075e48bce2fd148e87582c4518487a15d9 100644 (file)
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -2,3 +2,4 @@ DIST shotwell-0.28.3.tar.xz 5531900 BLAKE2B b585989434e3da9b2d5f43aabf41451e33b7
 DIST shotwell-0.28.4.tar.xz 5529712 BLAKE2B a8ee8243cf1a800fd1c1a91ade81decf9187aa6ce3b5040977dd45ae64245883691674ca2aa8d09df164e84dcc7f3e632dfc206b2f0eaecd18a171f0c170846d SHA512 b80014ec2c5ddfa35c0eea59daaf41fb8e8fac76482f18581de4c91b766f55d1b05e1925088152705ce3eb4ca228e5401ba80ebd2a6232d65b61cdb2c843267b
 DIST shotwell-0.29.2.tar.xz 2321576 BLAKE2B 2dd3c959ca8aba6ecb7c3c15ca491291a2c6ead860fac9c1fb1b97ad22140ce9e67617dd268b2d4d362bb8a0c2606d97b5cc71c12e19fcb59fec0185f27c3f0f SHA512 98c57d511a384ced717e2fb410af16326080e2291fce77ea953a377430459c7a81de73118925b2d42bf96b8b717efc93a898d0d859fbab1364c0c192dbb60311
 DIST shotwell-0.29.3.tar.xz 2416332 BLAKE2B 8f95e3e1b71eb20b10571b5689e9817112935c4d31c8b7800157f7771df04adb4559acc9885ec43032a7619ffefb8899fd90a7740798de4a150c4c78033e890c SHA512 f600db86adf5caece4ed4c8a3ca4309540f9eeb1caded8e3f062fd56fa54f2030568c8168fc662fcf80c9905e9b735d52a2578bc2401faf28876a6f5aed01121
+DIST shotwell-0.30.2.tar.xz 6461648 BLAKE2B d54f34c05dcb092149129977bf59f0434ec4082929e3c87d9b4e774f85b47d73ecce1e80a6a29965194e9791eecb018405b43f082fb8b334c8d012f06a00b817 SHA512 ee74b9d3fbc5b2a5ca87cbc351fa99f6afaec4ce717166f55d79f41f1b039c272ed9028eb3919874f086f934197806738a54f428e790bca50dd8c9af61c21c36

diff --git a/media-gfx/shotwell/metadata.xml b/media-gfx/shotwell/metadata.xml
index 905269f2b26deea3c262e21f82ac3bf775fb79ab..3e46be14231f52885a984c3b735dc10b7233aeb6 100644 (file)
--- a/media-gfx/shotwell/metadata.xml
+++ b/media-gfx/shotwell/metadata.xml
@@ -13,10 +13,13 @@
                <email>gnome@gentoo.org</email>
                <name>Gentoo GNOME Project</name>
        </maintainer>
+       <use>
+               <flag name="opencv">Enable face detection via <pkg>media-libs/opencv</pkg></flag>
+       </use>
        <longdescription lang="en">
-               Shotwell is a digital photo organizer designed for the GNOME desktop
-               environment. It allows you to import photos from disk or camera, organize
-               them in various ways, view them in full-window or fullscreen mode, and
-               export them to share with others.
+               Shotwell is a digital photo manager designed for the GNOME desktop
+               environment.  It allows you to import photos from disk or camera,
+               organize them by keywords and events, view them in full-window or fullscreen
+               mode, and share them with others via social networking and more.
        </longdescription>
 </pkgmetadata>

diff --git a/media-gfx/shotwell/shotwell-0.30.2.ebuild b/media-gfx/shotwell/shotwell-0.30.2.ebuild
new file mode 100644 (file)
index 0000000..167dc43
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.30.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Open source photo manager for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="opencv udev"
+
+COMMON_DEPEND="
+       >=x11-libs/gtk+-3.22.0:3
+       >=dev-libs/glib-2.40.0:2
+       >=dev-libs/libgee-0.8.5:0.8
+       >=net-libs/webkit-gtk-2.4:4
+       >=dev-libs/json-glib-0.7.6
+       >=dev-libs/libxml2-2.6.32:2
+       x11-libs/gdk-pixbuf:2
+       >=dev-db/sqlite-3.5.9:3
+       media-libs/gstreamer:1.0
+       media-libs/gst-plugins-base:1.0
+       >=media-libs/libgphoto2-2.5:=
+       udev? ( >=virtual/libgudev-145:= )
+       >=media-libs/gexiv2-0.10.4
+       >=media-libs/libraw-0.13.2:=
+       >=media-libs/libexif-0.6.16:=
+       dev-libs/libgdata
+       >=app-crypt/gcr-3:=[gtk]
+       x11-libs/cairo
+       opencv? ( >=media-libs/opencv-2.3.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+       media-plugins/gst-plugins-gdkpixbuf:1.0
+       media-plugins/gst-plugins-meta:1.0
+"
+DEPEND="${COMMON_DEPEND}
+       $(vala_depend)
+       dev-libs/appstream-glib
+       dev-util/itstool
+       >=sys-devel/gettext-0.19.8
+       virtual/pkgconfig
+       net-libs/libsoup:2.4[vala]
+       media-libs/gexiv2[vala]
+       app-crypt/gcr[vala]
+"
+
+src_prepare() {
+       xdg_src_prepare
+       vala_src_prepare
+}
+
+src_configure() {
+       local emesonargs=(
+               -Dunity-support=false
+               # -Dpublishers # In 0.30.2 all get compiled in anyways, even if restricted list, affects only runtime support
+               -Dextra-plugins=true
+               #trace
+               #measure
+               -Ddupe-detection=true
+               $(meson_use udev)
+               -Dinstall-apport-hook=false
+               $(meson_use opencv face-detection)
+       )
+       meson_src_configure
+}
+
+pkg_postinst() {
+       xdg_pkg_postinst
+       gnome2_schemas_update
+}
+
+pkg_postrm() {
+       xdg_pkg_postrm
+       gnome2_schemas_update
+}

diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 816c62aaa78d42fdfcc0d61f0197768f772f9277..158c4fdff8435202712664a9a760057c7ff18ca2 100644 (file)
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -261,6 +261,7 @@ dev-haskell/vector test
 # Tobias Klausmann <klausman@gentoo.org> (20 Nov 2014)
 # OpenCV likely will never work on Alpha
 media-video/vlc opencv
+media-gfx/shotwell opencv
 
 # Pacho Ramos <pacho@gentoo.org> (11 Nov 2014)
 # Missing keywords, bug #523686

diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 37c30c59e6faf39b3f64a4a27d7d0cfc391a0186..100a3c9784bb6824b3db7b35727bbd6eb17aaac5 100644 (file)
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mart Raudsepp <leio@gentoo.org> (17 Mar 2019)
+# Unkeyworded media-libs/opencv dependency
+media-gfx/shotwell opencv
+
 # Sergei Trofimovich <slyfox@gentoo.org> (13 Oct 2018)
 # USE=debug needs support for target-specific _FPU_MASK_IM. ia64
 # does not define those.

diff --git a/profiles/package.mask b/profiles/package.mask
index 55c7d87fef395c685268255b5a85e3a66dfc183e..ab76ca6e3a42e19d2e2d0f9ad1652e0d91fa3f80 100644 (file)
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -571,7 +571,7 @@ sys-devel/automake:1.8
 
 # Nicolas Bock <nicolasbock@gentoo.org> (17 Jul 2017)
 # Keep shotwell development series masked.
->=media-gfx/shotwell-0.29
+=media-gfx/shotwell-0.29*
 
 # Nicolas Bock <nicolasbock@gentoo.org> (31 Oct 2017)
 # There are multiple unresolved upstream issues with >=jabref-bin-4.0 (#636036).