ugly fix for shared building (PIC lib) but it works ... also add in hppa support while here

3 files changed, 17 insertions, 14 deletions

diff --git a/dev-libs/libedit/Manifest b/dev-libs/libedit/Manifest
index 16468d310090..438800bd3fdf 100644
--- a/dev-libs/libedit/Manifest
+++ b/dev-libs/libedit/Manifest
@@ -3,13 +3,13 @@ Hash: SHA1
 
 MD5 dd9909c8d431d328b7f97b210f957592 metadata.xml 620
 MD5 92891a4d13e3da426324d13f77fbca78 ChangeLog 359
-MD5 1c0690a5e0348aba313840062425bcd8 libedit-20040907.ebuild 754
-MD5 737f1b11b30496ab584ed7c7ca7e92a4 files/20031222-debian-to-gentoo.patch 3834
+MD5 a16056b86d0ca171f1a21085042ecd9e libedit-20040907.ebuild 818
+MD5 199385b4798d47bf1bc38042281105df files/20031222-debian-to-gentoo.patch 3892
 MD5 4c5c25a215f4345fe57b1f4158c806d2 files/digest-libedit-20040907 68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBVR0qHTu7gpaalycRAp9NAKCgpL4T7RKqH2jMnYsTXl2vO7+YfwCeOfHC
-+5YuOaxfVMAFtP0NqdJ1RJ8=
-=jQrT
+iD8DBQFBVR20HTu7gpaalycRAo/pAJsGH2tIIlQEM8qTtiFu0tpBqMnvnQCgw+oJ
+KMwAyrgDeJJzU3GMvALzZYc=
+=NNvD
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libedit/files/20031222-debian-to-gentoo.patch b/dev-libs/libedit/files/20031222-debian-to-gentoo.patch
index e2351f9b3dcc..4822f2aadf4d 100644
--- a/dev-libs/libedit/files/20031222-debian-to-gentoo.patch
+++ b/dev-libs/libedit/files/20031222-debian-to-gentoo.patch
@@ -30,7 +30,7 @@ diff -ur netbsd-cvs/Makefile libedit-20031222/Makefile
  
  AHDR=vi.h emacs.h common.h 
  ASRC=${LIBEDITDIR}/vi.c ${LIBEDITDIR}/emacs.c ${LIBEDITDIR}/common.c
-@@ -46,46 +49,54 @@
+@@ -46,46 +49,56 @@
  CLEANFILES+=	${AHDR} fcns.h help.h fcns.c help.c
  
  SUBDIR=	readline
@@ -98,12 +98,14 @@ diff -ur netbsd-cvs/Makefile libedit-20031222/Makefile
 -.include <bsd.lib.mk>
 -.include <bsd.subdir.mk>
 +.depend: vi.h emacs.h common.h fcns.h help.h help.c
++	-mkdir .a .so
 +.c.o:
-+	${CC} ${CFLAGS} -c $<
++	${CC} ${CFLAGS} -c $< -o .a/$*
++	${CC} ${CFLAGS} -fPIC -c $< -o .so/$*
 +libedit.a: ${OOBJS}
-+	ar -r $@ ${OOBJS}
++	ar -r $@ .a/*
 +libedit.so: ${OOBJS}
-+	${CC} --shared -o $@ ${OOBJS} ${LIBS}
++	${CC} --shared -o $@ .so/* ${LIBS}
 diff -ur netbsd-cvs/el.c libedit-20031222/el.c
 --- netbsd-cvs/el.c	2003-12-22 13:44:25.474909848 -0500
 +++ libedit-20031222/el.c	2003-12-22 15:00:15.545194024 -0500
diff --git a/dev-libs/libedit/libedit-20040907.ebuild b/dev-libs/libedit/libedit-20040907.ebuild
index e8f5af6d0823..1006c30aaa3d 100644
--- a/dev-libs/libedit/libedit-20040907.ebuild
+++ b/dev-libs/libedit/libedit-20040907.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/libedit-20040907.ebuild,v 1.2 2004/09/23 15:16:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/libedit-20040907.ebuild,v 1.3 2004/09/25 07:26:28 vapier Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="arm ppc x86"
+KEYWORDS="arm hppa ppc x86"
 IUSE=""
 
 DEPEND="sys-libs/ncurses
@@ -26,11 +26,12 @@ src_unpack() {
 }
 
 src_compile() {
-	emake -j1 || die
+	emake -j1 .depend || die "depend"
+	emake || die "make"
 }
 
 src_install() {
-	dolib.so libedit.so || die
-	dolib.a libedit.a || die
+	dolib.so libedit.so || die "dolib.so"
+	dolib.a libedit.a || die "dolib.a"
 	doman *.[35]
 }