From 09351e78166b5e864197c4456ebae3f89dd0bed9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 22 Jan 2019 10:09:44 +0000 Subject: gentoo resync : 22.01.2019 --- media-libs/gexiv2/Manifest | 5 +- .../gexiv2/files/gexiv2-0.10.10-vala-fixup.patch | 49 +++++++++++++ media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild | 80 ++++++++++++++++++++++ media-libs/gexiv2/gexiv2-0.10.10.ebuild | 79 --------------------- media-libs/gexiv2/gexiv2-9999.ebuild | 4 +- 5 files changed, 134 insertions(+), 83 deletions(-) create mode 100644 media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch create mode 100644 media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild delete mode 100644 media-libs/gexiv2/gexiv2-0.10.10.ebuild (limited to 'media-libs/gexiv2') diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest index 39119a3d92b5..5fa8151309b0 100644 --- a/media-libs/gexiv2/Manifest +++ b/media-libs/gexiv2/Manifest @@ -1,7 +1,8 @@ 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.10.8.tar.xz 634696 BLAKE2B 182cda3bac5b3211e5ef8267628a86cc496c0242f25c5cd94ed9eab81c7460022373f3bb794c976fd0b9a10e49f9ca7109521ac6f99bbe7a4e0306a31db899da SHA512 4c25cf6884495151947a70e62a096f3279223673bece4d4ff02720b2820aaad9e80c8715e02bf46c3f5598f582fdf07b4b3ddabd017d53001245e3381a4cc286 -EBUILD gexiv2-0.10.10.ebuild 1778 BLAKE2B 8c3bdd09c48b1337049a4f971fefa9060ae1b572e884a7911dad8b7bf87ea5cf7fe7afaa0afaa92a3a76df71d16603f6ea1e3f2c93f02cdf6b7e06ce3b77ac75 SHA512 45eaf8081a3d45f7232a284c75a09ab34c4e4ec28fb73ead465a6b1c634999a444c234a5cdb4ccd8e8fcf94b88979ea6827a9f91804f82bb7b9a67ab4957c1b2 +EBUILD gexiv2-0.10.10-r1.ebuild 1824 BLAKE2B 524284f047a6cbbfaede824ed246504f8f979166e007d58bfb82faabaccc11a361364deaa031102652b8864bdc9e8d72070eb3bc45828e03770e52909d900513 SHA512 83dcd434159cccef0002a7a13588b69665a905a9326eecec4f6ccd993b29919c249fa33d4346bff4b9c079f8daef54b486df492cad71e3e86778996dfee39af2 EBUILD gexiv2-0.10.8.ebuild 1527 BLAKE2B 6ddf3a6433cc5d6b566075718011be7ad782186482a3146533fdd1364b5385f2f8977e09a5ec3c73f7624fc929f6f8753d30bacb60ee27f35341c49a68429860 SHA512 2f50314429b7cd4b47bb5172c801490551cae93989a41d919ce7ebf35d6c0005a657507019dbf0356e4ff8f405747492782a95796558e9c4e05e446f043f2ade -EBUILD gexiv2-9999.ebuild 1621 BLAKE2B fc25baa5039abad251d79ce4ed59ce05eb878604608e833c65e835486f3b6724eff0a90c491eaec438f7405ae1f8401624ef6e7c7f6477c265d180641c08e6c2 SHA512 634213f60b484bbe46395938fc1bf64a13ea01da2b8531de1ea8e0ba0e3328c41b74d6eb945b1af9ad1d4d12bbc77775200963b17d7d765f9b944ca2c056ecd0 +EBUILD gexiv2-9999.ebuild 1621 BLAKE2B 20ec61c95e9cd66dd9a835363a27a439fa7fd70daf50ef79553d17e2e7347913fc7f27755118f109d7f74ea97c9d517e5dab4b30e0f118675d310e8d55771c5b SHA512 48a71d0c0fa913989b741b31810703781a7adbda6031d3030c152d5db25650638ce80de614551f7336b99986d57bfd361a1c743e1063259ffc8ef77eccf0c6ce MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf 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 new file mode 100644 index 000000000000..daf72ef3a85b --- /dev/null +++ b/media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch @@ -0,0 +1,49 @@ +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 new file mode 100644 index 000000000000..d0fea160c649 --- /dev/null +++ b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{4,5,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 ~amd64-fbsd" +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 ) +" + +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 + 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.10.10.ebuild b/media-libs/gexiv2/gexiv2-0.10.10.ebuild deleted file mode 100644 index ad4135f9b2a5..000000000000 --- a/media-libs/gexiv2/gexiv2-0.10.10.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{4,5,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 ~amd64-fbsd" -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 ) -" - -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 - 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 -) - -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-9999.ebuild b/media-libs/gexiv2/gexiv2-9999.ebuild index 2547c6a9ca91..1c6c54fc4d10 100644 --- a/media-libs/gexiv2/gexiv2-9999.ebuild +++ b/media-libs/gexiv2/gexiv2-9999.ebuild @@ -57,8 +57,8 @@ src_configure() { $(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 + -Dpython2_girdir=no + -Dpython3_girdir=no ) meson_src_configure } -- cgit v1.2.3