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.

Package-Manager: portage-2.2.0_alpha82-r1/cvs/Linux x86_64

5 files changed, 90 insertions, 23 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/Manifest b/net-irc/scrollz/Manifest
index 25ef5b88fa54..2b8759b0be87 100644
--- a/net-irc/scrollz/Manifest
+++ b/net-irc/scrollz/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
+AUX scrollz-2.2-cppflags.patch 492 RMD160 55068807707aa9a1bfc2e42c54a496e4e66f803e SHA1 64abaa61fed0cc8e6e569d1251279f49d9cd31b3 SHA256 d0f6465007a7ed365d393cf71efeeb54bcbf42b2cbf29c3ca15bf0a82af6c02d
+AUX scrollz-2.2-make-install.patch 714 RMD160 e85a38eb0c4ff95f32c728a8b854d92003741859 SHA1 f433bd955281c7a13da815c7ea013a61afb90a01 SHA256 f3d5690b92b745e08d84241789adf7266c94ca29591cd3eb3d5987aff27975d1
 DIST ScrollZ-2.2.tar.gz 939999 RMD160 832fb9b8270be9f7c3c7fac06adc8875ed2e13c5 SHA1 80a17f98792cc0d8db716c032eb237a20cd35845 SHA256 ed467c0f920bb84d85cdd8cea3e18a014025274b1a1ad688fd3725851f2bf653
 DIST scrollz_2.1.orig.tar.gz 950734 RMD160 e34de45e8de21521a725f0ba96b259b3bd62e3f4 SHA1 007c8920e4b99d99fdc53fb8bb940fb66eda4f1f SHA256 90de0fb08cd2a5971423c167b6c0556d1446e81fd97756c2dc43f058a0a6f919
 EBUILD scrollz-2.1.ebuild 1142 RMD160 3efabaebbf7ba9f0380dd71f1adde2e3be86fd4a SHA1 3fd5d38e04b46b494e40784b879536858f0878d3 SHA256 e6171b6a6a73b55e9c51459060fc2c5609f90b057f19ca72061bbf50a6afedc7
-EBUILD scrollz-2.2.ebuild 1162 RMD160 e4bb30b44d1c020c2df9ff8180554484d8d8722d SHA1 9e2bd7c6e59a981222a23475d0b74193bdbfbfe2 SHA256 16c61abe3d9ed00be12bd7e18627fad07d67da26ade46e7ba0b584004db7a7d1
-MISC ChangeLog 4076 RMD160 1fae036d885469de5bf57f783422ddf4dfbe1431 SHA1 4005e14103098fff98b38c1bee5ecaf4cd76be66 SHA256 2961721ee33019dc845128d35cf80ab37a2bdcbf8e6b7f54f8b92044cfb154fa
+EBUILD scrollz-2.2.ebuild 1343 RMD160 f9ff010fdf0ec28c9b15964f1f9a22b4ce4b7dfe SHA1 77be4ee17d79a39ae3c51630b42597c87f0200b9 SHA256 2d176da81bcecdee9e6081feec4d0005a8a09f930e51da63129fd9f929a8008f
+MISC ChangeLog 4421 RMD160 68285d28656e5b3dfae48de55918b5d205d1a2ec SHA1 503eba5072e6ace6cee1fdb04a55de60cbb64ef1 SHA256 9ae3af109b12d75467415e0db37542e24833c504f3dc3ad6c57ed6974d5ce112
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQIcBAEBCAAGBQJODK69AAoJEHQ6UuhrqBBQY68P/0gjqQ7YMcrVW7gXA9XCXlRh
-qqEnb7ZacIE2AIjz+cyTlxLShOU9L1yaat4Uwrev+lEPI7A2Bvw8U/Lumv9ZN6Zq
-EgPkI4TmaWrwDKPr1Le/0obXKGPX25YzNa62DD4xbCuf1JBTWm3PbYxcoFq0Embq
-wnve6A1eiXPDjR9e6rCOPFPfp+1wfWEKdqvLlI8vOOdzONT1HGqJbx+81S1IljCV
-YRaoxeOKQOSgCYUfBNsf4Pb1tcipVb5PVvTmY+QU0O0YKDf1fnrFgW2JaNn5AQTQ
-mD9UXREfXPXxva8L7cz8VDStqJdeulnCoRmsPWQW1s3Sh1eEeupQznP5q4F/BwUh
-eJuHcFYPRN8Aeo0JYWIe1nAAe/4bO86TlQ+s/BxqYItlt3gDgZgM9jRwpa3fPj09
-uvTktv/Edf77oI2eFn8AoCSc0HF6o0eYaCDURJF5PbT+famtJC8TZ0lJlmNOjc5Z
-268T4lGZe8pZadM473ZKF2eUbSws7TWx29h6JTcWan2ICnuP6Ho8CwTYygl5KKxJ
-UU3yIgUIlKqCJ6pV3Cda7y+Re48cQNr0EG5SMbDCAIerGplfG8WAxACSbXSI3szz
-dqJuY0Bb7PyZJh3m/YqjH+XimEPfP92odJ95mXjloyKJEw4W4jNB5RDOBI51CFXY
-3MxKHNUCI6Q1Mvu1qot5
-=r1lS
+iQIcBAEBCgAGBQJPAnrKAAoJEHQ6UuhrqBBQ9bkP/2h7x/iCWyxdN7INcecpXhYQ
+RfzcPgTFunJY6ghdTe5FKeMw7Bsmm0Clxcm1qd4AcMaEkNKRXt17V7GzrbjgGRka
+1Fh5j8NLrUffQsqwDSSHFAErY/X5/d+ewRFfDHWpEfu7gKQMEXB+D2JLSDokW8p7
+gR3K36RxPCbxHWbSHrLrwtfhvIBE0wo3dzwE2kjBGLnqd8MxqRa9qD76KaY5jilP
+VwV7fcBibQXfuJyu5VtvywTgc1ZrckS8i1/kEp4ItlcN7PS/B1noBJjAYKWwX9/o
+ehPK/535XsvVcQ1403cRAQxD3WWnIvm+SyLsLfHfmp7C3qQx2QIDMq5MZVq1FdqS
+8GwI7ZOG/h8Hoc84qIGwtuNU2dunOwjgB5cMhU9QbzjriLWFJ3JpUYH8V4D5EgTi
+0zuBqM/A/TZ6kWxRSEYisLhKHvhPxtdSX+T9Aaxz4xlGNy1k1Z+DnvDpBpBNeCQM
+HjidDsV+BICll7CMDFzSgI/UadHO5MiCC47L524QBctGCXJoURQRRYQUoy8eWSBd
+Xi7FG9DQmfHaGkyavT1mxK6SfSfsi36NiSFGqltCkDqOPUmt+JZxwZaJRiZyNFB0
+Bx9NcX1RD9phRopn319sM+p2jnFOD3d/ByrIr0GR3HLkbZcFtj1+s+0h2JyinmF0
+yHTORP3UfXeMrrJxcU+n
+=OY1e
 -----END PGP SIGNATURE-----
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
 }