8 files changed, 66 insertions, 202 deletions
diff --git a/sys-boot/palo/ChangeLog b/sys-boot/palo/ChangeLog
index a4b0e0c2940c..33e8c99bfe01 100644
--- a/sys-boot/palo/ChangeLog
+++ b/sys-boot/palo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-boot/palo
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/palo/ChangeLog,v 1.47 2014/01/30 15:42:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/palo/ChangeLog,v 1.48 2014/12/15 19:52:16 jer Exp $
+
+*palo-1.95 (15 Dec 2014)
+
+  15 Dec 2014; Jeroen Roovers <jer@gentoo.org> -palo-1.18-r1.ebuild,
+  +palo-1.95.ebuild, palo-9999.ebuild, -files/palo-1.16_p1-build.patch,
+  -files/palo-1.18-include.patch, +files/palo-1.95-toolchain.patch,
+  -files/palo-9999-toolchain.patch, -files/palo-remove-HOME-TERM.patch:
+  Version bump.
 
   30 Jan 2014; Jeroen Roovers <jer@gentoo.org> files/palo.conf:
   Improve helpful comments.
diff --git a/sys-boot/palo/files/palo-1.16_p1-build.patch b/sys-boot/palo/files/palo-1.16_p1-build.patch
deleted file mode 100644
index d1fe3359bb44..000000000000
--- a/sys-boot/palo/files/palo-1.16_p1-build.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/ipl/Makefile	2007-09-12 18:12:03.000000000 +0200
-+++ b/ipl/Makefile	2009-05-07 06:16:20.000000000 +0200
-@@ -11,17 +11,11 @@
- 
- MACHINE	:= $(subst 64,,$(shell uname -m))
- 
--ifneq (${MACHINE},parisc)
--# cross compilation
--CC	= hppa-linux-gcc
--LD	= hppa-linux-ld
--AR	= hppa-linux-ar
--endif
--
- # 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
---- a/palo/Makefile	2007-09-12 18:12:03.000000000 +0200
-+++ b/palo/Makefile	2009-05-07 06:16:50.000000000 +0200
-@@ -10,11 +10,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 
diff --git a/sys-boot/palo/files/palo-1.18-include.patch b/sys-boot/palo/files/palo-1.18-include.patch
deleted file mode 100644
index 47f9c0e087ce..000000000000
--- a/sys-boot/palo/files/palo-1.18-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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/files/palo-9999-toolchain.patch b/sys-boot/palo/files/palo-1.95-toolchain.patch
index 995be0339da8..1e70f2d5ebf0 100644
--- a/sys-boot/palo/files/palo-9999-toolchain.patch
+++ b/sys-boot/palo/files/palo-1.95-toolchain.patch
@@ -1,15 +1,22 @@
 --- a/palo/Makefile
 +++ b/palo/Makefile
-@@ -14,7 +14,7 @@
+@@ -12,13 +12,12 @@
+ OS := $(shell uname -s)
+ CC?=cc
  ifeq ($(strip ${OS}),HP-UX)
- CFLAGS=-g -O -I../include -I../lib -I$(PA)/include
+-CFLAGS=-g -O -I../include -I../lib -I$(PA)/include
++CFLAGS=-O -I../include -I../lib -I$(PA)/include
  else
 -CFLAGS=-g -O -I../include -I../lib -D_FILE_OFFSET_BITS=64
-+CFLAGS+= -O -I../include -I../lib -D_FILE_OFFSET_BITS=64
++CFLAGS=-O -I../include -I../lib -D_FILE_OFFSET_BITS=64
  endif
  
  # LDFLAGS=-Wl,-Bstatic 
-@@ -34,7 +34,7 @@
+-LDFLAGS=
+ 
+ OFILES2=mkbootable.o elf64.o load.o paloio.o elf32.o error.o gzip.o
+ 
+@@ -34,7 +33,7 @@
  	$(CC) $(CFLAGS) $(LDFLAGS) -o palo palo.a build.o
  
  palo.a:	$(OFILES)
