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

Package-Manager: portage-2.2.0_alpha102/cvs/Linux x86_64

7 files changed, 180 insertions, 5 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/Manifest b/dev-libs/libtecla/Manifest
index 8d3b5bd452e6..f81033362b2a 100644
--- a/dev-libs/libtecla/Manifest
+++ b/dev-libs/libtecla/Manifest
@@ -1,10 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX libtecla-1.6.1-LDFLAGS.patch 795 RMD160 7ef5ec2408f218637b385b629af894b1ed7c26e1 SHA1 bdf4d730978cf809643f81d8e1a5efa2957b039b SHA256 a6e9e0bc76fbc6d4959ede12d59e3122bf2fe93a6cda084b61c462273ce8a6a6
+AUX libtecla-1.6.1-LDFLAGS2.patch 1857 RMD160 22503b38767347532280e16f74fc5ef7a0976bb5 SHA1 cb1977227f447ccc589bc06aa6a59ae5ce3b29c1 SHA256 29ae35474cc7eb3b22ff8e6257c97eab52de2108d2b95593639c69e6a5e27de7
 AUX libtecla-1.6.1-install.patch 481 RMD160 d6e2be87f8e2a50b26a4a8ce48d95c67c93d48ef SHA1 e99e83f38f2e0382d499dbe9d524ea6570791ebd SHA256 48df38c829f428ddaae27143fd121e10f304286683b557d5fd7d8fbfab6fc9fe
 AUX libtecla-1.6.1-ldflags.patch 1127 RMD160 961acb4faf7cbdfb1ca61e275403caa0cddda178 SHA1 f163b1d3c8b6e1a1d9438490ca76d80c8de5dd2f SHA256 999ef958384f58e9b604064a461341aff05d22fe09513c67411ac80a25664863
 AUX libtecla-1.6.1-no-strip.patch 562 RMD160 aa032c383e7b084cf66d0697a6a241870e67cbc7 SHA1 f75b9f34496a02ccd00420badc1ea34ddfe3ce29 SHA256 5d7baafbc6f13abf9dd38839fe7896ece9f7eed63ae81be9d25ba666fe7855b2
 AUX libtecla-1.6.1-parallel_build.patch 908 RMD160 e16aa6b577ac5dcbbfa4a492a1f7a15476b76d36 SHA1 0920475c6bf00868c66c58c901f779fd31cf8fb7 SHA256 7322db23cfd06f9c29c5abb4ec629b91ad920a8bb5c6ed4de8716e8833d2ff9a
+AUX libtecla-1.6.1-parallel_build2.patch 1484 RMD160 ff5113c11bb93aa3b4b57c0e7a174215a445bf88 SHA1 75fc7448d6ac9218ac5b00135b38d8265b069aa0 SHA256 799367e7a16fa4264507b1cdbe7aeb9ff4b85bec44d2198580c8fcb9061aa072
+AUX libtecla-1.6.1-prll-install.patch 1309 RMD160 e53316e4e03e04331810140b8f9c7c2d16e9ee59 SHA1 d2f461ff4d844c1444f38331f8d975163aa88298 SHA256 1589b62dcbd97bda7029361dbf844530416dbae195669e14ddf7e18f20667a74
 DIST libtecla-1.6.1.tar.gz 518995 RMD160 024f05583dc78bee1a686054799ce32c86890484 SHA1 99c82990e7a41050211e4a449e50e20ee511c284 SHA256 21db2947bd1415070e0462673aa9bed04610946e09169fcd63e02557b0d999a1
 EBUILD libtecla-1.6.1-r1.ebuild 1096 RMD160 b32529757863bcc3534655e7802941a46eec8f38 SHA1 f382802e26d9620ae2c410df2b31a09b771f96e0 SHA256 b966c0c7d666906a6283e8ec2e22c0552c2c8a88888bf1f6b2431da36abfab2a
+EBUILD libtecla-1.6.1-r2.ebuild 1048 RMD160 78c6015b48ddb51dff5934cd923c4896a1d888d1 SHA1 0bba62bba840a7f46e75b465ce93f7b225b9593a SHA256 d4a13f35991fa7a5114d3e6af21b3a23c7332529667af11da7cc04a2b8144522
 EBUILD libtecla-1.6.1.ebuild 1069 RMD160 c30d33353f18db112e4e117188d750f7366eb96d SHA1 fd89f7e1ff75ba5c3e15199926f61d86549fa2fb SHA256 2695c7f15d531629f2a4d2b6e2e59a6199073181878375f7aa21cc2a04d828a7
-MISC ChangeLog 2834 RMD160 d58b0e465035d21a0e869535fc432dc34519e0cf SHA1 533c0d56bd4722e8f204d0357420e43e1432179e SHA256 cfc59c7f9b37b098624f6580c52a7ce4639e68775df101af3f6d1d88541372fe
-MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
+MISC ChangeLog 3156 RMD160 8c73e69187925e4503e9e4ff37ec68efacba9948 SHA1 edb234562119136f9edd84ab0a2ec98fb03745c1 SHA256 64068e615abed934f9c1b9be0e6aa866a5a0ff9f48a14ddb64183d38fec55022
+MISC metadata.xml 157 RMD160 ed43b99e7bf8bbf62cf4e46152138ab42d3a88c5 SHA1 2182a6de0b10959aad51af2990f1a6c69e34dd97 SHA256 750cb9e46ac2b77e1adf73de43c186a8c2d2234a9c6a89d9358d0969dc5cf8ac
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREKAAYFAk+pdicACgkQgAnW8HDreRZvBwCfbjg/sa2XC8ow+P7cHGiRlB87
+uiUAn3e7h0yUhRXS53oVBTfN9l0QeezX
+=N9ux
+-----END PGP SIGNATURE-----
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>