commit: f7e6c2c119d24e8709d518e382bf0891b4fc85d0 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> AuthorDate: Mon Nov 23 08:51:10 2020 +0000 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> CommitDate: Mon Nov 23 08:51:10 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7e6c2c1
media-gfx/geeqie: migrate to lua-single eclass Closes: https://bugs.gentoo.org/752744 Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> .../{geeqie-9999.ebuild => geeqie-1.5.1-r1.ebuild} | 18 ++++++++++-------- media-gfx/geeqie/geeqie-9999.ebuild | 8 +++++--- profiles/package.mask | 1 + 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/media-gfx/geeqie/geeqie-9999.ebuild b/media-gfx/geeqie/geeqie-1.5.1-r1.ebuild similarity index 84% copy from media-gfx/geeqie/geeqie-9999.ebuild copy to media-gfx/geeqie/geeqie-1.5.1-r1.ebuild index aef56eaf8ba..f0063ff9ba0 100644 --- a/media-gfx/geeqie/geeqie-9999.ebuild +++ b/media-gfx/geeqie/geeqie-1.5.1-r1.ebuild @@ -2,19 +2,18 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 +LUA_COMPAT=( lua5-{1..3} ) -inherit autotools git-r3 xdg +inherit autotools lua-single xdg DESCRIPTION="A lightweight GTK image viewer forked from GQview" HOMEPAGE="http://www.geeqie.org"; -SRC_URI="" -# Using github mirror, as geeqie.org does not have a valid SSL certificate -EGIT_REPO_URI="https://github.com/BestImageViewer/geeqie.git"; +SRC_URI="http://www.geeqie.org/${P}.tar.xz"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="" -IUSE="debug doc exif ffmpegthumbnailer gpu-accel +gtk3 jpeg lcms lirc lua map nls pdf tiff xmp" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map nls pdf tiff xmp" RDEPEND=" virtual/libintl @@ -26,7 +25,7 @@ RDEPEND=" jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) - lua? ( >=dev-lang/lua-5.1:= ) + lua? ( ${LUA_DEPS} ) map? ( media-libs/libchamplain:0.12 ) pdf? ( >=app-text/poppler-0.62[cairo] ) tiff? ( media-libs/tiff:0 ) @@ -39,9 +38,12 @@ BDEPEND=" virtual/pkgconfig nls? ( sys-devel/gettext )" -REQUIRED_USE="gpu-accel? ( gtk3 ) +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) + gpu-accel? ( gtk3 ) map? ( gpu-accel )" +PATCHES=( "${FILESDIR}"/${P}-no_common.patch ) + src_prepare() { default diff --git a/media-gfx/geeqie/geeqie-9999.ebuild b/media-gfx/geeqie/geeqie-9999.ebuild index aef56eaf8ba..b9db7c038a2 100644 --- a/media-gfx/geeqie/geeqie-9999.ebuild +++ b/media-gfx/geeqie/geeqie-9999.ebuild @@ -2,8 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 +LUA_COMPAT=( lua5-{1..3} ) -inherit autotools git-r3 xdg +inherit autotools git-r3 lua-single xdg DESCRIPTION="A lightweight GTK image viewer forked from GQview" HOMEPAGE="http://www.geeqie.org"; @@ -26,7 +27,7 @@ RDEPEND=" jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) - lua? ( >=dev-lang/lua-5.1:= ) + lua? ( ${LUA_DEPS} ) map? ( media-libs/libchamplain:0.12 ) pdf? ( >=app-text/poppler-0.62[cairo] ) tiff? ( media-libs/tiff:0 ) @@ -39,7 +40,8 @@ BDEPEND=" virtual/pkgconfig nls? ( sys-devel/gettext )" -REQUIRED_USE="gpu-accel? ( gtk3 ) +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) + gpu-accel? ( gtk3 ) map? ( gpu-accel )" src_prepare() { diff --git a/profiles/package.mask b/profiles/package.mask index 194f29976ce..ea6a145cefd 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -474,6 +474,7 @@ dev-lua/luacrypto >=games-engines/love-0.8.0-r100:0.8 >=games-engines/love-11.3-r100:0 >=mail-filter/imapfilter-2.6.16-r100 +>=media-gfx/geeqie-1.5.1-r1 >=net-analyzer/suricata-6.0.0-r100 >=net-im/swift-4.0.2-r100 >=net-p2p/eiskaltdcpp-2.2.10-r100
