[gentoo-commits] repo/gentoo:master commit in: x11-wm/ctwm/

2022-11-23 Thread Jakov Smolić
commit: 28e473e6e73de17aea2c8aa79f5d69dd0a558ab2
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Nov 24 06:16:52 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Nov 24 06:36:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28e473e6

x11-wm/ctwm: Remove USE=rplay

Signed-off-by: Jakov Smolić  gentoo.org>

 x11-wm/ctwm/ctwm-4.0.3.ebuild | 7 +++
 x11-wm/ctwm/metadata.xml  | 1 -
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/x11-wm/ctwm/ctwm-4.0.3.ebuild b/x11-wm/ctwm/ctwm-4.0.3.ebuild
index 27fb610aba73..4dca58842bed 100644
--- a/x11-wm/ctwm/ctwm-4.0.3.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://ctwm.org/dist/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="jpeg rplay test xpm"
+IUSE="jpeg test xpm"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -23,7 +23,6 @@ RDEPEND="
x11-libs/libXmu
x11-libs/libXt
jpeg? ( virtual/jpeg )
-   rplay? ( media-sound/rplay )
xpm? ( x11-libs/libXpm )
 "
 DEPEND="
@@ -45,9 +44,9 @@ src_prepare() {
 src_configure() {
local mycmakeargs=(
-DNOMANCOMPRESS=yes
+   -DUSE_RPLAY=OFF
-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}
-DUSE_JPEG=$(usex jpeg ON OFF)
-   -DUSE_RPLAY=$(usex rplay ON OFF)
-DUSE_XPM=$(usex xpm ON OFF)
)
 

diff --git a/x11-wm/ctwm/metadata.xml b/x11-wm/ctwm/metadata.xml
index 86839ff55249..05c81c0cafd9 100644
--- a/x11-wm/ctwm/metadata.xml
+++ b/x11-wm/ctwm/metadata.xml
@@ -15,7 +15,6 @@


Enable jpeg image support with 
virtual/jpeg
-   Enable sound support from 
media-sound/rplay
Enable upstream test suite, build required 
binary
Enable xpm icon support with 
x11-libs/libXpm




[gentoo-commits] repo/gentoo:master commit in: x11-wm/ctwm/

2021-08-03 Thread Andreas Sturmlechner
commit: e6ca3c698d18e0eb04119e23df83708569b71f38
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Aug  3 12:28:13 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Aug  3 13:18:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6ca3c69

x11-wm/ctwm: Drop 4.0.2, EAPI6--

Closes: https://bugs.gentoo.org/784059
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-wm/ctwm/Manifest  |  1 -
 x11-wm/ctwm/ctwm-4.0.2.ebuild | 45 ---
 2 files changed, 46 deletions(-)

diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index 48b6713b042..7f21353d7d2 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -1,2 +1 @@
-DIST ctwm-4.0.2.tar.xz 672608 BLAKE2B 
b4dc26b9d6ba5aba0a5f1f71363c25065aec0d4d4be7b9772f51117460062f5d7ea17d338e1ad9a89cf1213ca2125a1d203417bdc3f6c95a9b9969477b443a40
 SHA512 
445151f12084acd44bcf8a7d895e29363411a1a663b93e098fa9db5b96ae5cb43921eaf0695026aff2196117b810b96712a60570f57d6dabbee7fba34d5bd57f
 DIST ctwm-4.0.3.tar.xz 683684 BLAKE2B 
d16a47a5cd91ab5305da3c02f874d5ad1c71e2c8a3664cd33d5fa0781f4fdc2613407f5b43b4da16bcf89e323eb34b0888c5dbd02598746195991e7870aba0ef
 SHA512 
f9bb2f8f28a050cce0fc2f1f4e00e79acd7c54055016d8483e045d8f5fa9829f8f5d92bb53f0c1d9500f97d6f52cd827ddd15515c84451ea03551025a8ab831d

diff --git a/x11-wm/ctwm/ctwm-4.0.2.ebuild b/x11-wm/ctwm/ctwm-4.0.2.ebuild
deleted file mode 100644
index 47c1a4e0d2f..000
--- a/x11-wm/ctwm/ctwm-4.0.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A clean, light window manager"
-HOMEPAGE="http://ctwm.org/;
-SRC_URI="http://ctwm.org/dist/${P}.tar.xz;
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="
-   x11-libs/libICE
-   x11-libs/libSM
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXmu
-   x11-libs/libXpm
-   x11-libs/libXt
-"
-DEPEND="
-   ${RDEPEND}
-   app-arch/xz-utils
-   app-text/rman
-   virtual/jpeg
-   x11-base/xorg-proto
-"
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   # implicit 'isspace'
-   sed -i parse.c -e "// a#include " || die
-}
-
-src_install() {
-   cmake-utils_src_install
-
-   mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF} || die
-   mv "${D}"/usr/share/examples/${PN} "${D}"/usr/share/doc/${PF}/examples 
|| die
-}



[gentoo-commits] repo/gentoo:master commit in: x11-wm/ctwm/

2021-06-07 Thread Sergei Trofimovich
commit: f4e8fe74bec89cd02348386fdf755b126c3b2f8d
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Jun  7 06:22:46 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jun  7 06:25:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4e8fe74

x11-wm/ctwm: stable 4.0.3 for ppc

stable wrt bug #784059

Package-Manager: Portage-3.0.19, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 x11-wm/ctwm/ctwm-4.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/ctwm/ctwm-4.0.3.ebuild b/x11-wm/ctwm/ctwm-4.0.3.ebuild
index 86968cd029f..27fb610aba7 100644
--- a/x11-wm/ctwm/ctwm-4.0.3.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ctwm.org/dist/${P}.tar.xz;
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="jpeg rplay test xpm"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: x11-wm/ctwm/

2021-05-11 Thread Agostino Sarubbo
commit: 0750bad4a490cb2f3a0218c87db7a7abbc76842a
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue May 11 10:02:59 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue May 11 10:02:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0750bad4

x11-wm/ctwm: x86 stable wrt bug #784059

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-wm/ctwm/ctwm-4.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/ctwm/ctwm-4.0.3.ebuild b/x11-wm/ctwm/ctwm-4.0.3.ebuild
index 7c24c6682a8..5b1573d82a0 100644
--- a/x11-wm/ctwm/ctwm-4.0.3.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ctwm.org/dist/${P}.tar.xz;
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="jpeg rplay test xpm"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: x11-wm/ctwm/

2021-04-16 Thread Sam James
commit: 2420d762a97d451545231b3e2824dd6686a1008d
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 16 08:16:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 16 11:23:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2420d762

x11-wm/ctwm: eutils--

