Respect LDFLAGS wrt bug 334641. Thanks to Diego for the report. Fix parallel build, add missing dies and explicit RDEPEND. Drop old.

Package-Manager: portage-2.2_rc92/cvs/Linux x86_64

6 files changed, 91 insertions, 15 deletions

diff --git a/dev-libs/libtecla/ChangeLog b/dev-libs/libtecla/ChangeLog
index e36aa68237ed..7004c9cd975b 100644
--- a/dev-libs/libtecla/ChangeLog
+++ b/dev-libs/libtecla/ChangeLog
@@ -1,6 +1,15 @@
 # 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.16 2010/07/18 13:59:46 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtecla/ChangeLog,v 1.17 2010/10/14 13:44:53 xarthisius Exp $
+
+*libtecla-1.6.1-r1 (14 Oct 2010)
+
+  14 Oct 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  -libtecla-1.6.0-r1.ebuild, libtecla-1.6.1.ebuild,
+  +libtecla-1.6.1-r1.ebuild, +files/libtecla-1.6.1-ldflags.patch,
+  +files/libtecla-1.6.1-parallel_build.patch:
+  Respect LDFLAGS wrt bug 334641. Thanks to Diego for the report. Fix
+  parallel build, add missing dies and explicit RDEPEND. Drop old.
 
   18 Jul 2010; <nixnut@gentoo.org> libtecla-1.6.1.ebuild:
   ppc stable #325201
diff --git a/dev-libs/libtecla/Manifest b/dev-libs/libtecla/Manifest
index 69b386c63e02..8d3b5bd452e6 100644
--- a/dev-libs/libtecla/Manifest
+++ b/dev-libs/libtecla/Manifest
@@ -1,9 +1,10 @@
 AUX libtecla-1.6.1-LDFLAGS.patch 795 RMD160 7ef5ec2408f218637b385b629af894b1ed7c26e1 SHA1 bdf4d730978cf809643f81d8e1a5efa2957b039b SHA256 a6e9e0bc76fbc6d4959ede12d59e3122bf2fe93a6cda084b61c462273ce8a6a6
 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
-DIST libtecla-1.6.0.tar.gz 513586 RMD160 c8c68a30a4d8c50acb5a4801db9b025b44998773 SHA1 f7228bf9dd2e001c368a93568f35c6a28ccece73 SHA256 39398426a6bd8b023982e392b665810539688553ed9549c09f7d82fe6580497b
+AUX libtecla-1.6.1-parallel_build.patch 908 RMD160 e16aa6b577ac5dcbbfa4a492a1f7a15476b76d36 SHA1 0920475c6bf00868c66c58c901f779fd31cf8fb7 SHA256 7322db23cfd06f9c29c5abb4ec629b91ad920a8bb5c6ed4de8716e8833d2ff9a
 DIST libtecla-1.6.1.tar.gz 518995 RMD160 024f05583dc78bee1a686054799ce32c86890484 SHA1 99c82990e7a41050211e4a449e50e20ee511c284 SHA256 21db2947bd1415070e0462673aa9bed04610946e09169fcd63e02557b0d999a1
