dev-libs/libtecla: Move to EAPI=4, respect LDFLAGS, #334641; fix parallel install, #377987

(Portage version: 2.2.0_alpha102/cvs/Linux x86_64)

6 files changed, 164 insertions, 3 deletions

diff --git a/dev-libs/libtecla/ChangeLog b/dev-libs/libtecla/ChangeLog
index 7004c9cd975b..c3256ab695bc 100644
--- a/dev-libs/libtecla/ChangeLog
+++ b/dev-libs/libtecla/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/libtecla
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtecla/ChangeLog,v 1.17 2010/10/14 13:44:53 xarthisius Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtecla/ChangeLog,v 1.18 2012/05/08 19:38:09 jlec Exp $
+
+*libtecla-1.6.1-r2 (08 May 2012)
+
+  08 May 2012; Justin Lecher <jlec@gentoo.org> +libtecla-1.6.1-r2.ebuild,
+  +files/libtecla-1.6.1-LDFLAGS2.patch,
+  +files/libtecla-1.6.1-parallel_build2.patch,
+  +files/libtecla-1.6.1-prll-install.patch, metadata.xml:
+  Move to EAPI=4, respect LDFLAGS, #334641; fix parallel install, #377987
 
 *libtecla-1.6.1-r1 (14 Oct 2010)
 
