Add missing include. Bump version that upstream non-maintainer commit missed. Respect LDFLAGS.

Package-Manager: portage-2.2.0_alpha30/cvs/Linux i686

4 files changed, 73 insertions, 5 deletions

diff --git a/sys-boot/palo/ChangeLog b/sys-boot/palo/ChangeLog
index afa9337286c6..55d2e5623158 100644
--- a/sys-boot/palo/ChangeLog
+++ b/sys-boot/palo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-boot/palo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/palo/ChangeLog,v 1.30 2011/04/05 15:52:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/palo/ChangeLog,v 1.31 2011/04/21 20:47:00 jer Exp $
+
+*palo-1.18-r1 (21 Apr 2011)
+
+  21 Apr 2011; Jeroen Roovers <jer@gentoo.org> +palo-1.18-r1.ebuild,
+  +files/palo-1.18-include.patch:
+  Add missing include. Bump version that upstream non-maintainer commit missed.
+  Respect LDFLAGS.
 
   05 Apr 2011; Jeroen Roovers <jer@gentoo.org> palo-1.18.ebuild:
   Remove virtual/bootloader (bug #359971).
diff --git a/sys-boot/palo/Manifest b/sys-boot/palo/Manifest
index 7536e50078e6..68360ef8d171 100644
--- a/sys-boot/palo/Manifest
+++ b/sys-boot/palo/Manifest
@@ -2,16 +2,18 @@
 Hash: SHA1
 
 AUX palo-1.16_p1-build.patch 975 RMD160 ed514585fdd3680fb15a84160c8153cffac55a03 SHA1 978d0d6ea14873a5432f3d63b5a61e459a999890 SHA256 0eb0dae5f73ea508f9ce1e2291ae9c2ae868706d3b8bb4dac99e79d2c2a1b23f
+AUX palo-1.18-include.patch 331 RMD160 df71db0c9a9ede964c35c983a0a9495e0684aaf5 SHA1 ec2e78b2bafed590c695ede88bdf20d2ccd2b7e1 SHA256 b7d81fa5019127698ce74ec46539d0f7bf572a01fd8299c84caae90597fa664f
 AUX palo-remove-HOME-TERM.patch 3329 RMD160 a5acbcb4f951e0de481c2101b48f3bad16d27476 SHA1 af9a6e696989d6558961caf86ac44e1812e7276e SHA256 a3fe56fc6d0b78c57191bf45ba44f52f53bdf3f8575c258bc49cac4f08040653
 AUX palo.conf 207 RMD160 648432e3819a34cc2034722d8db1438bd5244f24 SHA1 70359b6c8925520a6749b8be3fa3f30d0ae4e5cd SHA256 191d665eee73ff654763d6c4399cb46d86fe24b00140ba1eea0601b339ebb92a
 DIST palo_1.18.tar.gz 107181 RMD160 64ecee0235f51d6bde96816ae482da0db896897e SHA1 3b47f4abadbec4235e3e63ac80a802f44a2c202f SHA256 2b75c5ed02c821c36419201c913f63979a0a5ea2abeee5bd8f7de4e8f9fc2a74
+EBUILD palo-1.18-r1.ebuild 1163 RMD160 af82a3afb4e88f471c29008deccf4c3d73ee1d85 SHA1 e6e3e4fd9e78f362a49a9425c8f2b367212213cf SHA256 61528bed2d0e1699aef082133f91127ba335d3ce871f736cf371c52ae0a78333
 EBUILD palo-1.18.ebuild 999 RMD160 a398a4ebbefc03f3c97c73f9dbc2cbc6f64d0570 SHA1 10cd62e70a4da02465ba03dc23016d5ae236c2b6 SHA256 2581133c3c576337eff2210c0af78ce53997d6e582729f5f676526012b037ba2
-MISC ChangeLog 5272 RMD160 076a520faefa86770ad25f0be7e2dde1d5750054 SHA1 d414ac46970ec721cdb713b7800811f6be057ae3 SHA256 01ea2f3da509e40e4cb0afda24b43edadc528e1f23d128ee70683db4672b141c
+MISC ChangeLog 5504 RMD160 60826bc4c3c60c2517c0d5fe5ea9f13b49ed0c80 SHA1 918eb28c296b1c3b824f5ccf5cbc7ae5927547b6 SHA256 fe053154aaf8e83c52e98d3ee7e0a8c1efd6872cc521a3fddf12176f63265bb5
 MISC metadata.xml 218 RMD160 7ebffdd97a99332a813fc08c76d8778cbaf6fbb1 SHA1 bf9a67f41e2a502fdd350ad6dc013c6a8610bd3d SHA256 d1a75fab2f73415e8705e229079747d610911988eefba166afeba4a965edeaad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2bOt0ACgkQVWmRsqeSphNNTwCdEyF3bS1aI4i3hfDwrn+twToj
-Zg4Ani4tbOD1SelEojDsjHin1gw7tVTk
-=YzaD
+iEYEARECAAYFAk2wl80ACgkQVWmRsqeSphOypwCeISaEh7Z1hZQkX+euQD3lSCCl
+YEAAn0C4uTZ7vgYLpRJ/qO7EulniIiDg
+=Ilxh
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/palo/files/palo-1.18-include.patch b/sys-boot/palo/files/palo-1.18-include.patch
new file mode 100644
index 000000000000..47f9c0e087ce
--- /dev/null
+++ b/sys-boot/palo/files/palo-1.18-include.patch
@@ -0,0 +1,12 @@
+paloio.c:64: warning: implicit declaration of function ‘memcmp’
+
+--- a/palo/paloio.c	2007-09-12 18:12:03.000000000 +0200
++++ b/palo/paloio.c	2011-04-21 22:35:10.000000000 +0200
+@@ -7,6 +7,7 @@
+  */
+ #include <unistd.h>
+ #include <stdio.h>
++#include <string.h>
+ #include <errno.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
diff --git a/sys-boot/palo/palo-1.18-r1.ebuild b/sys-boot/palo/palo-1.18-r1.ebuild
new file mode 100644
index 000000000000..8c39be9d6ee6
--- /dev/null
+++ b/sys-boot/palo/palo-1.18-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/palo/palo-1.18-r1.ebuild,v 1.1 2011/04/21 20:47:00 jer Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="PALO : PArisc Linux Loader"
+HOMEPAGE="http://parisc-linux.org/ http://packages.qa.debian.org/p/palo.html"
+SRC_URI="mirror://debian/pool/main/p/${PN}/${P/-/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~hppa"
+IUSE=""
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-remove-HOME-TERM.patch \
+		"${FILESDIR}"/${PN}-1.16_p1-build.patch \
+		"${FILESDIR}"/${P}-include.patch
+	sed -i lib/common.h -e '/^#define PALOVERSION/{s|".*"|"'${PV}'"|g}' || die
+	sed -i palo/Makefile -e '/^LDFLAGS=/d' || die
+}
+
+src_compile() {
+	tc-export CC
+	emake -C palo || die "make palo failed"
+	emake -C ipl || die "make ipl failed"
+	emake MACHINE=parisc iplboot || die "make iplboot failed"
+}
+
+src_install() {
+	into /
+	dosbin palo/palo || die
+
+	doman palo.8
+	dohtml README.html
+	dodoc README palo.conf
+
+	insinto /etc
+	doins "${FILESDIR}"/palo.conf || die
+
+	insinto /usr/share/palo
+	doins iplboot || die
+}