gentoo resync : 25.11.2020

7 files changed, 2 insertions, 315 deletions

diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index 4c9867678db5..b4a12c9aba25 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,11 +1,4 @@
-AUX gexiv2-0.10.10-meson-fixup.patch 1718 BLAKE2B 0460652424a8314eeba8f0d677b5dff5b0efc9165079c9232824bbfffb2a13a1ca2acef89ae066bc13ec4c40baef4ac4b1c66c02d4365b999fdd4f54858ea7af SHA512 06f7b13502b9397770b0d9ab20dd70d902feb7d70fd42381cda53183859db15102bbf16d0e4ce5f9b124de99c58c8e4cb0ec85ca1c6f60e3e5287cafcdfadd64
-AUX gexiv2-0.10.10-vala-fixup.patch 1785 BLAKE2B d82ec357f2ee7d50b79fa1c82bd9c4b6d0a528561fcacc08e966c73f9d89daf3c2ce2e2712f69e246507e14e0f10a0a5470c830e43aeeb06fdceffc3484cbc0e SHA512 e9708245ddee0fb88939ae26987e4e5859fd5e13efb03f01d276eeb77d4361832eac11b2873e73984ef25dbdcf502f2f3a82a78330f3c7b57b2e186cfb49395f
-DIST gexiv2-0.10.10.tar.xz 638168 BLAKE2B ae75a06007dcaca4c22e463661073d796b77921a313a5bb450c488ee963f72c6095d7abc12dedc0d089a28905cf386062221073100ba3513d9fb13eb524365ee SHA512 41e5b4a9d81882ea4b1bc6f3b9ced95ca4d03f836de30ff90b7a43311e5319f7c0f46cbad767bf2b00926c8e5fd2c1e8ca2a2113c308e23b7a4c21205399abf7
-DIST gexiv2-0.12.0.tar.xz 370816 BLAKE2B 7768cffafedf41948ca6ddd22614f0eb3b44a317a23ade3c8d39d5ec5ff77c0d8c61dd8dcca5108b3403e0e3ec8be6659c16445de27163e8689c6c40f5313566 SHA512 c89e7d307359c718dff1f3991acb4ece66bce985a3d8bee1c8fccf4ce39187af62684c87eaae9b0425a6fdbf147b7330902041d9588e52a4bad1da4255d245e9
 DIST gexiv2-0.12.1.tar.xz 372104 BLAKE2B e712bc8056e0e02d66ee831425776c26b65275db8f4cb4a526dbe9f00bddc473312f6c4c8e011906ca02ff256c00c7fe8d602acd64c787b05e13ad582ff8ebee SHA512 cbf83ea79eead9aab15ba760217fd6a1b55a5c60059f14f243327ad7d3c09d6a0528dbdb33a8ee235c76dac5aab0afa8b7d2ab4367fe9128a096dce5da19a68d
-EBUILD gexiv2-0.10.10-r1.ebuild 1847 BLAKE2B 6df34b756c2676082fafd030e77a4f3e3616233d6de1e31b1fe6b4ac486d4a9d681e1203da8bb758619b5d52a33107e6b6d9148afc42d46cac612fcc97c3ebad SHA512 e984aee5f691d012ae3324cda44b59b56b756d871d5af79b0e7915c5aef7e98c9ce702c7afcc3276ac732771656372b440ffe04f6c18fe7f553e19af9e3521b3
-EBUILD gexiv2-0.12.0-r1.ebuild 1785 BLAKE2B 59051cdab00b0bbc4cd97b70e766b601922037e33aca40b9e274d11723ecd94664005ff5c58900911fe8b26af18c4c5757c5e5f892198b86f41b271c30e51efa SHA512 1a16de479c4d773cb399bdfa303800125c5f244c11c3847e6653cc51579904150916c8256c7f00363a071cc4ed0b47a394e40472355b90354ebb638dc3f6aeb2
-EBUILD gexiv2-0.12.0.ebuild 1630 BLAKE2B a5b80844189a30261272c1687ea8dd77fba10a0601d42883839b5798735bf901afe677e33542c83d3a1a6cd472e2891e0c6f79eab96f383ef5a353c54491faab SHA512 2f6f9ac560721c464ecc85f83f2379f58ce1a1d34eafa6465d2d622b61a7916e9ed486572ad0bd63b74430163bbf20cc79389211eb80b3ab1743d007f58820f6
-EBUILD gexiv2-0.12.1.ebuild 1787 BLAKE2B aa912f4c5af788650e40aec8d2713f1b9857c3ebde662932485796e83b970d2a60cc66516c00a0679d5215a093fe1f1d9bc005aa04d7c740ee07267570400e01 SHA512 0dfbe138f183fea928dfc2f4d534f4869b0c1d2df913516312cb6019d5d02120419c4a82eb1b650e22559f4ead2bba22716b7990079d58698eadb9de573104dd
+EBUILD gexiv2-0.12.1.ebuild 1785 BLAKE2B 4067878033d384921908fca039da503cbfd4e2a1e25edd722b27d03d4944a59e40a8e52c8f13cb321d6ae400d000d8dcfe72822223aaa2d5fbdc337981ae6c9c SHA512 bf31e36da15c885c14e6def050e750c2ea042aaeda014742c8d97466b3e02c67672852513d6932c50fb822fb4ec80963ecfabd2102f12272248a59f2f646f76a
 EBUILD gexiv2-9999.ebuild 1630 BLAKE2B a5b80844189a30261272c1687ea8dd77fba10a0601d42883839b5798735bf901afe677e33542c83d3a1a6cd472e2891e0c6f79eab96f383ef5a353c54491faab SHA512 2f6f9ac560721c464ecc85f83f2379f58ce1a1d34eafa6465d2d622b61a7916e9ed486572ad0bd63b74430163bbf20cc79389211eb80b3ab1743d007f58820f6
 MISC metadata.xml 513 BLAKE2B 7820281c36922b5e68aacb3c3935f7193e2725515f196eaf72f6eba42327a8c8d10ceaed6422fb95cf15b0f1a0d96a168c7a677e42ae847fe050b26c39c39a0b SHA512 deb951010c3342738d8ad5b9e79baa790913f3b906799f9f72f59d4e978f0564fc52f14482bb632ffe817488d154bd8bafe98bc5eea07b7c2da1504867d671b0
