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

2024-01-08 Thread Sam James 
commit: 43e415e626663bfab4ae938c0cd15bf6a23600ee
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan  8 12:09:58 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan  8 12:25:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43e415e6

x11-wm/vtwm: sys-devel/bison -> app-alternatives/yacc

All of these will be using app-alternatives/yacc anyway as they're not unsetting

YACC or LEX, so make the dep reflect reality.

(Included both YACC and LEX out of conservatism.)

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

 x11-wm/vtwm/vtwm-5.4.7-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/vtwm/vtwm-5.4.7-r3.ebuild b/x11-wm/vtwm/vtwm-5.4.7-r3.ebuild
index c36460c29f94..09a460c40347 100644
--- a/x11-wm/vtwm/vtwm-5.4.7-r3.ebuild
+++ b/x11-wm/vtwm/vtwm-5.4.7-r3.ebuild
@@ -27,7 +27,7 @@ DEPEND="
x11-base/xorg-proto"
 BDEPEND="
app-text/rman
-   sys-devel/bison
+   app-alternatives/yacc
app-alternatives/lex
sys-devel/gcc
>=x11-misc/imake-1.0.8-r1"

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

2024-01-08 Thread Sam James 
commit: 9ef3662f7aaa88a44bff5d699fc58193acbc0427
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan  8 11:52:59 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan  8 12:03:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ef3662f

x11-wm/vtwm: sys-devel/flex -> app-alternatives/lex

All of these will be using app-alternatives/lex anyway as they're not unsetting

YACC or LEX, so make the dep reflect reality.

(Included both YACC and LEX out of conservatism.)

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

 x11-wm/vtwm/vtwm-5.4.7-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-wm/vtwm/vtwm-5.4.7-r3.ebuild b/x11-wm/vtwm/vtwm-5.4.7-r3.ebuild
index ab75aafbdf7d..c36460c29f94 100644
--- a/x11-wm/vtwm/vtwm-5.4.7-r3.ebuild
+++ b/x11-wm/vtwm/vtwm-5.4.7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -28,7 +28,7 @@ DEPEND="
 BDEPEND="
app-text/rman
sys-devel/bison
-   sys-devel/flex
+   app-alternatives/lex
sys-devel/gcc
>=x11-misc/imake-1.0.8-r1"

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

2022-10-19 Thread Sam James 
commit: 7a15b4eb88ed2433f41ffdb829f706359033dab0
Author: Petr Vaněk  atlas  cz>
AuthorDate: Wed Oct 19 09:34:59 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 20 03:52:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a15b4eb

x11-wm/vtwm: fix metadata indentation

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Sam James  gentoo.org>

 x11-wm/vtwm/metadata.xml | 16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/x11-wm/vtwm/metadata.xml b/x11-wm/vtwm/metadata.xml
index c216f9e0537a..363a5204f0c2 100644
--- a/x11-wm/vtwm/metadata.xml
+++ b/x11-wm/vtwm/metadata.xml
@@ -1,11 +1,13 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-
-VTWM, one of many TWM descendants, implements a Virtual
-  Desktop, meaning that what is currently on screen is just a portion of a
-  larger workspace. What portion of the virtual desktop that is displayed,
-  and whatever windows might be visible within it, are simple
-  point-and-click operations within a scaled representation of the
-  workspace.
+   
+   
+   VTWM, one of many TWM descendants, implements a Virtual
+   Desktop, meaning that what is currently on screen is just a portion of a
+   larger workspace. What portion of the virtual desktop that is displayed,
+   and whatever windows might be visible within it, are simple
+   point-and-click operations within a scaled representation of the
+   workspace.
+

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

2022-10-16 Thread Ionen Wolkens 
commit: b8a1520675c8374066b82ff43830ae30ce318cfb
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Oct 16 15:44:27 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Oct 16 16:59:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8a15206

x11-wm/vtwm: EAPI7->8, drop rplay, fix w/ clang16, -std=gnu89

Also added some lacking EPREFIX and xsetroot dep.

Just surface fixes, left old patches/sed as-is given haven't
tried runtime (may be due for last rites like rplay).

Closes: https://bugs.gentoo.org/874468
Signed-off-by: Ionen Wolkens  gentoo.org>

 x11-wm/vtwm/files/vtwm-5.4.7-clang16.patch |  7 +++
 x11-wm/vtwm/metadata.xml   |  3 -
 .../{vtwm-5.4.7-r2.ebuild => vtwm-5.4.7-r3.ebuild} | 64 --
 3 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/x11-wm/vtwm/files/vtwm-5.4.7-clang16.patch 