diff --git a/dev-libs/libtecla/files/libtecla-1.6.1-LDFLAGS2.patch b/dev-libs/libtecla/files/libtecla-1.6.1-LDFLAGS2.patch
new file mode 100644
index 000000000000..c29d3e04c48e
--- /dev/null
+++ b/dev-libs/libtecla/files/libtecla-1.6.1-LDFLAGS2.patch
@@ -0,0 +1,20 @@
+ Makefile.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index e492136..a44371a 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -165,10 +165,10 @@ CFLAGS = $(OPT) $(WARNING_FLAGS) $(DEFINES) @CFLAGS@ @SHARED_CFLAGS@
+ default: $(TARGETS)
+ 
+ normal:
+-	@$(MAKE) -f $(srcdir)/Makefile.rules TARGETS="$(TARGET_LIBS)" SUFFIX="" CFLAGS="$(CFLAGS)" CC="$(CC)" OBJDIR=normal_obj LINK_SHARED='@LINK_SHARED@' SHARED_EXT='@SHARED_EXT@' SHARED_ALT='@SHARED_ALT@' LIBS='$(LIBS)' srcdir='$(srcdir)' LIBDIR='$(LIBDIR)' LN_S='@LN_S@' DEMOS="$(DEMOS)" PROGRAMS='$(PROGRAMS)' RANLIB='$(RANLIB)' LDFLAGS=$(LDFLAGS) CPPFLAGS=$(CPPFLAGS)
++	@$(MAKE) -f $(srcdir)/Makefile.rules TARGETS="$(TARGET_LIBS)" SUFFIX="" CFLAGS="$(CFLAGS)" CC="$(CC)" OBJDIR=normal_obj LINK_SHARED='@LINK_SHARED@' SHARED_EXT='@SHARED_EXT@' SHARED_ALT='@SHARED_ALT@' LIBS='$(LIBS)' srcdir='$(srcdir)' LIBDIR='$(LIBDIR)' LN_S='@LN_S@' DEMOS="$(DEMOS)" PROGRAMS='$(PROGRAMS)' RANLIB='$(RANLIB)' LDFLAGS='$(LDFLAGS)' CPPFLAGS='$(CPPFLAGS)'
+ 
+ reentrant:
+-	@$(MAKE) -f $(srcdir)/Makefile.rules TARGETS="$(TARGET_LIBS)" SUFFIX="_r" CFLAGS="$(CFLAGS) $(DEFINES_R)" CC="$(CC)" OBJDIR=reentrant_obj LINK_SHARED='@LINK_SHARED@' SHARED_EXT='@SHARED_EXT@' SHARED_ALT='@SHARED_ALT@' LIBS='$(LIBS)' srcdir='$(srcdir)' LIBDIR='$(LIBDIR)' LN_S='@LN_S@' DEMOS="$(DEMOS)" PROGRAMS='$(PROGRAMS_R)' RANLIB='$(RANLIB)' LDFLAGS=$(LDFLAGS) CPPFLAGS=$(CPPFLAGS)
++	@$(MAKE) -f $(srcdir)/Makefile.rules TARGETS="$(TARGET_LIBS)" SUFFIX="_r" CFLAGS="$(CFLAGS) $(DEFINES_R)" CC="$(CC)" OBJDIR=reentrant_obj LINK_SHARED='@LINK_SHARED@' SHARED_EXT='@SHARED_EXT@' SHARED_ALT='@SHARED_ALT@' LIBS='$(LIBS)' srcdir='$(srcdir)' LIBDIR='$(LIBDIR)' LN_S='@LN_S@' DEMOS="$(DEMOS)" PROGRAMS='$(PROGRAMS_R)' RANLIB='$(RANLIB)' LDFLAGS='$(LDFLAGS)' CPPFLAGS='$(CPPFLAGS)'
+ 
+ demos: normal
+ 
diff --git a/dev-libs/libtecla/files/libtecla-1.6.1-parallel_build2.patch b/dev-libs/libtecla/files/libtecla-1.6.1-parallel_build2.patch
new file mode 100644
index 000000000000..3f85f5fdb854
--- /dev/null
+++ b/dev-libs/libtecla/files/libtecla-1.6.1-parallel_build2.patch
@@ -0,0 +1,36 @@
+ Makefile.rules |   16 ++++++++--------
+ 1 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.rules b/Makefile.rules
+index 0c2f1d1..a3960b5 100644
+--- a/Makefile.rules
++++ b/Makefile.rules
+@@ -53,20 +53,20 @@ libtecla.map.opt: $(srcdir)/libtecla.map
+ 
+ demos: $(DEMO_PROGS)
+ 
+-demo$(SUFFIX): $(OBJDIR)/demo.o
+-	LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) -o $@ \
++demo$(SUFFIX): $(OBJDIR)/demo.o libtecla$(SUFFIX)$(SHARED_EXT)
++	LD_RUN_PATH="$(LIBDIR)" $(CC) $(CFLAGS) -o $@ \
+  $(OBJDIR)/demo.o -L. -ltecla$(SUFFIX) $(LIBS)
+ 
+-demo2$(SUFFIX): $(OBJDIR)/demo2.o
+-	LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) -o $@ \
++demo2$(SUFFIX): $(OBJDIR)/demo2.o libtecla$(SUFFIX)$(SHARED_EXT)
++	LD_RUN_PATH="$(LIBDIR)" $(CC) $(CFLAGS) -o $@ \
+  $(OBJDIR)/demo2.o -L. -ltecla$(SUFFIX) $(LIBS)
+ 
+-demo3$(SUFFIX): $(OBJDIR)/demo3.o
+-	LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) -o $@ \
++demo3$(SUFFIX): $(OBJDIR)/demo3.o libtecla$(SUFFIX)$(SHARED_EXT)
++	LD_RUN_PATH="$(LIBDIR)" $(CC) $(CFLAGS) -o $@ \
+  $(OBJDIR)/demo3.o -L. -ltecla$(SUFFIX) $(LIBS)
+ 
+-enhance$(SUFFIX): $(OBJDIR)/enhance.o
+-	LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(LDFLAGS) $(CFLAGS) -o $@ \
++enhance$(SUFFIX): $(OBJDIR)/enhance.o libtecla$(SUFFIX)$(SHARED_EXT)
++	LD_RUN_PATH="$(LIBDIR)" $(CC) $(LDFLAGS) $(CFLAGS) -o $@ \
+  $(OBJDIR)/enhance.o -L. -ltecla$(SUFFIX) $(LIBS)
+ 
+ #-----------------------------------------------------------------------
diff --git a/dev-libs/libtecla/files/libtecla-1.6.1-prll-install.patch b/dev-libs/libtecla/files/libtecla-1.6.1-prll-install.patch
new file mode 100644
index 000000000000..1815f8571566
--- /dev/null
+++ b/dev-libs/libtecla/files/libtecla-1.6.1-prll-install.patch
@@ -0,0 +1,52 @@
+ Makefile.in |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index a44371a..dfd44b0 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -217,7 +217,7 @@ install_inc: $(INCDIR)
+ 
+ install_man: $(MANDIR) libr_man func_man prog_man misc_man file_man
+ 
+-libr_man:
++libr_man: $(MANDIR)
+ 	if test "@MAKE_MAN_PAGES@"_ = "yes"_; then \
+ 	  for template in man/libr/*.in; do \
+ 	    page=`basename "$$template" .in`; \
+@@ -225,7 +225,7 @@ libr_man:
+ 	  done ; \
+ 	fi
+ 
+-func_man:
++func_man: $(MANDIR) 
+ 	if test "@MAKE_MAN_PAGES@"_ = "yes"_; then \
+ 	  for template in man/func/*.in; do \
+ 	    page=`basename "$$template" .in`; \
+@@ -233,7 +233,7 @@ func_man:
+ 	  done ; \
+ 	fi
+ 
+-prog_man:
++prog_man: $(MANDIR)
+ 	if test "@MAKE_MAN_PAGES@"_ = "yes"_; then \
+ 	  for template in man/prog/*.in; do \
+ 	    page=`basename "$$template" .in`; \
+@@ -241,7 +241,7 @@ prog_man:
+ 	  done ; \
+ 	fi
+ 
+-misc_man:
++misc_man: $(MANDIR)
+ 	if test "@MAKE_MAN_PAGES@"_ = "yes"_; then \
+ 	  for template in man/misc/*.in; do \
+ 	    page=`basename "$$template" .in`; \
+@@ -249,7 +249,7 @@ misc_man:
+ 	  done ; \
+ 	fi
+ 
+-file_man:
++file_man: $(MANDIR)
+ 	if test "@MAKE_MAN_PAGES@"_ = "yes"_; then \
+ 	  for template in man/file/*.in; do \
+ 	    page=`basename "$$template" .in`; \
diff --git a/dev-libs/libtecla/libtecla-1.6.1-r2.ebuild b/dev-libs/libtecla/libtecla-1.6.1-r2.ebuild
new file mode 100644
index 000000000000..cde42f01c86a
--- /dev/null
+++ b/dev-libs/libtecla/libtecla-1.6.1-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtecla/libtecla-1.6.1-r2.ebuild,v 1.1 2012/05/08 19:38:09 jlec Exp $
+
+EAPI=4
+
+inherit autotools eutils flag-o-matic multilib
+
+DESCRIPTION="Tecla command-line editing library"
+HOMEPAGE="http://www.astro.caltech.edu/~mcs/tecla/"
+SRC_URI="http://www.astro.caltech.edu/~mcs/tecla/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="static-libs"
+
+DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/libtecla
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-install.patch \
+		"${FILESDIR}"/${P}-ldflags.patch \
+		"${FILESDIR}"/${P}-no-strip.patch \
+		"${FILESDIR}"/${P}-parallel_build2.patch \
+		"${FILESDIR}"/${P}-LDFLAGS2.patch \
+		"${FILESDIR}"/${P}-prll-install.patch
+	eautoreconf
+}
+
+src_compile() {
+	emake \
+		OPT="" \
+		LDFLAGS="${LDFLAGS}" \
+		LFLAGS="$(raw-ldflags)"
+}
+
+src_install() {
+	default
+	use static-libs || \
+		rm -rvf "${ED}"/usr/$(get_libdir)/*a || die
+}
diff --git a/dev-libs/libtecla/metadata.xml b/dev-libs/libtecla/metadata.xml
index b229aec85b8f..d369d068ffb8 100644
--- a/dev-libs/libtecla/metadata.xml
+++ b/dev-libs/libtecla/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+	<herd>sci</herd>
 </pkgmetadata>