Version bump wrt #354575 by Tomáš Hlušička <tomas.hlusicka@seznam.cz>

Package-Manager: portage-2.2.0_alpha36/cvs/Linux x86_64

5 files changed, 316 insertions, 3 deletions

diff --git a/x11-wm/amiwm/ChangeLog b/x11-wm/amiwm/ChangeLog
index ba096467b8cc..7daf92e07704 100644
--- a/x11-wm/amiwm/ChangeLog
+++ b/x11-wm/amiwm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/amiwm
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/ChangeLog,v 1.12 2010/05/29 13:11:33 xarthisius Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/ChangeLog,v 1.13 2011/06/11 11:52:47 xarthisius Exp $
+
+*amiwm-0.21_p2 (11 Jun 2011)
+
+  11 Jun 2011; Kacper Kowalik <xarthisius@gentoo.org> +amiwm-0.21_p2.ebuild,
+  +files/amiwm-0.21_p2-gentoo.diff, +files/amiwm-0.21_p2-implicts.patch:
+  Version bump wrt #354575 by Tomáš Hlušička <tomas.hlusicka@seznam.cz>
 
   29 May 2010; Kacper Kowalik <xarthisius@gentoo.org> amiwm-0.20_p48.ebuild,
   +files/amiwm-0.20_p48-gentoo.diff:
diff --git a/x11-wm/amiwm/Manifest b/x11-wm/amiwm/Manifest
index 8bb9528d2532..5c960bddd585 100644
--- a/x11-wm/amiwm/Manifest
+++ b/x11-wm/amiwm/Manifest
@@ -1,6 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX amiwm-0.20_p48-flex.patch 250 RMD160 0ebc4ddff2c2672c7d0acd8a1bdff60a2e7065e7 SHA1 c84e18bf8cb6b7e7a884bc0354f9f692f1550abc SHA256 fe68aa7053ea125c7988d4c9a5678a3926152869bcf67409725eaf17e01b9dbe
 AUX amiwm-0.20_p48-gentoo.diff 5877 RMD160 180f3e839bc276a5202641c81899cee0d385d16d SHA1 0b0c636f78ef4f9839c054a815a8ecbe05610417 SHA256 cde1d1753efede6188b5e9f6ccee226df6b9b034100592ba951ab64eb54170cf
+AUX amiwm-0.21_p2-gentoo.diff 6030 RMD160 8bc99ca8b86eff178def0bd0c2f69626a5fc4c59 SHA1 45c87b414c2c3242d827ffb15df7098c9c0e5e3a SHA256 60680ea549e76468d51418d1168c30527696ab8b9b6d97d067422dd8711bcb5e
+AUX amiwm-0.21_p2-implicts.patch 1547 RMD160 e65fcf3f34768960e8170b35600bfd04b54845ed SHA1 9c5580283a411af83bf7bea22017dec001801ee9 SHA256 bd84dba61c5c9fe0c8d1c6a7730d2823230cc0de89d07f2f82c95eeea1b1716b
 DIST amiwm0.20pl48.tar.gz 141542 RMD160 abb5922a84501a28a73684c9e056dba6ac6969b7 SHA1 6cf5f7197403a9519ea1f3b272e67a8de4fdca43 SHA256 a354d67de725ae07ca54284bf1f9ba4cec6874017f2391fbeb465ca84aa827d3
+DIST amiwm0.21pl2.tar.gz 195128 RMD160 3f135fb5ca0e945bcd7035485a9a886012b43db7 SHA1 770082049158a47e7171a5d74e82eeea7957b36e SHA256 7d8f83ae15f04fdc2c188e546bf8233974f5e38f2b4724655128ab7b5351c3df
 EBUILD amiwm-0.20_p48.ebuild 1255 RMD160 2198134c5cd81fe8173952e347e3f22b8f45dddb SHA1 ca524e31f5a5616b56355027b3196f926c7b5da2 SHA256 acefa004aba539cba005554361352cee2875936f4da6fc17ec5b7214af3610d3