b/x11-wm/vtwm/files/vtwm-5.4.7-clang16.patch
new file mode 100644
index ..b74908a61f68
--- /dev/null
+++ b/x11-wm/vtwm/files/vtwm-5.4.7-clang16.patch
@@ -0,0 +1,7 @@
+https://bugs.gentoo.org/874468
+--- a/gram.y
 b/gram.y
+@@ -86,2 +86,3 @@
+ static void yyerror();
++static int yylex();
+ static name_list **list;

diff --git a/x11-wm/vtwm/metadata.xml b/x11-wm/vtwm/metadata.xml
index ef50f3b43a75..c216f9e0537a 100644
--- a/x11-wm/vtwm/metadata.xml
+++ b/x11-wm/vtwm/metadata.xml
@@ -8,7 +8,4 @@
   and whatever windows might be visible within it, are simple
   point-and-click operations within a scaled representation of the
   workspace.
-  
-Enable rplay support, needed for sound.
-  
 

diff --git a/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild b/x11-wm/vtwm/vtwm-5.4.7-r3.ebuild
similarity index 55%
rename from x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
rename to x11-wm/vtwm/vtwm-5.4.7-r3.ebuild
index 4f976b42e894..ab75aafbdf7d 100644
--- a/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
+++ b/x11-wm/vtwm/vtwm-5.4.7-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="TWM descendant that implements a Virtual Desktop"
 HOMEPAGE="http://www.vtwm.org/";
@@ -12,15 +12,18 @@ SRC_URI="http://www.vtwm.org/downloads/${P}.tar.gz";
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ppc sparc x86"
-IUSE="rplay"
 
-RDEPEND="x11-libs/libX11
-   x11-libs/libXmu
-   x11-libs/libXt
+COMMON_DEPEND="
+   x11-libs/libX11
x11-libs/libXext
+   x11-libs/libXmu
x11-libs/libXpm
-   rplay? ( media-sound/rplay )"
-DEPEND="${RDEPEND}
+   x11-libs/libXt"
+RDEPEND="
+   ${COMMON_DEPEND}
+   x11-apps/xsetroot"
+DEPEND="
+   ${COMMON_DEPEND}
x11-base/xorg-proto"
 BDEPEND="
app-text/rman
@@ -29,24 +32,27 @@ BDEPEND="
sys-devel/gcc
>=x11-misc/imake-1.0.8-r1"
 
+PATCHES=(
+   "${FILESDIR}"/${P}-do-not-rm.patch
+   "${FILESDIR}"/${P}-NO_SOUND_SUPPORT.patch
+   "${FILESDIR}"/${P}-clang16.patch
+)
+
 src_prepare() {
-   eapply "${FILESDIR}"/${P}-do-not-rm.patch
-   sed -i Imakefile \
-   -e 's:-L/usr/local/lib::g' \
-   -e 's:-I/usr/local/include::g' \
-   || die "sed Imakefile"
-   if ! use rplay ; then
-   sed -i Imakefile \
-   -e 's:^XCOMM\ \(.*NO_SOUND\):\1:' \
-   -e 's:^\(SOUNDLIB.*\):XCOMM\ \1:' \
-   -e 's:sound\..::g' \
-   || die "sed Imakefile"
-   eapply "${FILESDIR}"/${P}-NO_SOUND_SUPPORT.patch
-   fi
default
+
+   # disable sound support, relies on last-rited media-sound/rplay
+   sed -e 's:^XCOMM\ \(.*NO_SOUND\):\1:' \
+   -e 's:^\(SOUNDLIB.*\):XCOMM\ \1:' \
+   -e 's:sound\..::g' \
+   -e 's:-I/usr/local/include::g' \
+   -e 's:-L/usr/local/lib::g' \
+   -i Imakefile || die
 }
 
 src_configure() {
+   append-cflags -std=gnu89 # old codebase, incompatible with c2x
+
CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf -a || die "xmkmf 
failed"
 }
@@ -59,15 +65,17 @@ src_compile() {
 }
 
 src_install() {
-   emake BINDIR=/usr/bin \
-   LIBDIR=/etc/X11 \
-   MANPATH=/usr/share/man \
+   emake BINDIR="${EPREFIX}"/usr/bin \
+   LIBDIR="${EPREFIX}"/etc/X11 \
+   MANPATH="${EPREFIX}"/usr/share/man \
DESTDIR="${D}" install
 
-   echo "#!/bin/sh" > vtwm
-   echo "xsetroot -cursor_name left_ptr &" >> vtwm
-   echo "/usr/bin/vtwm" >> vtwm
exeinto /etc/X11/Sessions
-   doexe vtwm
+   newexe - vtwm <<-EOF
+   #!/usr/bin/env sh
+   xsetroot -cursor_name left_ptr &
+   "${EPREFIX}/usr/bin/vtwm"
+   EOF
+
dodoc doc/{4.7.*,CHANGELOG,BUGS,DEVELOPERS,HISTORY,SOU

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

2022-09-30 Thread Ionen Wolkens 
commit: 9ad9a90a22515deca0a04f3df582d3c1950dd0fa
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Sep 30 10:28:45 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Sep 30 10:48:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ad9a90a

x11-wm/vtwm: force gcc -E for imake's generation

Requires traditional cpp support and is broken in all sort of ways
with clang-cpp / -E. Can still use clang & friends for everything else.

Ideally these packages need to be built another way or last rited,
imake will just accumulate more problems.

Closes: https://bugs.gentoo.org/870925
Signed-off-by: Ionen Wolkens  gentoo.org>

 x11-wm/vtwm/vtwm-5.4.7-r2.ebuild | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild b/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
index 67ac8de4a833..4f976b42e894 100644
--- a/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
+++ b/x11-wm/vtwm/vtwm-5.4.7-r2.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
@@ -20,12 +20,13 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm
rplay? ( media-sound/rplay )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+   x11-base/xorg-proto"
 BDEPEND="
app-text/rman
sys-devel/bison
sys-devel/flex
-   x11-base/xorg-proto
+   sys-devel/gcc
>=x11-misc/imake-1.0.8-r1"
 
 src_prepare() {
@@ -47,7 +48,7 @@ src_prepare() {
 
 src_configure() {
CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
-   IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die "xmkmf 
failed"
+   IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf -a || die "xmkmf 
failed"
 }
 
 src_compile() {

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

2021-04-14 Thread Joonas Niilola 
commit: 8d84aa93208cea5c8681efd950a5b57f69ef9675
Author: Ionen Wolkens  gmail  com>
AuthorDate: Wed Apr 14 15:04:34 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Apr 15 06:38:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d84aa93

x11-wm/vtwm: fix build with -native-symlinks

Also swapped DEPEND with BDEPEND to put imake in the right block.

Closes: https://bugs.gentoo.org/726210
Signed-off-by: Ionen Wolkens  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20381
Signed-off-by: Joonas Niilola  gentoo.org>

 x11-wm/vtwm/vtwm-5.4.7-r2.ebuild | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild b/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
index e2c87e29d8c..67ac8de4a83 100644
--- a/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
+++ b/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,12 +20,13 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm
rplay? ( media-sound/rplay )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
app-text/rman
sys-devel/bison
sys-devel/flex
x11-base/xorg-proto
-   x11-misc/imake"
+   >=x11-misc/imake-1.0.8-r1"
 
 src_prepare() {
eapply "${FILESDIR}"/${P}-do-not-rm.patch
@@ -45,14 +46,14 @@ src_prepare() {
 }
 
 src_configure() {
-   xmkmf || die "xmkmf failed"
-   emake depend
+   CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+   IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die "xmkmf 
failed"
 }
 
 src_compile() {
emake \
-   CC=$(tc-getCC) \
-   CCOPTIONS="${CFLAGS}" \
+   CC="$(tc-getCC)" \
+   CDEBUGFLAGS="${CFLAGS}" \
EXTRA_LDOPTIONS="${LDFLAGS}"
 }

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

2019-10-12 Thread Michał Górny 
commit: a0a9c16e328a97125676ef05ffa2a52f4cd9e7e4
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Oct 12 07:01:24 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Oct 12 07:01:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0a9c16e

x11-wm/vtwm: Drop old (EAPI 0)

Signed-off-by: Michał Górny  gentoo.org>

 x11-wm/vtwm/Manifest   |  1 -
 x11-wm/vtwm/vtwm-5.4.6a.ebuild | 42 --
 2 files changed, 43 deletions(-)

diff --git a/x11-wm/vtwm/Manifest b/x11-wm/vtwm/Manifest
index 05340f23564..50231ab3294 100644
--- a/x11-wm/vtwm/Manifest
+++ b/x11-wm/vtwm/Manifest
@@ -1,2 +1 @@
-DIST vtwm-5.4.6a.tar.gz 992488 BLAKE2B 
15a28556c78a9fc81f656eb6d50a2bf9f2d86ef6938cb8926cbb909c2c0edce6cbbe09270e72dfc29f9c665aecc36dcd57bcbf26af96b1f3b24518427b652395
 SHA512 
2500dfe50fae90cbc2b3dcf1dd05c330abd978a51abdf2768b3231fabdd71975f3bbdc341ebe25101773009cbf7cb12f263a013165bbda5c048e8b602686
 DIST vtwm-5.4.7.tar.gz 1021160 BLAKE2B 
a669e21d2fad5a93036c866053fb73db25f3ab1e877256650d4cc295db3861bd6ff90517e00d7042b00621c05d1947b9747380eac72fec85cfc1d68c8a6b59bb
 SHA512 
abd9a1b1d077232eef7f39521823446f2674d69a071333209a808ff651dfa83a7f6fa00dab06356897d9e7a88fd6616e5920af030e24541bd4703b3351628728

diff --git a/x11-wm/vtwm/vtwm-5.4.6a.ebuild b/x11-wm/vtwm/vtwm-5.4.6a.ebuild
deleted file mode 100644
index b97b7621cc6..000
--- a/x11-wm/vtwm/vtwm-5.4.6a.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="one of many TWM descendants and implements a Virtual Desktop"
-HOMEPAGE="http://www.vtwm.org/";
-SRC_URI="ftp://ftp.visi.com/users/hawkeyd/X/${P}.tar.gz";
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ppc sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-   x11-libs/libXmu
-   x11-libs/libXt
-   x11-libs/libXext
-   x11-libs/libXpm"
-DEPEND="${RDEPEND}
-   app-text/rman
-   x11-base/xorg-proto
-   x11-misc/imake"
-
-src_compile() {
-   xmkmf || die "xmkmf failed"
-   emake -j1 || die "emake failed"
-}
-
-src_install() {
-   make BINDIR=/usr/bin \
-   LIBDIR=/etc/X11 \
-   MANPATH=/usr/share/man \
-   DESTDIR="${D}" install || die "make install failed"
-
-   echo "#!/bin/sh" > vtwm
-   echo "xsetroot -cursor_name left_ptr &" >> vtwm
-   echo "/usr/bin/vtwm" >> vtwm
-   exeinto /etc/X11/Sessions
-   doexe vtwm || die
-   dodoc doc/{4.6.*,CHANGELOG,BUGS,DEVELOPERS,HISTORY,SOUND,WISHLIST} || 
die
-}

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

2019-10-11 Thread Matt Turner 
commit: 14ed6d97d8789a56732cdb1f28356e81395f6032
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Oct 12 04:15:35 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Oct 12 04:29:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14ed6d97

x11-wm/vtwm: drop to ~alpha, bug 696388

Signed-off-by: Matt Turner  gentoo.org>

 x11-wm/vtwm/vtwm-5.4.6a.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/vtwm/vtwm-5.4.6a.ebuild b/x11-wm/vtwm/vtwm-5.4.6a.ebuild
index db49006317f..b97b7621cc6 100644
--- a/x11-wm/vtwm/vtwm-5.4.6a.ebuild
+++ b/x11-wm/vtwm/vtwm-5.4.6a.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.visi.com/users/hawkeyd/X/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha ppc sparc x86"
+KEYWORDS="~alpha ppc sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11

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

2019-10-07 Thread Sergei Trofimovich 
commit: bd1fa7465177910f200abee825956e69fa5250b5
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Oct  7 19:17:31 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Oct  7 19:17:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd1fa746

x11-wm/vtwm: stable 5.4.7-r2 for ppc, bug #696388

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

 x11-wm/vtwm/vtwm-5.4.7-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild b/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
index 071b6a4dd51..e2c87e29d8c 100644
--- a/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
+++ b/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.vtwm.org/downloads/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ppc sparc x86"
 IUSE="rplay"
 
 RDEPEND="x11-libs/libX11

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

2019-10-07 Thread Agostino Sarubbo 
commit: 3e138d155d60a816c608edd4b785efb37e7d0b0a
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Oct  7 10:44:09 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Oct  7 10:44:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e138d15

x11-wm/vtwm: sparc stable wrt bug #696388

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-wm/vtwm/vtwm-5.4.7-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild b/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
index 8b54d98248a..071b6a4dd51 100644
--- a/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
+++ b/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.vtwm.org/downloads/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~ppc sparc x86"
 IUSE="rplay"
 
 RDEPEND="x11-libs/libX11

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

2019-10-06 Thread Thomas Deutschmann 
commit: 9ee436381c112c0ba0d40e52e2729b6bbef802e8
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Oct  6 21:10:11 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Oct  6 21:18:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ee43638

x11-wm/vtwm: x86 stable (bug #696388)

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

 x11-wm/vtwm/vtwm-5.4.7-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild b/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
index 449d8860060..8b54d98248a 100644
--- a/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
+++ b/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.vtwm.org/downloads/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
 IUSE="rplay"
 
 RDEPEND="x11-libs/libX11

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

2019-01-28 Thread Andreas K. Hüttel 
commit: 98abe1c50c9568376cde43c0e8790436fa27af95
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Jan 27 23:56:00 2019 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sun Jan 27 23:56:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98abe1c5

x11-wm/vtwm: EAPI bump

Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 .../{vtwm-5.4.7-r1.ebuild => vtwm-5.4.7-r2.ebuild} | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/x11-wm/vtwm/vtwm-5.4.7-r1.ebuild b/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
similarity index 75%
rename from x11-wm/vtwm/vtwm-5.4.7-r1.ebuild
rename to x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
index f1f31db2b33..449d8860060 100644
--- a/x11-wm/vtwm/vtwm-5.4.7-r1.ebuild
+++ b/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
-DESCRIPTION="one of many TWM descendants and implements a Virtual Desktop"
+DESCRIPTION="TWM descendant that implements a Virtual Desktop"
 HOMEPAGE="http://www.vtwm.org/";
 SRC_URI="http://www.vtwm.org/downloads/${P}.tar.gz";
 
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
x11-misc/imake"
 
 src_prepare() {
-   epatch "${FILESDIR}"/${P}-do-not-rm.patch
+   eapply "${FILESDIR}"/${P}-do-not-rm.patch
sed -i Imakefile \
-e 's:-L/usr/local/lib::g' \
-e 's:-I/usr/local/include::g' \
@@ -39,33 +39,33 @@ src_prepare() {
-e 's:^\(SOUNDLIB.*\):XCOMM\ \1:' \
-e 's:sound\..::g' \
|| die "sed Imakefile"
-   epatch "${FILESDIR}"/${P}-NO_SOUND_SUPPORT.patch
+   eapply "${FILESDIR}"/${P}-NO_SOUND_SUPPORT.patch
fi
+   default
 }
 
 src_configure() {
xmkmf || die "xmkmf failed"
-   emake depend || die "emake depend"
+   emake depend
 }
 
 src_compile() {
emake \
CC=$(tc-getCC) \
CCOPTIONS="${CFLAGS}" \
-   EXTRA_LDOPTIONS="${LDFLAGS}" \
-   || die "emake failed"
+   EXTRA_LDOPTIONS="${LDFLAGS}"
 }
 
 src_install() {
emake BINDIR=/usr/bin \
LIBDIR=/etc/X11 \
MANPATH=/usr/share/man \
-   DESTDIR="${D}" install || die "emake install failed"
+   DESTDIR="${D}" install
 
echo "#!/bin/sh" > vtwm
echo "xsetroot -cursor_name left_ptr &" >> vtwm
echo "/usr/bin/vtwm" >> vtwm
exeinto /etc/X11/Sessions
-   doexe vtwm || die
-   dodoc doc/{4.7.*,CHANGELOG,BUGS,DEVELOPERS,HISTORY,SOUND,WISHLIST} || 
die
+   doexe vtwm
+   dodoc doc/{4.7.*,CHANGELOG,BUGS,DEVELOPERS,HISTORY,SOUND,WISHLIST}
 }

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

2019-01-28 Thread Andreas K. Hüttel 
commit: 16142237f6d6402870a46c58a6b0c39375246f0a
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Jan 27 23:51:28 2019 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sun Jan 27 23:51:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16142237

x11-wm/vtwm: Builds on amd64 :)

Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 x11-wm/vtwm/vtwm-5.4.7-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-wm/vtwm/vtwm-5.4.7-r1.ebuild b/x11-wm/vtwm/vtwm-5.4.7-r1.ebuild
index 4fb624a7bec..f1f31db2b33 100644
--- a/x11-wm/vtwm/vtwm-5.4.7-r1.ebuild
+++ b/x11-wm/vtwm/vtwm-5.4.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -11,7 +11,7 @@ SRC_URI="http://www.vtwm.org/downloads/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE="rplay"
 
 RDEPEND="x11-libs/libX11