summaryrefslogtreecommitdiff
path: root/x11-wm/musca
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-06-08 09:04:53 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-06-08 09:04:53 +0100
commit73c318acdaf6f8309d68bd266051e6dd1f1bd787 (patch)
tree2878053f3e7faed19a1f82c733d3bd29df69991e /x11-wm/musca
parent2018227e9344edb9da15fc6a4a8298086cc2aa77 (diff)
gentoo resync : 08.06.2019
Diffstat (limited to 'x11-wm/musca')
-rw-r--r--x11-wm/musca/Manifest3
-rw-r--r--x11-wm/musca/musca-0.9.24_p20100226-r3.ebuild64
-rw-r--r--x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild25
3 files changed, 15 insertions, 77 deletions
diff --git a/x11-wm/musca/Manifest b/x11-wm/musca/Manifest
index 7f7fca5a3138..0a05039cd6d0 100644
--- a/x11-wm/musca/Manifest
+++ b/x11-wm/musca/Manifest
@@ -5,6 +5,5 @@ AUX musca-0.9.24_p20100226-fix-pad.patch 818 BLAKE2B b89d6eea59c6c172832750e9d42
AUX musca-0.9.24_p20100226-null.patch 4271 BLAKE2B 52ec8124f563fbe0e3b281e36cabc4b59ed0a8091af40dee2eddc49b2d2cd1233a2c8bf6da5feb3e3251a4df4a5ead0922b6af66cbb96cdfb01ee9b287ed9797 SHA512 76bf5d67eee6a5045d1781b818333ef36bac87276bb6050b794502abc4aa77a930092f62ec07622ee18f6bb270924ec40813ee70d25ea8e5d3cf1458a39569a5
AUX musca.xsession 16 BLAKE2B ce00d05a09d8611a71c4d219a48bcc3e9386deb67c5ccb7d6638fab0d41862f0a503cb0ff506b71881606abb2a36da3d0df717791ff95cb8b344370ce3c4d366 SHA512 f276046ab82ceeaebf5307ea9050d55767a55cbd1913854ef0f73bdf162d2d751537ad604fc2a99d8d9c9b89426b609f127451c7a3f6b36868c74842d28a8622
DIST musca-0.9.24_p20100226.tgz 81490 BLAKE2B 6aa9ccdd94749df1a701d605f07c29f8dbb7cb0afb73bdb9392d35df7e518496219e972535e671dd5d6d32520fa7e1d928e91489c2a303aebfe051cdd11a5230 SHA512 9030931dbc332fce144edc6bea907d86aab1eef6b1384958a7889b533af5065a2f20b7233ea063648fff0eb468c2083a310e38586c2c4d83848c773fb1984f45
-EBUILD musca-0.9.24_p20100226-r3.ebuild 1180 BLAKE2B a54c5c5492f08781e36f8da2429bad0d52b84006ca7c81a15075b867864466d0a0eb0219f1223ee2ce28bc77a27c85ea735c554f003677e805077722b5d63169 SHA512 bca766ac4931ad5d81ca212b44c69f85a318a175a303340b8e3116790bda7cae9600aa1108081b3c128c34b8d99aa6d7f0ad6a7120ee80c86dfcc990853bc2e1
-EBUILD musca-0.9.24_p20100226-r4.ebuild 1234 BLAKE2B c729fb8db4480ffacf76ebd4694da222c9e48e280ddadcc10adc5ca1375725ec602a2e4ef6a46d70d573256f921efde1b0178a6fb7e93e22ff983d7b92183de6 SHA512 87c82a3f29f69d4364238a7041ff9867a95d2fe98a85b5af132ceb6d6e054797505d896562be1efe285051c50f6e6dfc1043db99311d4f41d4ac04796cac3d76
+EBUILD musca-0.9.24_p20100226-r4.ebuild 1220 BLAKE2B 1fca1b50cb9c9e918bb4033e26d48ecc382b0734fc0be211a72cc385ff9a917c771d86b3bf7cfdb3d0e4e139190ab28ea6db6ec1284fca838fa77c06499c1461 SHA512 39ae3a9813bf5fb2cbc057c520e60c8348301800df958aac9860ef3de8857095c6d36037ca82646fbfe0ce71c19f1378392329b1c25860a6c565a290a6cd09cd
MISC metadata.xml 486 BLAKE2B 12bdde943981e2eb7a6dc26a6744d596a8fce6b8125f788e760f27d1d7f3f6d8c840b173d7cd3418371a33fe2f064421b4f66484507dff22ea4895695a89cd8f SHA512 098a06d7dff066cf54e909923066078fc8347f7402846a66c26bae0e5df4752cd5a44dec6457e977b2060be5f3068e16ad5147e151ea1b4cac23b4e9e20c136a
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 df917b3ed563..000000000000
--- 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
-}
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 adef927a76b5..3b59bc329b78 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"
@@ -11,14 +10,24 @@ SRC_URI="mirror://gentoo/${P}.tgz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+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