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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7FE6A15800F for ; Wed, 11 Jan 2023 09:43:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7FC5E0C34; Wed, 11 Jan 2023 09:43:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8B014E0C34 for ; Wed, 11 Jan 2023 09:43:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 69897335D97 for ; Wed, 11 Jan 2023 09:43:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C12774E for ; Wed, 11 Jan 2023 09:43:12 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1673430187.f0c04cbab985d0b83803d039e3fa345e5d5d356a.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/ratpoison/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/ratpoison/ratpoison-1.4.9-r2.ebuild x11-wm/ratpoison/ratpoison-1.4.9-r3.ebuild x11-wm/ratpoison/ratpoison-9999.ebuild X-VCS-Directories: x11-wm/ratpoison/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: f0c04cbab985d0b83803d039e3fa345e5d5d356a X-VCS-Branch: master Date: Wed, 11 Jan 2023 09:43:12 +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: ea7832fc-0834-4927-8886-ff3c0666f8f1 X-Archives-Hash: e20012befc655a9ee1b979b49de37adb commit: f0c04cbab985d0b83803d039e3fa345e5d5d356a Author: Ulrich Müller gentoo org> AuthorDate: Wed Jan 11 09:41:56 2023 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Wed Jan 11 09:43:07 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0c04cba x11-wm/ratpoison: EAPI 8, fix LICENSE Signed-off-by: Ulrich Müller gentoo.org> ...poison-1.4.9-r2.ebuild => ratpoison-1.4.9-r3.ebuild} | 17 +++++++++-------- x11-wm/ratpoison/ratpoison-9999.ebuild | 14 +++++++------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/x11-wm/ratpoison/ratpoison-1.4.9-r2.ebuild b/x11-wm/ratpoison/ratpoison-1.4.9-r3.ebuild similarity index 82% rename from x11-wm/ratpoison/ratpoison-1.4.9-r2.ebuild rename to x11-wm/ratpoison/ratpoison-1.4.9-r3.ebuild index 3d20f3c4d143..5a548bdf096a 100644 --- a/x11-wm/ratpoison/ratpoison-1.4.9-r2.ebuild +++ b/x11-wm/ratpoison/ratpoison-1.4.9-r3.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit elisp-common toolchain-funcs DESCRIPTION="window manager without mouse dependency" -HOMEPAGE="http://www.nongnu.org/ratpoison/" -SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz" +HOMEPAGE="https://www.nongnu.org/ratpoison/" +SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz" -LICENSE="GPL-2" +LICENSE="GPL-2+ || ( GPL-2+ FDL-1.2+ )" SLOT="0" KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux" IUSE="debug emacs +history sloppy +xft +xrandr" @@ -24,9 +25,9 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - virtual/pkgconfig x11-base/xorg-proto " +BDEPEND="virtual/pkgconfig" SITEFILE=50ratpoison-gentoo.el DOCS=( @@ -53,7 +54,7 @@ src_configure() { src_compile() { emake CFLAGS="${CFLAGS}" if use emacs; then - elisp-compile contrib/ratpoison.el || die + elisp-compile contrib/ratpoison.el fi if use sloppy; then @@ -82,7 +83,7 @@ src_install() { dodoc contrib/{genrpbindings,split.sh} \ doc/{ipaq.ratpoisonrc,sample.ratpoisonrc} - rm -rf "${ED}/usr/share/"{doc/ratpoison,ratpoison} + rm -rf "${ED}/usr/share/"{doc/ratpoison,ratpoison} || die if use emacs; then elisp-install ${PN} contrib/ratpoison.* diff --git a/x11-wm/ratpoison/ratpoison-9999.ebuild b/x11-wm/ratpoison/ratpoison-9999.ebuild index b22f59987d42..20380c32fc12 100644 --- a/x11-wm/ratpoison/ratpoison-9999.ebuild +++ b/x11-wm/ratpoison/ratpoison-9999.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit autotools elisp-common git-r3 toolchain-funcs DESCRIPTION="window manager without mouse dependency" HOMEPAGE="https://www.nongnu.org/ratpoison/" EGIT_REPO_URI="https://git.savannah.gnu.org/git/ratpoison.git" -LICENSE="GPL-2" +LICENSE="GPL-2+ || ( GPL-2+ FDL-1.2+ )" SLOT="0" -KEYWORDS="" IUSE="debug emacs +history sloppy +xft +xrandr" RDEPEND=" @@ -36,13 +36,13 @@ DOCS=( README TODO ) + PATCHES=( "${FILESDIR}"/ratpoison.el-gentoo.patch ) src_prepare() { default - eautoreconf } @@ -58,7 +58,7 @@ src_configure() { src_compile() { emake CFLAGS="${CFLAGS}" if use emacs; then - elisp-compile contrib/ratpoison.el || die + elisp-compile contrib/ratpoison.el fi if use sloppy; then @@ -87,7 +87,7 @@ src_install() { dodoc contrib/{genrpbindings,split.sh} \ doc/{ipaq.ratpoisonrc,sample.ratpoisonrc} - rm -rf "${ED}/usr/share/"{doc/ratpoison,ratpoison} + rm -rf "${ED}/usr/share/"{doc/ratpoison,ratpoison} || die if use emacs; then elisp-install ${PN} contrib/ratpoison.*