Cleanup build and install palo into /sbin.

(Portage version: 2.1.1_pre2-r4)

7 files changed, 56 insertions, 10 deletions

diff --git a/sys-boot/palo/ChangeLog b/sys-boot/palo/ChangeLog
index 626a2205f2b8..aa61961f54ce 100644
--- a/sys-boot/palo/ChangeLog
+++ b/sys-boot/palo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/palo
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/palo/ChangeLog,v 1.17 2006/06/02 20:51:52 gmsoft Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/palo/ChangeLog,v 1.18 2006/07/08 15:28:55 vapier Exp $
+
+  08 Jul 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/palo-1.14-build.patch, palo-1.14_pre20060409.ebuild:
+  Cleanup build and install palo into /sbin.
 
   02 Jun 2006; Guy Martin <gmsoft@gentoo.org> palo-1.14_pre20060409.ebuild:
   Stable on hppa.
diff --git a/sys-boot/palo/files/digest-palo-1.10_pre20051012 b/sys-boot/palo/files/digest-palo-1.10_pre20051012
index 24660c1c14f2..27c8eb600828 100644
--- a/sys-boot/palo/files/digest-palo-1.10_pre20051012
+++ b/sys-boot/palo/files/digest-palo-1.10_pre20051012
@@ -1 +1,3 @@
 MD5 effb3d446823b5eb7faf912760bcdc04 palo-1.10-CVS20051012.tar.gz 88740
+RMD160 d5b2fa03f4b0476d8aa555d27a7fb33ebaffd8fd palo-1.10-CVS20051012.tar.gz 88740
+SHA256 9b867f1f6b2ca78a468534beb5daa4d3350cbeb8ac92439af93e94b4c5b43738 palo-1.10-CVS20051012.tar.gz 88740
diff --git a/sys-boot/palo/files/digest-palo-1.14_pre20060409 b/sys-boot/palo/files/digest-palo-1.14_pre20060409
index 789ecd4e3476..d2783b40441d 100644
--- a/sys-boot/palo/files/digest-palo-1.14_pre20060409
+++ b/sys-boot/palo/files/digest-palo-1.14_pre20060409
@@ -1 +1,3 @@
 MD5 8cf22a5dbbf012988fe55007f207a2f2 palo-1.14-CVS20060409.tar.gz 95347
+RMD160 6cbeeeef180168de77bfc003c598a6d8d36df13a palo-1.14-CVS20060409.tar.gz 95347
+SHA256 7435bad266b33092b8fc68b2c120f7ea2fab1fcf4119a9526dcac4bc7368fc6c palo-1.14-CVS20060409.tar.gz 95347
diff --git a/sys-boot/palo/files/digest-palo-1.5_pre20040515 b/sys-boot/palo/files/digest-palo-1.5_pre20040515
index 7a4138206f50..54ec57d8cde3 100644
--- a/sys-boot/palo/files/digest-palo-1.5_pre20040515
+++ b/sys-boot/palo/files/digest-palo-1.5_pre20040515
@@ -1 +1,3 @@
 MD5 6ba7ad22be32fc6593a7bfef3d0873a5 palo-1.5-CVS20040515.tar.gz 101107
+RMD160 4ddc027a568dde6163b08d3be8d3e793aebac896 palo-1.5-CVS20040515.tar.gz 101107
+SHA256 7e4b45dd465b0c02f73b27ff63f8d331feefd9ce238c2482288b61a2dbf29029 palo-1.5-CVS20040515.tar.gz 101107
diff --git a/sys-boot/palo/files/digest-palo-1.8_pre20050523 b/sys-boot/palo/files/digest-palo-1.8_pre20050523
index 2d61f6442114..3549cce9fa39 100644
--- a/sys-boot/palo/files/digest-palo-1.8_pre20050523
+++ b/sys-boot/palo/files/digest-palo-1.8_pre20050523
@@ -1 +1,3 @@
 MD5 ad3ad58281410f365aca9894052b326f palo-1.8-CVS20050523.tar.gz 101390
+RMD160 7d52e85c51d0d6bc131a4dfd5629e37c4bf17042 palo-1.8-CVS20050523.tar.gz 101390
+SHA256 3e1c52f4ce2b68297500a468cc70f18bb81b2e014c45edc92fe79199aa7faaf7 palo-1.8-CVS20050523.tar.gz 101390
diff --git a/sys-boot/palo/files/palo-1.14-build.patch b/sys-boot/palo/files/palo-1.14-build.patch
new file mode 100644
index 000000000000..f86b40c8e69e
--- /dev/null
+++ b/sys-boot/palo/files/palo-1.14-build.patch
@@ -0,0 +1,29 @@
+--- palo/Makefile
++++ palo/Makefile
+@@ -11,10 +11,11 @@
+ 
+ OS := $(shell uname -s)
+ CC=gcc
++
++CFLAGS ?= -g -O
++CFLAGS += -I../include -I../lib
+ ifeq ($(strip ${OS}),HP-UX)
+-CFLAGS=-g -O -I../include -I../lib -I$(PA)/include
+-else
+-CFLAGS=-g -O -I../include -I../lib
++CFLAGS += -I$(PA)/include
+ endif
+ 
+ # LDFLAGS=-Wl,-Bstatic 
+--- ipl/Makefile
++++ ipl/Makefile
+@@ -21,7 +21,8 @@
+ # Source sharing with palo
+ VPATH=../lib:.
+ 
+-CFLAGS	= -I. -I../lib -I../include -O2 -mdisable-fpregs -Wall
++CFLAGS ?= -O2
++CFLAGS += -I. -I../lib -I../include -mdisable-fpregs -Wall
+ LDFLAGS  = -N --section-start .init=0x60000 -e '$$START$$'
+ 
+ all:	iplelf
diff --git a/sys-boot/palo/palo-1.14_pre20060409.ebuild b/sys-boot/palo/palo-1.14_pre20060409.ebuild
index 1070ce91d755..63b8b3f6e98a 100644
--- a/sys-boot/palo/palo-1.14_pre20060409.ebuild
+++ b/sys-boot/palo/palo-1.14_pre20060409.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/palo/palo-1.14_pre20060409.ebuild,v 1.3 2006/06/02 20:51:52 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/palo/palo-1.14_pre20060409.ebuild,v 1.4 2006/07/08 15:28:55 vapier Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 MY_V=${PV/_pre/-CVS}
 DESCRIPTION="PALO : PArisc Linux Loader"
@@ -14,31 +14,36 @@ SLOT="0"
 KEYWORDS="-* hppa"
 IUSE=""
 
-DEPEND="virtual/libc"
+DEPEND=""
 PROVIDE="virtual/bootloader"
 
 S=${WORKDIR}/palo
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${PN}-remove-HOME-TERM.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-remove-HOME-TERM.patch
+	epatch "${FILESDIR}"/${PN}-1.14-build.patch
 }
 
 src_compile() {
-	emake -C palo CFLAGS="${CFLAGS} -I../include -I../lib -D__KERNEL_STRICT_NAMES" || die "make palo failed."
-	emake -C ipl CFLAGS="${CFLAGS} -I. -I../lib -I../include -mdisable-fpregs -Wall -D__kernel_timer_t=int -D__kernel_clockid_t=int" || die "make ipl failed."
+	append-flags -D__KERNEL_STRICT_NAMES
+	emake -C palo || die "make palo failed"
+	append-flags -D__kernel_timer_t=int -D__kernel_clockid_t=int
+	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
+	doins "${FILESDIR}"/palo.conf || die
 
 	insinto /usr/share/palo
-	doins iplboot
+	doins iplboot || die
 }