Signed-off-by: Sam James  gentoo.org>

 x11-wm/ctwm/ctwm-4.0.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-wm/ctwm/ctwm-4.0.2.ebuild b/x11-wm/ctwm/ctwm-4.0.2.ebuild
index 883e461c3da..47c1a4e0d2f 100644
--- a/x11-wm/ctwm/ctwm-4.0.2.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils eutils flag-o-matic toolchain-funcs
+inherit cmake-utils flag-o-matic toolchain-funcs
 
 DESCRIPTION="A clean, light window manager"
 HOMEPAGE="http://ctwm.org/;



[gentoo-commits] repo/gentoo:master commit in: x11-wm/ctwm/

2021-03-26 Thread Joonas Niilola
commit: b5c89a2d0eea024513fed664c0627fd19d78079e
Author: Jake Lilly  gmail  com>
AuthorDate: Tue Mar 23 08:10:19 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Mar 26 09:23:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5c89a2d

x11-wm/ctwm: adopt and fix

Bug: https://bugs.gentoo.org/715904
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Jake Lilly  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20074
Signed-off-by: Joonas Niilola  gentoo.org>

 x11-wm/ctwm/ctwm-4.0.3.ebuild | 33 ++---
 x11-wm/ctwm/metadata.xml  | 19 ++-
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/x11-wm/ctwm/ctwm-4.0.3.ebuild b/x11-wm/ctwm/ctwm-4.0.3.ebuild
index 4cf2574b36c..7c24c6682a8 100644
--- a/x11-wm/ctwm/ctwm-4.0.3.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake
+
+inherit cmake flag-o-matic virtualx
 
 DESCRIPTION="A clean, light window manager"
 HOMEPAGE="https://ctwm.org/;
@@ -11,6 +12,8 @@ SRC_URI="https://ctwm.org/dist/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="jpeg rplay test xpm"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
x11-libs/libICE
@@ -18,18 +21,21 @@ RDEPEND="
x11-libs/libX11
x11-libs/libXext
x11-libs/libXmu
-   x11-libs/libXpm
x11-libs/libXt
+   jpeg? ( virtual/jpeg )
+   rplay? ( media-sound/rplay )
+   xpm? ( x11-libs/libXpm )
 "
 DEPEND="
${RDEPEND}
app-arch/xz-utils
-   app-text/rman
-   virtual/jpeg
x11-base/xorg-proto
 "
 
 src_prepare() {
+   # Bug 715904, sigjmp_buf is guarded by GNU_SOURCE
+   use elibc_musl && append-cflags -D_GNU_SOURCE
+
cmake_src_prepare
 
# implicit 'isspace'
@@ -37,10 +43,23 @@ src_prepare() {
 }
 
 src_configure() {
-   mycmakeargs=(
+   local mycmakeargs=(
-DNOMANCOMPRESS=yes
-   -DDOCDIR=/usr/share/doc/${PF}
+   -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}
+   -DUSE_JPEG=$(usex jpeg ON OFF)
+   -DUSE_RPLAY=$(usex rplay ON OFF)
+   -DUSE_XPM=$(usex xpm ON OFF)
)
 
cmake_src_configure
 }
+
+src_compile() {
+   # Bug 701656, test_bins target needs to be compiled
+   # to satisfy the 't_efp' test
+   cmake_src_compile all $(usex test test_bins '')
+}
+
+src_test() {
+   virtx cmake_src_test
+}

diff --git a/x11-wm/ctwm/metadata.xml b/x11-wm/ctwm/metadata.xml
index 6f49eba8f49..ef70fcb2225 100644
--- a/x11-wm/ctwm/metadata.xml
+++ b/x11-wm/ctwm/metadata.xml
@@ -1,5 +1,22 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
+   
+   lilly...@gmail.com
+   Jake Lilly
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   
+   http://www.ctwm.org/CHANGES.html
+   http://www.ctwm.org/docs.html
+   
+   
+   Enable jpeg image support with 
virtual/jpeg
+   Enable sound support from 
media-sound/rplay
+   Enable upstream test suite, build required 
binary
+   Enable xpm icon support with 
x11-libs/libXpm
+   
 



[gentoo-commits] repo/gentoo:master commit in: x11-wm/ctwm/

2019-10-28 Thread Jonas Stein
commit: 5f9024daa726141821d14c0cc583e27dc147552f
Author: Jonas Stein  gentoo  org>
AuthorDate: Mon Oct 28 21:28:06 2019 +
Commit: Jonas Stein  gentoo  org>
CommitDate: Mon Oct 28 21:29:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f9024da

x11-wm/ctwm: QA fix in SRC_URI

fix ${HOMEPAGE} in SRC_URI

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Jonas Stein  gentoo.org>

 x11-wm/ctwm/ctwm-4.0.2.ebuild | 4 ++--
 x11-wm/ctwm/ctwm-4.0.3.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/x11-wm/ctwm/ctwm-4.0.2.ebuild b/x11-wm/ctwm/ctwm-4.0.2.ebuild
index b19c081cece..883e461c3da 100644
--- a/x11-wm/ctwm/ctwm-4.0.2.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit cmake-utils eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="A clean, light window manager"
 HOMEPAGE="http://ctwm.org/;
-SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
+SRC_URI="http://ctwm.org/dist/${P}.tar.xz;
 
 LICENSE="MIT"
 SLOT="0"

diff --git a/x11-wm/ctwm/ctwm-4.0.3.ebuild b/x11-wm/ctwm/ctwm-4.0.3.ebuild
index 76858cabf87..cceee0bca32 100644
--- a/x11-wm/ctwm/ctwm-4.0.3.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.3.ebuild
@@ -6,7 +6,7 @@ inherit cmake-utils
 
 DESCRIPTION="A clean, light window manager"
 HOMEPAGE="https://ctwm.org/;
-SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
+SRC_URI="https://ctwm.org/dist/${P}.tar.xz;
 
 LICENSE="MIT"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: x11-wm/ctwm/, x11-wm/ctwm/files/

2019-07-25 Thread Jeroen Roovers
commit: d94f2b0fd37905e3746edb817a4c400d9a50d3eb
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Jul 25 06:35:13 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Jul 25 06:35:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d94f2b0f

x11-wm/ctwm: Old

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Jeroen Roovers  gentoo.org>

 x11-wm/ctwm/Manifest  |  1 -
 x11-wm/ctwm/ctwm-4.0.1-r1.ebuild  | 50 ---
 x11-wm/ctwm/files/ctwm-4.0.1-m4.patch | 21 ---
 3 files changed, 72 deletions(-)

diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index 909d5e62ee4..48b6713b042 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -1,3 +1,2 @@
-DIST ctwm-4.0.1.tar.xz 656776 BLAKE2B 
37d6011d04f8d64552a86608a4d3867e6e1b0135f45457886daee6be1ae23ca1e3079caa1a63befd1d17bcc640e40ba0f1ed92e0a0caf2c6182f6e282f012bf7
 SHA512 
8c5c0bf868ba36cf5acca1ac5dbcea9327f63892698ace5086fabe563632acbb578cefea44ac3de91dc15afdbdce0370169e14156525507b90dc8aca8d305bc6
 DIST ctwm-4.0.2.tar.xz 672608 BLAKE2B 
b4dc26b9d6ba5aba0a5f1f71363c25065aec0d4d4be7b9772f51117460062f5d7ea17d338e1ad9a89cf1213ca2125a1d203417bdc3f6c95a9b9969477b443a40
 SHA512 
445151f12084acd44bcf8a7d895e29363411a1a663b93e098fa9db5b96ae5cb43921eaf0695026aff2196117b810b96712a60570f57d6dabbee7fba34d5bd57f
 DIST ctwm-4.0.3.tar.xz 683684 BLAKE2B 
d16a47a5cd91ab5305da3c02f874d5ad1c71e2c8a3664cd33d5fa0781f4fdc2613407f5b43b4da16bcf89e323eb34b0888c5dbd02598746195991e7870aba0ef
 SHA512 
f9bb2f8f28a050cce0fc2f1f4e00e79acd7c54055016d8483e045d8f5fa9829f8f5d92bb53f0c1d9500f97d6f52cd827ddd15515c84451ea03551025a8ab831d

diff --git a/x11-wm/ctwm/ctwm-4.0.1-r1.ebuild b/x11-wm/ctwm/ctwm-4.0.1-r1.ebuild
deleted file mode 100644
index b684a843fb9..000
--- a/x11-wm/ctwm/ctwm-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A clean, light window manager"
-HOMEPAGE="http://ctwm.org/;
-SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-
-RDEPEND="
-   x11-libs/libICE
-   x11-libs/libSM
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXmu
-   x11-libs/libXpm
-   x11-libs/libXt
-"
-DEPEND="
-   ${RDEPEND}
-   app-arch/xz-utils
-   app-text/rman
-   virtual/jpeg
-   x11-base/xorg-proto
-"
-
-PATCHES=(
-   # http://bazaar.launchpad.net/~ctwm/ctwm/trunk/revision/597
-   "${FILESDIR}"/${P}-m4.patch
-)
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   # implicit 'isspace'
-   sed -i parse.c -e "// a#include " || die
-}
-
-src_install() {
-   cmake-utils_src_install
-
-   mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF} || die
-   mv "${D}"/usr/share/examples/${PN} "${D}"/usr/share/doc/${PF}/examples 
|| die
-}