-MISC ChangeLog 1687 RMD160 5a1ada5d1004f442c3f6ec026737fad28e6daa47 SHA1 aa3dafe45f4be3ca2756c1162ade91a06b114d7c SHA256 6d7cc396be998f645aa27d78ca96ec860fd16b0cedb51cbd45ccfcdc1fbf7141
+EBUILD amiwm-0.21_p2.ebuild 1247 RMD160 07f4dd9bc7ad5097a634135eb2a0931681975ed3 SHA1 9c22b0adbb5c69ebe6a06bb853208be9e6bfb3af SHA256 fc6e1f47a093ffc2710db1f7d9ce1426196be5ae30dc44e5753cc51dd4559caf
+MISC ChangeLog 1944 RMD160 28cec206ebbfd3d895ae6b271bde0146b90b4b02 SHA1 eb241d891b2e91d48a713f5626eec0540d5fd51a SHA256 ecd8addb8299fe67c41412921209ad08403c90401e2f80608d496fc0050359a7
 MISC metadata.xml 420 RMD160 29dd3d5d13127b2dddef6eac8c71ab2048dcf9ed SHA1 4c7bd4d5e98d38da3770ebc641167ff7eff956ab SHA256 34e9a598a8736ffaa958d2aa32f7929b4e617728ddadea3e3adc0e762c31e40b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iJwEAQECAAYFAk3zVxoACgkQIiMqcbOVdxRR5wP+N5cgCHR+wWgeVYNNR4ZBX2WS
