[gentoo-commits] repo/gentoo:master commit in: x11-wm/amiwm/
commit: 651ddf681084e3d4f66f52a037360567c7cdbff9
Author: James Le Cuirot gentoo org>
AuthorDate: Sat Sep 16 13:39:13 2023 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sat Sep 16 13:39:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=651ddf68
x11-wm/amiwm: Respect ${AR} when building
Closes: https://bugs.gentoo.org/913665
Signed-off-by: James Le Cuirot gentoo.org>
x11-wm/amiwm/Manifest | 2 +-
.../{amiwm-0.22.01_p20230904.ebuild => amiwm-0.22.01_p20230916.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-wm/amiwm/Manifest b/x11-wm/amiwm/Manifest
index 794a4f22d7c2..250b8225e4c3 100644
--- a/x11-wm/amiwm/Manifest
+++ b/x11-wm/amiwm/Manifest
@@ -1 +1 @@
-DIST amiwm-0.22.01_p20230904.tar.gz 153778 BLAKE2B
406ebf1ab584c60785c1a56fc367178012aab3166e74825b53e89a0c450263b724a8d1e927b20aab0321b987d0aa5792b0c9e36c66a55b40824e5d91664ecba8
SHA512
a3e385d966d96a84b6a044e489a7cfe0365672eaec7cc3d678cca2d1ebbb625f47beba9373d3361e94f82584bf3f423d9d9b606a7617f8c9d08953c0c9652e1b
+DIST amiwm-0.22.01_p20230916.tar.gz 153785 BLAKE2B
c1a3e25bcef99f8381dec22eec82ec66393b97eb1924e7fb8f58d57ff81db0c1b0dfdda9cca46e0c8e0fe514ec6c9c79f3abcdfc99915571b9e1d9a6f29548b0
SHA512
4d58b3120ff2c72ad5aeab488221e992380567bbb69abc9ef170fc133be4bde771b93c71ef1e10a2dd995cb5aadc7598f62b8ce7288d6265da17b2fd93554dc0
diff --git a/x11-wm/amiwm/amiwm-0.22.01_p20230904.ebuild
b/x11-wm/amiwm/amiwm-0.22.01_p20230916.ebuild
similarity index 94%
rename from x11-wm/amiwm/amiwm-0.22.01_p20230904.ebuild
rename to x11-wm/amiwm/amiwm-0.22.01_p20230916.ebuild
index eca68da58692..3395a726dd7b 100644
--- a/x11-wm/amiwm/amiwm-0.22.01_p20230904.ebuild
+++ b/x11-wm/amiwm/amiwm-0.22.01_p20230916.ebuild
@@ -5,7 +5,7 @@ EAPI=8
inherit autotools
-COMMIT="de6456b0aeca16243ed4c54fdc241be746274bcd"
+COMMIT="74a398944f9a2c543b6b176e65ed4ee2373b1d65"
DESCRIPTION="Amiga Workbench inspired window manager for Xorg"
HOMEPAGE="https://github.com/sdomi/amiwm;
SRC_URI="https://github.com/chewi/${PN}/archive/${COMMIT}.tar.gz ->
${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: x11-wm/amiwm/
commit: f5bc89136de298baa8197b4ebea855222a76277b
Author: James Le Cuirot gentoo org>
AuthorDate: Mon Sep 4 18:59:12 2023 +
Commit: James Le Cuirot gentoo org>
CommitDate: Mon Sep 4 18:59:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5bc8913
x11-wm/amiwm: Fix implicit declaration of exit() during configure, EAPI 8
Closes: https://bugs.gentoo.org/913625
Signed-off-by: James Le Cuirot gentoo.org>
x11-wm/amiwm/Manifest | 2 +-
...wm-0.22.01_p20200826.ebuild => amiwm-0.22.01_p20230904.ebuild} | 8
x11-wm/amiwm/metadata.xml | 5 -
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/x11-wm/amiwm/Manifest b/x11-wm/amiwm/Manifest
index d2c039c17bb6..794a4f22d7c2 100644
--- a/x11-wm/amiwm/Manifest
+++ b/x11-wm/amiwm/Manifest
@@ -1 +1 @@
-DIST amiwm-0.22.01_p20200826.tar.gz 153787 BLAKE2B
eebd61436bff6c063c0946f61632f5a56ba01d62f01e2761de62fed1c2c5049a191dbbaf836ac0b0771b38a84dc6f52a40ee53b9c73666855cfe03b6a829f9a8
SHA512
a4329eb8ea98b631611a6e069f27a6c640bfac94aa5a2c3591c9c35c4b08ea6f123fadcd56597353b27ec67bc079e8268e1b700fe85c0d545c9bb93439362c1b
+DIST amiwm-0.22.01_p20230904.tar.gz 153778 BLAKE2B
406ebf1ab584c60785c1a56fc367178012aab3166e74825b53e89a0c450263b724a8d1e927b20aab0321b987d0aa5792b0c9e36c66a55b40824e5d91664ecba8
SHA512
a3e385d966d96a84b6a044e489a7cfe0365672eaec7cc3d678cca2d1ebbb625f47beba9373d3361e94f82584bf3f423d9d9b606a7617f8c9d08953c0c9652e1b
diff --git a/x11-wm/amiwm/amiwm-0.22.01_p20200826.ebuild
b/x11-wm/amiwm/amiwm-0.22.01_p20230904.ebuild
similarity index 84%
rename from x11-wm/amiwm/amiwm-0.22.01_p20200826.ebuild
rename to x11-wm/amiwm/amiwm-0.22.01_p20230904.ebuild
index 01783f64e26e..eca68da58692 100644
--- a/x11-wm/amiwm/amiwm-0.22.01_p20200826.ebuild
+++ b/x11-wm/amiwm/amiwm-0.22.01_p20230904.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools
-COMMIT="8b8c956a904fa73edb02d4dc6d45bc0358bff3b3"
+COMMIT="de6456b0aeca16243ed4c54fdc241be746274bcd"
DESCRIPTION="Amiga Workbench inspired window manager for Xorg"
-HOMEPAGE="https://github.com/redsPL/amiwm;
+HOMEPAGE="https://github.com/sdomi/amiwm;
SRC_URI="https://github.com/chewi/${PN}/archive/${COMMIT}.tar.gz ->
${P}.tar.gz"
LICENSE="amiwm"
diff --git a/x11-wm/amiwm/metadata.xml b/x11-wm/amiwm/metadata.xml
index 7118affd8801..e2849ec8821c 100644
--- a/x11-wm/amiwm/metadata.xml
+++ b/x11-wm/amiwm/metadata.xml
@@ -5,9 +5,12 @@
ch...@gentoo.org
James Le Cuirot
+
+ sdomi/amiwm
+
amiwm is an X window manager that tries to make your display
look and
feel like an Amiga Workbench screen. It is fully functional and
can do
all the usual window manager stuff, like moving and resizing
windows.
-
+
[gentoo-commits] repo/gentoo:master commit in: x11-wm/amiwm/
commit: 6ecbf4b990257f5991372c751064dfa54fce28ac
Author: James Le Cuirot gentoo org>
AuthorDate: Sun Jan 9 10:03:05 2022 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sun Jan 9 10:03:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ecbf4b9
x11-wm/amiwm: Keyword 0.22.01_p20200826 for ~m68k
Manually tested and working.
Signed-off-by: James Le Cuirot gentoo.org>
x11-wm/amiwm/amiwm-0.22.01_p20200826.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-wm/amiwm/amiwm-0.22.01_p20200826.ebuild
b/x11-wm/amiwm/amiwm-0.22.01_p20200826.ebuild
index 7e7eaed103a1..01783f64e26e 100644
--- a/x11-wm/amiwm/amiwm-0.22.01_p20200826.ebuild
+++ b/x11-wm/amiwm/amiwm-0.22.01_p20200826.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 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://github.com/chewi/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="amiwm"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~m68k ~ppc ~x86"
COMMON_DEPEND="
x11-libs/libX11
[gentoo-commits] repo/gentoo:master commit in: x11-wm/amiwm/, x11-wm/amiwm/files/
commit: 1c794609d902a5f054580dbf597a557e32a2e197
Author: James Le Cuirot gentoo org>
AuthorDate: Sun Apr 26 21:05:15 2020 +
Commit: James Le Cuirot gentoo org>
CommitDate: Thu May 7 22:24:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c794609
x11-wm/amiwm: Drop old 0.21_p2
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: James Le Cuirot gentoo.org>
x11-wm/amiwm/Manifest | 1 -
x11-wm/amiwm/amiwm-0.21_p2.ebuild | 62
.../amiwm/files/amiwm-0.21_p2-flex-2.6.3-fix.patch | 31
x11-wm/amiwm/files/amiwm-0.21_p2-gentoo.diff | 160 -
x11-wm/amiwm/files/amiwm-0.21_p2-implicts.patch| 73 --
5 files changed, 327 deletions(-)
diff --git a/x11-wm/amiwm/Manifest b/x11-wm/amiwm/Manifest
index 39acc8033f5..d2c039c17bb 100644
--- a/x11-wm/amiwm/Manifest
+++ b/x11-wm/amiwm/Manifest
@@ -1,2 +1 @@
DIST amiwm-0.22.01_p20200826.tar.gz 153787 BLAKE2B
eebd61436bff6c063c0946f61632f5a56ba01d62f01e2761de62fed1c2c5049a191dbbaf836ac0b0771b38a84dc6f52a40ee53b9c73666855cfe03b6a829f9a8
SHA512
a4329eb8ea98b631611a6e069f27a6c640bfac94aa5a2c3591c9c35c4b08ea6f123fadcd56597353b27ec67bc079e8268e1b700fe85c0d545c9bb93439362c1b
-DIST amiwm0.21pl2.tar.gz 195128 BLAKE2B
de7c843e6b756797b7a72a8e0b6fde6d4c02893e3eae8262d85d4417a7ad6309c10add802c04dde2d092bc7c8a604edbc96c4a9fc3c7f1166897a7933a978ccb
SHA512
6504a4fd4c30a571b0c501b46fdc442fcc993c27b4595753f7bfa12a38c0b997a01d939c7a35e6c499aa0f8972bc0fda7cc88a9fe77091f363f8cd5a9e8d50de
diff --git a/x11-wm/amiwm/amiwm-0.21_p2.ebuild
b/x11-wm/amiwm/amiwm-0.21_p2.ebuild
deleted file mode 100644
index 0fba9046d07..000
--- a/x11-wm/amiwm/amiwm-0.21_p2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib toolchain-funcs
-
-MY_P=${PN}${PV/_p/pl}
-DESCRIPTION="Windowmanager ala Amiga(R) Workbench(R)"
-HOMEPAGE="http://www.lysator.liu.se/~marcus/amiwm.html;
-SRC_URI="ftp://ftp.lysator.liu.se/pub/X11/wm/${PN}/${MY_P}.tar.gz;
-
-LICENSE="amiwm"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-COMMON_DEPEND="x11-libs/libX11
- x11-libs/libXmu
- x11-libs/libXext"
-
-RDEPEND="${COMMON_DEPEND}
- media-gfx/xloadimage
- x11-apps/xrdb
- x11-apps/xsetroot
- x11-terms/xterm"
-DEPEND="${COMMON_DEPEND}
- x11-base/xorg-proto"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/${P}-gentoo.diff"
- "${FILESDIR}/${P}-implicts.patch"
- "${FILESDIR}/${P}-flex-2.6.3-fix.patch"
-)
-
-pkg_setup() {
- tc-export CC
-}
-
-src_prepare() {
- default
- sed -e "s:\$(exec_prefix)/lib:\$(exec_prefix)/$(get_libdir):" \
- -e '/^STRIPFLAG/s@-s@@' \
- -e '/$(LN_S)/s@$(DESTDIR)$(AMIWM_HOME)@../..$(AMIWM_HOME)@' \
- -i Makefile.in || die
- sed -i -e "s:/bin/ksh:/bin/sh:g" Xsession{,2}.in || die
-
- cat <<- EOF > "${T}"/amiwm
- #!/bin/sh
- exec /usr/bin/amiwm
- EOF
-}
-
-src_install() {
- local DOCS=( README* )
- default
-
- exeinto /etc/X11/Sessions
- doexe "${T}"/amiwm
-}
diff --git a/x11-wm/amiwm/files/amiwm-0.21_p2-flex-2.6.3-fix.patch
b/x11-wm/amiwm/files/amiwm-0.21_p2-flex-2.6.3-fix.patch
deleted file mode 100644
index ae89aafdae8..000
--- a/x11-wm/amiwm/files/amiwm-0.21_p2-flex-2.6.3-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
amiwm0.21pl2/lex.l
-+++ amiwm0.21pl2/lex.l
-@@ -1,5 +1,6 @@
-+%option noyywrap
- %{
- #include
- #include "gram.h"
- extern char *progname;
- extern int ParseError;
amiwm0.21pl2/kbdlexer.l
-+++ amiwm0.21pl2/kbdlexer.l
-@@ -1,5 +1,6 @@
-+%option noyywrap
- %{
- #include
- #include
-
- #include "libami.h"
-@@ -134,12 +135,9 @@ int parse_keyword(char *str, YYSTYPE *va
-
- . { fprintf(stderr, "%s: illegal character \"%s\" ignored\n",
- progname, yytext); }
- %%
-
--#ifndef yywrap
--int yywrap() { return 1; }
--#endif
- #undef input
- #define input() ((*inptr)?(*inptr++):0)
- #undef unput
- #define unput(c) (*--inptr=c)
diff --git a/x11-wm/amiwm/files/amiwm-0.21_p2-gentoo.diff
b/x11-wm/amiwm/files/amiwm-0.21_p2-gentoo.diff
deleted file mode 100644
index fa875a4a43b..000
--- a/x11-wm/amiwm/files/amiwm-0.21_p2-gentoo.diff
+++ /dev/null
@@ -1,160 +0,0 @@
-Fix parallel build, don't strip binaries, respect CC LDFLAGS, fix install dirs
-Fix incompatible implicit declaration of built-in function
{strlen,memset,strcpy}
-
-http://bugs.gentoo.org/show_bug.cgi?id=248680
-http://bugs.gentoo.org/show_bug.cgi?id=299918
-
a/Makefile.in
-+++ b/Makefile.in
-@@ -14,7 +14,7 @@
- exec_prefix = @exec_prefix@
- bindir = $(exec_prefix)/bin
- libdir = $(exec_prefix)/lib
--mandir = $(prefix)/man
-+mandir = $(prefix)/share/man
- INSTALL = @INSTALL@
- LN_S = @LN_S@
-
[gentoo-commits] repo/gentoo:master commit in: x11-wm/amiwm/
commit: baca96a6b736494967f3f0ca386b34204c8222ea Author: James Le Cuirot gentoo org> AuthorDate: Sun Apr 26 21:01:04 2020 + Commit: James Le Cuirot gentoo org> CommitDate: Thu May 7 22:24:17 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baca96a6 x11-wm/amiwm: Take over as maintainer Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: James Le Cuirot gentoo.org> x11-wm/amiwm/metadata.xml | 13 - 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/x11-wm/amiwm/metadata.xml b/x11-wm/amiwm/metadata.xml index 722041341d0..06ced70e47f 100644 --- a/x11-wm/amiwm/metadata.xml +++ b/x11-wm/amiwm/metadata.xml @@ -1,10 +1,13 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - - amiwm is an X window manager that tries to make your display look and - feel like an Amiga Workbench screen. It is fully functional and can do - all the usual window manager stuff, like moving and resizing windows. + + ch...@gentoo.org + James Le Cuirot + + + amiwm is an X window manager that tries to make your display look and + feel like an Amiga Workbench screen. It is fully functional and can do + all the usual window manager stuff, like moving and resizing windows.
[gentoo-commits] repo/gentoo:master commit in: x11-wm/amiwm/
commit: fcb7da7fe90babb7bc6d2a7bc98cfb75f9f99476
Author: James Le Cuirot gentoo org>
AuthorDate: Sun Apr 26 21:04:26 2020 +
Commit: James Le Cuirot gentoo org>
CommitDate: Thu May 7 22:24:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcb7da7f
x11-wm/amiwm: Version bump to 0.22.01_p20200826 snapshot
It has a new (but somewhat dead) upstream. I sent a bunch of patches
to fix all the build issues though.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: James Le Cuirot gentoo.org>
x11-wm/amiwm/Manifest | 1 +
x11-wm/amiwm/amiwm-0.22.01_p20200826.ebuild | 51 +
2 files changed, 52 insertions(+)
diff --git a/x11-wm/amiwm/Manifest b/x11-wm/amiwm/Manifest
index f22c0a66448..39acc8033f5 100644
--- a/x11-wm/amiwm/Manifest
+++ b/x11-wm/amiwm/Manifest
@@ -1 +1,2 @@
+DIST amiwm-0.22.01_p20200826.tar.gz 153787 BLAKE2B
eebd61436bff6c063c0946f61632f5a56ba01d62f01e2761de62fed1c2c5049a191dbbaf836ac0b0771b38a84dc6f52a40ee53b9c73666855cfe03b6a829f9a8
SHA512
a4329eb8ea98b631611a6e069f27a6c640bfac94aa5a2c3591c9c35c4b08ea6f123fadcd56597353b27ec67bc079e8268e1b700fe85c0d545c9bb93439362c1b
DIST amiwm0.21pl2.tar.gz 195128 BLAKE2B
de7c843e6b756797b7a72a8e0b6fde6d4c02893e3eae8262d85d4417a7ad6309c10add802c04dde2d092bc7c8a604edbc96c4a9fc3c7f1166897a7933a978ccb
SHA512
6504a4fd4c30a571b0c501b46fdc442fcc993c27b4595753f7bfa12a38c0b997a01d939c7a35e6c499aa0f8972bc0fda7cc88a9fe77091f363f8cd5a9e8d50de
diff --git a/x11-wm/amiwm/amiwm-0.22.01_p20200826.ebuild
b/x11-wm/amiwm/amiwm-0.22.01_p20200826.ebuild
new file mode 100644
index 000..7e7eaed103a
--- /dev/null
+++ b/x11-wm/amiwm/amiwm-0.22.01_p20200826.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+COMMIT="8b8c956a904fa73edb02d4dc6d45bc0358bff3b3"
+DESCRIPTION="Amiga Workbench inspired window manager for Xorg"
+HOMEPAGE="https://github.com/redsPL/amiwm;
+SRC_URI="https://github.com/chewi/${PN}/archive/${COMMIT}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="amiwm"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+COMMON_DEPEND="
+ x11-libs/libX11
+ x11-libs/libXmu
+ x11-libs/libXext
+"
+
+RDEPEND="
+ ${COMMON_DEPEND}
+ media-fonts/font-misc-misc[nls,X]
+ x11-apps/xrdb
+ x11-apps/xsetroot
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-base/xorg-proto
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_prepare() {
+ default
+ eautoconf
+}
+
+src_install() {
+ emake install DESTDIR="${D}" STRIPFLAG=
+ einstalldocs
+
+ exeinto /etc/X11/Sessions
+ newexe - ${PN} <<-EOF
+ #!/bin/sh
+ exec ${PN}
+ EOF
+}
[gentoo-commits] repo/gentoo:master commit in: x11-wm/amiwm/files/
commit: a30bf5eb20677f73390da05000d3fe7d6a9cda82
Author: Michael Mair-Keimberger (asterix) gmail
com>
AuthorDate: Sat Feb 18 15:26:01 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sat Feb 18 22:07:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a30bf5eb
x11-wm/amiwm: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/4015
x11-wm/amiwm/files/amiwm-0.20_p48-flex.patch | 12 --
x11-wm/amiwm/files/amiwm-0.20_p48-gentoo.diff | 188 --
2 files changed, 200 deletions(-)
diff --git a/x11-wm/amiwm/files/amiwm-0.20_p48-flex.patch
b/x11-wm/amiwm/files/amiwm-0.20_p48-flex.patch
deleted file mode 100644
index c346fbb0bc..00
--- a/x11-wm/amiwm/files/amiwm-0.20_p48-flex.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://bugs.gentoo.org/110169
-
amiwm/lex.l
-+++ amiwm/lex.l
-@@ -6,6 +6,7 @@
- extern FILE *rcfile;
- #undef yyin
- #define yyin rcfile
-+#define YY_SKIP_YYWRAP
- #define yywrap() 1
- extern int parse_keyword(char *);
- void fixup_string(char *, char *);
diff --git a/x11-wm/amiwm/files/amiwm-0.20_p48-gentoo.diff
b/x11-wm/amiwm/files/amiwm-0.20_p48-gentoo.diff
deleted file mode 100644
index 7b13b66a08..00
--- a/x11-wm/amiwm/files/amiwm-0.20_p48-gentoo.diff
+++ /dev/null
@@ -1,188 +0,0 @@
-Fix parallel build, don't strip binaries, respect CC LDFLAGS, fix install dirs
-Fix incompatible implicit declaration of built-in function
{strlen,memset,strcpy}
-
-http://bugs.gentoo.org/show_bug.cgi?id=248680
-http://bugs.gentoo.org/show_bug.cgi?id=299918
-
Makefile.in
-+++ Makefile.in
-@@ -1,7 +1,6 @@
- srcdir = @srcdir@
- VPATH = @srcdir@
- SHELL = /bin/sh
--CC = @CC@
- LEX = @LEX@
- YACC = @YACC@
- CFLAGS = @CFLAGS@
-@@ -14,7 +13,7 @@
- exec_prefix = @exec_prefix@
- bindir = $(exec_prefix)/bin
- libdir = $(exec_prefix)/lib
--mandir = $(prefix)/man
-+mandir = $(prefix)/share/man
- INSTALL = @INSTALL@
- LN_S = @LN_S@
- RM = -rm -f
-@@ -44,8 +43,14 @@
-
- AMIWM_HOME = $(libdir)/amiwm
-
-+.PHONY: yaccs all clean lib lexs
-+
-+.SUFFIXES: .c
-+
- all : $(PROGS) $(MODULES)
-
-+$(OBJS): lexs
-+
- lib :
- @( cd libami; $(MAKE) libami.a )
-
-@@ -64,71 +69,63 @@
- ppmtoinfo.o : ppmtoinfo.c
- $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -DAMIWM_HOME=\"$(AMIWM_HOME)\" $<
-
--gram.h gram.c: gram.y
-- $(YACC) $(YFLAGS) gram.y
-- mv y.tab.c gram.c
-- mv y.tab.h gram.h
-+yaccs: gram.c kbdmodule.c
-+lexs: yaccs lex.c kbdlexer.c
-+
-+%.c: %.y
-+ $(YACC) $(YFLAGS) $< -o $@
-
- lex.c : lex.l
- $(LEX) -t lex.l > lex.c
-
--kbdmodule.h kbdmodule.c: kbdmodule.y
-- $(YACC) $(YFLAGS) kbdmodule.y
-- mv y.tab.c kbdmodule.c
-- mv y.tab.h kbdmodule.h
--
- kbdlexer.c : kbdlexer.l
- $(LEX) -t kbdlexer.l > kbdlexer.c
-
--install : $(PROGS) $(MODULES) Xsession Xsession2 Xinitrc amiwm-init
-- -mkdir -p $(AMIWM_HOME)
-- $(INSTALL) -s requestchoice $(AMIWM_HOME)/requestchoice
-- $(INSTALL) -s executecmd $(AMIWM_HOME)/executecmd
-+install : Xsession Xsession2 Xinitrc amiwm-init
-+ $(INSTALL) -D requestchoice $(DESTDIR)$(AMIWM_HOME)/requestchoice
-+ $(INSTALL) executecmd $(DESTDIR)$(AMIWM_HOME)/executecmd
- for module in $(MODULES); do \
- if [ "$$module" = "Background" ]; then \
-- $(INSTALL) $$module $(AMIWM_HOME)/$$module; \
-+ $(INSTALL) $$module $(DESTDIR)$(AMIWM_HOME)/$$module; \
- else \
-- $(INSTALL) -s $$module $(AMIWM_HOME)/$$module; \
-+ $(INSTALL) $$module $(DESTDIR)$(AMIWM_HOME)/$$module; \
- fi \
- done
-- $(INSTALL) -m 644 system.amiwmrc $(AMIWM_HOME)/system.amiwmrc
-- $(INSTALL) -m 644 def_tool.info $(AMIWM_HOME)/def_tool.info
-- $(INSTALL) -m 644 system.map $(AMIWM_HOME)/system.map
-- $(INSTALL) -m 644 magicwb.map $(AMIWM_HOME)/magicwb.map
-- $(INSTALL) -m 644 schwartz.map $(AMIWM_HOME)/schwartz.map
-- $(INSTALL) -m 755 Xsession $(AMIWM_HOME)/Xsession
-- $(INSTALL) -m 755 Xsession2 $(AMIWM_HOME)/Xsession2
-- $(INSTALL) -m 755 Xinitrc $(AMIWM_HOME)/Xinitrc
-- $(INSTALL) -m 755 amiwm-init $(AMIWM_HOME)/amiwm-init
-- $(INSTALL) -s amiwm $(bindir)/amiwm
-- $(INSTALL) -s ppmtoinfo $(bindir)/ppmtoinfo
-- $(RM) $(bindir)/requestchoice
-- $(LN_S) $(AMIWM_HOME)/requestchoice $(bindir)/requestchoice
-- -mkdir -p $(mandir)/man1
-- $(INSTALL) -m 644 amiwm.1 $(mandir)/man1/amiwm.1
-+ $(INSTALL) -m 644 system.amiwmrc $(DESTDIR)$(AMIWM_HOME)/system.amiwmrc
-+ $(INSTALL) -m 644 def_tool.info $(DESTDIR)$(AMIWM_HOME)/def_tool.info
-+ $(INSTALL) -m 644 system.map $(DESTDIR)$(AMIWM_HOME)/system.map
-+ $(INSTALL) -m 644 magicwb.map $(DESTDIR)$(AMIWM_HOME)/magicwb.map
-+ $(INSTALL) -m 644 schwartz.map $(DESTDIR)$(AMIWM_HOME)/schwartz.map
-+ $(INSTALL) -m 755 Xsession $(DESTDIR)$(AMIWM_HOME)/Xsession
-+ $(INSTALL) -m 755 Xsession2 $(DESTDIR)$(AMIWM_HOME)/Xsession2
-+
[gentoo-commits] repo/gentoo:master commit in: x11-wm/amiwm/, x11-wm/amiwm/files/
commit: 284d5a25df8d884fe6f71f5019ccaa21f0d677eb
Author: Nicholas Vinson gmail com>
AuthorDate: Thu Jan 5 03:31:17 2017 +
Commit: Lars Wendler gentoo org>
CommitDate: Thu Jan 5 06:49:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=284d5a25
x11-wm/amiwm: patch to add flex 2.6.3 support
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/
x11-wm/amiwm/amiwm-0.21_p2.ebuild | 5 ++--
.../amiwm/files/amiwm-0.21_p2-flex-2.6.3-fix.patch | 31 ++
2 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/x11-wm/amiwm/amiwm-0.21_p2.ebuild
b/x11-wm/amiwm/amiwm-0.21_p2.ebuild
index 466c8be..462fed4 100644
--- a/x11-wm/amiwm/amiwm-0.21_p2.ebuild
+++ b/x11-wm/amiwm/amiwm-0.21_p2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -37,7 +37,8 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}"/${P}-gentoo.diff \
- "${FILESDIR}"/${P}-implicts.patch
+ "${FILESDIR}"/${P}-implicts.patch \
+ "${FILESDIR}"/${P}-flex-2.6.3-fix.patch
sed -i -e "s:\$(exec_prefix)/lib:\$(exec_prefix)/$(get_libdir):" \
Makefile.in || die
sed -i -e "s:/bin/ksh:/bin/sh:g" Xsession{,2}.in || die
diff --git a/x11-wm/amiwm/files/amiwm-0.21_p2-flex-2.6.3-fix.patch
b/x11-wm/amiwm/files/amiwm-0.21_p2-flex-2.6.3-fix.patch
new file mode 100644
index ..ae89aaf
--- /dev/null
+++ b/x11-wm/amiwm/files/amiwm-0.21_p2-flex-2.6.3-fix.patch
@@ -0,0 +1,31 @@
+--- amiwm0.21pl2/lex.l
amiwm0.21pl2/lex.l
+@@ -1,5 +1,6 @@
++%option noyywrap
+ %{
+ #include
+ #include "gram.h"
+ extern char *progname;
+ extern int ParseError;
+--- amiwm0.21pl2/kbdlexer.l
amiwm0.21pl2/kbdlexer.l
+@@ -1,5 +1,6 @@
++%option noyywrap
+ %{
+ #include
+ #include
+
+ #include "libami.h"
+@@ -134,12 +135,9 @@ int parse_keyword(char *str, YYSTYPE *va
+
+ . { fprintf(stderr, "%s: illegal character \"%s\" ignored\n",
+ progname, yytext); }
+ %%
+
+-#ifndef yywrap
+-int yywrap() { return 1; }
+-#endif
+ #undef input
+ #define input() ((*inptr)?(*inptr++):0)
+ #undef unput
+ #define unput(c) (*--inptr=c)
[gentoo-commits] repo/gentoo:master commit in: x11-wm/amiwm/
commit: c124f951eb937f27d87363fd1e1f9b980c17812e
Author: Lars Wendler gentoo org>
AuthorDate: Thu Jan 5 06:49:41 2017 +
Commit: Lars Wendler gentoo org>
CommitDate: Thu Jan 5 06:49:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c124f951
x11-wm/amiwm: Bumped to EAPI-6
Removed stripping from Makefile.in
Fixed bad symlink in Makefile.in
Package-Manager: Portage-2.3.3, Repoman-2.3.1
x11-wm/amiwm/amiwm-0.21_p2.ebuild | 25 +++--
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/x11-wm/amiwm/amiwm-0.21_p2.ebuild
b/x11-wm/amiwm/amiwm-0.21_p2.ebuild
index 462fed4..a875e17 100644
--- a/x11-wm/amiwm/amiwm-0.21_p2.ebuild
+++ b/x11-wm/amiwm/amiwm-0.21_p2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=4
+EAPI=6
inherit eutils multilib toolchain-funcs
@@ -29,18 +29,24 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xproto
x11-proto/xextproto"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-gentoo.diff"
+ "${FILESDIR}/${P}-implicts.patch"
+ "${FILESDIR}/${P}-flex-2.6.3-fix.patch"
+)
pkg_setup() {
tc-export CC
}
src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.diff \
- "${FILESDIR}"/${P}-implicts.patch \
- "${FILESDIR}"/${P}-flex-2.6.3-fix.patch
- sed -i -e "s:\$(exec_prefix)/lib:\$(exec_prefix)/$(get_libdir):" \
- Makefile.in || die
+ default
+ sed -e "s:\$(exec_prefix)/lib:\$(exec_prefix)/$(get_libdir):" \
+ -e '/^STRIPFLAG/s@-s@@' \
+ -e '/$(LN_S)/s@$(DESTDIR)$(AMIWM_HOME)@../..$(AMIWM_HOME)@' \
+ -i Makefile.in || die
sed -i -e "s:/bin/ksh:/bin/sh:g" Xsession{,2}.in || die
cat <<- EOF > "${T}"/amiwm
@@ -50,9 +56,8 @@ src_prepare() {
}
src_install() {
- emake DESTDIR="${D}" install || die
-
- dodoc README*
+ local DOCS=( README* )
+ default
exeinto /etc/X11/Sessions
doexe "${T}"/amiwm