diff --git a/x11-wm/ctwm/files/ctwm-4.0.1-m4.patch 
b/x11-wm/ctwm/files/ctwm-4.0.1-m4.patch
deleted file mode 100644
index 94aa5a02d82..000
--- a/x11-wm/ctwm/files/ctwm-4.0.1-m4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-=== modified file 'parse_m4.c'
 ctwm-4.0.1orig/parse_m4.c  2016-05-03 20:19:31 +
-+++ ctwm-4.0.1MaFu/parse_m4.c  2017-06-13 10:37:46 +
-@@ -140,12 +140,15 @@
-   char client[MAXHOSTNAME], server[MAXHOSTNAME], *colon;
-   struct hostent *hostname;
-   char *vc, *color;
--  static char tmp_name[] = "/tmp/ctwmrcXX";
-+#define TMPLFILE "/tmp/ctwmrcXX"
-+  static char tmp_name[sizeof(TMPLFILE)];
-   int fd;
-   FILE *tmpf;
-   char *user;
- 
-   /* Create temp file */
-+  strcpy(tmp_name, TMPLFILE);
-+#undef TMPLFILE
-   fd = mkstemp(tmp_name);
-   if(fd < 0) {
-   perror("mkstemp failed in m4_defs");
-



[gentoo-commits] repo/gentoo:master commit in: x11-wm/ctwm/

2019-07-25 Thread Jeroen Roovers
commit: 88efc473af2b86a25ed0ca2752f2e2eaa2a959d4
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Jul 25 06:34:13 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Jul 25 06:35:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88efc473

x11-wm/ctwm: Version 4.0.3

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Fixes: https://bugs.gentoo.org/690592
Signed-off-by: Jeroen Roovers  gentoo.org>

 x11-wm/ctwm/Manifest  |  1 +
 x11-wm/ctwm/ctwm-4.0.3.ebuild | 46 +++
 2 files changed, 47 insertions(+)

diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index 7b0583a8a95..909d5e62ee4 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -1,2 +1,3 @@
 DIST ctwm-4.0.1.tar.xz 656776 BLAKE2B 
37d6011d04f8d64552a86608a4d3867e6e1b0135f45457886daee6be1ae23ca1e3079caa1a63befd1d17bcc640e40ba0f1ed92e0a0caf2c6182f6e282f012bf7
 SHA512 
8c5c0bf868ba36cf5acca1ac5dbcea9327f63892698ace5086fabe563632acbb578cefea44ac3de91dc15afdbdce0370169e14156525507b90dc8aca8d305bc6
 DIST ctwm-4.0.2.tar.xz 672608 BLAKE2B 
b4dc26b9d6ba5aba0a5f1f71363c25065aec0d4d4be7b9772f51117460062f5d7ea17d338e1ad9a89cf1213ca2125a1d203417bdc3f6c95a9b9969477b443a40
 SHA512 
445151f12084acd44bcf8a7d895e29363411a1a663b93e098fa9db5b96ae5cb43921eaf0695026aff2196117b810b96712a60570f57d6dabbee7fba34d5bd57f
+DIST ctwm-4.0.3.tar.xz 683684 BLAKE2B 
d16a47a5cd91ab5305da3c02f874d5ad1c71e2c8a3664cd33d5fa0781f4fdc2613407f5b43b4da16bcf89e323eb34b0888c5dbd02598746195991e7870aba0ef
 SHA512 
f9bb2f8f28a050cce0fc2f1f4e00e79acd7c54055016d8483e045d8f5fa9829f8f5d92bb53f0c1d9500f97d6f52cd827ddd15515c84451ea03551025a8ab831d

diff --git a/x11-wm/ctwm/ctwm-4.0.3.ebuild b/x11-wm/ctwm/ctwm-4.0.3.ebuild
new file mode 100644
index 000..63fd567ef40
--- /dev/null
+++ b/x11-wm/ctwm/ctwm-4.0.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils
+
+DESCRIPTION="A clean, light window manager"
+HOMEPAGE="https://ctwm.org/;
+SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+RDEPEND="
+   x11-libs/libICE
+   x11-libs/libSM
+   x11-libs/libX11
+   x11-libs/libXext
+   x11-libs/libXmu
+   x11-libs/libXpm
+   x11-libs/libXt
+"
+DEPEND="
+   ${RDEPEND}
+   app-arch/xz-utils
+   app-text/rman
+   virtual/jpeg
+   x11-base/xorg-proto
+"
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   # implicit 'isspace'
+   sed -i parse.c -e "// a#include " || die
+}
+
+src_configure() {
+   mycmakeargs=(
+   -DNOMANCOMPRESS=yes
+   -DDOCDIR=/usr/share/doc/${PF}
+   )
+
+   cmake-utils_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: x11-wm/ctwm/

2018-10-20 Thread Mikle Kolyada
commit: fd61484fcf1d08d4f7d0e9210d05bb01bd2094cf
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Oct 20 18:21:59 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Oct 20 18:21:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd61484f

x11-wm/ctwm: amd64 stable wrt bug #668046

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 x11-wm/ctwm/ctwm-4.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/ctwm/ctwm-4.0.2.ebuild b/x11-wm/ctwm/ctwm-4.0.2.ebuild
index aaa5bf12727..7160731c35e 100644
--- a/x11-wm/ctwm/ctwm-4.0.2.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 
 RDEPEND="
x11-libs/libICE



[gentoo-commits] repo/gentoo:master commit in: x11-wm/ctwm/

2018-10-14 Thread Sergei Trofimovich
commit: 3b18d0d9975c1c60a938b9c21665cb8530d28e1d
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Oct 14 08:55:23 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Oct 14 08:55:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b18d0d9

x11-wm/ctwm: stable 4.0.2 for ppc, bug #668046

Signed-off-by: Sergei Trofimovich  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="ppc"

 x11-wm/ctwm/ctwm-4.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/ctwm/ctwm-4.0.2.ebuild b/x11-wm/ctwm/ctwm-4.0.2.ebuild
index 774a4feed75..aaa5bf12727 100644
--- a/x11-wm/ctwm/ctwm-4.0.2.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ppc x86 ~x86-fbsd"
 
 RDEPEND="
x11-libs/libICE



[gentoo-commits] repo/gentoo:master commit in: x11-wm/ctwm/

2018-10-13 Thread Thomas Deutschmann
commit: 9bbb1c218eb0781f6e437cf1e2a4b4ce3dd73a01
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Oct 14 01:31:10 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Oct 14 01:31:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bbb1c21

x11-wm/ctwm: x86 stable (bug #668046)

Package-Manager: Portage-2.3.50, Repoman-2.3.11
Signed-off-by: Thomas Deutschmann  gentoo.org>

 x11-wm/ctwm/ctwm-4.0.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-wm/ctwm/ctwm-4.0.2.ebuild b/x11-wm/ctwm/ctwm-4.0.2.ebuild
index d4278854c5b..774a4feed75 100644
--- a/x11-wm/ctwm/ctwm-4.0.2.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc x86 ~x86-fbsd"
 
 RDEPEND="
x11-libs/libICE



[gentoo-commits] repo/gentoo:master commit in: x11-wm/ctwm/

2018-08-26 Thread Jeroen Roovers
commit: a18ae6807880e58db20c073bbf60ae8b332dd15d
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Aug 26 12:09:36 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Aug 26 12:09:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18ae680

x11-wm/ctwm: Old.

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 x11-wm/ctwm/ctwm-4.0.1.ebuild | 45 ---
 1 file changed, 45 deletions(-)

diff --git a/x11-wm/ctwm/ctwm-4.0.1.ebuild b/x11-wm/ctwm/ctwm-4.0.1.ebuild
deleted file mode 100644
index c509b28861a..000
--- a/x11-wm/ctwm/ctwm-4.0.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A clean, light window manager"
-HOMEPAGE="http://ctwm.org/;
-SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-
-RDEPEND="
-   x11-libs/libICE
-   x11-libs/libSM
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXmu
-   x11-libs/libXpm
-   x11-libs/libXt
-"
-DEPEND="
-   ${RDEPEND}
-   app-arch/xz-utils
-   app-text/rman
-   virtual/jpeg
-   x11-base/xorg-proto
-"
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   # implicit 'isspace'
-   sed -i parse.c -e "// a#include " || die
-}
-
-src_install() {
-   cmake-utils_src_install
-
-   mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF} || die
-   mv "${D}"/usr/share/examples/${PN} "${D}"/usr/share/doc/${PF}/examples 
|| die
-}