+qSYVK4yjCMYyHHxwftlgxHp+5nYBVqfAUzcPE5bb5sT+t0irYMJpj0/LCn+PsziY
+4P2NBGG3jyx0o+N1Xs5CMg3AsYHv3Ce4e3hMKds326uzOSMP25p9EaiiZ3mo+AZZ
+eUcW0zZsKxo1GsxhsaY=
+=sx3Q
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/amiwm/amiwm-0.21_p2.ebuild b/x11-wm/amiwm/amiwm-0.21_p2.ebuild
new file mode 100644
index 000000000000..1e09968bb6d5
--- /dev/null
+++ b/x11-wm/amiwm/amiwm-0.21_p2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/amiwm-0.21_p2.ebuild,v 1.1 2011/06/11 11:52:47 xarthisius Exp $
+
+EAPI=4
+
+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-proto/xproto
+	x11-proto/xextproto"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	tc-export CC
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.diff \
+		"${FILESDIR}"/${P}-implicts.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
+
+	cat <<- EOF > "${T}"/amiwm
+		#!/bin/sh
+		exec /usr/bin/amiwm
+	EOF
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc README*
+
+	exeinto /etc/X11/Sessions
+	doexe "${T}"/amiwm
+}
diff --git a/x11-wm/amiwm/files/amiwm-0.21_p2-gentoo.diff b/x11-wm/amiwm/files/amiwm-0.21_p2-gentoo.diff
new file mode 100644
index 000000000000..fa875a4a43bf
--- /dev/null
+++ b/x11-wm/amiwm/files/amiwm-0.21_p2-gentoo.diff
@@ -0,0 +1,160 @@
+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@
+ RM = -rm -f
+@@ -45,13 +45,19 @@
+ 
+ AMIWM_HOME = $(libdir)/amiwm
+ 
++.PHONY: yaccs all clean lib_all lexs
++
++.SUFFIXES: .c
++
+ all : lib_all
+ 	@$(MAKE) local_all
+ 
+ local_all : $(PROGS) $(MODULES)
+ 
++$(OBJS): lexs
++
+ lib_all :
+-	@( cd libami; $(MAKE) all )
++	@$(MAKE) -C libami all
+ 
+ .c.o:
+ 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
+@@ -71,83 +77,75 @@
+ ppmtoinfo.o : ppmtoinfo.c
+ 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -DAMIWM_HOME=\"$(AMIWM_HOME)\" $<
+ 
+-gram.h gram.c: gram.y
+-	$(YACC) $(YFLAGS) $<
+-	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.c
+ 
+-kbdmodule.h kbdmodule.c: kbdmodule.y
+-	$(YACC) $(YFLAGS) $<
+-	mv y.tab.c kbdmodule.c
+-	mv y.tab.h kbdmodule.h
++lex.c : lex.l
++	$(LEX) -t $< > lex.c
+ 
+ kbdlexer.c : kbdlexer.l
+ 	$(LEX) -t $< > kbdlexer.c
+ 
+-install : $(PROGS) $(MODULES) Xsession Xsession2 Xinitrc amiwm-init
+-	-mkdir -p $(AMIWM_HOME)
+-	$(INSTALL) $(STRIPFLAG) requestchoice $(AMIWM_HOME)/requestchoice
+-	$(INSTALL) $(STRIPFLAG) 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" = "$(srcdir)/Background" ]; then \
+-	    $(INSTALL) $$module $(AMIWM_HOME)/Background; \
++	    $(INSTALL) $$module $(DESTDIR)$(AMIWM_HOME)/Background; \
+ 	  else \
+-	    $(INSTALL) $(STRIPFLAG) $$module $(AMIWM_HOME)/$$module; \
++	    $(INSTALL) $(STRIPFLAG) $$module $(DESTDIR)$(AMIWM_HOME)/$$module; \
+ 	  fi; \
+ 	done
+-	$(INSTALL) -m 644 $(srcdir)/system.amiwmrc $(AMIWM_HOME)/system.amiwmrc
+-	$(INSTALL) -m 644 $(srcdir)/def_tool.info $(AMIWM_HOME)/def_tool.info
+-	$(INSTALL) -m 644 $(srcdir)/system.map $(AMIWM_HOME)/system.map
+-	$(INSTALL) -m 644 $(srcdir)/magicwb.map $(AMIWM_HOME)/magicwb.map
+-	$(INSTALL) -m 644 $(srcdir)/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 $(srcdir)/amiwm-init $(AMIWM_HOME)/amiwm-init
+-	-mkdir -p $(bindir)
+-	$(INSTALL) $(STRIPFLAG) amiwm $(bindir)/amiwm
+-	$(INSTALL) $(STRIPFLAG) ppmtoinfo $(bindir)/ppmtoinfo
+-	$(RM) $(bindir)/requestchoice
+-	$(LN_S) $(AMIWM_HOME)/requestchoice $(bindir)/requestchoice
+-	-mkdir -p $(mandir)/man1
+-	$(INSTALL) -m 644 $(srcdir)/amiwm.1 $(mandir)/man1/amiwm.1
++	$(INSTALL) -m 644 $(srcdir)/system.amiwmrc $(DESTDIR)$(AMIWM_HOME)/system.amiwmrc
++	$(INSTALL) -m 644 $(srcdir)/def_tool.info $(DESTDIR)$(AMIWM_HOME)/def_tool.info
++	$(INSTALL) -m 644 $(srcdir)/system.map $(DESTDIR)$(AMIWM_HOME)/system.map
++	$(INSTALL) -m 644 $(srcdir)/magicwb.map $(DESTDIR)$(AMIWM_HOME)/magicwb.map
++	$(INSTALL) -m 644 $(srcdir)/schwartz.map $(DESTDIR)$(AMIWM_HOME)/schwartz.map
++	$(INSTALL) -m 755 Xsession $(DESTDIR)$(AMIWM_HOME)/Xsession
++	$(INSTALL) -m 755 Xsession2 $(DESTDIR)$(AMIWM_HOME)/Xsession2
++	$(INSTALL) -m 755 Xinitrc $(DESTDIR)$(AMIWM_HOME)/Xinitrc
++	$(INSTALL) -m 755 $(srcdir)/amiwm-init $(DESTDIR)$(AMIWM_HOME)/amiwm-init
++	$(INSTALL) -D amiwm $(DESTDIR)$(bindir)/amiwm
++	$(INSTALL) ppmtoinfo $(DESTDIR)$(bindir)/ppmtoinfo
++	$(RM) $(DESTDIR)$(bindir)/requestchoice
++	$(LN_S) $(DESTDIR)$(AMIWM_HOME)/requestchoice $(DESTDIR)$(bindir)/requestchoice
++	$(INSTALL) -D -m 644 $(srcdir)/amiwm.1 $(DESTDIR)$(mandir)/man1/amiwm.1
+ 
+ fs-install : Filesystem
+-	$(INSTALL) $(STRIPFLAG) Filesystem $(AMIWM_HOME)/Filesystem
+-	$(INSTALL) -m 644 def_disk.info $(AMIWM_HOME)/def_disk.info
+-	$(INSTALL) -m 644 def_drawer.info $(AMIWM_HOME)/def_disk.info
++	$(INSTALL) Filesystem $(DESTDIR)$(AMIWM_HOME)/Filesystem
++	$(INSTALL) -m 644 def_disk.info $(DESTDIR)$(AMIWM_HOME)/def_disk.info
++	$(INSTALL) -m 644 def_drawer.info $(DESTDIR)$(AMIWM_HOME)/def_disk.info
+ 
+ cde-install : Xresources.amiwm Amilogo.bm Amilogo.pm
+-	-mkdir -p $(DT_DIR)/config/C/Xresources.d
+-	$(INSTALL) -m 644 Xresources.amiwm $(DT_DIR)/config/C/Xresources.d/Xresources.amiwm
+-	-mkdir -p $(DT_DIR)/appconfig/icons/C
+-	$(INSTALL) -m 644 Amilogo.bm $(DT_DIR)/appconfig/icons/C/Amilogo.bm
++	$(INSTALL) -D -m 644 Xresources.amiwm $(DESTDIR)$(DT_DIR)/config/C/Xresources.d/Xresources.amiwm
++	$(INSTALL) -D -m 644 Amilogo.bm $(DESTDIR)$(DT_DIR)/appconfig/icons/C/Amilogo.bm
+ 	$(INSTALL) -m 644 Amilogo.pm $(DT_DIR)/appconfig/icons/C/Amilogo.pm
+ 
+ 
+ amiwm : $(OBJS) $(LIBAMI)
+-	$(CC) -o amiwm $(OBJS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o amiwm $(OBJS) $(LIBS)
+ 
+ requestchoice : requestchoice.o $(LIBAMI)
+-	$(CC) -o requestchoice requestchoice.o $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o requestchoice requestchoice.o $(LIBS)
+ 
+ executecmd : executecmd.o $(LIBAMI)
+-	$(CC) -o executecmd executecmd.o $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o executecmd executecmd.o $(LIBS)
+ 
+ Filesystem : filesystem.o $(LIBAMI)
+-	$(CC) -o Filesystem filesystem.o $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o Filesystem filesystem.o $(LIBS)
+ 
+ Keyboard : kbdmodule.o kbdlexer.o $(LIBAMI)
+-	$(CC) -o Keyboard kbdmodule.o kbdlexer.o $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o Keyboard kbdmodule.o kbdlexer.o $(LIBS)
+ 
+ ppmtoinfo : ppmtoinfo.o
+-	$(CC) -o ppmtoinfo ppmtoinfo.o -lm
++	$(CC) $(CFLAGS) $(LDFLAGS) -o ppmtoinfo ppmtoinfo.o -lm
+ 
+ localetest : localetest.o $(LIBAMI)
+-	$(CC) -o localetest localetest.o $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o localetest localetest.o $(LIBS)
+ 
+ clean :
+ 	$(RM) core $(PROGS) $(LIBAMI) Keyboard *.o libami/*.o
diff --git a/x11-wm/amiwm/files/amiwm-0.21_p2-implicts.patch b/x11-wm/amiwm/files/amiwm-0.21_p2-implicts.patch
new file mode 100644
index 000000000000..4a01347d0e86
--- /dev/null
+++ b/x11-wm/amiwm/files/amiwm-0.21_p2-implicts.patch
@@ -0,0 +1,73 @@
+--- a/main.c
++++ b/main.c
+@@ -131,6 +131,7 @@
+ extern void read_rc_file(char *filename, int manage_all);
+ extern void init_modules();
+ extern void flushmodules();
++extern void closescreen();
+ extern void raiselowerclient(Client *, int);
+ 
+ #ifndef AMIGAOS
+--- a/menu.c
++++ b/menu.c
+@@ -45,6 +45,11 @@
+ extern void mod_menuselect(struct module *, int, int, int);
+ extern void setfocus(Window);
+ extern void flushmodules();
++extern void openscreen(char *, Window);
++extern void realizescreens(void);
++extern void screentoback();
++extern void wberror(Scrn *, char *);
++extern void closescreen();
+ 
+ Scrn *mbdclick=NULL, *mbdscr=NULL;
+ 
+--- a/icc.c
++++ b/icc.c
+@@ -6,6 +6,7 @@
+ #include "prefs.h"
+ 
+ #include <string.h>
++#include <stdlib.h>
+ 
+ #ifdef AMIGAOS
+ #include <pragmas/xlib_pragmas.h>
+--- a/libami/lists.c
++++ b/libami/lists.c
+@@ -1,3 +1,4 @@
++#include <string.h>
+ #include "libami.h"
+ 
+ #ifndef AMIGAOS
+--- a/kbdmodule.y
++++ b/kbdmodule.y
+@@ -2,6 +2,8 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include "libami.h"
++int yyerror(char *);
++int yylex (void);
+ 
+ void docmd(XEvent *e, void *callback)
+ {
+--- a/gram.y
++++ b/gram.y
+@@ -8,6 +8,8 @@
+ #include "screen.h"
+ #include "icc.h"
+ #include "style.h"
++int yyerror(char *);
++int yylex (void);
+ extern void set_sys_palette(void);
+ extern void set_mwb_palette(void);
+ extern void set_schwartz_palette(void);
+--- a/ppmtoinfo.c
++++ b/ppmtoinfo.c
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <time.h>
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif