public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/ratpoison/
Date: Wed, 11 Jan 2023 09:43:12 +0000 (UTC)	[thread overview]
Message-ID: <1673430187.f0c04cbab985d0b83803d039e3fa345e5d5d356a.ulm@gentoo> (raw)

commit:     f0c04cbab985d0b83803d039e3fa345e5d5d356a
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 11 09:41:56 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> 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 <ulm <AT> 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.*


             reply	other threads:[~2023-01-11  9:43 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-11  9:43 Ulrich Müller [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-02-21  1:28 [gentoo-commits] repo/gentoo:master commit in: x11-wm/ratpoison/ Jonas Stein
2021-07-17 19:37 Andreas K. Hüttel
2020-11-29 18:02 Aaron Bauman
2020-11-29 17:17 Sergei Trofimovich
2020-04-06 17:54 Sergei Trofimovich
2019-12-20 22:49 Ulrich Müller
2019-04-28 13:56 Jeroen Roovers
2018-09-15  8:36 Jeroen Roovers
2017-04-12 20:15 Jeroen Roovers
2017-04-12 20:15 Jeroen Roovers
2016-07-23 12:03 Jeroen Roovers
2015-10-18  5:12 Jeroen Roovers

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1673430187.f0c04cbab985d0b83803d039e3fa345e5d5d356a.ulm@gentoo \
    --to=ulm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox