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

2024-04-14 Thread Michał Górny 
commit: 8cb4e7fc58f8d0d7318b57f2c180ad600f2e5dee
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Apr 14 18:03:08 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Apr 14 18:11:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cb4e7fc

media-gfx/entangle: EAPI 8, py3.12

Closes: https://bugs.gentoo.org/929615
Signed-off-by: Michał Górny  gentoo.org>

 media-gfx/entangle/entangle-3.0-r3.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-gfx/entangle/entangle-3.0-r3.ebuild 
b/media-gfx/entangle/entangle-3.0-r3.ebuild
index 73c99698dd3a..575c7d78c119 100644
--- a/media-gfx/entangle/entangle-3.0-r3.ebuild
+++ b/media-gfx/entangle/entangle-3.0-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit gnome2-utils meson python-single-r1 xdg-utils

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

2023-10-29 Thread Mart Raudsepp 
commit: d5697b397c04819067eb77340636ab3536398a47
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Oct 29 22:16:02 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct 29 22:16:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5697b39

media-gfx/entangle: Explicitly depend on libpeas SLOT=0

Another libpeas SLOT is coming.

Signed-off-by: Mart Raudsepp  gentoo.org>

 media-gfx/entangle/{entangle-3.0-r2.ebuild => entangle-3.0-r3.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/entangle/entangle-3.0-r2.ebuild 
b/media-gfx/entangle/entangle-3.0-r3.ebuild
similarity index 96%
rename from media-gfx/entangle/entangle-3.0-r2.ebuild
rename to media-gfx/entangle/entangle-3.0-r3.ebuild
index f9cac710c4b3..73c99698dd3a 100644
--- a/media-gfx/entangle/entangle-3.0-r2.ebuild
+++ b/media-gfx/entangle/entangle-3.0-r3.ebuild
@@ -21,7 +21,7 @@ DEPEND="
>=dev-libs/glib-2.36:2
>=dev-libs/gobject-introspection-1.54.0
dev-libs/libgudev:=
-   >=dev-libs/libpeas-1.2.0[gtk,${PYTHON_SINGLE_USEDEP}]
+   >=dev-libs/libpeas-1.2.0:0[gtk,${PYTHON_SINGLE_USEDEP}]
>=media-libs/gexiv2-0.10[introspection]
>=media-libs/libgphoto2-2.5.0:=
media-libs/gstreamer:1.0

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

2023-10-04 Thread Sam James 
commit: ba929cb95242b4960b60683016e6884d3968455f
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct  4 19:28:42 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct  4 19:28:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba929cb9

media-gfx/entangle: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 media-gfx/entangle/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media-gfx/entangle/metadata.xml b/media-gfx/entangle/metadata.xml
index 29c284604a6a..60c98605ee19 100644
--- a/media-gfx/entangle/metadata.xml
+++ b/media-gfx/entangle/metadata.xml
@@ -12,4 +12,7 @@
media-vi...@gentoo.org
Gentoo Video project

+   
+   entangle/entangle
+

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

2023-02-20 Thread Michał Górny 
commit: 3b42f31552d92c800e7f1a6b015c0efb70a93918
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Feb 20 16:49:11 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Feb 20 18:05:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b42f315

media-gfx/entangle: Enable py3.11

Signed-off-by: Michał Górny  gentoo.org>

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

diff --git a/media-gfx/entangle/entangle-3.0-r2.ebuild 
b/media-gfx/entangle/entangle-3.0-r2.ebuild
index 8bd415cc416b..f9cac710c4b3 100644
--- a/media-gfx/entangle/entangle-3.0-r2.ebuild
+++ b/media-gfx/entangle/entangle-3.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit gnome2-utils meson python-single-r1 xdg-utils

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

2023-01-09 Thread Michał Górny 
commit: 8569a6f331a14b80705f63b4d99e34221be8e380
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Jan  9 16:58:43 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Jan  9 16:59:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8569a6f3

media-gfx/entangle: Require x11-libs/gtk+[X]

Closes: https://bugs.gentoo.org/889252
Signed-off-by: Michał Górny  gentoo.org>

 media-gfx/entangle/{entangle-3.0-r1.ebuild => entangle-3.0-r2.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/entangle/entangle-3.0-r1.ebuild 
b/media-gfx/entangle/entangle-3.0-r2.ebuild
similarity index 95%
rename from media-gfx/entangle/entangle-3.0-r1.ebuild
rename to media-gfx/entangle/entangle-3.0-r2.ebuild
index 1496fba1154a..63cee64f9516 100644
--- a/media-gfx/entangle/entangle-3.0-r1.ebuild
+++ b/media-gfx/entangle/entangle-3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ DEPEND="
media-libs/lcms:2
>=media-libs/libraw-0.9.0:=
>=x11-libs/gdk-pixbuf-2.12.0:2
-   >=x11-libs/gtk+-3.22:3[introspection]
+   >=x11-libs/gtk+-3.22:3[X,introspection]
>=x11-libs/libXext-1.3.0
>=x11-libs/pango-1.40.11
x11-themes/adwaita-icon-theme

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

2022-12-23 Thread Michał Górny 
commit: b3efa10e8c0a46072dea1b431f410a6d269e845f
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Dec 23 09:53:16 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Dec 23 09:56:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3efa10e

media-gfx/entangle: Add := to libraw dep

Signed-off-by: Michał Górny  gentoo.org>

 media-gfx/entangle/{entangle-3.0.ebuild => entangle-3.0-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/entangle/entangle-3.0.ebuild 
b/media-gfx/entangle/entangle-3.0-r1.ebuild
similarity index 98%
rename from media-gfx/entangle/entangle-3.0.ebuild
rename to media-gfx/entangle/entangle-3.0-r1.ebuild
index 0dca334b8484..1496fba1154a 100644
--- a/media-gfx/entangle/entangle-3.0.ebuild
+++ b/media-gfx/entangle/entangle-3.0-r1.ebuild
@@ -27,7 +27,7 @@ DEPEND="
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
media-libs/lcms:2
-   >=media-libs/libraw-0.9.0
+   >=media-libs/libraw-0.9.0:=
>=x11-libs/gdk-pixbuf-2.12.0:2
>=x11-libs/gtk+-3.22:3[introspection]
>=x11-libs/libXext-1.3.0

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

2022-05-31 Thread Michał Górny 
commit: 6713f52a4f688c77dcf55df1c048ebaf19792675
Author: Michał Górny  gentoo  org>
AuthorDate: Tue May 31 07:04:18 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue May 31 07:18:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6713f52a

media-gfx/entangle: Enable py3.10

Signed-off-by: Michał Górny  gentoo.org>

 media-gfx/entangle/entangle-3.0.ebuild | 14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/media-gfx/entangle/entangle-3.0.ebuild 
b/media-gfx/entangle/entangle-3.0.ebuild
index cc06e89278bc..0dca334b8484 100644
--- a/media-gfx/entangle/entangle-3.0.ebuild
+++ b/media-gfx/entangle/entangle-3.0.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
+
 inherit gnome2-utils meson python-single-r1 xdg-utils
 
 DESCRIPTION="Tethered Camera Control & Capture"
@@ -13,7 +14,6 @@ 
SRC_URI="https://entangle-photo.org/download/sources/${P}.tar.xz;
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 DEPEND="
@@ -32,8 +32,11 @@ DEPEND="
>=x11-libs/gtk+-3.22:3[introspection]
>=x11-libs/libXext-1.3.0
>=x11-libs/pango-1.40.11
-   x11-themes/adwaita-icon-theme"
-RDEPEND="${DEPEND}"
+   x11-themes/adwaita-icon-theme
+"
+RDEPEND="
+   ${DEPEND}
+"
 
 # perl for pod2man
 BDEPEND="
@@ -43,7 +46,8 @@ BDEPEND="
dev-util/gtk-doc
dev-util/itstool
sys-devel/gettext
-   virtual/pkgconfig"
+   virtual/pkgconfig
+"
 
 PATCHES=(
"${FILESDIR}"/${P}-fix-meson-0.61-build.patch

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

2022-01-20 Thread Sam James 
commit: f844ba75b62115c7045e059226eb74dd441aa914
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 20 14:54:10 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 20 14:54:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f844ba75

media-gfx/entangle: fix build with meson 0.61

Closes: https://bugs.gentoo.org/831581
Signed-off-by: Sam James  gentoo.org>

 media-gfx/entangle/entangle-3.0.ebuild |  6 +++-
 .../files/entangle-3.0-fix-meson-0.61-build.patch  | 32 ++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/media-gfx/entangle/entangle-3.0.ebuild 
b/media-gfx/entangle/entangle-3.0.ebuild
index a86a9e92e53b..cc06e89278bc 100644
--- a/media-gfx/entangle/entangle-3.0.ebuild
+++ b/media-gfx/entangle/entangle-3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -45,6 +45,10 @@ BDEPEND="
sys-devel/gettext
virtual/pkgconfig"
 
+PATCHES=(
+   "${FILESDIR}"/${P}-fix-meson-0.61-build.patch
+)
+
 src_compile() {
# prevent gst from loading system plugins which causes
# sandbox violations on device access

diff --git a/media-gfx/entangle/files/entangle-3.0-fix-meson-0.61-build.patch 
b/media-gfx/entangle/files/entangle-3.0-fix-meson-0.61-build.patch
new file mode 100644
index ..ba2d1addfb13
--- /dev/null
+++ b/media-gfx/entangle/files/entangle-3.0-fix-meson-0.61-build.patch
@@ -0,0 +1,32 @@
+https://gitlab.com/entangle/entangle/-/commit/54795d275a93e94331a614c8712740fcedbdd4f0.patch
+https://bugs.gentoo.org/831581
+
+From: EorlBruder 
+Date: Wed, 12 Jan 2022 11:27:50 +0100
+Subject: [PATCH] meson: fix build for meson >=0.60.0
+
+Replaced the positional arguments in i18n.merge_files with the
+data_dirs-keyword
+
+Fixes #67
+--- a/src/meson.build
 b/src/meson.build
+@@ -40,7 +40,7 @@ appname = 'org.entangle_photo.Manager'
+ desktop = appname + '.desktop'
+ 
+ i18n.merge_file (
+-  desktop,
++  data_dirs: desktop,
+   type: 'desktop',
+   input: desktop,
+   output: desktop,
+@@ -60,7 +60,7 @@ metainfotmp = custom_target('gen-metadata',
+'@INPUT@', '@OUTPUT@'])
+ 
+ i18n.merge_file(
+-  metainfo,
++  data_dirs: metainfo,
+   input: metainfotmp,
+   output: metainfo,
+   install: true,
+GitLab

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

2021-04-20 Thread Michał Górny 
commit: 553fad8658e8d4a84adad0a74f641285b236f340
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Apr 20 07:18:18 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Apr 20 07:18:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=553fad86

media-gfx/entangle: Enable py3.9

Signed-off-by: Michał Górny  gentoo.org>

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

diff --git a/media-gfx/entangle/entangle-3.0.ebuild 
b/media-gfx/entangle/entangle-3.0.ebuild
index f6883eee636..a86a9e92e53 100644
--- a/media-gfx/entangle/entangle-3.0.ebuild
+++ b/media-gfx/entangle/entangle-3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit gnome2-utils meson python-single-r1 xdg-utils
 
 DESCRIPTION="Tethered Camera Control & Capture"

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

2020-09-18 Thread Michał Górny 
commit: ce2277af5e2b609eb6ee569e6c4060e632fb6d5e
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Sep 18 09:30:33 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Sep 18 09:38:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce2277af

media-gfx/entangle: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 media-gfx/entangle/Manifest|  1 -
 media-gfx/entangle/entangle-2.0.ebuild | 67 --
 2 files changed, 68 deletions(-)

diff --git a/media-gfx/entangle/Manifest b/media-gfx/entangle/Manifest
index 7f9dc2ff050..814e1c80be5 100644
--- a/media-gfx/entangle/Manifest
+++ b/media-gfx/entangle/Manifest
@@ -1,2 +1 @@
-DIST entangle-2.0.tar.xz 501912 BLAKE2B 
b7e1c393dc95d66bf4389c607c0eb6eb70161ceb2c845135c7c99313a1ec13388c6b00fd6ed7f38ad6f9f18d8c97eba0aadab7964d1be8ec03373e5598374796
 SHA512 
be8b75c5dd0bdd7cd380f35b5d46d7be9f7caa2be257ce954cf9516ebd5601071ac8b50838f9c40470b6e3e5f95083c3671af68ac43eb345a60d674636a0fe86
 DIST entangle-3.0.tar.xz 518808 BLAKE2B 
fe2bf4b114bc04fdc56792f984ae7387b70d693fa82f8deaa2023de71a8bba72bc95d4bfc430cdfaf5244e9114b4f7e8bb2e17f3b86de6529037519fa3877899
 SHA512 
8c6d7e067f88a770c63b76fde2a6ae71894aae95477fcf66b4670697889fdf7939d3f95532626d6f4ca7ae75841d8f247f6bcf78a1ce195b540989f1bfe5ebdd

diff --git a/media-gfx/entangle/entangle-2.0.ebuild 
b/media-gfx/entangle/entangle-2.0.ebuild
deleted file mode 100644
index 9094ca377da..000
--- a/media-gfx/entangle/entangle-2.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit gnome2-utils meson python-single-r1 xdg-utils
-
-DESCRIPTION="Tethered Camera Control & Capture"
-HOMEPAGE="https://entangle-photo.org/;
-SRC_URI="https://entangle-photo.org/download/sources/${P}.tar.xz;
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="
-   ${PYTHON_DEPS}
-   >=dev-libs/glib-2.36:2
-   >=dev-libs/gobject-introspection-1.54.0
-   dev-libs/libgudev:=
-   >=dev-libs/libpeas-1.2.0[gtk,${PYTHON_SINGLE_USEDEP}]
-   >=media-libs/gexiv2-0.10[introspection]
-   >=media-libs/libgphoto2-2.5.0:=
-   media-libs/gstreamer:1.0
-   media-libs/gst-plugins-base:1.0
-   media-libs/lcms:2
-   >=media-libs/libraw-0.9.0
-   >=x11-libs/gdk-pixbuf-2.12.0:2
-   >=x11-libs/gtk+-3.22:3[introspection]
-   >=x11-libs/libXext-1.3.0
-   x11-themes/adwaita-icon-theme"
-RDEPEND="${DEPEND}"
-
-# perl for pod2man
-BDEPEND="
-   app-text/yelp-tools
-   dev-lang/perl
-   dev-util/glib-utils
-   dev-util/gtk-doc
-   dev-util/itstool
-   sys-devel/gettext
-   virtual/pkgconfig"
-
-src_compile() {
-   # prevent gst from loading system plugins which causes
-   # sandbox violations on device access
-   local -x GST_PLUGIN_SYSTEM_PATH_1_0=
-   # pre-generate enums to resolve race conditions
-   # https://bugs.gentoo.org/709740
-   meson_src_compile \
-   src/backend/entangle-{camera,colour-profile}-enums.h \
-   src/frontend/entangle-image-display-enums.h
-   meson_src_compile
-}
-
-pkg_postinst() {
-   xdg_icon_cache_update
-   gnome2_schemas_update
-}
-
-pkg_postrm() {
-   xdg_icon_cache_update
-   gnome2_schemas_update
-}

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

2020-08-09 Thread Michał Górny 
commit: 66b5e8a27e9c0361ca4b20f9a8ee0c326c36a911
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Aug  9 09:23:36 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Aug  9 09:26:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66b5e8a2

media-gfx/entangle: Bump to 3.0

Signed-off-by: Michał Górny  gentoo.org>

 media-gfx/entangle/Manifest|  1 +
 media-gfx/entangle/entangle-3.0.ebuild | 68 ++
 2 files changed, 69 insertions(+)

diff --git a/media-gfx/entangle/Manifest b/media-gfx/entangle/Manifest
index 6d18ed9ac52..7f9dc2ff050 100644
--- a/media-gfx/entangle/Manifest
+++ b/media-gfx/entangle/Manifest
@@ -1 +1,2 @@
 DIST entangle-2.0.tar.xz 501912 BLAKE2B 
b7e1c393dc95d66bf4389c607c0eb6eb70161ceb2c845135c7c99313a1ec13388c6b00fd6ed7f38ad6f9f18d8c97eba0aadab7964d1be8ec03373e5598374796
 SHA512 
be8b75c5dd0bdd7cd380f35b5d46d7be9f7caa2be257ce954cf9516ebd5601071ac8b50838f9c40470b6e3e5f95083c3671af68ac43eb345a60d674636a0fe86
+DIST entangle-3.0.tar.xz 518808 BLAKE2B 
fe2bf4b114bc04fdc56792f984ae7387b70d693fa82f8deaa2023de71a8bba72bc95d4bfc430cdfaf5244e9114b4f7e8bb2e17f3b86de6529037519fa3877899
 SHA512 
8c6d7e067f88a770c63b76fde2a6ae71894aae95477fcf66b4670697889fdf7939d3f95532626d6f4ca7ae75841d8f247f6bcf78a1ce195b540989f1bfe5ebdd

diff --git a/media-gfx/entangle/entangle-3.0.ebuild 
b/media-gfx/entangle/entangle-3.0.ebuild
new file mode 100644
index 000..59d37d09fd0
--- /dev/null
+++ b/media-gfx/entangle/entangle-3.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+inherit gnome2-utils meson python-single-r1 xdg-utils
+
+DESCRIPTION="Tethered Camera Control & Capture"
+HOMEPAGE="https://entangle-photo.org/;
+SRC_URI="https://entangle-photo.org/download/sources/${P}.tar.xz;
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="
+   ${PYTHON_DEPS}
+   >=dev-libs/glib-2.36:2
+   >=dev-libs/gobject-introspection-1.54.0
+   dev-libs/libgudev:=
+   >=dev-libs/libpeas-1.2.0[gtk,${PYTHON_SINGLE_USEDEP}]
+   >=media-libs/gexiv2-0.10[introspection]
+   >=media-libs/libgphoto2-2.5.0:=
+   media-libs/gstreamer:1.0
+   media-libs/gst-plugins-base:1.0
+   media-libs/lcms:2
+   >=media-libs/libraw-0.9.0
+   >=x11-libs/gdk-pixbuf-2.12.0:2
+   >=x11-libs/gtk+-3.22:3[introspection]
+   >=x11-libs/libXext-1.3.0
+   >=x11-libs/pango-1.40.11
+   x11-themes/adwaita-icon-theme"
+RDEPEND="${DEPEND}"
+
+# perl for pod2man
+BDEPEND="
+   app-text/yelp-tools
+   dev-lang/perl
+   dev-util/glib-utils
+   dev-util/gtk-doc
+   dev-util/itstool
+   sys-devel/gettext
+   virtual/pkgconfig"
+
+src_compile() {
+   # prevent gst from loading system plugins which causes
+   # sandbox violations on device access
+   local -x GST_PLUGIN_SYSTEM_PATH_1_0=
+   # pre-generate enums to resolve race conditions
+   # https://bugs.gentoo.org/709740
+   meson_src_compile \
+   src/backend/entangle-{camera,colour-profile}-enums.h \
+   src/frontend/entangle-image-display-enums.h
+   meson_src_compile
+}
+
+pkg_postinst() {
+   xdg_icon_cache_update
+   gnome2_schemas_update
+}
+
+pkg_postrm() {
+   xdg_icon_cache_update
+   gnome2_schemas_update
+}

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

2020-03-16 Thread Michał Górny 
commit: 2915022e663fb87d36eb3e73c115ae8b31a925aa
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Mar 16 09:15:07 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Mar 16 09:15:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2915022e

media-gfx/entangle: Enable py3.8

Signed-off-by: Michał Górny  gentoo.org>

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

diff --git a/media-gfx/entangle/entangle-2.0.ebuild 
b/media-gfx/entangle/entangle-2.0.ebuild
index 8e23c27d8c6..9094ca377da 100644
--- a/media-gfx/entangle/entangle-2.0.ebuild
+++ b/media-gfx/entangle/entangle-2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit gnome2-utils meson python-single-r1 xdg-utils
 
 DESCRIPTION="Tethered Camera Control & Capture"

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

2020-03-16 Thread Michał Górny 
commit: 72ce3559a0b4e1a483606faaa4f660abbb031be7
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Mar 16 07:27:10 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Mar 16 07:35:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72ce3559

media-gfx/entangle: Prebuild enum targets to fix race condition

Closes: https://bugs.gentoo.org/709740
Signed-off-by: Michał Górny  gentoo.org>

 media-gfx/entangle/entangle-2.0.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/media-gfx/entangle/entangle-2.0.ebuild 
b/media-gfx/entangle/entangle-2.0.ebuild
index a8563923bc5..8e23c27d8c6 100644
--- a/media-gfx/entangle/entangle-2.0.ebuild
+++ b/media-gfx/entangle/entangle-2.0.ebuild
@@ -48,6 +48,11 @@ src_compile() {
# prevent gst from loading system plugins which causes
# sandbox violations on device access
local -x GST_PLUGIN_SYSTEM_PATH_1_0=
+   # pre-generate enums to resolve race conditions
+   # https://bugs.gentoo.org/709740
+   meson_src_compile \
+   src/backend/entangle-{camera,colour-profile}-enums.h \
+   src/frontend/entangle-image-display-enums.h
meson_src_compile
 }

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

2019-12-26 Thread Michał Górny 
commit: c92034d4e8f875dbeaeedd8d369294112cbea19b
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Dec 26 11:20:13 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Dec 26 11:27:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c92034d4

media-gfx/entangle: Remove redundant version

Signed-off-by: Michał Górny  gentoo.org>

 media-gfx/entangle/Manifest  |  1 -
 media-gfx/entangle/entangle-0.6.0.ebuild | 41 
 2 files changed, 42 deletions(-)

diff --git a/media-gfx/entangle/Manifest b/media-gfx/entangle/Manifest
index 252e0485b25..6d18ed9ac52 100644
--- a/media-gfx/entangle/Manifest
+++ b/media-gfx/entangle/Manifest
@@ -1,2 +1 @@
-DIST entangle-0.6.0.tar.gz 906858 BLAKE2B 
18a35ef7e077f5929846127e06bff2d07b61c5409d2957b421d8ec5466f29483b6fc7d5567cd057e2b44ef4147ed962e267e7e5509ef6640582b5d291a7f79f3
 SHA512 
f96718f01286eb0dbf1fafd4d51258bda876a5b22a6167173f0f60b4fe00683baff3d4c8f9866a5dc1eec493e2b25fd932794a63a8a8d102cb220b1d6ea8e960
 DIST entangle-2.0.tar.xz 501912 BLAKE2B 
b7e1c393dc95d66bf4389c607c0eb6eb70161ceb2c845135c7c99313a1ec13388c6b00fd6ed7f38ad6f9f18d8c97eba0aadab7964d1be8ec03373e5598374796
 SHA512 
be8b75c5dd0bdd7cd380f35b5d46d7be9f7caa2be257ce954cf9516ebd5601071ac8b50838f9c40470b6e3e5f95083c3671af68ac43eb345a60d674636a0fe86

diff --git a/media-gfx/entangle/entangle-0.6.0.ebuild 
b/media-gfx/entangle/entangle-0.6.0.ebuild
deleted file mode 100644
index 70933e3d62f..000
--- a/media-gfx/entangle/entangle-0.6.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit gnome2 eutils
-
-DESCRIPTION="Tethered Camera Control & Capture"
-HOMEPAGE="http://entangle-photo.org/;
-SRC_URI="http://entangle-photo.org/download/sources/${P}.tar.gz;
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=dev-libs/glib-2.26:2
-   >=x11-libs/gdk-pixbuf-2.12.0:2
-   >=x11-libs/gtk+-3.3.18:3[introspection]
-   dev-libs/libgudev:=
-   >=dev-libs/dbus-glib-0.60
-   >=dev-libs/gobject-introspection-0.9.3
-   >=media-libs/libgphoto2-2.4.11:=
-   media-libs/lcms:2
-   >=dev-libs/libpeas-1.2.0[gtk]
-   >=media-libs/gexiv2-0.4[introspection]
-   >=x11-libs/libXext-1.3.0
-   >=x11-themes/gnome-icon-theme-symbolic-3.0.0
-   >=media-libs/libraw-0.9.0"
-RDEPEND="${DEPEND}"
-DEPEND+="
-   virtual/pkgconfig"
-
-G2CONF+="
-   --disable-maintainer-mode
-   --docdir=/usr/share/doc/${PF}
-   --htmldir=/usr/share/doc/${PF}/html
-   --disable-werror
-   --disable-static"
-
-DOCS=( AUTHORS ChangeLog NEWS README )

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

2019-12-08 Thread Michał Górny 
commit: bcd3eb2153c9a3715c6e835c98a9a4d770512b54
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Dec  8 10:51:49 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Dec  8 11:11:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcd3eb21

media-gfx/entangle: Switch to new python-single-r1 API

Signed-off-by: Michał Górny  gentoo.org>

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

diff --git a/media-gfx/entangle/entangle-2.0.ebuild 
b/media-gfx/entangle/entangle-2.0.ebuild
index ebb4c3d3cf0..00fd3649f7a 100644
--- a/media-gfx/entangle/entangle-2.0.ebuild
+++ b/media-gfx/entangle/entangle-2.0.ebuild
@@ -21,7 +21,7 @@ DEPEND="
>=dev-libs/glib-2.36:2
>=dev-libs/gobject-introspection-1.54.0
dev-libs/libgudev:=
-   >=dev-libs/libpeas-1.2.0[gtk,${PYTHON_USEDEP}]
+   >=dev-libs/libpeas-1.2.0[gtk,${PYTHON_SINGLE_USEDEP}]
>=media-libs/gexiv2-0.10[introspection]
>=media-libs/libgphoto2-2.5.0:=
media-libs/gstreamer:1.0

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

2019-09-27 Thread Michał Górny 
commit: ca00ec281351561204a22d2907583ec964e5ecae
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Sep 27 11:45:01 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Sep 27 12:26:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca00ec28

media-gfx/entangle: Bump to 2.0

Closes: https://bugs.gentoo.org/543308
Closes: https://bugs.gentoo.org/677158
Closes: https://bugs.gentoo.org/682250
Signed-off-by: Michał Górny  gentoo.org>

 media-gfx/entangle/Manifest|  1 +
 media-gfx/entangle/entangle-2.0.ebuild | 62 ++
 2 files changed, 63 insertions(+)

diff --git a/media-gfx/entangle/Manifest b/media-gfx/entangle/Manifest
index 0c23f9d36bd..252e0485b25 100644
--- a/media-gfx/entangle/Manifest
+++ b/media-gfx/entangle/Manifest
@@ -1 +1,2 @@
 DIST entangle-0.6.0.tar.gz 906858 BLAKE2B 
18a35ef7e077f5929846127e06bff2d07b61c5409d2957b421d8ec5466f29483b6fc7d5567cd057e2b44ef4147ed962e267e7e5509ef6640582b5d291a7f79f3
 SHA512 
f96718f01286eb0dbf1fafd4d51258bda876a5b22a6167173f0f60b4fe00683baff3d4c8f9866a5dc1eec493e2b25fd932794a63a8a8d102cb220b1d6ea8e960
+DIST entangle-2.0.tar.xz 501912 BLAKE2B 
b7e1c393dc95d66bf4389c607c0eb6eb70161ceb2c845135c7c99313a1ec13388c6b00fd6ed7f38ad6f9f18d8c97eba0aadab7964d1be8ec03373e5598374796
 SHA512 
be8b75c5dd0bdd7cd380f35b5d46d7be9f7caa2be257ce954cf9516ebd5601071ac8b50838f9c40470b6e3e5f95083c3671af68ac43eb345a60d674636a0fe86

diff --git a/media-gfx/entangle/entangle-2.0.ebuild 
b/media-gfx/entangle/entangle-2.0.ebuild
new file mode 100644
index 000..1d719a1b3d2
--- /dev/null
+++ b/media-gfx/entangle/entangle-2.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit gnome2-utils meson python-single-r1 xdg-utils
+
+DESCRIPTION="Tethered Camera Control & Capture"
+HOMEPAGE="https://entangle-photo.org/;
+SRC_URI="https://entangle-photo.org/download/sources/${P}.tar.xz;
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="
+   ${PYTHON_DEPS}
+   >=dev-libs/glib-2.36:2
+   >=dev-libs/gobject-introspection-1.54.0
+   >=dev-libs/libpeas-1.2.0[gtk,${PYTHON_USEDEP}]
+   >=media-libs/gexiv2-0.10[introspection]
+   >=media-libs/libgphoto2-2.5.0:=
+   media-libs/gstreamer:1.0
+   media-libs/gst-plugins-base:1.0
+   media-libs/lcms:2
+   >=media-libs/libraw-0.9.0
+   >=x11-libs/gdk-pixbuf-2.12.0:2
+   >=x11-libs/gtk+-3.22:3[introspection]
+   >=x11-libs/libXext-1.3.0
+   x11-themes/adwaita-icon-theme
+   virtual/libgudev:="
+RDEPEND="${DEPEND}"
+
+# perl for pod2man
+BDEPEND="
+   app-text/yelp-tools
+   dev-lang/perl
+   dev-util/glib-utils
+   dev-util/gtk-doc
+   dev-util/itstool
+   sys-devel/gettext
+   virtual/pkgconfig"
+
+src_compile() {
+   # prevent gst from loading system plugins which causes
+   # sandbox violations on device access
+   local -x GST_PLUGIN_SYSTEM_PATH_1_0=
+   meson_src_compile
+}
+
+pkg_postinst() {
+   xdg_icon_cache_update
+   gnome2_schemas_update
+}
+
+pkg_postrm() {
+   xdg_icon_cache_update
+   gnome2_schemas_update
+}

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

2019-09-27 Thread Michał Górny 
commit: 9519d2624c88d57bed0f7c1628033225f43d5f48
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Sep 27 11:58:07 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Sep 27 12:26:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9519d262

media-gfx/entangle: Add myself as maintainer

Signed-off-by: Michał Górny  gentoo.org>

 media-gfx/entangle/metadata.xml | 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/media-gfx/entangle/metadata.xml b/media-gfx/entangle/metadata.xml
index b14feceaa87..b2ed51eff36 100644
--- a/media-gfx/entangle/metadata.xml
+++ b/media-gfx/entangle/metadata.xml
@@ -1,11 +1,15 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-lu_z...@gentoo.org
-  
-
-media-vi...@gentoo.org
-Gentoo Video project
-  
+   
+   mgo...@gentoo.org
+   Michał Górny
+   
+   
+   lu_z...@gentoo.org
+   
+   
+   media-vi...@gentoo.org
+   Gentoo Video project
+