From 99137f11feb22edc583aa2dc2a13243dc5e9c650 Mon Sep 17 00:00:00 2001
From: Andrew Savchenko <bircoph@gentoo.org>
Date: Wed, 13 Apr 2016 15:54:04 +0300
Subject: dev-libs/libtecla: version bump

- fix parallel build failure (bug 514506);
- update to EAPI=6;
- update rework patches so that they are suitable for upstream.

Package-Manager: portage-2.2.28
Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
---
 .../libtecla/files/libtecla-1.6.3-ldflags.patch    | 37 ++++++++++++++++++++++
 .../libtecla/files/libtecla-1.6.3-prll-build.patch |  9 ++++++
 .../files/libtecla-1.6.3-secure-runpath.patch      | 26 +++++++++++++++
 .../files/libtecla-1.6.3-static-libs.patch         | 25 +++++++++++++++
 4 files changed, 97 insertions(+)
 create mode 100644 dev-libs/libtecla/files/libtecla-1.6.3-ldflags.patch
 create mode 100644 dev-libs/libtecla/files/libtecla-1.6.3-prll-build.patch
 create mode 100644 dev-libs/libtecla/files/libtecla-1.6.3-secure-runpath.patch
 create mode 100644 dev-libs/libtecla/files/libtecla-1.6.3-static-libs.patch

(limited to 'dev-libs/libtecla/files')