-EBUILD libtecla-1.6.0-r1.ebuild 832 RMD160 fb0a5a6ee0d0e3478a715b60bee1b11e01e092f3 SHA1 a216dbe7f59054eb49af5eeb9611496755c46157 SHA256 3f3499faa50e277ea7b5f5f58c836d7e9e5d4dae39777d7e1ede703d61979882
-EBUILD libtecla-1.6.1.ebuild 1045 RMD160 87752fcee2e565fa1c3d4d88d04f7245dc3be90b SHA1 80e9f79132821035e39272087c97fb2ad49380ae SHA256 7824c247a5ded21df9c15ba64da1f1e8cc96f3974b7833e79a2bd221a3000f24
-MISC ChangeLog 2440 RMD160 095c9deeafbedf9b0dfc4e6deef8780a0aaf458d SHA1 96e61c639401ec3aac6ffc587f744777ced517ae SHA256 f23c30dcab21c34b032b782566059a019a5cb7590de41eb99c3ea8fe91fb6cbc
+EBUILD libtecla-1.6.1-r1.ebuild 1096 RMD160 b32529757863bcc3534655e7802941a46eec8f38 SHA1 f382802e26d9620ae2c410df2b31a09b771f96e0 SHA256 b966c0c7d666906a6283e8ec2e22c0552c2c8a88888bf1f6b2431da36abfab2a
+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
diff --git a/dev-libs/libtecla/files/libtecla-1.6.1-ldflags.patch b/dev-libs/libtecla/files/libtecla-1.6.1-ldflags.patch
new file mode 100644
index 000000000000..423e8113213d
--- /dev/null
+++ b/dev-libs/libtecla/files/libtecla-1.6.1-ldflags.patch
@@ -0,0 +1,27 @@
+# add missing LDFLAGS to build system.
+# the configure script still fails to add LDFLAGS when linking
+# the libtecla shared object but since it calls ld directory 
+# LDFLAGS can't be used straight out of the box.
+
+--- libtecla/Makefile.rules
++++ libtecla/Makefile.rules
+@@ -66,7 +66,7 @@
+  $(OBJDIR)/demo3.o -L. -ltecla$(SUFFIX) $(LIBS)
+ 
+ enhance$(SUFFIX): $(OBJDIR)/enhance.o
+-	LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) -o $@ \
++	LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(LDFLAGS) $(CFLAGS) -o $@ \
+  $(OBJDIR)/enhance.o -L. -ltecla$(SUFFIX) $(LIBS)
+ 
+ #-----------------------------------------------------------------------
+--- libtecla/configure.in
++++ libtecla/configure.in
+@@ -468,7 +468,7 @@
+     VERSION_OPT=''
+   fi
+ 
+-  LINK_SHARED="$LD"' -o $$@ -soname libtecla$$(SUFFIX).so.'${MAJOR_VER}' -shared '$VERSION_OPT' $$(LIB_OBJECTS) $$(LIBS) -lc'
++  LINK_SHARED="$LD"' $$(LFLAGS) -o $$@ -soname libtecla$$(SUFFIX).so.'${MAJOR_VER}' -shared '$VERSION_OPT' $$(LIB_OBJECTS) $$(LIBS) -lc'
+   SHARED_CFLAGS="-fpic"
+ 
+ dnl Reenable the inclusion of symbols which get undefined when POSIX_C_SOURCE
diff --git a/dev-libs/libtecla/files/libtecla-1.6.1-parallel_build.patch b/dev-libs/libtecla/files/libtecla-1.6.1-parallel_build.patch
new file mode 100644
index 000000000000..846b038f713e
--- /dev/null
+++ b/dev-libs/libtecla/files/libtecla-1.6.1-parallel_build.patch
@@ -0,0 +1,26 @@
+--- Makefile.rules
++++ Makefile.rules
+@@ -53,19 +53,19 @@
+ 
+ demos: $(DEMO_PROGS)
+ 
+-demo$(SUFFIX): $(OBJDIR)/demo.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
++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
++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
++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/libtecla-1.6.0-r1.ebuild b/dev-libs/libtecla/libtecla-1.6.1-r1.ebuild
index f2d44a4fceb9..e2bd11112486 100644
--- a/dev-libs/libtecla/libtecla-1.6.0-r1.ebuild
+++ b/dev-libs/libtecla/libtecla-1.6.1-r1.ebuild
@@ -1,6 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtecla/libtecla-1.6.0-r1.ebuild,v 1.4 2009/09/23 17:24:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtecla/libtecla-1.6.1-r1.ebuild,v 1.1 2010/10/14 13:44:53 xarthisius Exp $
+
+EAPI=2
+
+inherit autotools eutils flag-o-matic
 
 DESCRIPTION="Tecla command-line editing library"
 HOMEPAGE="http://www.astro.caltech.edu/~mcs/tecla/"
@@ -8,22 +12,30 @@ SRC_URI="http://www.astro.caltech.edu/~mcs/tecla/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE=""
-DEPEND=""
+DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/libtecla
 
-src_compile() {
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-install.patch \
+		"${FILESDIR}"/${P}-ldflags.patch \
+		"${FILESDIR}"/${P}-no-strip.patch
 	# remove build directory from RPATH (see bug #119477)
 	sed -e "s|:\$\$LD_RUN_PATH:\`pwd\`||" -i Makefile.rules || \
 		die "Failed to adjust Makefile.rules"
-	econf || die
-	make || die
+	epatch "${FILESDIR}"/${P}-parallel_build.patch
+	eautoreconf
+}
+
+src_compile() {
+	emake LFLAGS="$(raw-ldflags)" || die
 }
 
 src_install() {
-	make install prefix="${D}"/usr MANDIR="${D}"/usr/share/man || die
-	dodoc CHANGES INSTALL LICENSE.TERMS PORTING README RELEASE.NOTES
+	emake DESTDIR="${D}" install || die
+	dodoc CHANGES INSTALL PORTING README RELEASE.NOTES || die
 }
diff --git a/dev-libs/libtecla/libtecla-1.6.1.ebuild b/dev-libs/libtecla/libtecla-1.6.1.ebuild
index 9f13035ebd0c..fdafa2c243b4 100644
--- a/dev-libs/libtecla/libtecla-1.6.1.ebuild
+++ b/dev-libs/libtecla/libtecla-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.ebuild,v 1.8 2010/07/18 13:59:46 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtecla/libtecla-1.6.1.ebuild,v 1.9 2010/10/14 13:44:53 xarthisius Exp $
 
 inherit eutils
 
@@ -14,6 +14,7 @@ KEYWORDS="amd64 ppc x86"
 
 IUSE=""
 DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/libtecla