Fix parallel build wrt bug 248680, don't strip files wrt bug 299918 + other QA fixes

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 226 insertions, 24 deletions

diff --git a/x11-wm/amiwm/ChangeLog b/x11-wm/amiwm/ChangeLog
index 658af32cec1e..d3808c8c6237 100644
--- a/x11-wm/amiwm/ChangeLog
+++ b/x11-wm/amiwm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-wm/amiwm
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/ChangeLog,v 1.10 2009/12/27 13:33:41 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/ChangeLog,v 1.11 2010/05/29 13:10:44 xarthisius Exp $
+
+  29 May 2010; Kacper Kowalik <xarthisius@gentoo.org> amiwm-0.20_p48.ebuild,
+  +files/amiwm-0.20_p48-gentoo.diff:
+  Fix parallel build wrt bug 248680, don't strip files wrt bug 299918.
+  Thanks
+  Diego for reporting.
+  Fix install directories, respect CC and user flags, multilib-strict.
+  Fix incompatible implicit declaration of built-in function.
+  Update dependencies.
 
   27 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   amiwm-0.20_p48.ebuild:
diff --git a/x11-wm/amiwm/amiwm-0.20_p48.ebuild b/x11-wm/amiwm/amiwm-0.20_p48.ebuild
index 351204a3659c..2717b0f8dfb8 100644
--- a/x11-wm/amiwm/amiwm-0.20_p48.ebuild
+++ b/x11-wm/amiwm/amiwm-0.20_p48.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/amiwm-0.20_p48.ebuild,v 1.10 2009/12/27 13:33:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/amiwm-0.20_p48.ebuild,v 1.11 2010/05/29 13:10:44 xarthisius Exp $
 
-inherit eutils
+EAPI="2"
+
+inherit eutils multilib toolchain-funcs
 
 MY_P="${PN}${PV/_p/pl}"
 DESCRIPTION="Windowmanager ala Amiga(R) Workbench(R)"
@@ -14,39 +16,42 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND="x11-libs/libX11
+COMMON_DEPEND="x11-libs/libX11
 	x11-libs/libXmu
 	x11-libs/libXext"
-DEPEND="${RDEPEND}
+
+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}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-flex.patch #110169
+pkg_setup() {
+	tc-export CC
 }
 
-src_compile() {
-	econf
-	# bug #248680
-	emake -j1 || die "build failed"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-flex.patch \
+		"${FILESDIR}"/${P}-gentoo.diff
+	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
 }
 
 src_install() {
-	dodir /usr/bin
-	einstall || die
-
-	rm "${D}"/usr/bin/requestchoice
-	dosym /usr/lib/amiwm/requestchoice /usr/bin/requestchoice
-
-	dosed /usr/lib/amiwm/{Xinitrc,Xsession,Xsession2}
+	emake DESTDIR="${D}" install || die
 
-	dodoc INSTALL README*
+	dodoc README* || die
 
 	exeinto /etc/X11/Sessions
-	echo "/usr/bin/amiwm" > "${T}"/amiwm
+	cat <<- EOF > "${T}"/amiwm
+		#!/bin/sh
+		exec /usr/bin/amiwm
+	EOF
 	doexe "${T}"/amiwm
 }
diff --git a/x11-wm/amiwm/files/amiwm-0.20_p48-gentoo.diff b/x11-wm/amiwm/files/amiwm-0.20_p48-gentoo.diff
new file mode 100644
index 000000000000..7b13b66a08aa
--- /dev/null
+++ b/x11-wm/amiwm/files/amiwm-0.20_p48-gentoo.diff
@@ -0,0 +1,188 @@
+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
++	$(INSTALL) -m 755 Xinitrc $(DESTDIR)$(AMIWM_HOME)/Xinitrc
++	$(INSTALL) -m 755 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 amiwm.1 $(DESTDIR)$(mandir)/man1/amiwm.1
+ 
+ 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) -m 644 Amilogo.pm $(DT_DIR)/appconfig/icons/C/Amilogo.pm
++	$(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 $(DESTDIR)$(DT_DIR)/appconfig/icons/C/Amilogo.pm
+ 
+ 
+ amiwm : $(OBJS) lib
+-	$(CC) -o amiwm $(OBJS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o amiwm $(OBJS) $(LIBS)
+ 
+ requestchoice : requestchoice.o lib
+-	$(CC) -o requestchoice requestchoice.o $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o requestchoice requestchoice.o $(LIBS)
+ 
+ executecmd : executecmd.o lib
+-	$(CC) -o executecmd executecmd.o $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o executecmd executecmd.o $(LIBS)
+ 
+ Keyboard : kbdmodule.o kbdlexer.o lib
+-	$(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
+ 
+ clean :
+ 	$(RM) core $(PROGS) $(LIBAMI) *.o libami/*.o
+--- icc.c
++++ icc.c
+@@ -1,3 +1,4 @@
++#include <string.h>
+ #include "drawinfo.h"
+ #include "screen.h"
+ #include "icc.h"
+--- rc.c
++++ rc.c
+@@ -1,7 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <X11/Xmu/CharSet.h>
+-
++#include <string.h>
+ #include "alloc.h"
+ #include "prefs.h"
+ #include "drawinfo.h"
+--- libami/drawinfo.c
++++ libami/drawinfo.c
+@@ -1,7 +1,7 @@
+ #include <X11/Xlib.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-
++#include <string.h>
+ #include "alloc.h"
+ #include "drawinfo.h"
+ 
+--- libami/mdscreen.c
++++ libami/mdscreen.c
+@@ -1,3 +1,4 @@
++#include <string.h>
+ #include "libami.h"
+ #include "module.h"
+ 
+--- libami/error.c
++++ libami/error.c
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <string.h>
+ #include "libami.h"
+ 
+ #ifndef AMIGAOS