Bump for #331557

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

2 files changed, 73 insertions, 0 deletions

diff --git a/dev-db/kyotocabinet/files/fix_rpath-1.2.4.patch b/dev-db/kyotocabinet/files/fix_rpath-1.2.4.patch
new file mode 100644
index 000000000000..ac3c8f840d04
--- /dev/null
+++ b/dev-db/kyotocabinet/files/fix_rpath-1.2.4.patch
@@ -0,0 +1,61 @@
+diff --git a/Makefile.in b/Makefile.in
+index 4ac046d..c757dfa 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -53,8 +53,8 @@ CXXFLAGS = @MYCXXFLAGS@
+ LDFLAGS = @MYLDFLAGS@
+ CMDLDFLAGS = @MYCMDLDFLAGS@
+ LIBS = @LIBS@
+-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@
+-RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@
++LDENV = 
++RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR)
+ POSTCMD = @MYPOSTCMD@
+ 
+ 
+diff --git a/configure.in b/configure.in
+index ad63005..f0448d6 100644
+--- a/configure.in
++++ b/configure.in
+@@ -34,27 +34,17 @@ MYDOCUMENTFILES="COPYING ChangeLog doc kyotocabinet.idl"
+ MYPCFILES="kyotocabinet.pc"
+ 
+ # Building flags
+-MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -O2"
++MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char"
+ MYCXXFLAGS="-Wall -fPIC -fsigned-char -O2"
+-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include"
++MYCPPFLAGS="-I. -I\$(INCLUDEDIR)"
+ MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1"
+ MYCPPFLAGS="$MYCPPFLAGS -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D__EXTENSIONS__"
+-MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib"
++MYLDFLAGS="-L. -L\$(LIBDIR)"
+ MYCMDLDFLAGS=""
+ MYRUNPATH="\$(LIBDIR)"
+ MYLDLIBPATHENV="LD_LIBRARY_PATH"
+ MYPOSTCMD="true"
+ 
+-# Building paths
+-PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
+-PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb"
+-CPATH="$HOME/include:/usr/local/include:$CPATH"
+-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
+-export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH
+-
+-
+ 
+ #================================================================
+ # Options
+diff --git a/kyotocabinet.pc.in b/kyotocabinet.pc.in
+index f21c87b..718f2d8 100644
+--- a/kyotocabinet.pc.in
++++ b/kyotocabinet.pc.in
+@@ -10,5 +10,5 @@ datadir=@datadir@
+ Name: Kyoto Cabinet
+ Description: another modern implementation of DBM
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lkyotocabinet @LIBS@
++Libs: -L${libdir} -lkyotocabinet
+ Cflags: -I${includedir}
diff --git a/dev-db/kyotocabinet/files/remove_ldconfig-1.2.4.patch b/dev-db/kyotocabinet/files/remove_ldconfig-1.2.4.patch
new file mode 100644
index 000000000000..8436a2648fbc
--- /dev/null
+++ b/dev-db/kyotocabinet/files/remove_ldconfig-1.2.4.patch
@@ -0,0 +1,12 @@
+diff --git a/Makefile.in b/Makefile.in
+index 6754032..b1f9055 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -123,7 +123,6 @@ install :
+ 	cd man && cp -Rf $(MAN1FILES) $(DESTDIR)$(MAN1DIR)
+ 	mkdir -p $(DESTDIR)$(PCDIR)
+ 	cp -Rf $(PCFILES) $(DESTDIR)$(PCDIR)
+-	-[ "$$UID" = 0 ] && PATH=/sbin:/usr/sbin:$(PATH) ldconfig 2>/dev/null || true
+ 	@printf '\n'
+ 	@printf '#================================================================\n'
+ 	@printf '# Thanks for using Kyoto Cabinet.\n'
\ No newline at end of file