From b021e6bb11fadddc78461e01e5e4a69a915640c8 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Sun, 19 Jan 2020 20:33:57 +0100 Subject: media-gfx/imv: Fix dependencies Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Jeroen Roovers --- media-gfx/imv/imv-4.0.1-r1.ebuild | 90 ------------------------------------- media-gfx/imv/imv-4.0.1-r2.ebuild | 91 +++++++++++++++++++++++++++++++++++++ media-gfx/imv/imv-4.1.0-r1.ebuild | 94 +++++++++++++++++++++++++++++++++++++++ media-gfx/imv/imv-4.1.0.ebuild | 92 -------------------------------------- media-gfx/imv/imv-9999.ebuild | 2 + 5 files changed, 187 insertions(+), 182 deletions(-) delete mode 100644 media-gfx/imv/imv-4.0.1-r1.ebuild create mode 100644 media-gfx/imv/imv-4.0.1-r2.ebuild create mode 100644 media-gfx/imv/imv-4.1.0-r1.ebuild delete mode 100644 media-gfx/imv/imv-4.1.0.ebuild diff --git a/media-gfx/imv/imv-4.0.1-r1.ebuild b/media-gfx/imv/imv-4.0.1-r1.ebuild deleted file mode 100644 index dab63717b9c3..000000000000 --- a/media-gfx/imv/imv-4.0.1-r1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs xdg-utils - -DESCRIPTION="Minimal image viewer designed for tiling window manager users" -HOMEPAGE="https://github.com/eXeC64/imv" -SRC_URI="https://github.com/eXeC64/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT-with-advertising" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="X +freeimage jpeg png +svg test tiff wayland" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - || ( X wayland ) -" - -RDEPEND=" - !sys-apps/renameutils - media-libs/fontconfig - media-libs/libsdl2 - media-libs/sdl2-ttf - X? ( - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libxkbcommon - x11-libs/pango - ) - freeimage? ( media-libs/freeimage ) - jpeg? ( media-libs/libjpeg-turbo ) - png? ( media-libs/libpng ) - svg? ( gnome-base/librsvg ) - tiff? ( media-libs/tiff ) - wayland? ( dev-libs/wayland ) -" -BDEPEND=" - app-text/asciidoc - test? ( dev-util/cmocka ) -" -DEPEND=" - ${RDEPEND} -" - -src_prepare() { - default - sed -i -e 's|pkg-config|$(PKG_CONFIG)|g' Makefile || die -} - -src_configure() { - tc-export PKG_CONFIG - local WINDOWS - if use X; then - if ! use wayland; then - WINDOWS=x11 - else - WINDOWS=all - fi - else - if use wayland; then - WINDOWS=wayland - fi - fi - - BACKENDS=( - BACKEND_FREEIMAGE=$(usex freeimage) - BACKEND_JPEG=$(usex jpeg) - BACKEND_LIBPNG=$(usex png) - BACKEND_LIBRSVG=$(usex svg) - BACKEND_LIBTIFF=$(usex tiff) - WINDOWS=${WINDOWS} - ) -} - -src_compile() { - emake ${BACKENDS[@]} -} - -src_install() { - emake ${BACKENDS[@]} DESTDIR="${D}" install -} - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/media-gfx/imv/imv-4.0.1-r2.ebuild b/media-gfx/imv/imv-4.0.1-r2.ebuild new file mode 100644 index 000000000000..a93b2f9f6269 --- /dev/null +++ b/media-gfx/imv/imv-4.0.1-r2.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit toolchain-funcs xdg-utils + +DESCRIPTION="Minimal image viewer designed for tiling window manager users" +HOMEPAGE="https://github.com/eXeC64/imv" +SRC_URI="https://github.com/eXeC64/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT-with-advertising" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="X +freeimage jpeg png +svg test tiff wayland" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + || ( X wayland ) +" + +RDEPEND=" + !sys-apps/renameutils + media-libs/fontconfig + media-libs/libsdl2 + media-libs/sdl2-ttf + X? ( + virtual/glu + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libxkbcommon + x11-libs/pango + ) + freeimage? ( media-libs/freeimage ) + jpeg? ( media-libs/libjpeg-turbo ) + png? ( media-libs/libpng ) + svg? ( gnome-base/librsvg ) + tiff? ( media-libs/tiff ) + wayland? ( dev-libs/wayland ) +" +BDEPEND=" + app-text/asciidoc + test? ( dev-util/cmocka ) +" +DEPEND=" + ${RDEPEND} +" + +src_prepare() { + default + sed -i -e 's|pkg-config|$(PKG_CONFIG)|g' Makefile || die +} + +src_configure() { + tc-export PKG_CONFIG + local WINDOWS + if use X; then + if ! use wayland; then + WINDOWS=x11 + else + WINDOWS=all + fi + else + if use wayland; then + WINDOWS=wayland + fi + fi + + BACKENDS=( + BACKEND_FREEIMAGE=$(usex freeimage) + BACKEND_JPEG=$(usex jpeg) + BACKEND_LIBPNG=$(usex png) + BACKEND_LIBRSVG=$(usex svg) + BACKEND_LIBTIFF=$(usex tiff) + WINDOWS=${WINDOWS} + ) +} + +src_compile() { + emake ${BACKENDS[@]} +} + +src_install() { + emake ${BACKENDS[@]} DESTDIR="${D}" install +} + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/media-gfx/imv/imv-4.1.0-r1.ebuild b/media-gfx/imv/imv-4.1.0-r1.ebuild new file mode 100644 index 000000000000..eb2681a4e709 --- /dev/null +++ b/media-gfx/imv/imv-4.1.0-r1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit toolchain-funcs xdg-utils + +DESCRIPTION="Minimal image viewer designed for tiling window manager users" +HOMEPAGE="https://github.com/eXeC64/imv" +SRC_URI="https://github.com/eXeC64/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT-with-advertising" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="X +freeimage jpeg libnsgif png +svg test tiff wayland" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + || ( X wayland ) +" + +RDEPEND=" + !sys-apps/renameutils + dev-libs/icu:= + media-libs/fontconfig + media-libs/libsdl2 + media-libs/sdl2-ttf + X? ( + virtual/glu + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libxkbcommon[X] + x11-libs/pango + ) + freeimage? ( media-libs/freeimage ) + jpeg? ( media-libs/libjpeg-turbo ) + libnsgif? ( media-libs/libnsgif ) + png? ( media-libs/libpng ) + svg? ( gnome-base/librsvg ) + tiff? ( media-libs/tiff ) + wayland? ( dev-libs/wayland ) +" +BDEPEND=" + app-text/asciidoc + test? ( dev-util/cmocka ) +" +DEPEND=" + ${RDEPEND} +" + +src_prepare() { + default + sed -i -e 's|pkg-config|$(PKG_CONFIG)|g' Makefile || die +} + +src_configure() { + tc-export PKG_CONFIG + local WINDOWS + if use X; then + if ! use wayland; then + WINDOWS=x11 + else + WINDOWS=all + fi + else + if use wayland; then + WINDOWS=wayland + fi + fi + + BACKENDS=( + BACKEND_FREEIMAGE=$(usex freeimage) + BACKEND_JPEG=$(usex jpeg) + BACKEND_LIBNSGIF=$(usex libnsgif) + BACKEND_LIBPNG=$(usex png) + BACKEND_LIBRSVG=$(usex svg) + BACKEND_LIBTIFF=$(usex tiff) + WINDOWS=${WINDOWS} + ) +} + +src_compile() { + emake ${BACKENDS[@]} +} + +src_install() { + emake ${BACKENDS[@]} DESTDIR="${D}" install +} + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/media-gfx/imv/imv-4.1.0.ebuild b/media-gfx/imv/imv-4.1.0.ebuild deleted file mode 100644 index 4987f5a28049..000000000000 --- a/media-gfx/imv/imv-4.1.0.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs xdg-utils - -DESCRIPTION="Minimal image viewer designed for tiling window manager users" -HOMEPAGE="https://github.com/eXeC64/imv" -SRC_URI="https://github.com/eXeC64/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT-with-advertising" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="X +freeimage jpeg libnsgif png +svg test tiff wayland" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - || ( X wayland ) -" - -RDEPEND=" - !sys-apps/renameutils - media-libs/fontconfig - media-libs/libsdl2 - media-libs/sdl2-ttf - X? ( - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libxkbcommon - x11-libs/pango - ) - freeimage? ( media-libs/freeimage ) - jpeg? ( media-libs/libjpeg-turbo ) - libnsgif? ( media-libs/libnsgif ) - png? ( media-libs/libpng ) - svg? ( gnome-base/librsvg ) - tiff? ( media-libs/tiff ) - wayland? ( dev-libs/wayland ) -" -BDEPEND=" - app-text/asciidoc - test? ( dev-util/cmocka ) -" -DEPEND=" - ${RDEPEND} -" - -src_prepare() { - default - sed -i -e 's|pkg-config|$(PKG_CONFIG)|g' Makefile || die -} - -src_configure() { - tc-export PKG_CONFIG - local WINDOWS - if use X; then - if ! use wayland; then - WINDOWS=x11 - else - WINDOWS=all - fi - else - if use wayland; then - WINDOWS=wayland - fi - fi - - BACKENDS=( - BACKEND_FREEIMAGE=$(usex freeimage) - BACKEND_JPEG=$(usex jpeg) - BACKEND_LIBNSGIF=$(usex libnsgif) - BACKEND_LIBPNG=$(usex png) - BACKEND_LIBRSVG=$(usex svg) - BACKEND_LIBTIFF=$(usex tiff) - WINDOWS=${WINDOWS} - ) -} - -src_compile() { - emake ${BACKENDS[@]} -} - -src_install() { - emake ${BACKENDS[@]} DESTDIR="${D}" install -} - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/media-gfx/imv/imv-9999.ebuild b/media-gfx/imv/imv-9999.ebuild index 5fc4052027f6..986d27dd3255 100644 --- a/media-gfx/imv/imv-9999.ebuild +++ b/media-gfx/imv/imv-9999.ebuild @@ -19,10 +19,12 @@ REQUIRED_USE=" RDEPEND=" !sys-apps/renameutils + dev-libs/icu:= media-libs/fontconfig media-libs/libsdl2 media-libs/sdl2-ttf X? ( + virtual/glu x11-libs/libX11 x11-libs/libxcb x11-libs/libxkbcommon -- cgit v1.2.3-65-gdbad