diff --git a/dev-libs/libtecla/files/libtecla-1.6.3-ldflags.patch b/dev-libs/libtecla/files/libtecla-1.6.3-ldflags.patch
new file mode 100644
index 000000000000..68c9e947b987
--- /dev/null
+++ b/dev-libs/libtecla/files/libtecla-1.6.3-ldflags.patch
@@ -0,0 +1,37 @@
+--- libtecla/Makefile.rules.orig	2014-11-10 00:36:53.000000000 +0300
++++ libtecla/Makefile.rules	2016-04-13 10:37:36.234418914 +0300
+@@ -54,19 +54,19 @@
+ demos: $(DEMO_PROGS)
+ 
+ demo$(SUFFIX): $(OBJDIR)/demo.o $(TARGETS)
+-	LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) -o $@ \
++	LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \
+  $(OBJDIR)/demo.o -L. -ltecla$(SUFFIX) $(LIBS)
+ 
+ demo2$(SUFFIX): $(OBJDIR)/demo2.o $(TARGETS)
+-	LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) -o $@ \
++	LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \
+  $(OBJDIR)/demo2.o -L. -ltecla$(SUFFIX) $(LIBS)
+ 
+ demo3$(SUFFIX): $(OBJDIR)/demo3.o $(TARGETS)
+-	LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) -o $@ \
++	LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \
+  $(OBJDIR)/demo3.o -L. -ltecla$(SUFFIX) $(LIBS)
+ 
+ enhance$(SUFFIX): $(OBJDIR)/enhance.o $(TARGETS)
+-	LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) -o $@ \
++	LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \
+  $(OBJDIR)/enhance.o -L. -ltecla$(SUFFIX) $(LIBS)
+ 
+ #-----------------------------------------------------------------------
+--- libtecla/configure.in.orig	2014-11-10 01:15:29.000000000 +0300
++++ libtecla/configure.in	2016-04-13 10:32:25.916263565 +0300
+@@ -490,7 +490,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.3-prll-build.patch b/dev-libs/libtecla/files/libtecla-1.6.3-prll-build.patch
new file mode 100644
index 000000000000..89f30a6ea31a
--- /dev/null
+++ b/dev-libs/libtecla/files/libtecla-1.6.3-prll-build.patch
@@ -0,0 +1,9 @@
+--- libtecla/Makefile.rules.orig	2016-04-13 11:13:10.000000000 +0300
++++ libtecla/Makefile.rules	2016-04-13 11:17:45.628234106 +0300
+@@ -165,5 +165,5 @@
+ # Include file dependencies.
+ #-----------------------------------------------------------------------
+ 
+-$(OBJDIR)/keytab.h: $(srcdir)/keytab.h $(srcdir)/libtecla.h
++$(OBJDIR)/keytab.h: $(srcdir)/keytab.h $(srcdir)/libtecla.h $(OBJDIR)
+ 	cp $(srcdir)/keytab.h $@
diff --git a/dev-libs/libtecla/files/libtecla-1.6.3-secure-runpath.patch b/dev-libs/libtecla/files/libtecla-1.6.3-secure-runpath.patch
new file mode 100644
index 000000000000..b62104ae1d35
--- /dev/null
+++ b/dev-libs/libtecla/files/libtecla-1.6.3-secure-runpath.patch
@@ -0,0 +1,26 @@
+--- libtecla/Makefile.rules.orig	2014-11-10 00:36:53.000000000 +0300
++++ libtecla/Makefile.rules	2016-04-13 10:37:36.234418914 +0300
+@@ -54,19 +54,19 @@
+ demos: $(DEMO_PROGS)
+ 
+ demo$(SUFFIX): $(OBJDIR)/demo.o $(TARGETS)
+-	LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \
++	LD_RUN_PATH="$(LIBDIR)" $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \
+  $(OBJDIR)/demo.o -L. -ltecla$(SUFFIX) $(LIBS)
+ 
+ demo2$(SUFFIX): $(OBJDIR)/demo2.o $(TARGETS)
+-	LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \
++	LD_RUN_PATH="$(LIBDIR)" $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \
+  $(OBJDIR)/demo2.o -L. -ltecla$(SUFFIX) $(LIBS)
+ 
+ demo3$(SUFFIX): $(OBJDIR)/demo3.o $(TARGETS)
+-	LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \
++	LD_RUN_PATH="$(LIBDIR)" $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \
+  $(OBJDIR)/demo3.o -L. -ltecla$(SUFFIX) $(LIBS)
+ 
+ enhance$(SUFFIX): $(OBJDIR)/enhance.o $(TARGETS)
+-	LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \
++	LD_RUN_PATH="$(LIBDIR)" $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \
+  $(OBJDIR)/enhance.o -L. -ltecla$(SUFFIX) $(LIBS)
+ 
+ #-----------------------------------------------------------------------
diff --git a/dev-libs/libtecla/files/libtecla-1.6.3-static-libs.patch b/dev-libs/libtecla/files/libtecla-1.6.3-static-libs.patch
new file mode 100644
index 000000000000..b88940e49b8b
--- /dev/null
+++ b/dev-libs/libtecla/files/libtecla-1.6.3-static-libs.patch
@@ -0,0 +1,25 @@
+--- libtecla/configure.in.orig	2016-04-13 11:12:15.000000000 +0300
++++ libtecla/configure.in	2016-04-13 11:43:05.632287268 +0300
+@@ -426,6 +426,9 @@
+ AC_ARG_WITH(file-system, AC_HELP_STRING([--with-file-system], [Does the target have a filesystem (default=yes)]),
+  AC_DEFINE(WITHOUT_FILE_SYSTEM), )
+ 
++dnl Some users may be not interested in static libs
++AC_ARG_ENABLE([static-libs], AC_HELP_STRING([--enable-static-libs], [Enable static libs if shared libs will be also build (default=yes)]))
++
+ dnl The following bourne shell case statement is where system
+ dnl dependencies can be added.  In particular, if your system supports
+ dnl shared library creation, the following switch is the place to
+@@ -571,7 +574,11 @@
+ dnl libraries to the list of libraries to be built.
+ 
+ if test "$LINK_SHARED"_ != "_"; then
+-  TARGET_LIBS="static shared"
++    if test "$enable_static_libs"_ != "_"; then
++      TARGET_LIBS="static shared"
++    else
++      TARGET_LIBS="shared"
++    fi
+ else
+   TARGET_LIBS="static"
+   LINK_SHARED="@:"
-- 
cgit v1.2.3-65-gdbad