diff options
| -rw-r--r-- | dev-libs/libedit/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-libs/libedit/files/digest-libedit-20061103-r2 | 3 | ||||
| -rw-r--r-- | dev-libs/libedit/files/libedit-20061103-freebsd.patch | 7 | ||||
| -rw-r--r-- | dev-libs/libedit/libedit-20061103-r2.ebuild | 53 |
4 files changed, 69 insertions, 2 deletions
diff --git a/dev-libs/libedit/ChangeLog b/dev-libs/libedit/ChangeLog index 5a9a17d73cd4..b31d52664ac5 100644 --- a/dev-libs/libedit/ChangeLog +++ b/dev-libs/libedit/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/libedit # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/ChangeLog,v 1.23 2007/06/14 11:29:22 fmccor Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/ChangeLog,v 1.24 2007/07/21 01:48:26 uberlord Exp $ + +*libedit-20061103-r2 (21 Jul 2007) + + 21 Jul 2007; Roy Marples <uberlord@gentoo.org> + files/libedit-20061103-freebsd.patch, +libedit-20061103-r2.ebuild: + Don't define get_alias_text on FreeBSD until our sh supports it. 14 Jun 2007; Ferris McCormick <fmccor@gentoo.org> libedit-20061103-r1.ebuild: diff --git a/dev-libs/libedit/files/digest-libedit-20061103-r2 b/dev-libs/libedit/files/digest-libedit-20061103-r2 new file mode 100644 index 000000000000..cc5a3bd4a954 --- /dev/null +++ b/dev-libs/libedit/files/digest-libedit-20061103-r2 @@ -0,0 +1,3 @@ +MD5 54f47c091e20563c3281684f4719a106 libedit-20061103.tar.bz2 97032 +RMD160 8c15895dedd69d979c8d911803246808c12ea198 libedit-20061103.tar.bz2 97032 +SHA256 11542988eeed1fbe23b8b421389dbd37fb0cedb1d7c76b49399163be27eacf3f libedit-20061103.tar.bz2 97032 diff --git a/dev-libs/libedit/files/libedit-20061103-freebsd.patch b/dev-libs/libedit/files/libedit-20061103-freebsd.patch index dea35d4e122c..f9e3aba77141 100644 --- a/dev-libs/libedit/files/libedit-20061103-freebsd.patch +++ b/dev-libs/libedit/files/libedit-20061103-freebsd.patch @@ -1,3 +1,8 @@ +OK, FreeBSD sh does not define get_alias_text and until it does we need +to NOT define the __weak_reference for it here. +According to bug #157407 this will break heimdal and thunderbird. +Tough, as our /bin/sh is more important at this time. + Index: work/netbsd-cvs/sys.h =================================================================== --- work.orig/netbsd-cvs/sys.h @@ -8,7 +13,7 @@ Index: work/netbsd-cvs/sys.h +#ifdef __FreeBSD__ +# undef __weak_reference -+# define __weak_reference(x) __attribute__((__weakref__)) ++/* # define __weak_reference(x) __attribute__((__weakref__)) */ +#endif + #if !defined(__attribute__) && (defined(__cplusplus) || !defined(__GNUC__) || __GNUC__ == 2 && __GNUC_MINOR__ < 8) diff --git a/dev-libs/libedit/libedit-20061103-r2.ebuild b/dev-libs/libedit/libedit-20061103-r2.ebuild new file mode 100644 index 000000000000..ddbe744901aa --- /dev/null +++ b/dev-libs/libedit/libedit-20061103-r2.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/libedit-20061103-r2.ebuild,v 1.1 2007/07/21 01:48:26 uberlord Exp $ + +inherit eutils toolchain-funcs + +DESCRIPTION="BSD replacement for libreadline" +HOMEPAGE="http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libedit/" +SRC_URI="mirror://gentoo/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="elibc_glibc" + +DEPEND="sys-libs/ncurses + !<=sys-freebs/freebsd-lib-6.2_rc1" + +S=${WORKDIR}/netbsd-cvs + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${PN}-20061103-debian-to-gentoo.patch + + if use elibc_glibc; then + mv "${WORKDIR}"/glibc-*/*.c . + epatch "${FILESDIR}/${P}-glibc.patch" + fi + + # FreeBSD's __weak_reference macro differs from NetBSD's + epatch "${FILESDIR}/${P}-freebsd.patch" +} + +src_compile() { + emake -j1 .depend || die "depend" + emake || die "make" +} + +src_install() { + into / + dolib.so libedit.so || die "dolib.so" + into /usr + dolib.a libedit.a || die "dolib.a" + insinto /usr/include + doins histedit.h || die "doins histedit.h" + insinto /usr/include/libedit + doins readline/readline.h || die "doins readline.h" + doman *.[35] + + gen_usr_ldscript libedit.so +} |