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 EED4A13835A for ; Tue, 13 Oct 2020 16:55:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4C5B7E0921; Tue, 13 Oct 2020 16:55:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 E2F4FE0921 for ; Tue, 13 Oct 2020 16:55:24 +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 BB5BF335D7B for ; Tue, 13 Oct 2020 16:55:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D636D3A8 for ; Tue, 13 Oct 2020 16:55:20 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1602607670.bc11115e4b3deafe18a165010a7065ccb12eb327.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-engines/love/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-engines/love/love-9999.ebuild X-VCS-Directories: games-engines/love/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: bc11115e4b3deafe18a165010a7065ccb12eb327 X-VCS-Branch: master Date: Tue, 13 Oct 2020 16:55:20 +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: f1f70484-fe96-47c3-9562-2f5f434c3667 X-Archives-Hash: 6490a96b5b6f64963d7a0cc8e10abfc2 commit: bc11115e4b3deafe18a165010a7065ccb12eb327 Author: Marek Szuba gentoo org> AuthorDate: Tue Oct 13 16:21:35 2020 +0000 Commit: Marek Szuba gentoo org> CommitDate: Tue Oct 13 16:47:50 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc11115e games-engines/love: sync the live ebuild with 11.3 Closes: https://bugs.gentoo.org/737904 Signed-off-by: Marek Szuba gentoo.org> games-engines/love/love-9999.ebuild | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/games-engines/love/love-9999.ebuild b/games-engines/love/love-9999.ebuild index c4f181125e4..6265299294f 100644 --- a/games-engines/love/love-9999.ebuild +++ b/games-engines/love/love-9999.ebuild @@ -1,16 +1,15 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit gnome2-utils xdg-utils +EAPI=7 + +inherit xdg-utils if [[ ${PV} == 9999* ]]; then - inherit mercurial - EHG_REPO_URI="https://bitbucket.org/rude/${PN}" - SRC_URI="" - KEYWORDS="" + inherit git-r3 + EGIT_REPO_URI="https://github.com/love2d/${PN}.git" else - SRC_URI="https://www.bitbucket.org/rude/${PN}/downloads/${P}-linux-src.tar.gz" + SRC_URI="https://github.com/love2d/${PN}/releases/download/${PV}/${P}-linux-src.tar.gz" KEYWORDS="~amd64 ~arm ~x86" fi @@ -22,7 +21,7 @@ SLOT="0" IUSE="+luajit" RDEPEND="sys-libs/zlib - !luajit? ( dev-lang/lua:0[deprecated] ) + !luajit? ( dev-lang/lua:0 ) luajit? ( dev-lang/luajit:2 ) media-libs/freetype media-libs/libmodplug @@ -52,23 +51,23 @@ src_install() { default find "${D}" -name '*.la' -delete || die - if [ "$SLOT" != "0" ] - then + + if [[ ${SLOT} != 0 ]]; then mv "${ED}/usr/bin/${PN}" "${ED}/usr/bin/${PN}-${SLOT}" || die mv "${ED}"/usr/share/applications/love{,"-$SLOT"}.desktop || die - sed -i "s|/usr/bin/love|/usr/bin/love-$SLOT|" "${ED}/usr/share/applications/love-$SLOT.desktop" || die - rm "${ED}"/usr/{lib64/liblove.so,share/{mime/packages/love.xml,pixmaps/love.svg,icons/hicolor/scalable/mimetypes/application-x-love-game.svg,man/man1/love.1}} || die + sed -i -e "/^Name=/s/$/ ($SLOT)/" -e "s|/usr/bin/love|/usr/bin/love-$SLOT|" "${ED}/usr/share/applications/love-$SLOT.desktop" || die + rm -r "${ED}"/usr/{lib64/liblove.so,share/{mime/,pixmaps/,icons/,man/}} || die fi } pkg_postinst() { - gnome2_icon_cache_update xdg_desktop_database_update + xdg_icon_cache_update xdg_mimeinfo_database_update } pkg_postrm() { - gnome2_icon_cache_update xdg_desktop_database_update + xdg_icon_cache_update xdg_mimeinfo_database_update }