summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2023-01-11 10:41:56 +0100
committerUlrich Müller <ulm@gentoo.org>2023-01-11 10:43:07 +0100
commitf0c04cbab985d0b83803d039e3fa345e5d5d356a (patch)
tree167a2c9ae945e1f161ce90754ec9307b1988e855 /x11-wm
parentdev-lang/lazarus: change name to ${P} (diff)
downloadgentoo-f0c04cbab985d0b83803d039e3fa345e5d5d356a.tar.gz
gentoo-f0c04cbab985d0b83803d039e3fa345e5d5d356a.tar.bz2
gentoo-f0c04cbab985d0b83803d039e3fa345e5d5d356a.zip
x11-wm/ratpoison: EAPI 8, fix LICENSE
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/ratpoison/ratpoison-1.4.9-r3.ebuild (renamed from x11-wm/ratpoison/ratpoison-1.4.9-r2.ebuild)17
-rw-r--r--x11-wm/ratpoison/ratpoison-9999.ebuild14
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
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.*