Version bump (masked for haskell testing)

(Portage version: 2.2_rc23/cvs/Linux x86_64)

4 files changed, 72 insertions, 3 deletions

diff --git a/dev-libs/libedit/ChangeLog b/dev-libs/libedit/ChangeLog
index 5145271086fc..86861a314777 100644
--- a/dev-libs/libedit/ChangeLog
+++ b/dev-libs/libedit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libedit
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/ChangeLog,v 1.25 2009/01/04 22:15:44 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/ChangeLog,v 1.26 2009/03/07 12:47:17 drizzt Exp $
+
+*libedit-20090111.3.0 (07 Mar 2009)
+
+  07 Mar 2009; Timothy Redaelli <drizzt@gentoo.org>
+  +files/libedit-20090111-3.0-weak_reference.patch, libedit-20061103.ebuild,
+  +libedit-20090111.3.0.ebuild:
+  Version bump (masked for haskell testing)
 
   04 Jan 2009; Christoph Mende <angelos@gentoo.org>
   +files/libedit-20061103-ldflags.patch, libedit-20061103.ebuild,
diff --git a/dev-libs/libedit/files/libedit-20090111-3.0-weak_reference.patch b/dev-libs/libedit/files/libedit-20090111-3.0-weak_reference.patch
new file mode 100644
index 000000000000..79fd7bd3feda
--- /dev/null
+++ b/dev-libs/libedit/files/libedit-20090111-3.0-weak_reference.patch
@@ -0,0 +1,24 @@
+Patch from FreeBSD to fix __weak_reference
+
+--- src/vi.c.orig	Sun Feb  4 11:49:12 2007
++++ src/vi.c	Sun Feb  4 11:51:31 2007
+@@ -915,16 +915,15 @@
+  * NB: posix implies that we should enter insert mode, however
+  * this is against historical precedent...
+  */
+-#ifdef __weak_reference
+-extern char *get_alias_text(const char *) __weak_reference(get_alias_text);
+-#endif
+ protected el_action_t
+ /*ARGSUSED*/
+ vi_alias(EditLine *el, int c)
+ {
+-#ifdef __weak_reference
++#ifdef __weak_extern
+ 	char alias_name[3];
+ 	char *alias_text;
++	extern char *get_alias_text(const char *);
++	__weak_extern(get_alias_text);
+ 
+ 	if (get_alias_text == 0) {
+ 		return CC_ERROR;
diff --git a/dev-libs/libedit/libedit-20061103.ebuild b/dev-libs/libedit/libedit-20061103.ebuild
index d88ea9804f90..c81831ae9886 100644
--- a/dev-libs/libedit/libedit-20061103.ebuild
+++ b/dev-libs/libedit/libedit-20061103.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/libedit-20061103.ebuild,v 1.4 2009/01/04 22:15:44 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/libedit-20061103.ebuild,v 1.5 2009/03/07 12:47:17 drizzt Exp $
 
 inherit eutils toolchain-funcs
 
 DESCRIPTION="BSD replacement for libreadline"
-HOMEPAGE="http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libedit/"
+HOMEPAGE="http://www.thrysoee.dk/editline/ http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libedit/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD"
diff --git a/dev-libs/libedit/libedit-20090111.3.0.ebuild b/dev-libs/libedit/libedit-20090111.3.0.ebuild
new file mode 100644
index 000000000000..ef584248c1ca
--- /dev/null
+++ b/dev-libs/libedit/libedit-20090111.3.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/libedit-20090111.3.0.ebuild,v 1.1 2009/03/07 12:47:17 drizzt Exp $
+
+inherit eutils toolchain-funcs versionator
+
+MY_PV=$(get_major_version)-$(get_after_major_version)
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="BSD replacement for libreadline."
+HOMEPAGE="http://www.thrysoee.dk/editline/"
+SRC_URI="http://www.thrysoee.dk/editline/${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86-fbsd"
+IUSE=""
+
+DEPEND="sys-libs/ncurses
+	!<=sys-freebsd/freebsd-lib-6.2_rc1"
+
+RDEPEND=${DEPEND}
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${MY_P}-weak_reference.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	gen_usr_ldscript -a edit
+}