[gentoo-commits] repo/gentoo:master commit in: x11-wm/ctwm/

2018-08-26 Thread Jeroen Roovers
commit: be1646f032a845a9f391901655f108d3b1495459
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Aug 26 12:07:38 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Aug 26 12:09:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be1646f0

x11-wm/ctwm: Version 4.0.2.

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 x11-wm/ctwm/Manifest  |  1 +
 x11-wm/ctwm/ctwm-4.0.2.ebuild | 45 +++
 2 files changed, 46 insertions(+)

diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index f97b3d847ee..7b0583a8a95 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -1 +1,2 @@
 DIST ctwm-4.0.1.tar.xz 656776 BLAKE2B 
37d6011d04f8d64552a86608a4d3867e6e1b0135f45457886daee6be1ae23ca1e3079caa1a63befd1d17bcc640e40ba0f1ed92e0a0caf2c6182f6e282f012bf7
 SHA512 
8c5c0bf868ba36cf5acca1ac5dbcea9327f63892698ace5086fabe563632acbb578cefea44ac3de91dc15afdbdce0370169e14156525507b90dc8aca8d305bc6
+DIST ctwm-4.0.2.tar.xz 672608 BLAKE2B 
b4dc26b9d6ba5aba0a5f1f71363c25065aec0d4d4be7b9772f51117460062f5d7ea17d338e1ad9a89cf1213ca2125a1d203417bdc3f6c95a9b9969477b443a40
 SHA512 
445151f12084acd44bcf8a7d895e29363411a1a663b93e098fa9db5b96ae5cb43921eaf0695026aff2196117b810b96712a60570f57d6dabbee7fba34d5bd57f

diff --git a/x11-wm/ctwm/ctwm-4.0.2.ebuild b/x11-wm/ctwm/ctwm-4.0.2.ebuild
new file mode 100644
index 000..d4278854c5b
--- /dev/null
+++ b/x11-wm/ctwm/ctwm-4.0.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A clean, light window manager"
+HOMEPAGE="http://ctwm.org/;
+SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+RDEPEND="
+   x11-libs/libICE
+   x11-libs/libSM
+   x11-libs/libX11
+   x11-libs/libXext
+   x11-libs/libXmu
+   x11-libs/libXpm
+   x11-libs/libXt
+"
+DEPEND="
+   ${RDEPEND}
+   app-arch/xz-utils
+   app-text/rman
+   virtual/jpeg
+   x11-base/xorg-proto
+"
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   # implicit 'isspace'
+   sed -i parse.c -e "// a#include " || die
+}
+
+src_install() {
+   cmake-utils_src_install
+
+   mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF} || die
+   mv "${D}"/usr/share/examples/${PN} "${D}"/usr/share/doc/${PF}/examples 
|| die
+}



