commit: 079d4f2b6783d80eb862d593b7aa1cd22431e74e Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Wed Dec 23 15:14:17 2020 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Wed Dec 23 15:14:17 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=079d4f2b
www-apps/cgit: migrate to lua-single.eclass Compatibility as per the upstream README. Implementation name is passed directly to the build scripts so trivial to migrate. Both the latest release and the live ebuild. Closes: https://bugs.gentoo.org/752870 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> profiles/package.mask | 1 + .../{cgit-9999.ebuild => cgit-1.2.3-r100.ebuild} | 29 +++++++++++----------- www-apps/cgit/cgit-9999.ebuild | 18 ++++++-------- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index e6fa10d4290..63f022693ce 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -534,6 +534,7 @@ kde-apps/kdebase-meta:5 >=sys-apps/roccat-tools-5.9.0-r100 >=sys-cluster/slurm-20.11.0.1-r100 >=www-apache/mod_security-2.9.3-r100 +>=www-apps/cgit-1.2.3-r100 >=www-client/elinks-0.13.5-r100 >=www-client/luakit-2.2.1-r100 >=www-servers/lighttpd-1.4.55-r100 diff --git a/www-apps/cgit/cgit-9999.ebuild b/www-apps/cgit/cgit-1.2.3-r100.ebuild similarity index 79% copy from www-apps/cgit/cgit-9999.ebuild copy to www-apps/cgit/cgit-1.2.3-r100.ebuild index 4b617428b6e..08c24550c1b 100644 --- a/www-apps/cgit/cgit-9999.ebuild +++ b/www-apps/cgit/cgit-1.2.3-r100.ebuild @@ -3,21 +3,25 @@ EAPI=7 +LUA_COMPAT=( lua5-{1..2} luajit ) WEBAPP_MANUAL_SLOT="yes" -inherit git-r3 toolchain-funcs webapp +inherit lua-single toolchain-funcs webapp [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/" +GIT_V="2.25.1" + DESCRIPTION="a fast web-interface for git repositories" HOMEPAGE="https://git.zx2c4.com/cgit/about"; -SRC_URI="" -EGIT_REPO_URI="https://git.zx2c4.com/cgit"; +SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz + https://git.zx2c4.com/cgit/snapshot/${P}.tar.xz"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="" -IUSE="doc +highlight libressl +lua +luajit test" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="doc +highlight libressl +lua test" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" RESTRICT="!test? ( test )" RDEPEND=" @@ -27,10 +31,7 @@ RDEPEND=" highlight? ( || ( dev-python/pygments app-text/highlight ) ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) - lua? ( - luajit? ( dev-lang/luajit ) - !luajit? ( dev-lang/lua:0 ) - ) + lua? ( ${LUA_DEPS} ) sys-libs/zlib virtual/httpd-cgi " @@ -42,9 +43,13 @@ DEPEND="${RDEPEND} pkg_setup() { webapp_pkg_setup + use lua && lua-single_pkg_setup } src_prepare() { + rmdir git || die + mv "${WORKDIR}"/git-"${GIT_V}" git || die + echo "prefix = ${EPREFIX}/usr" >> cgit.conf echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf @@ -52,11 +57,7 @@ src_prepare() { echo "CACHE_ROOT = ${CGIT_CACHEDIR}" >> cgit.conf echo "DESTDIR = ${D}" >> cgit.conf if use lua; then - if use luajit; then - echo "LUA_PKGCONFIG = luajit" >> cgit.conf - else - echo "LUA_PKGCONFIG = lua" >> cgit.conf - fi + echo "LUA_PKGCONFIG = ${ELUA}" >> cgit.conf else echo "NO_LUA = 1" >> cgit.conf fi diff --git a/www-apps/cgit/cgit-9999.ebuild b/www-apps/cgit/cgit-9999.ebuild index 4b617428b6e..8975d5eebd6 100644 --- a/www-apps/cgit/cgit-9999.ebuild +++ b/www-apps/cgit/cgit-9999.ebuild @@ -3,9 +3,10 @@ EAPI=7 +LUA_COMPAT=( lua5-{1..2} luajit ) WEBAPP_MANUAL_SLOT="yes" -inherit git-r3 toolchain-funcs webapp +inherit git-r3 lua-single toolchain-funcs webapp [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/" @@ -17,7 +18,8 @@ EGIT_REPO_URI="https://git.zx2c4.com/cgit"; LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="doc +highlight libressl +lua +luajit test" +IUSE="doc +highlight libressl +lua test" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" RESTRICT="!test? ( test )" RDEPEND=" @@ -27,10 +29,7 @@ RDEPEND=" highlight? ( || ( dev-python/pygments app-text/highlight ) ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) - lua? ( - luajit? ( dev-lang/luajit ) - !luajit? ( dev-lang/lua:0 ) - ) + lua? ( ${LUA_DEPS} ) sys-libs/zlib virtual/httpd-cgi " @@ -42,6 +41,7 @@ DEPEND="${RDEPEND} pkg_setup() { webapp_pkg_setup + use lua && lua-single_pkg_setup } src_prepare() { @@ -52,11 +52,7 @@ src_prepare() { echo "CACHE_ROOT = ${CGIT_CACHEDIR}" >> cgit.conf echo "DESTDIR = ${D}" >> cgit.conf if use lua; then - if use luajit; then - echo "LUA_PKGCONFIG = luajit" >> cgit.conf - else - echo "LUA_PKGCONFIG = lua" >> cgit.conf - fi + echo "LUA_PKGCONFIG = ${ELUA}" >> cgit.conf else echo "NO_LUA = 1" >> cgit.conf fi
