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

(Portage version: 2.2.0_alpha36/cvs/Linux x86_64)

4 files changed, 299 insertions, 2 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/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