[gentoo-commits] repo/gentoo:master commit in: x11-wm/ctwm/

2018-08-05 Thread Sergei Trofimovich
commit: dec476d2e9304d6a949e8e4133aa82a7a03abe4e
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Aug  5 20:10:29 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Aug  5 20:15:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dec476d2

x11-wm/ctwm: stable 4.0.1-r1 for ppc, bug #661060

Tested-by: ernsteiswuerfel
Package-Manager: Portage-2.3.44, Repoman-2.3.10
RepoMan-Options: --include-arches="ppc"

 x11-wm/ctwm/ctwm-4.0.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/ctwm/ctwm-4.0.1-r1.ebuild b/x11-wm/ctwm/ctwm-4.0.1-r1.ebuild
index dec0ce65169..b684a843fb9 100644
--- a/x11-wm/ctwm/ctwm-4.0.1-r1.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 
 RDEPEND="
x11-libs/libICE



[gentoo-commits] repo/gentoo:master commit in: x11-wm/ctwm/

2018-07-15 Thread Mikle Kolyada
commit: 31443e18e8278f2b2e7b054938699985bed11eee
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Jul 15 17:10:58 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Jul 15 17:10:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31443e18

x11-wm/ctwm: amd64 stable wrt bug #661060

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-wm/ctwm/ctwm-4.0.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/ctwm/ctwm-4.0.1-r1.ebuild b/x11-wm/ctwm/ctwm-4.0.1-r1.ebuild
index fa3a8022728..dec0ce65169 100644
--- a/x11-wm/ctwm/ctwm-4.0.1-r1.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
 
 RDEPEND="
x11-libs/libICE



[gentoo-commits] repo/gentoo:master commit in: x11-wm/ctwm/files/, x11-wm/ctwm/

2018-06-16 Thread Pacho Ramos
commit: 0afdd48a8638835d44749a51085da8c2756c0d56
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jun 16 18:28:51 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jun 16 18:33:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0afdd48a

x11-wm/ctwm: Fix multiple screens (#625620 by Manfred Knick)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-wm/ctwm/ctwm-4.0.1-r1.ebuild  | 50 +++
 x11-wm/ctwm/files/ctwm-4.0.1-m4.patch | 21 +++
 2 files changed, 71 insertions(+)

diff --git a/x11-wm/ctwm/ctwm-4.0.1-r1.ebuild b/x11-wm/ctwm/ctwm-4.0.1-r1.ebuild
new file mode 100644
index 000..7046fe0373d
--- /dev/null
+++ b/x11-wm/ctwm/ctwm-4.0.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A clean, light window manager"
+HOMEPAGE="http://ctwm.org/;
+SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+RDEPEND="
+   x11-libs/libICE
+   x11-libs/libSM
+   x11-libs/libX11
+   x11-libs/libXext
+   x11-libs/libXmu
+   x11-libs/libXpm
+   x11-libs/libXt
+"
+DEPEND="
+   ${RDEPEND}
+   app-arch/xz-utils
+   app-text/rman
+   virtual/jpeg
+   x11-base/xorg-proto
+"
+
+PATCHES=(
+   # http://bazaar.launchpad.net/~ctwm/ctwm/trunk/revision/597
+   "${FILESDIR}"/${P}-m4.patch
+)
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   # implicit 'isspace'
+   sed -i parse.c -e "// a#include " || die
+}
+
+src_install() {
+   cmake-utils_src_install
+
+   mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF} || die
+   mv "${D}"/usr/share/examples/${PN} "${D}"/usr/share/doc/${PF}/examples 
|| die
+}

diff --git a/x11-wm/ctwm/files/ctwm-4.0.1-m4.patch 
b/x11-wm/ctwm/files/ctwm-4.0.1-m4.patch
new file mode 100644
index 000..94aa5a02d82
--- /dev/null
+++ b/x11-wm/ctwm/files/ctwm-4.0.1-m4.patch
@@ -0,0 +1,21 @@
+=== modified file 'parse_m4.c'
+--- ctwm-4.0.1orig/parse_m4.c  2016-05-03 20:19:31 +
 ctwm-4.0.1MaFu/parse_m4.c  2017-06-13 10:37:46 +
+@@ -140,12 +140,15 @@
+   char client[MAXHOSTNAME], server[MAXHOSTNAME], *colon;
+   struct hostent *hostname;
+   char *vc, *color;
+-  static char tmp_name[] = "/tmp/ctwmrcXX";
++#define TMPLFILE "/tmp/ctwmrcXX"
++  static char tmp_name[sizeof(TMPLFILE)];
+   int fd;
+   FILE *tmpf;
+   char *user;
+ 
+   /* Create temp file */
++  strcpy(tmp_name, TMPLFILE);
++#undef TMPLFILE
+   fd = mkstemp(tmp_name);
+   if(fd < 0) {
+   perror("mkstemp failed in m4_defs");
+



[gentoo-commits] repo/gentoo:master commit in: x11-wm/ctwm/

2018-05-09 Thread Mikle Kolyada
commit: b6595fdde050646ce347a8fcb10f350f5af0d2c1
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed May  9 10:31:13 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed May  9 10:31:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6595fdd

x11-wm/ctwm: ppc stable wrt bug #64

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 x11-wm/ctwm/ctwm-4.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/ctwm/ctwm-4.0.1.ebuild b/x11-wm/ctwm/ctwm-4.0.1.ebuild
index f95c140b423..ecd97a4a914 100644
--- a/x11-wm/ctwm/ctwm-4.0.1.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 
 RDEPEND="
x11-libs/libICE



[gentoo-commits] repo/gentoo:master commit in: x11-wm/ctwm/

2018-05-09 Thread Mikle Kolyada
commit: 07d807b4dc9e820f67bc74d68d6ed5bb9bd523af
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed May  9 10:32:32 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed May  9 10:32:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07d807b4

x11-wm/ctwm: Drop old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 x11-wm/ctwm/Manifest  |  2 --
 x11-wm/ctwm/ctwm-3.7.ebuild   | 57 --
 x11-wm/ctwm/ctwm-3.8.2.ebuild | 81 ---
 3 files changed, 140 deletions(-)

diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index 1bf3589f954..f97b3d847ee 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -1,3 +1 @@
-DIST ctwm-3.7.tar.gz 1139461 BLAKE2B 
7c96f6434dea660dcbcc017b89bb9df533b6b26688392ba7baf14b4b701d093f8ff4e0c0c3af61bd5ea32d0b88b336d6958e1d4f524de1cb4d4577e20cfe3380
 SHA512 
e3c1e4bed68ffbf3efbc6057743889d706ed16e74bd334ebb689c8283f1288778dc368f0a6064aa7e24a6416592f22d1eeffc09c76cb0cd4ea64467718c62cfd
-DIST ctwm-3.8.2.tar.xz 549984 BLAKE2B 
90b1d7c872e2ca8960853829d9ad5b19476ca8cdbcda9d3fcb180787aa85ff13b3d63e6c6d19e38193d71c2175c939d65d9581ce2629314c78dc0a56bf8cb139
 SHA512 
4633b7bf7b8528ecfd2a753f443fd5286fd394df37ebe885138d30a498f0d721076835d135974a2bd11ca9c32ffd288f84788cb0407ae346a29c5f6371dca497
 DIST ctwm-4.0.1.tar.xz 656776 BLAKE2B 
37d6011d04f8d64552a86608a4d3867e6e1b0135f45457886daee6be1ae23ca1e3079caa1a63befd1d17bcc640e40ba0f1ed92e0a0caf2c6182f6e282f012bf7
 SHA512 
8c5c0bf868ba36cf5acca1ac5dbcea9327f63892698ace5086fabe563632acbb578cefea44ac3de91dc15afdbdce0370169e14156525507b90dc8aca8d305bc6

diff --git a/x11-wm/ctwm/ctwm-3.7.ebuild b/x11-wm/ctwm/ctwm-3.7.ebuild
deleted file mode 100644
index a558de71004..000
--- a/x11-wm/ctwm/ctwm-3.7.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="A clean, light window manager"
-HOMEPAGE="http://ctwm.free.lp.se/;
-SRC_URI="http://ctwm.free.lp.se/dist/${P}.tar.gz;
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXmu
-   x11-libs/libXpm
-   x11-libs/libXt"
-DEPEND="${RDEPEND}
-   app-text/rman
-   virtual/jpeg
-   x11-misc/imake
-   x11-proto/xextproto
-   x11-proto/xproto"
-
-src_compile() {
-   sed -i -e "s@\(CONFDIR =\).*@\1 /etc/X11/twm@g" Imakefile \
-   || die "sed failed"
-
-   cp Imakefile.local-template Imakefile.local
-
-   xmkmf || die "xmkmf failed"
-   make TWMDIR=/usr/share/${PN} || die "make failed"
-}
-
-src_install() {
-   make BINDIR=/usr/bin \
-   MANPATH=/usr/share/man \
-   TWMDIR=/usr/share/${PN} \
-   DESTDIR="${D}" install || die "make install failed"
-
-   make MANPATH=/usr/share/man \
-   DOCHTMLDIR=/usr/share/doc/${PF}/html \
-   DESTDIR="${D}" install.man || die "make install.man failed"
-
-   echo "#!/bin/sh" > ${T}/ctwm
-   echo "/usr/bin/ctwm" >> ${T}/ctwm
-
-   exeinto /etc/X11/Sessions
-   doexe "${T}"/ctwm
-
-   dodoc CHANGES README* TODO* PROBLEMS
-   dodoc *.ctwmrc*
-}

diff --git a/x11-wm/ctwm/ctwm-3.8.2.ebuild b/x11-wm/ctwm/ctwm-3.8.2.ebuild
deleted file mode 100644
index 050ce634b58..000
--- a/x11-wm/ctwm/ctwm-3.8.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A clean, light window manager"
-HOMEPAGE="http://ctwm.org/;
-SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-
-RDEPEND="
-   x11-libs/libICE
-   x11-libs/libSM
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXmu
-   x11-libs/libXpm
-   x11-libs/libXt
-"
-DEPEND="
-   ${RDEPEND}
-   app-arch/xz-utils
-   app-text/rman
-   virtual/jpeg
-   x11-misc/imake
-   x11-proto/xextproto
-   x11-proto/xproto
-"
-
-src_prepare() {
-   # overflow bug 338180
-   sed -i menus.c -e "/char modStr/ s/5/6/" || die
-
-   # implicit 'isspace'
-   sed -i parse.c -e "// a#include " || die
-
-   sed -i Imakefile -e "/^CONFDIR/s@=.*@= /etc/X11/twm@g" || die
-
-   cp Imakefile.local-template Imakefile.local
-
-   # TODO: Add GNOME support
-   sed -i Imakefile.local -e '/^#define GNOME/d' || die
-}
-
-src_configure() {
-   append-cppflags -DXPM -DJPEG
-   xmkmf || die
-}
-
-src_compile() {
-   emake \
-   CC=$(tc-getCC) \
-   CFLAGS="${CFLAGS}" \
-   EXTRA_LDOPTIONS="${LDFLAGS}" \
-   TWMDIR=/usr/share/${PN}
-}
-
-src_install() {
-   emake BINDIR=/usr/bin \
-   

[gentoo-commits] repo/gentoo:master commit in: x11-wm/ctwm/

2018-04-06 Thread Jonas Stein
commit: 248c0e9d03214c0cc3df1ddc64a8be59e4e5d541
Author: Harri Nieminen  gmail  com>
AuthorDate: Fri Apr  6 11:25:14 2018 +
Commit: Jonas Stein  gentoo  org>
CommitDate: Fri Apr  6 23:53:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=248c0e9d

x11-wm/ctwm: Clean up old

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 x11-wm/ctwm/Manifest|  1 -
 x11-wm/ctwm/ctwm-3.8a-r1.ebuild | 72 -
 2 files changed, 73 deletions(-)

diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index 90699373e94..1bf3589f954 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -1,4 +1,3 @@
 DIST ctwm-3.7.tar.gz 1139461 BLAKE2B 
7c96f6434dea660dcbcc017b89bb9df533b6b26688392ba7baf14b4b701d093f8ff4e0c0c3af61bd5ea32d0b88b336d6958e1d4f524de1cb4d4577e20cfe3380
 SHA512 
e3c1e4bed68ffbf3efbc6057743889d706ed16e74bd334ebb689c8283f1288778dc368f0a6064aa7e24a6416592f22d1eeffc09c76cb0cd4ea64467718c62cfd
 DIST ctwm-3.8.2.tar.xz 549984 BLAKE2B 
90b1d7c872e2ca8960853829d9ad5b19476ca8cdbcda9d3fcb180787aa85ff13b3d63e6c6d19e38193d71c2175c939d65d9581ce2629314c78dc0a56bf8cb139
 SHA512 
4633b7bf7b8528ecfd2a753f443fd5286fd394df37ebe885138d30a498f0d721076835d135974a2bd11ca9c32ffd288f84788cb0407ae346a29c5f6371dca497
-DIST ctwm-3.8a.tar.gz 738226 BLAKE2B 
edab8f95dc6ec4dbd41e70552682858217bd4ba98f3b9a16a73d661dd0a92850eafd63f161d52c2f5034c11fe3df9ceb7ecf9baf7962782b7b0ca9f2152ef6fc
 SHA512 
df850358ece699af7922c7b0c8a39694d9b1cb835a653665ab826ac9a159bb959ed502c65997b79beaa06542b017e19e3916bdf3c45f71a85f2168bc576de5be
 DIST ctwm-4.0.1.tar.xz 656776 BLAKE2B 
37d6011d04f8d64552a86608a4d3867e6e1b0135f45457886daee6be1ae23ca1e3079caa1a63befd1d17bcc640e40ba0f1ed92e0a0caf2c6182f6e282f012bf7
 SHA512 
8c5c0bf868ba36cf5acca1ac5dbcea9327f63892698ace5086fabe563632acbb578cefea44ac3de91dc15afdbdce0370169e14156525507b90dc8aca8d305bc6

diff --git a/x11-wm/ctwm/ctwm-3.8a-r1.ebuild b/x11-wm/ctwm/ctwm-3.8a-r1.ebuild
deleted file mode 100644
index 974916539b9..000
--- a/x11-wm/ctwm/ctwm-3.8a-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A clean, light window manager"
-HOMEPAGE="http://ctwm.free.lp.se/;
-SRC_URI="http://ctwm.free.lp.se/dist/${P}.tar.gz;
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXmu
-   x11-libs/libXpm
-   x11-libs/libXt"
-DEPEND="${RDEPEND}
-   app-text/rman
-   virtual/jpeg
-   x11-misc/imake
-   x11-proto/xextproto
-   x11-proto/xproto"
-
-src_prepare() {
-   sed -e "/char modStr/ s/5/6/" -i menus.c || die #overflow bug 338180
-   sed -e "// a#include " -i parse.c || die #implicit 
'isspace'
-   sed -i Imakefile \
-   -e "s@\(CONFDIR =\).*@\1 /etc/X11/twm@g" \
-   || die
-
-   cp Imakefile.local-template Imakefile.local
-
-   # TODO: Add GNOME support
-   sed -i Imakefile.local \
-   -e '/^#define GNOME/d' \
-   || die
-}
-
-src_compile() {
-   xmkmf || die
-   emake \
-   CC=$(tc-getCC) \
-   CFLAGS="${CFLAGS}" \
-   EXTRA_LDOPTIONS="${LDFLAGS}" \
-   TWMDIR=/usr/share/${PN} \
-   || die
-}
-
-src_install() {
-   make BINDIR=/usr/bin \
-   MANPATH=/usr/share/man \
-   TWMDIR=/usr/share/${PN} \
-   DESTDIR="${D}" install || die
-
-   make MANPATH=/usr/share/man \
-   DOCHTMLDIR=/usr/share/doc/${PF}/html \
-   DESTDIR="${D}" install.man || die
-
-   echo "#!/bin/sh" > ${T}/ctwm
-   echo "/usr/bin/ctwm" >> ${T}/ctwm
-
-   exeinto /etc/X11/Sessions
-   doexe "${T}"/ctwm || die
-
-   dodoc CHANGES README* TODO* PROBLEMS || die
-   dodoc *.ctwmrc* || die
-}



[gentoo-commits] repo/gentoo:master commit in: x11-wm/ctwm/

2018-03-24 Thread Mikle Kolyada
commit: 6c3ca1ad6657a848f662bc7cafdc2b76660e25d8
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Mar 24 22:07:51 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Mar 24 22:07:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c3ca1ad

x11-wm/ctwm: amd64 stable wrt bug #64

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 x11-wm/ctwm/ctwm-4.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/ctwm/ctwm-4.0.1.ebuild b/x11-wm/ctwm/ctwm-4.0.1.ebuild
index d2d7b872f6c..f95c140b423 100644
--- a/x11-wm/ctwm/ctwm-4.0.1.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
 
 RDEPEND="
x11-libs/libICE



[gentoo-commits] repo/gentoo:master commit in: x11-wm/ctwm/

2017-10-15 Thread David Seifert
commit: 52b032312e112a9d4c6bf7758f16d7af5d27a78a
Author: David Seifert  gentoo  org>
AuthorDate: Mon Oct 16 03:32:39 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Oct 16 03:32:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52b03231

x11-wm/ctwm: [QA] Add cmake-utils_src_prepare

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 x11-wm/ctwm/ctwm-4.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/ctwm/ctwm-4.0.1.ebuild b/x11-wm/ctwm/ctwm-4.0.1.ebuild
index a9b7409c23f..c57dae135bc 100644
--- a/x11-wm/ctwm/ctwm-4.0.1.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.1.ebuild
@@ -32,7 +32,7 @@ DEPEND="
 "
 
 src_prepare() {
-   default
+   cmake-utils_src_prepare
 
# implicit 'isspace'
sed -i parse.c -e "// a#include " || die



[gentoo-commits] repo/gentoo:master commit in: x11-wm/ctwm/

2017-06-06 Thread Jeroen Roovers
commit: b7ddf13cf77f36c29a7be4f2e852ca9f7701916f
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Jun  6 18:29:15 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Jun  6 18:29:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7ddf13c

x11-wm/ctwm: Remove testing cruft.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 x11-wm/ctwm/ctwm-4.0.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-wm/ctwm/ctwm-4.0.1.ebuild b/x11-wm/ctwm/ctwm-4.0.1.ebuild
index 2e8cd8224e2..a9b7409c23f 100644
--- a/x11-wm/ctwm/ctwm-4.0.1.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.1.ebuild
@@ -41,6 +41,6 @@ src_prepare() {
 src_install() {
cmake-utils_src_install
 
-   mv -v "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF} || die
-   mv -v "${D}"/usr/share/examples/${PN} 
"${D}"/usr/share/doc/${PF}/examples || die
+   mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF} || die
+   mv "${D}"/usr/share/examples/${PN} "${D}"/usr/share/doc/${PF}/examples 
|| die
 }



[gentoo-commits] repo/gentoo:master commit in: x11-wm/ctwm/

2017-06-06 Thread Jeroen Roovers
commit: ec4f687cf8ddf09d497dbbfdd5fae1b8dcc8574f
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Jun  6 18:26:39 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Jun  6 18:27:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec4f687c

x11-wm/ctwm: Version bump.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 x11-wm/ctwm/Manifest  |  1 +
 x11-wm/ctwm/ctwm-4.0.1.ebuild | 46 +++
 2 files changed, 47 insertions(+)

diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index 10b1e7dfd21..a04bf767c01 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -1,3 +1,4 @@
 DIST ctwm-3.7.tar.gz 1139461 SHA256 
fa16dbaef6992cdbcdbe05a9dc12c2c16910f5e51a2df54607aeb74f9b4a5171 SHA512 
e3c1e4bed68ffbf3efbc6057743889d706ed16e74bd334ebb689c8283f1288778dc368f0a6064aa7e24a6416592f22d1eeffc09c76cb0cd4ea64467718c62cfd
 WHIRLPOOL 
c50f518ffd28057d1e63be3a444e0bde617e88626f70ed55d434f2ddbb3be920289ca15b1fc2f11cb219ebe692bdf4cb893b1506e7e684ef4378a487f4d46a1e
 DIST ctwm-3.8.2.tar.xz 549984 SHA256 
574d67a8a69f2f1ebaa71aa40cc50667e814f74b51f5db8886e2def6a3e0900f SHA512 
4633b7bf7b8528ecfd2a753f443fd5286fd394df37ebe885138d30a498f0d721076835d135974a2bd11ca9c32ffd288f84788cb0407ae346a29c5f6371dca497
 WHIRLPOOL 
6416ecff3230e823bf52219ae8538862a6ed8e66506a16111b715431e3dd007e81d4b1ac6b83321ec12ca95926fb7747b1927626458fa51fb3205589c3f07eda
 DIST ctwm-3.8a.tar.gz 738226 SHA256 
39322cc6b0d12dc286af0944f9a10d3a099a5f04c5d9c47b75742cdf65dbd4a4 SHA512 
df850358ece699af7922c7b0c8a39694d9b1cb835a653665ab826ac9a159bb959ed502c65997b79beaa06542b017e19e3916bdf3c45f71a85f2168bc576de5be
 WHIRLPOOL 
20c985b09f281a3cd9433ee8684e7245ae88caacb9c712ff78b4d82862d633d22a048c6c0095ae9a5e60f0c16c83184929cb8d23fc9f9300ee9824ac0535946e
+DIST ctwm-4.0.1.tar.xz 656776 SHA256 
674639f6fe7916a0462ce3b8eae43b95acb26ba2049341bbf7ddd81534f538e1 SHA512 
8c5c0bf868ba36cf5acca1ac5dbcea9327f63892698ace5086fabe563632acbb578cefea44ac3de91dc15afdbdce0370169e14156525507b90dc8aca8d305bc6
 WHIRLPOOL 
f45613d63fe20fb1ed5620a84decf338b397a902fa2cf0635a878a7cd785a56bacfbbd1f2653be5b5512a334a38e9639c12c25b2112e70208cee1ec391083a53

diff --git a/x11-wm/ctwm/ctwm-4.0.1.ebuild b/x11-wm/ctwm/ctwm-4.0.1.ebuild
new file mode 100644
index 000..2e8cd8224e2
--- /dev/null
+++ b/x11-wm/ctwm/ctwm-4.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A clean, light window manager"
+HOMEPAGE="http://ctwm.org/;
+SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+RDEPEND="
+   x11-libs/libICE
+   x11-libs/libSM
+   x11-libs/libX11
+   x11-libs/libXext
+   x11-libs/libXmu
+   x11-libs/libXpm
+   x11-libs/libXt
+"
+DEPEND="
+   ${RDEPEND}
+   app-arch/xz-utils
+   app-text/rman
+   virtual/jpeg
+   x11-proto/xextproto
+   x11-proto/xproto
+"
+
+src_prepare() {
+   default
+
+   # implicit 'isspace'
+   sed -i parse.c -e "// a#include " || die
+}
+
+src_install() {
+   cmake-utils_src_install
+
+   mv -v "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF} || die
+   mv -v "${D}"/usr/share/examples/${PN} 
"${D}"/usr/share/doc/${PF}/examples || die
+}



[gentoo-commits] repo/gentoo:master commit in: x11-wm/ctwm/files/

2017-02-18 Thread David Seifert
commit: c71fe6e797e9580a823231c57218116865ed9336
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Sat Feb 18 15:26:31 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 18 22:07:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c71fe6e7

x11-wm/ctwm: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/4015

 x11-wm/ctwm/files/ctwm-3.6-r1-gentoo.diff | 55 ---
 1 file changed, 55 deletions(-)

diff --git a/x11-wm/ctwm/files/ctwm-3.6-r1-gentoo.diff 
b/x11-wm/ctwm/files/ctwm-3.6-r1-gentoo.diff
deleted file mode 100644
index d6f9e5cee3..00
--- a/x11-wm/ctwm/files/ctwm-3.6-r1-gentoo.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -urN ctwm-3.6.ORIG/gram.y ctwm-3.6/gram.y
 ctwm-3.6.ORIG/gram.y   2001-12-12 00:38:52.0 +0900
-+++ ctwm-3.6/gram.y2004-02-07 06:43:37.067787401 +0900
-@@ -419,14 +419,13 @@
-   | WINDOW_RING   { list = >WindowRingL; }
- win_list
-   | WINDOW_RING   { Scr->WindowRingAll = TRUE; }
--  ;
-   | WINDOW_RING_EXCLUDE{ if (!Scr->WindowRingL)
- Scr->WindowRingAll = TRUE;
- list = >WindowRingExcludeL; }
-   win_list
--
-   | WINDOW_GEOMETRIES  {  }
- wingeom_list
-+  ;
- 
- noarg : KEYWORD   { if (!do_single_keyword ($1)) {
-   twmrc_error_prefix();
-@@ -683,8 +682,8 @@
-   | wingeom_entries wingeom_entry
-   ;
- 
--wingeom_entry : string string { AddToList (>WindowGeometries, $1, $2) }
--
-+wingeom_entry : string string { AddToList (>WindowGeometries, $1, $2); }
-+  ;
- 
- 
- squeeze   : SQUEEZE_TITLE { 
-@@ -835,6 +834,7 @@
-   AddToClientsList ($1, client);
- }
- 
-+  ;
- occupy_window_list: LB occupy_window_entries RB {}
-   ;
- 
-@@ -845,7 +845,7 @@
- occupy_window_entry   : string {
-   AddToClientsList (workspace, $1);
- }
--
-+  ;
- icon_list : LB icon_entries RB {}
-   ;
- 
-@@ -962,6 +962,7 @@
- RemoveDQuote(ptr);
- $$ = (unsigned char*)ptr;
-   }
-+  ;
- number: NUMBER{ $$ = $1; }
-   ;
-