summaryrefslogtreecommitdiff
path: root/dev-db/cdb
diff options
context:
space:
mode:
Diffstat (limited to 'dev-db/cdb')
-rw-r--r--dev-db/cdb/Manifest6
-rw-r--r--dev-db/cdb/cdb-0.75-r4.ebuild29
-rw-r--r--dev-db/cdb/files/cdb-0.75-errno.diff4
-rw-r--r--dev-db/cdb/files/cdb-0.75-stdint.diff85
4 files changed, 55 insertions, 69 deletions
diff --git a/dev-db/cdb/Manifest b/dev-db/cdb/Manifest
index 7c7b514f2d52..19b0c3e4a3fd 100644
--- a/dev-db/cdb/Manifest
+++ b/dev-db/cdb/Manifest
@@ -1,5 +1,5 @@
-AUX cdb-0.75-errno.diff 243 BLAKE2B e0b2433529e8ade1c4802353017948fd709f47843f339d8e1f77f9c665ece80721613d2dce8c9e67b595ee03f9b7298b04f927a26ad0bf8b5e38a10836799c81 SHA512 03c64d2ab185c16d88f51aaa12d1ca06102444c3eed9d712fcd53e6b8eaeeeacbdf525d91c7fc3eb28bf88be776de4748157d596103b9fc7776a5bde05eef4c4
-AUX cdb-0.75-stdint.diff 11423 BLAKE2B 85f0c3d1b2908c001ebdb055ebe4d7a79bf16a61d1d3ce8295e17cc9c0d5f1d7859465e3dba377a2857741ef082efb621c0cb77179bc6208b35120d390b71f53 SHA512 0308d25c6f9ee3b8fc49e75a2e69c7cdbf8cca7dbf165b3a107d5e2717051f6c68df04a962456295c56e6dde97ee0777944cf406c3eb48f4b7f39ecfaf56f877
+AUX cdb-0.75-errno.diff 170 BLAKE2B 806a8f0b83fef34796705596f7e4c2896d3ef56d0209a5a181d46dbaa87268620a2d1cf4ee3ae1fa8890886d8f9db2b8c417cb51a4b9dc11802ed33f1b14c4f7 SHA512 00b39bf8cda478a3e3e5851eb7e2dd154bd547d6fdf73d3de5ca6f6ac565aca7a275b67bbde988249f4daabddbcee4ba5509cc079c2533f42268cfa5b39984cb
+AUX cdb-0.75-stdint.diff 8956 BLAKE2B af2815290b395a23cb58a48b49361aa648d461ca247f6cba5fec7dfb0634be4fa1c09e4fc11536ff22dd5c221024cd0391d714fbb7fb160b91343111cebc37ca SHA512 2589722307e4b8c9e6e010a0a452a987bf5190bbaf20ece85b54666dd6633f30c85b443bddc31e70ea4024912a3999cd7197a0ac06cf86dbaf00c8b82551ae36
DIST cdb-0.75.tar.gz 54162 BLAKE2B 7b488bf330b2aac88a1cca82a6a49e24d0fd953c77935231a31bd72cc0936a37628736b5b22ea0d58aaa77cd118976ab8aa82ccc080f99e190e3f1db5d51b622 SHA512 6faeab91a77457348b58f685e81000b83fb609691317198a06284c5c62dee1e4d6138f90be1e727021f279d740169c175a21b23c96adb39a654e3f7fafdf36c0
-EBUILD cdb-0.75-r4.ebuild 1382 BLAKE2B 0c0929b9d745ba6752f20b1a657caf709d94a7f5a5fe6bc032dee7f358fb7e3e928228644f1c66e5df847b16730c9b28400bf77c170c21d02ede878aa7feb49b SHA512 67b89a3ff8af7a19b24f4d2157375136e3c09fcd90f225218ff3290ad5cac61e648414e690f60aff7e20fb453f4a5a02b43592d9f98fefb7b593d053d01382e1
+EBUILD cdb-0.75-r4.ebuild 1371 BLAKE2B ce85ccdf6b72d50cf93df7324141bc2cc44e03effb948e761822912f2d17e1d0e87db9c8e690feeaf168e0eaebe363b6c1911dca6ce35c98b850aaae08294d76 SHA512 5c06e18686f0fddff28d955ad24a44a52b0ea6e7baeccb4766349e061d9383889dcdd42055235da088e16b38455dbefaab561421bfe10ea99e9b4f03a4eeec63
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-db/cdb/cdb-0.75-r4.ebuild b/dev-db/cdb/cdb-0.75-r4.ebuild
index a488f55a6e3d..a2dd2c71b29a 100644
--- a/dev-db/cdb/cdb-0.75-r4.ebuild
+++ b/dev-db/cdb/cdb-0.75-r4.ebuild
@@ -1,34 +1,37 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils multilib toolchain-funcs
+EAPI=7
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+inherit toolchain-funcs
DESCRIPTION="Fast, reliable, simple package for creating and reading constant databases"
HOMEPAGE="http://cr.yp.to/cdb.html"
SRC_URI="http://cr.yp.to/cdb/${P}.tar.gz"
+
LICENSE="public-domain"
SLOT="0"
-IUSE=""
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-DEPEND=">=sys-apps/sed-4
- !dev-db/tinycdb"
+DEPEND="!dev-db/tinycdb"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${P}-errno.diff
+ "${FILESDIR}"/${P}-stdint.diff
+)
+
src_prepare() {
- epatch "${FILESDIR}"/${P}-errno.diff
- epatch "${FILESDIR}"/${P}-stdint.diff
+ default
sed -i -e 's/head -1/head -n 1/g' Makefile \
|| die "sed Makefile failed"
}
src_configure() {
- echo "$(tc-getCC) ${CFLAGS} -fPIC" > conf-cc
- echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
- echo "${EPREFIX}/usr" > conf-home
+ echo "$(tc-getCC) ${CFLAGS} -fPIC" > conf-cc || die
+ echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+ echo "${EPREFIX}/usr" > conf-home || die
}
src_install() {
@@ -36,7 +39,7 @@ src_install() {
# ok so ... first off, some automakes fail at finding
# cdb.a, so install that now
- dolib *.a
+ dolib.a *.a
# then do this pretty little symlinking to solve the somewhat
# cosmetic library issue at hand
diff --git a/dev-db/cdb/files/cdb-0.75-errno.diff b/dev-db/cdb/files/cdb-0.75-errno.diff
index 5f6ac20c59c6..e037ded7aac0 100644
--- a/dev-db/cdb/files/cdb-0.75-errno.diff
+++ b/dev-db/cdb/files/cdb-0.75-errno.diff
@@ -1,5 +1,5 @@
---- error.h.orig 2003-03-29 04:18:26.000000000 -0800
-+++ error.h 2003-03-29 04:19:00.000000000 -0800
+--- a/error.h
++++ b/error.h
@@ -1,7 +1,7 @@
#ifndef ERROR_H
#define ERROR_H
diff --git a/dev-db/cdb/files/cdb-0.75-stdint.diff b/dev-db/cdb/files/cdb-0.75-stdint.diff
index eb564512075e..1775fd84f906 100644
--- a/dev-db/cdb/files/cdb-0.75-stdint.diff
+++ b/dev-db/cdb/files/cdb-0.75-stdint.diff
@@ -1,6 +1,5 @@
-diff -Naur cdb-0.75-orig/cdb.c cdb-0.75/cdb.c
---- cdb-0.75-orig/cdb.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdb.c 2009-01-16 19:46:17.000000000 +0100
+--- a/cdb.c
++++ b/cdb.c
@@ -41,7 +41,7 @@
}
}
@@ -30,9 +29,8 @@ diff -Naur cdb-0.75-orig/cdb.c cdb-0.75/cdb.c
if (!c->loop) {
u = cdb_hash(key,len);
-diff -Naur cdb-0.75-orig/cdbdump.c cdb-0.75/cdbdump.c
---- cdb-0.75-orig/cdbdump.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdbdump.c 2009-01-16 19:46:17.000000000 +0100
+--- a/cdbdump.c
++++ b/cdbdump.c
@@ -18,7 +18,7 @@
if (buffer_flush(buffer_1) == -1) die_write();
}
@@ -73,9 +71,8 @@ diff -Naur cdb-0.75-orig/cdbdump.c cdb-0.75/cdbdump.c
getnum(&eod);
while (pos < 2048) getnum(&dlen);
-diff -Naur cdb-0.75-orig/cdbget.c cdb-0.75/cdbget.c
---- cdb-0.75-orig/cdbget.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdbget.c 2009-01-16 19:46:17.000000000 +0100
+--- a/cdbget.c
++++ b/cdbget.c
@@ -27,8 +27,8 @@
{
char *key;
@@ -87,9 +84,8 @@ diff -Naur cdb-0.75-orig/cdbget.c cdb-0.75/cdbget.c
unsigned long u = 0;
if (!*argv) die_usage();
-diff -Naur cdb-0.75-orig/cdb.h cdb-0.75/cdb.h
---- cdb-0.75-orig/cdb.h 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdb.h 2009-01-16 19:46:17.000000000 +0100
+--- a/cdb.h
++++ b/cdb.h
@@ -6,26 +6,26 @@
#include "uint32.h"
@@ -128,9 +124,8 @@ diff -Naur cdb-0.75-orig/cdb.h cdb-0.75/cdb.h
extern void cdb_findstart(struct cdb *);
extern int cdb_findnext(struct cdb *,char *,unsigned int);
-diff -Naur cdb-0.75-orig/cdb_hash.c cdb-0.75/cdb_hash.c
---- cdb-0.75-orig/cdb_hash.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdb_hash.c 2009-01-16 19:46:17.000000000 +0100
+--- a/cdb_hash.c
++++ b/cdb_hash.c
@@ -2,15 +2,15 @@
#include "cdb.h"
@@ -150,9 +145,8 @@ diff -Naur cdb-0.75-orig/cdb_hash.c cdb-0.75/cdb_hash.c
h = CDB_HASHSTART;
while (len) {
-diff -Naur cdb-0.75-orig/cdb_make.c cdb-0.75/cdb_make.c
---- cdb-0.75-orig/cdb_make.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdb_make.c 2009-01-16 19:51:05.000000000 +0100
+--- a/cdb_make.c
++++ b/cdb_make.c
@@ -19,15 +19,15 @@
return seek_set(fd,c->pos);
}
@@ -198,9 +192,8 @@ diff -Naur cdb-0.75-orig/cdb_make.c cdb-0.75/cdb_make.c
u /= sizeof(struct cdb_hp);
if (memsize > u) { errno = error_nomem; return -1; }
-diff -Naur cdb-0.75-orig/cdbmake.c cdb-0.75/cdbmake.c
---- cdb-0.75-orig/cdbmake.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdbmake.c 2009-01-16 19:46:17.000000000 +0100
+--- a/cdbmake.c
++++ b/cdbmake.c
@@ -41,7 +41,7 @@
unsigned int klen;
unsigned int dlen;
@@ -210,9 +203,8 @@ diff -Naur cdb-0.75-orig/cdbmake.c cdb-0.75/cdbmake.c
int fd;
char ch;
-diff -Naur cdb-0.75-orig/cdb_make.h cdb-0.75/cdb_make.h
---- cdb-0.75-orig/cdb_make.h 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdb_make.h 2009-01-16 19:46:17.000000000 +0100
+--- a/cdb_make.h
++++ b/cdb_make.h
@@ -8,7 +8,7 @@
#define CDB_HPLIST 1000
@@ -248,9 +240,8 @@ diff -Naur cdb-0.75-orig/cdb_make.h cdb-0.75/cdb_make.h
extern int cdb_make_add(struct cdb_make *,char *,unsigned int,char *,unsigned int);
extern int cdb_make_finish(struct cdb_make *);
-diff -Naur cdb-0.75-orig/cdbstats.c cdb-0.75/cdbstats.c
---- cdb-0.75-orig/cdbstats.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdbstats.c 2009-01-16 19:46:17.000000000 +0100
+--- a/cdbstats.c
++++ b/cdbstats.c
@@ -28,7 +28,7 @@
if (buffer_flush(buffer_1small) == -1) die_write();
}
@@ -282,9 +273,8 @@ diff -Naur cdb-0.75-orig/cdbstats.c cdb-0.75/cdbstats.c
seek_pos rest;
int r;
-diff -Naur cdb-0.75-orig/cdbtest.c cdb-0.75/cdbtest.c
---- cdb-0.75-orig/cdbtest.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdbtest.c 2009-01-16 19:46:17.000000000 +0100
+--- a/cdbtest.c
++++ b/cdbtest.c
@@ -24,7 +24,7 @@
if (buffer_flush(buffer_1small) == -1) die_write();
}
@@ -316,9 +306,8 @@ diff -Naur cdb-0.75-orig/cdbtest.c cdb-0.75/cdbtest.c
seek_pos rest;
int r;
-diff -Naur cdb-0.75-orig/Makefile cdb-0.75/Makefile
---- cdb-0.75-orig/Makefile 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/Makefile 2009-01-16 19:46:17.000000000 +0100
+--- a/Makefile
++++ b/Makefile
@@ -298,13 +298,6 @@
uint32.h
./compile testzero.c
@@ -333,9 +322,8 @@ diff -Naur cdb-0.75-orig/Makefile cdb-0.75/Makefile
uint32_pack.o: \
compile uint32_pack.c uint32.h
./compile uint32_pack.c
-diff -Naur cdb-0.75-orig/TARGETS cdb-0.75/TARGETS
---- cdb-0.75-orig/TARGETS 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/TARGETS 2009-01-16 19:52:06.000000000 +0100
+--- a/TARGETS
++++ b/TARGETS
@@ -1,6 +1,5 @@
load
compile
@@ -343,9 +331,8 @@ diff -Naur cdb-0.75-orig/TARGETS cdb-0.75/TARGETS
cdbget.o
systype
makelib
-diff -Naur cdb-0.75-orig/uint32.h cdb-0.75/uint32.h
---- cdb-0.75-orig/uint32.h 1970-01-01 01:00:00.000000000 +0100
-+++ cdb-0.75/uint32.h 2009-01-16 19:46:17.000000000 +0100
+--- a/uint32.h
++++ b/uint32.h
@@ -0,0 +1,11 @@
+#ifndef UINT32_H
+#define UINT32_H
@@ -358,9 +345,8 @@ diff -Naur cdb-0.75-orig/uint32.h cdb-0.75/uint32.h
+extern void uint32_unpack_big(char *,uint32_t *);
+
+#endif
-diff -Naur cdb-0.75-orig/uint32.h1 cdb-0.75/uint32.h1
---- cdb-0.75-orig/uint32.h1 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/uint32.h1 1970-01-01 01:00:00.000000000 +0100
+--- a/uint32.h1
++++ b/uint32.h1
@@ -1,11 +0,0 @@
-#ifndef UINT32_H
-#define UINT32_H
@@ -373,9 +359,8 @@ diff -Naur cdb-0.75-orig/uint32.h1 cdb-0.75/uint32.h1
-extern void uint32_unpack_big(char *,uint32 *);
-
-#endif
-diff -Naur cdb-0.75-orig/uint32.h2 cdb-0.75/uint32.h2
---- cdb-0.75-orig/uint32.h2 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/uint32.h2 1970-01-01 01:00:00.000000000 +0100
+--- a/uint32.h2
++++ b/uint32.h2
@@ -1,11 +0,0 @@
-#ifndef UINT32_H
-#define UINT32_H
@@ -388,9 +373,8 @@ diff -Naur cdb-0.75-orig/uint32.h2 cdb-0.75/uint32.h2
-extern void uint32_unpack_big(char *,uint32 *);
-
-#endif
-diff -Naur cdb-0.75-orig/uint32_pack.c cdb-0.75/uint32_pack.c
---- cdb-0.75-orig/uint32_pack.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/uint32_pack.c 2009-01-16 19:46:17.000000000 +0100
+--- a/uint32_pack.c
++++ b/uint32_pack.c
@@ -1,6 +1,6 @@
#include "uint32.h"
@@ -408,9 +392,8 @@ diff -Naur cdb-0.75-orig/uint32_pack.c cdb-0.75/uint32_pack.c
{
s[3] = u & 255;
u >>= 8;
-diff -Naur cdb-0.75-orig/uint32_unpack.c cdb-0.75/uint32_unpack.c
---- cdb-0.75-orig/uint32_unpack.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/uint32_unpack.c 2009-01-16 19:46:17.000000000 +0100
+--- a/uint32_unpack.c
++++ b/uint32_unpack.c
@@ -1,8 +1,8 @@
#include "uint32.h"
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-12 19:04:16 +0000