diff --git a/media-libs/gexiv2/files/gexiv2-0.10.10-meson-fixup.patch b/media-libs/gexiv2/files/gexiv2-0.10.10-meson-fixup.patch
deleted file mode 100644
index 03f0e4fd3162..000000000000
--- a/media-libs/gexiv2/files/gexiv2-0.10.10-meson-fixup.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -9,12 +9,12 @@ gir = find_program('g-ir-scanner', requi
- vapigen = find_program('vapigen', required: false)
- vala = find_program('valac', required: false)
- 
--introspection_available = gir.found() and not get_option('disable-introspection')
--vapi_available = introspection_available and vapigen.found() and not get_option('disable-vala')
-+introspection_available = gir.found() and get_option('introspection')
-+vapi_available = introspection_available and vapigen.found() and get_option('vapi')
- 
- subdir('gexiv2')
- 
--if get_option('enable-gtk-doc')
-+if get_option('gtk_doc')
-   subdir('docs')
- endif
- 
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,5 +1,5 @@
--option('enable-gtk-doc', type: 'boolean', value: false, description: 'Enable generating the API reference (depends on GTK-Doc)')
--option('disable-introspection', type: 'boolean', value : false, description: 'Disable GObject Introspection')
--option('disable-vala', type: 'boolean', value: false, description: 'Disable generation of vala vapi file')
-+option('gtk_doc', type: 'boolean', value: false, description: 'Enable or disable generating the API reference (depends on GTK-Doc)')
-+option('introspection', type: 'boolean', value : true, description: 'Enable or disable GObject Introspection')
-+option('vapi', type: 'boolean', value: true, description: 'Enable or disable generation of vala vapi file')
- option('python2-girdir', type: 'string', value : 'auto', description : 'Installation dir for PyGObject2 overrides (default = auto, no disables python2)')
- option('python3-girdir', type: 'string', value : 'auto', description : 'Installation dir for PyGObject3 overrides (default = auto, no disables python3)')
diff --git a/media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch b/media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch
deleted file mode 100644
index daf72ef3a85b..000000000000
--- a/media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: "Marty E. Plummer" <hanetzer@startmail.com>
-Date: Sun, 13 Jan 2019 13:33:32 -0600
-Subject: [PATCH] meson.build: improve handling of vapi
-
-As it currently stands the vapi files are not generatable on linux
-distros which do not provide unversioned valac/vapigen. Use instead
-meson's add_languages function to handle detection of existing vala
-toolchain, which will check the VALAC and VAPIGEN env vars.
-
-Signed-off-by: Marty E. Plummer <hanetzer@startmail.com>
-
---- a/meson.build
-+++ b/meson.build
-@@ -6,11 +6,9 @@ exiv2 = dependency('exiv2', version : '>
- gobject = dependency('gobject-2.0', version : '>= 2.38.0')
- 
- gir = find_program('g-ir-scanner', required: false)
--vapigen = find_program('vapigen', required: false)
--vala = find_program('valac', required: false)
- 
- introspection_available = gir.found() and get_option('introspection')
--vapi_available = introspection_available and vapigen.found() and get_option('vapi')
-+vapi_available = introspection_available and add_languages('vala', required: false) and get_option('vapi')
- 
- subdir('gexiv2')
- 
---- a/test/meson.build
-+++ b/test/meson.build
-@@ -17,15 +17,11 @@ regression_test = executable('gexiv2-reg
- test('regression', regression_test, env : test_env)
- 
- if vapi_available
--  valac = find_program('valac')
--  if valac.found()
--    add_languages('vala')
--    executable('gexiv2-dump',
--               'gexiv2-dump.vala',
--               include_directories : include_directories('..'),
--               dependencies : [gobject, vapi],
--               link_with : gexiv2)
--  endif
-+  executable('gexiv2-dump',
-+             'gexiv2-dump.vala',
-+             include_directories : include_directories('..'),
-+             dependencies : [gobject, vapi],
-+             link_with : gexiv2)
- endif
- 
- if python2_available
diff --git a/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
deleted file mode 100644
index 87a3618d7c7e..000000000000
--- a/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit meson python-r1 vala xdg-utils
-
-DESCRIPTION="GObject-based wrapper around the Exiv2 library"
-HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gexiv2.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="gtk-doc +introspection python static-libs test +vala"
-REQUIRED_USE="
-	python? ( introspection ${PYTHON_REQUIRED_USE} )
-	test? ( python introspection )
-	vala? ( introspection )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.38.0:2
-	>=media-gfx/exiv2-0.21:=
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-	test? (
-		dev-python/pygobject:3
-		media-gfx/exiv2[xmp]
-	)
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	# renames meson options to current git HEAD's names, current naming scheme
-	# is rather awkward
-	"${FILESDIR}"/${PN}-0.10.10-meson-fixup.patch
-	"${FILESDIR}"/${PN}-0.10.10-vala-fixup.patch
-)
-
-src_prepare() {
-	xdg_environment_reset
-	use vala && vala_src_prepare
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use introspection)
-		$(meson_use vala vapi)
-		$(meson_use gtk-doc gtk_doc)
-		# prevents installation of python modules (uses install_data from meson
-		# which does not optimize the modules
-		-Dpython2-girdir=no
-		-Dpython3-girdir=no
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if use python ; then
-		python_moduleinto gi/overrides/
-		python_foreach_impl python_domodule GExiv2.py
-	fi
-}
diff --git a/media-libs/gexiv2/gexiv2-0.12.0-r1.ebuild b/media-libs/gexiv2/gexiv2-0.12.0-r1.ebuild
deleted file mode 100644
index 814a3757847b..000000000000
--- a/media-libs/gexiv2/gexiv2-0.12.0-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit meson python-r1 vala
-
-DESCRIPTION="GObject-based wrapper around the Exiv2 library"
-HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gexiv2.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-fi
-
-LICENSE="LGPL-2.1+ GPL-2"
-SLOT="0"
-IUSE="gtk-doc +introspection python static-libs test +vala"
-REQUIRED_USE="
-	python? ( introspection ${PYTHON_REQUIRED_USE} )
-	test? ( python introspection )
-	vala? ( introspection )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=media-gfx/exiv2-0.26:=
-	>=dev-libs/glib-2.38.0:2
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	python? ( ${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-	test? ( media-gfx/exiv2[xmp] )
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	default
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-		$(meson_use vala vapi)
-		-Dtools=false # requires vala, freshly promoted tool that some other distros don't ship yet either
-		# Prevents installation of python modules (uses install_data from meson
-		# which does not optimize the modules)
-		-Dpython2_girdir=no
-		-Dpython3_girdir=no
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if use python ; then
-		python_moduleinto gi/overrides/
-		python_foreach_impl python_domodule GExiv2.py
-	fi
-}
diff --git a/media-libs/gexiv2/gexiv2-0.12.0.ebuild b/media-libs/gexiv2/gexiv2-0.12.0.ebuild
deleted file mode 100644
index e496ad32ab1f..000000000000
--- a/media-libs/gexiv2/gexiv2-0.12.0.ebuild
+++ /dev/null
@@ -1,73 +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} )
-
-inherit meson python-r1 vala
-
-DESCRIPTION="GObject-based wrapper around the Exiv2 library"
-HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gexiv2.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-LICENSE="LGPL-2.1+ GPL-2"
-SLOT="0"
-IUSE="gtk-doc +introspection python static-libs test +vala"
-REQUIRED_USE="
-	python? ( introspection ${PYTHON_REQUIRED_USE} )
-	test? ( python introspection )
-	vala? ( introspection )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-	test? (
-		dev-python/pygobject:3
-		media-gfx/exiv2[xmp]
-	)
-	vala? ( $(vala_depend) )
-"
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.38.0:2
-	>=media-gfx/exiv2-0.21:=
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use introspection)
-		$(meson_use vala vapi)
-		$(meson_use gtk-doc gtk_doc)
-		# Prevents installation of python modules (uses install_data from meson
-		# which does not optimize the modules)
-		-Dpython2_girdir=no
-		-Dpython3_girdir=no
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if use python ; then
-		python_moduleinto gi/overrides/
-		python_foreach_impl python_domodule GExiv2.py
-	fi
-}
diff --git a/media-libs/gexiv2/gexiv2-0.12.1.ebuild b/media-libs/gexiv2/gexiv2-0.12.1.ebuild
index d39cb8d6a019..b4a53c46f9b8 100644
--- a/media-libs/gexiv2/gexiv2-0.12.1.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.12.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 fi
 
 LICENSE="LGPL-2.1+ GPL-2"