diff --git a/sys-boot/palo/files/palo-remove-HOME-TERM.patch b/sys-boot/palo/files/palo-remove-HOME-TERM.patch
deleted file mode 100644
index 6d157edcd067..000000000000
--- a/sys-boot/palo/files/palo-remove-HOME-TERM.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- a/Makefile	2004-05-17 13:39:00.431714000 +0200
-+++ b/Makefile	2004-05-17 13:39:45.221714000 +0200
-@@ -56,7 +56,7 @@
-     ROOT=root=/dev/nfs nfsroot=${NFSROOT} ip=bootp
- endif
- 
--CMDLINE = 0/vmlinux HOME=/ TERM=linux $(ROOT) $(EISAIRQ) $(CONSOLE)
-+CMDLINE = 0/vmlinux $(ROOT) $(EISAIRQ) $(CONSOLE)
- 
- all: makepalo README palo.conf
- 	
---- a/README	2004-05-17 13:39:00.431714000 +0200
-+++ b/README	2004-05-17 13:40:09.341714000 +0200
-@@ -42,13 +42,13 @@
-        files to it, unmount.
-      * Use palo to make the disk bootable:
-         $ palo \
--             -c "5/vmlinux HOME=/ TERM=linux console=tty" \
-+             -c "5/vmlinux console=tty" \
-              -k path/to/vmlinux \
-              -I /dev/your-disk
- 
-       On a self-hosted system, you can accomplish the same thing by placing
-       the following into /etc/palo.conf:
--   --commandline=5/vmlinux HOME=/ TERM=linux console=tty
-+   --commandline=5/vmlinux console=tty
-    --recoverykernel=/boot/vmlinux
-    --init-partitioned=/dev/your-disk
- 
---- a/README.html	2004-05-17 13:39:00.431714000 +0200
-+++ b/README.html	2004-05-17 13:40:27.801714000 +0200
-@@ -52,13 +52,13 @@
-     <p><li>Use <i>palo</i> to make the disk bootable:
-     <pre>
- 	$ palo \
--	     -c "5/vmlinux HOME=/ TERM=linux console=tty" \
-+	     -c "5/vmlinux console=tty" \
- 	     -k path/to/vmlinux \
- 	     -I /dev/your-disk</pre>
- <center><table border=1 bgcolor=yellow width=80%><tr><td>
- On a self-hosted system, you can accomplish the same thing by placing
- the following into <tt>/etc/palo.conf</tt>:
--<pre>--commandline=5/vmlinux HOME=/ TERM=linux console=tty
-+<pre>--commandline=5/vmlinux console=tty
- --recoverykernel=/boot/vmlinux
- --init-partitioned=/dev/your-disk</pre>
- and running <i>palo</i>.
---- a/ipl/ipl.c	2004-05-17 13:39:00.491714000 +0200
-+++ b/ipl/ipl.c	2004-05-17 13:39:19.681714000 +0200
-@@ -481,9 +481,6 @@
- 	        chk_strcat(commandline, "ttyB0", CMDLINELEN, &ok);
-             else
- 	        chk_strcat(commandline, "ttyS0", CMDLINELEN, &ok);
--
--	    if (strstr(commandline, " TERM=") == 0)
--	        chk_strcat(commandline, " TERM=vt102", CMDLINELEN, &ok);
- 	}
- 	else
- 	{
-@@ -519,8 +516,6 @@
- 	    }
- 	    if (strstr(commandline, " sti_font=") == 0)
- 	        chk_strcat(commandline, " sti_font=VGA8x16", CMDLINELEN, &ok);
--	    if (strstr(commandline, " TERM=") == 0)
--	        chk_strcat(commandline, " TERM=linux", CMDLINELEN, &ok);
- 	}
-     }
- 
---- a/palo.conf	2004-05-17 13:39:00.431714000 +0200
-+++ b/palo.conf	2004-05-17 13:41:01.541714000 +0200
-@@ -8,7 +8,7 @@
- # recovery kernel, and the default dynamically-booted kernel.
- # --recoverykernel=/boot/vmlinux
- # --init-partitioned=/dev/sda
--# --commandline=3/boot/vmlinux HOME=/ TERM=linux root=/dev/sda3
-+# --commandline=3/boot/vmlinux root=/dev/sda3
- 
- #
- #Usage: palo [options]
-@@ -18,8 +18,8 @@
- #		Maximum 127 characters.
- #    -k, --recoverykernel=path to recovery kernel (perhaps /boot/vmlinux)
- #    -b, --bootloader=path to boot loader
--		Defaults to /usr/share/palo/iplboot -- you usually don't
--		need to use -b or --bootloader
-+#		Defaults to /usr/share/palo/iplboot -- you usually don't
-+#		need to use -b or --bootloader
- #    -r, --ramdisk=path to initial ramdisk image
- #    -I, --init-partitioned=partitioned device or file
- #    		Initialize a pre-partitioned device, usually a hard disk.
diff --git a/sys-boot/palo/palo-1.18-r1.ebuild b/sys-boot/palo/palo-1.18-r1.ebuild
deleted file mode 100644
index d72fe5b4b79a..000000000000
--- a/sys-boot/palo/palo-1.18-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2013 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.3 2013/01/30 00:44:35 jer Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="PALO : PArisc Linux Loader"
-HOMEPAGE="http://parisc-linux.org/"
-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
-
-	insinto /etc/kernel/postinst.d/
-	INSOPTIONS="-m 0744" doins "${FILESDIR}"/99palo
-}
diff --git a/sys-boot/palo/palo-1.95.ebuild b/sys-boot/palo/palo-1.95.ebuild
new file mode 100644
index 000000000000..86451bdaa7aa
--- /dev/null
+++ b/sys-boot/palo/palo-1.95.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/palo/palo-1.95.ebuild,v 1.1 2014/12/15 19:52:16 jer Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="PALO : PArisc Linux Loader"
+HOMEPAGE="http://parisc-linux.org/ https://parisc.wiki.kernel.org/"
+SRC_URI="mirror://debian/pool/main/p/${PN}/${P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~hppa"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.95-toolchain.patch
+}
+
+src_compile() {
+	local target
+	for target in '-C palo' '-C ipl' 'iplboot'; do
+		emake AR=$(tc-getAR) CC=$(tc-getCC) LD=$(tc-getLD) ${target}
+	done
+}
+
+src_install() {
+	into /
+	dosbin palo/palo
+
+	doman palo.8
+	dohtml README.html
+	dodoc Changes TODO debian/changelog
+
+	insinto /etc
+	doins "${FILESDIR}"/palo.conf
+
+	insinto /usr/share/palo
+	doins iplboot
+
+	insinto /etc/kernel/postinst.d/
+	INSOPTIONS="-m 0744" doins "${FILESDIR}"/99palo
+}
diff --git a/sys-boot/palo/palo-9999.ebuild b/sys-boot/palo/palo-9999.ebuild
index e4e482333293..0b58226aba49 100644
--- a/sys-boot/palo/palo-9999.ebuild
+++ b/sys-boot/palo/palo-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/palo/palo-9999.ebuild,v 1.6 2014/01/23 14:43:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/palo/palo-9999.ebuild,v 1.7 2014/12/15 19:52:16 jer Exp $
 
 EAPI=5
 
@@ -13,13 +13,10 @@ EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/deller/palo.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-9999-toolchain.patch
+	epatch "${FILESDIR}"/${PN}-1.95-toolchain.patch
 	sed -i lib/common.h -e '/^#define PALOVERSION/{s|".*"|"'${PV}'"|g}' || die
-	sed -i palo/Makefile -e '/^LDFLAGS=/d'  || die
 }
 
 src_compile() {