* [gentoo-commits] repo/gentoo:master commit in: x11-wm/musca/
@ 2017-02-07 17:48 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2017-02-07 17:48 UTC (permalink / raw
To: gentoo-commits
commit: b33597d1ff74168425748fad6c26019a1aabd139
Author: Harri Nieminen <moikkis <AT> gmail <DOT> com>
AuthorDate: Tue Feb 7 17:12:49 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Feb 7 17:47:46 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b33597d1
x11-wm/musca: Fix toolong DESCRIPTION
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3871
x11-wm/musca/musca-0.9.24_p20100226-r3.ebuild | 5 ++---
x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/x11-wm/musca/musca-0.9.24_p20100226-r3.ebuild b/x11-wm/musca/musca-0.9.24_p20100226-r3.ebuild
index 0db45a2..db51ef4 100644
--- a/x11-wm/musca/musca-0.9.24_p20100226-r3.ebuild
+++ b/x11-wm/musca/musca-0.9.24_p20100226-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -6,8 +6,7 @@ EAPI="4"
inherit eutils savedconfig toolchain-funcs
-DESCRIPTION="A simple dynamic window manager for X, with features nicked from
-ratpoison and dwm"
+DESCRIPTION="A simple dynamic window manager, with features nicked from ratpoison and dwm"
HOMEPAGE="https://launchpad.net/musca"
SRC_URI="mirror://gentoo/${P}.tgz"
diff --git a/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild b/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
index fbe96e7..2d75783 100644
--- a/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
+++ b/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit eutils savedconfig toolchain-funcs
-DESCRIPTION="A simple dynamic window manager for X, with features nicked from
-ratpoison and dwm"
+DESCRIPTION="A simple dynamic window manager, with features nicked from ratpoison and dwm"
HOMEPAGE="https://launchpad.net/musca"
SRC_URI="mirror://gentoo/${P}.tgz"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/musca/
@ 2019-05-23 23:32 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2019-05-23 23:32 UTC (permalink / raw
To: gentoo-commits
commit: 9fe4286c34062260443e1ba174bf298ba93a2221
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu May 23 23:32:12 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu May 23 23:32:12 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fe4286c
x11-wm/musca: Port to EAPI 7
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: David Seifert <soap <AT> gentoo.org>
x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild | 27 +++++++++++----------------
1 file changed, 11 insertions(+), 16 deletions(-)
diff --git a/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild b/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
index 129899ded8d..adef927a76b 100644
--- a/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
+++ b/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils savedconfig toolchain-funcs
+EAPI=7
+
+inherit savedconfig toolchain-funcs
DESCRIPTION="A simple dynamic window manager, with features nicked from ratpoison and dwm"
HOMEPAGE="https://launchpad.net/musca"
@@ -13,14 +14,11 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="apis xlisten"
-COMMON="x11-libs/libX11"
-DEPEND="${COMMON}
- sys-apps/sed"
+DEPEND="x11-libs/libX11"
RDEPEND="
- ${COMMON}
+ ${DEPEND}
>=x11-misc/dmenu-4.4
- apis? ( x11-misc/xbindkeys )
-"
+ apis? ( x11-misc/xbindkeys )"
src_prepare() {
restore_config config.h
@@ -30,12 +28,13 @@ src_prepare() {
-e 's:sed.*exec.*-i::g' \
|| die
- epatch \
+ eapply \
"${FILESDIR}"/${PN}-0.9.24-make.patch \
"${FILESDIR}"/${PN}-0.9.24_p20100226-dmenu-4.4.patch \
"${FILESDIR}"/${PN}-0.9.24_p20100226-null.patch \
"${FILESDIR}"/${PN}-0.9.24_p20100226-fix-cycle.patch \
"${FILESDIR}"/${PN}-0.9.24_p20100226-fix-pad.patch
+ eapply_user
local i
for i in apis xlisten; do
@@ -49,13 +48,9 @@ src_prepare() {
src_install() {
dobin musca
+ use xlisten && dobin xlisten
+ use apis && dobin apis
- local i
- for i in xlisten apis; do
- if use ${i}; then
- dobin ${i}
- fi
- done
doman musca.1
exeinto /etc/X11/Sessions
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/musca/
@ 2019-06-05 7:06 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2019-06-05 7:06 UTC (permalink / raw
To: gentoo-commits
commit: 4df7ca193d1b8e315701a9cb70b2426150b67bd2
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 5 07:06:39 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jun 5 07:06:53 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4df7ca19
x11-wm/musca: Old
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
x11-wm/musca/musca-0.9.24_p20100226-r3.ebuild | 64 ---------------------------
1 file changed, 64 deletions(-)
diff --git a/x11-wm/musca/musca-0.9.24_p20100226-r3.ebuild b/x11-wm/musca/musca-0.9.24_p20100226-r3.ebuild
deleted file mode 100644
index df917b3ed56..00000000000
--- a/x11-wm/musca/musca-0.9.24_p20100226-r3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils savedconfig toolchain-funcs
-
-DESCRIPTION="A simple dynamic window manager, with features nicked from ratpoison and dwm"
-HOMEPAGE="https://launchpad.net/musca"
-SRC_URI="mirror://gentoo/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="apis xlisten"
-
-COMMON="x11-libs/libX11"
-DEPEND="${COMMON}
- sys-apps/sed"
-RDEPEND="
- ${COMMON}
- >=x11-misc/dmenu-4.4
- apis? ( x11-misc/xbindkeys )
-"
-
-src_prepare() {
- restore_config config.h
-
- sed -i config.h \
- -e 's:"sort | dmenu -i -b":"-i -b":g' \
- -e 's:sed.*exec.*-i::g' \
- || die
-
- epatch \
- "${FILESDIR}"/${PN}-0.9.24-make.patch \
- "${FILESDIR}"/${PN}-0.9.24_p20100226-dmenu-4.4.patch \
- "${FILESDIR}"/${PN}-0.9.24_p20100226-null.patch
-
- local i
- for i in apis xlisten; do
- if ! use ${i}; then
- sed -e "s|${i}||g" -i Makefile || die
- fi
- done
-
- tc-export CC
-}
-
-src_install() {
- dobin musca
-
- local i
- for i in xlisten apis; do
- if use ${i}; then
- dobin ${i}
- fi
- done
- doman musca.1
-
- exeinto /etc/X11/Sessions
- newexe "${FILESDIR}"/${PN}.xsession musca
-
- save_config config.h
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/musca/
@ 2019-06-05 7:06 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2019-06-05 7:06 UTC (permalink / raw
To: gentoo-commits
commit: 3aad76accff2a463d062b58d271aebe351dad708
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 5 07:02:16 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jun 5 07:06:53 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aad76ac
x11-wm/musca: Whitespace, properly convert to EAPI=7
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild b/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
index 9cdf8f8f7ad..3b59bc329b7 100644
--- a/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
+++ b/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
@@ -2,7 +2,6 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-
inherit savedconfig toolchain-funcs
DESCRIPTION="A simple dynamic window manager, with features nicked from ratpoison and dwm"
@@ -14,11 +13,21 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE="apis xlisten"
-DEPEND="x11-libs/libX11"
+DEPEND="
+ x11-libs/libX11
+"
RDEPEND="
${DEPEND}
>=x11-misc/dmenu-4.4
- apis? ( x11-misc/xbindkeys )"
+ apis? ( x11-misc/xbindkeys )
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9.24-make.patch
+ "${FILESDIR}"/${PN}-0.9.24_p20100226-dmenu-4.4.patch
+ "${FILESDIR}"/${PN}-0.9.24_p20100226-null.patch
+ "${FILESDIR}"/${PN}-0.9.24_p20100226-fix-cycle.patch
+ "${FILESDIR}"/${PN}-0.9.24_p20100226-fix-pad.patch
+)
src_prepare() {
restore_config config.h
@@ -28,13 +37,7 @@ src_prepare() {
-e 's:sed.*exec.*-i::g' \
|| die
- eapply \
- "${FILESDIR}"/${PN}-0.9.24-make.patch \
- "${FILESDIR}"/${PN}-0.9.24_p20100226-dmenu-4.4.patch \
- "${FILESDIR}"/${PN}-0.9.24_p20100226-null.patch \
- "${FILESDIR}"/${PN}-0.9.24_p20100226-fix-cycle.patch \
- "${FILESDIR}"/${PN}-0.9.24_p20100226-fix-pad.patch
- eapply_user
+ default
local i
for i in apis xlisten; do
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-06-05 7:06 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-05 7:06 [gentoo-commits] repo/gentoo:master commit in: x11-wm/musca/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2019-06-05 7:06 Jeroen Roovers
2019-05-23 23:32 David Seifert
2017-02-07 17:48 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox