From b0e746e4c8e107b98ace97a48f6268cc380214d6 Mon Sep 17 00:00:00 2001
From: Akinori Hattori <hattya@gentoo.org>
Date: Sat, 1 Jul 2017 21:48:30 +0900
Subject: dev-db/tinycdb: update patches

Package-Manager: Portage-2.3.6, Repoman-2.3.1
---
 dev-db/tinycdb/files/tinycdb-0.77-gentoo.diff | 28 ---------------------------
 dev-db/tinycdb/files/tinycdb-0.77-uclibc.diff | 15 --------------
 dev-db/tinycdb/files/tinycdb-0.77-umask.diff  | 11 -----------
 dev-db/tinycdb/files/tinycdb-gentoo.patch     | 28 +++++++++++++++++++++++++++
 dev-db/tinycdb/files/tinycdb-uclibc.patch     | 15 ++++++++++++++
 dev-db/tinycdb/files/tinycdb-umask.patch      | 11 +++++++++++
 dev-db/tinycdb/tinycdb-0.77-r2.ebuild         |  6 +++---
 7 files changed, 57 insertions(+), 57 deletions(-)
 delete mode 100644 dev-db/tinycdb/files/tinycdb-0.77-gentoo.diff
 delete mode 100644 dev-db/tinycdb/files/tinycdb-0.77-uclibc.diff
 delete mode 100644 dev-db/tinycdb/files/tinycdb-0.77-umask.diff
 create mode 100644 dev-db/tinycdb/files/tinycdb-gentoo.patch
 create mode 100644 dev-db/tinycdb/files/tinycdb-uclibc.patch
 create mode 100644 dev-db/tinycdb/files/tinycdb-umask.patch

(limited to 'dev-db')

