From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6AB27138359 for ; Sat, 7 Nov 2020 15:23:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E6963E086E; Sat, 7 Nov 2020 15:23:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BECF0E086E for ; Sat, 7 Nov 2020 15:23:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 41C02340845 for ; Sat, 7 Nov 2020 15:23:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 49C5D43F for ; Sat, 7 Nov 2020 15:23:34 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1604762497.1a0f9aa095600fd54cd4595470732c314b0bd7ec.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/gexiv2/files/, media-libs/gexiv2/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/gexiv2/Manifest media-libs/gexiv2/files/gexiv2-0.10.10-meson-fixup.patch media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild media-libs/gexiv2/gexiv2-0.12.0-r1.ebuild media-libs/gexiv2/gexiv2-0.12.0.ebuild X-VCS-Directories: media-libs/gexiv2/files/ media-libs/gexiv2/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: 1a0f9aa095600fd54cd4595470732c314b0bd7ec X-VCS-Branch: master Date: Sat, 7 Nov 2020 15:23:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9edfcc5f-8da3-491d-91ca-ff69bf65ed38 X-Archives-Hash: c8c7c91eac8717bbaa10a993077a35af commit: 1a0f9aa095600fd54cd4595470732c314b0bd7ec Author: Mart Raudsepp gentoo org> AuthorDate: Sat Nov 7 14:52:04 2020 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Sat Nov 7 15:21:37 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a0f9aa0 media-libs/gexiv2: remove old Package-Manager: Portage-2.3.103, Repoman-2.3.20 Signed-off-by: Mart Raudsepp gentoo.org> media-libs/gexiv2/Manifest | 2 - .../gexiv2/files/gexiv2-0.10.10-meson-fixup.patch | 29 -------- .../gexiv2/files/gexiv2-0.10.10-vala-fixup.patch | 49 ------------- media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild | 81 ---------------------- media-libs/gexiv2/gexiv2-0.12.0-r1.ebuild | 74 -------------------- media-libs/gexiv2/gexiv2-0.12.0.ebuild | 73 ------------------- 6 files changed, 308 deletions(-) diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest index 9b4983dc4f6..81c2d8bcc74 100644 --- a/media-libs/gexiv2/Manifest +++ b/media-libs/gexiv2/Manifest @@ -1,3 +1 @@ -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 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 03f0e4fd316..00000000000 --- 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 daf72ef3a85..00000000000 --- a/media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: "Marty E. Plummer" -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 - ---- 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 87a3618d7c7..00000000000 --- 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 814a3757847..00000000000 --- 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 e496ad32ab1..00000000000 --- 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 -}