Use ${CHOST}-gcc instead of gcc when compiling (fixes bug #397441 by ago). Don't use einstall() (fixes bug #397445 by ago). Add patches for parallel make install and respecting CPPFLAGS.

(Portage version: 2.2.0_alpha82-r1/cvs/Linux x86_64)

4 files changed, 72 insertions, 7 deletions

diff --git a/net-irc/scrollz/ChangeLog b/net-irc/scrollz/ChangeLog
index 1e72b55c9ed1..b21ee16b6d92 100644
--- a/net-irc/scrollz/ChangeLog
+++ b/net-irc/scrollz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/scrollz
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/scrollz/ChangeLog,v 1.33 2011/06/30 17:12:32 binki Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/scrollz/ChangeLog,v 1.34 2012/01/03 03:52:07 binki Exp $
+
+  03 Jan 2012; Nathan Phillip Brink <binki@gentoo.org> scrollz-2.2.ebuild,
+  +files/scrollz-2.2-cppflags.patch, +files/scrollz-2.2-make-install.patch:
+  Use ${CHOST}-gcc instead of gcc when compiling (fixes bug #397441 by ago).
+  Don't use einstall() (fixes bug #397445 by ago). Add patches for parallel
+  make install and respecting CPPFLAGS.
 
 *scrollz-2.2 (30 Jun 2011)
 
diff --git a/net-irc/scrollz/files/scrollz-2.2-cppflags.patch b/net-irc/scrollz/files/scrollz-2.2-cppflags.patch
new file mode 100644
index 000000000000..a6727544eca5
--- /dev/null
+++ b/net-irc/scrollz/files/scrollz-2.2-cppflags.patch
@@ -0,0 +1,26 @@
+From: Nathan Phillip Brink <binki@gentoo.org>
+Subject: [PATCH] Respect CPPFLAGS.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -68,7 +68,7 @@
+ IRCDOC = ${IRCSHARE}/doc
+ 
+ CC = @CC@
+-DEFS = @DEFS@
++DEFS = @DEFS@ @CPPFLAGS@
+ LIBS = @LIBS@
+ 
+ # Set this to -g if you want to be able to debug the client, otherwise
+
+--- a/source/Makefile.in
++++ b/source/Makefile.in
+@@ -11,7 +11,7 @@
+ LDFLAGS	= @LDFLAGS@
+ LEX	= @LEX@
+ LEXLIB	= @LEXLIB@
+-DEFS	= @DEFS@
++DEFS	= @DEFS@ @CPPFLAGS@
+ LN	= @LN@
+ RM	= @RM@
+ 
diff --git a/net-irc/scrollz/files/scrollz-2.2-make-install.patch b/net-irc/scrollz/files/scrollz-2.2-make-install.patch
new file mode 100644
index 000000000000..f5591f2a8212
--- /dev/null
+++ b/net-irc/scrollz/files/scrollz-2.2-make-install.patch
@@ -0,0 +1,24 @@
+From: Nathan Phillip Brink <binki@gentoo.org>
+Date: 2011-01-03
+Subject: [PATCH] Fix parallel make install.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -179,7 +179,7 @@
+ 	@(cd $(DESTDIR)/$(bindir) ; $(LN) scrollz-$(VERSION) scrollz)
+ 	@cp doc/ScrollZ.doc $(DESTDIR)/$(IRCDOC)
+ 
+-installman: scrollz.1
++installman: installdirs scrollz.1
+ 	$(INSTALL) scrollz.1 $(DESTDIR)/$(mandir)
+ 
+ installserv: installio
+@@ -197,7 +197,7 @@
+ 		$(DESTDIR)/$(INSTALL_SCRIPT) \
+ 		$(DESTDIR)/$(HELP_DIR) $(DESTDIR)/$(IRCDOC) $(DESTDIR)/$(mandir)
+ 
+-installhelp:
++installhelp: installdirs
+ 	$(INSTALL_HELP_CMD)
+ 	find $(DESTDIR)/$(HELP_DIR) -type d -print | xargs chmod a+rx
+ 	find $(DESTDIR)/$(HELP_DIR) -type f -print | xargs chmod a+r
diff --git a/net-irc/scrollz/scrollz-2.2.ebuild b/net-irc/scrollz/scrollz-2.2.ebuild
index fd0f1ae4f689..532568e07329 100644
--- a/net-irc/scrollz/scrollz-2.2.ebuild
+++ b/net-irc/scrollz/scrollz-2.2.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/scrollz/scrollz-2.2.ebuild,v 1.1 2011/06/30 17:12:32 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/scrollz/scrollz-2.2.ebuild,v 1.2 2012/01/03 03:52:07 binki Exp $
 
 EAPI=4
 
+inherit eutils toolchain-funcs
+
 MY_P=ScrollZ-${PV}
 
 DESCRIPTION="Advanced IRC client based on ircII"
@@ -28,6 +30,11 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cppflags.patch
+	epatch "${FILESDIR}"/${P}-make-install.patch
+}
+
 src_configure() {
 	local _myssl
 
@@ -39,6 +46,7 @@ src_configure() {
 		fi
 	fi
 
+	tc-export CC #397441, ancient autoconf
 	econf \
 		--with-default-server=irc.gentoo.org \
 		$(use_enable socks5) \
@@ -49,9 +57,10 @@ src_configure() {
 }
 
 src_install() {
-	einstall \
-		sharedir="${ED}/usr/share" \
-		mandir="${ED}/usr/share/man/man1"
+	emake \
+		DESTDIR="${D}" \
+		mandir="${EPREFIX}/usr/share/man/man1" \
+		install
 
 	dodoc ChangeLog* NEWS README* todo
 }