diff --git a/dev-db/tinycdb/files/tinycdb-0.77-gentoo.diff b/dev-db/tinycdb/files/tinycdb-0.77-gentoo.diff
deleted file mode 100644
index 87ab43ff5c82..000000000000
--- a/dev-db/tinycdb/files/tinycdb-0.77-gentoo.diff
+++ /dev/null
@@ -1,28 +0,0 @@
---- tinycdb-0.77.orig/Makefile
-+++ tinycdb-0.77/Makefile
-@@ -34,7 +34,7 @@
- CDB_USELIB = $(LIB)
- NSS_USELIB = $(PICLIB)
- LIBMAP = $(LIBBASE).map
--INSTALLPROG = cdb
-+INSTALLPROG = cdb-shared
- 
- # The following assumes GNU CC/LD -
- # used for building shared libraries only
-@@ -59,7 +59,7 @@
-  ChangeLog NEWS
- DEBIANFILES = debian/control debian/rules debian/copyright debian/changelog
- 
--all: static
-+all: shared
- static: staticlib cdb
- staticlib: $(LIB)
- nss: $(NSS_CDB)
-@@ -128,6 +128,7 @@
- 
- do_install = \
-  while [ "$$1" ] ; do \
-+   if [ ! -f $$1 ]; then shift 4; continue; fi; \
-    if [ .$$4 = .- ]; then f=$$1; else f=$$4; fi; \
-    d=$(DESTDIR)$$3 ; echo installing $$1 to $$d/$$f; \
-    [ -d $$d ] || mkdir -p $$d || exit 1 ; \
diff --git a/dev-db/tinycdb/files/tinycdb-0.77-uclibc.diff b/dev-db/tinycdb/files/tinycdb-0.77-uclibc.diff
deleted file mode 100644
index 52240931e091..000000000000
--- a/dev-db/tinycdb/files/tinycdb-0.77-uclibc.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- tinycdb-0.77.orig/cdb.c
-+++ tinycdb-0.77/cdb.c
-@@ -31,6 +31,12 @@
- # define HAVE_PROGRAM_INVOCATION_SHORT_NAME
- #endif
-
-+#ifdef __UCLIBC__
-+# ifndef __UCLIBC_HAS_PROGRAM_INVOCATION_NAME__
-+#  undef HAVE_PROGRAM_INVOCATION_SHORT_NAME
-+# endif
-+#endif
-+
- #ifdef HAVE_PROGRAM_INVOCATION_SHORT_NAME
- # define progname program_invocation_short_name
- #else
diff --git a/dev-db/tinycdb/files/tinycdb-0.77-umask.diff b/dev-db/tinycdb/files/tinycdb-0.77-umask.diff
deleted file mode 100644
index 2a53babb2510..000000000000
--- a/dev-db/tinycdb/files/tinycdb-0.77-umask.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cdb.c
-+++ b/cdb.c
-@@ -21,6 +21,8 @@
- #include <stdarg.h>
- #include <fcntl.h>
- #include <errno.h>
-+#include <sys/types.h> /* umask() */
-+#include <sys/stat.h>  /* umask() */
- #include "cdb.h"
- 
- #ifndef EPROTO
diff --git a/dev-db/tinycdb/files/tinycdb-gentoo.patch b/dev-db/tinycdb/files/tinycdb-gentoo.patch
new file mode 100644
index 000000000000..e8406b647d4b
--- /dev/null
+++ b/dev-db/tinycdb/files/tinycdb-gentoo.patch
@@ -0,0 +1,28 @@
+--- a/Makefile
++++ b/Makefile
+@@ -34,7 +34,7 @@
+ CDB_USELIB = $(LIB)
+ NSS_USELIB = $(PICLIB)
+ LIBMAP = $(LIBBASE).map
+-INSTALLPROG = cdb
++INSTALLPROG = cdb-shared
+ 
+ # The following assumes GNU CC/LD -
+ # used for building shared libraries only
+@@ -59,7 +59,7 @@
+  ChangeLog NEWS
+ DEBIANFILES = debian/control debian/rules debian/copyright debian/changelog
+ 
+-all: static
++all: shared
+ static: staticlib cdb
+ staticlib: $(LIB)
+ nss: $(NSS_CDB)
+@@ -128,6 +128,7 @@
+ 
+ do_install = \
+  while [ "$$1" ] ; do \
++   if [ ! -f $$1 ]; then shift 4; continue; fi; \
+    if [ .$$4 = .- ]; then f=$$1; else f=$$4; fi; \
+    d=$(DESTDIR)$$3 ; echo installing $$1 to $$d/$$f; \
+    [ -d $$d ] || mkdir -p $$d || exit 1 ; \
diff --git a/dev-db/tinycdb/files/tinycdb-uclibc.patch b/dev-db/tinycdb/files/tinycdb-uclibc.patch
new file mode 100644
index 000000000000..14e56bd7b6fc
--- /dev/null
+++ b/dev-db/tinycdb/files/tinycdb-uclibc.patch
@@ -0,0 +1,15 @@
+--- a/cdb.c
++++ b/cdb.c
+@@ -31,6 +31,12 @@
+ # define HAVE_PROGRAM_INVOCATION_SHORT_NAME
+ #endif
+
++#ifdef __UCLIBC__
++# ifndef __UCLIBC_HAS_PROGRAM_INVOCATION_NAME__
++#  undef HAVE_PROGRAM_INVOCATION_SHORT_NAME
++# endif
++#endif
++
+ #ifdef HAVE_PROGRAM_INVOCATION_SHORT_NAME
+ # define progname program_invocation_short_name
+ #else
diff --git a/dev-db/tinycdb/files/tinycdb-umask.patch b/dev-db/tinycdb/files/tinycdb-umask.patch
new file mode 100644
index 000000000000..2a53babb2510
--- /dev/null
+++ b/dev-db/tinycdb/files/tinycdb-umask.patch
@@ -0,0 +1,11 @@
+--- a/cdb.c
++++ b/cdb.c
+@@ -21,6 +21,8 @@
+ #include <stdarg.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#include <sys/types.h> /* umask() */
++#include <sys/stat.h>  /* umask() */
+ #include "cdb.h"
+ 
+ #ifndef EPROTO
diff --git a/dev-db/tinycdb/tinycdb-0.77-r2.ebuild b/dev-db/tinycdb/tinycdb-0.77-r2.ebuild
index b615360a339e..937f5d7f3fe1 100644
--- a/dev-db/tinycdb/tinycdb-0.77-r2.ebuild
+++ b/dev-db/tinycdb/tinycdb-0.77-r2.ebuild
@@ -18,9 +18,9 @@ RESTRICT="test"
 RDEPEND="!dev-db/cdb"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.diff
-	epatch "${FILESDIR}"/${P}-umask.diff
-	epatch "${FILESDIR}"/${P}-uclibc.diff
+	epatch "${FILESDIR}"/${PN}-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-umask.patch
+	epatch "${FILESDIR}"/${PN}-uclibc.patch
 	# fix multilib support
 	sed -i "/^libdir/s:/lib:/$(get_libdir):" Makefile
 }
-- 
cgit v1.2.3-65-gdbad