From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- dev-libs/9libs/9libs-1.0-r3.ebuild | 46 +++++++++++++ dev-libs/9libs/Manifest | 4 ++ dev-libs/9libs/files/9libs-va_list.patch | 115 +++++++++++++++++++++++++++++++ dev-libs/9libs/metadata.xml | 5 ++ 4 files changed, 170 insertions(+) create mode 100644 dev-libs/9libs/9libs-1.0-r3.ebuild create mode 100644 dev-libs/9libs/Manifest create mode 100644 dev-libs/9libs/files/9libs-va_list.patch create mode 100644 dev-libs/9libs/metadata.xml (limited to 'dev-libs/9libs') diff --git a/dev-libs/9libs/9libs-1.0-r3.ebuild b/dev-libs/9libs/9libs-1.0-r3.ebuild new file mode 100644 index 000000000000..608cb956d74a --- /dev/null +++ b/dev-libs/9libs/9libs-1.0-r3.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +inherit eutils toolchain-funcs + +DESCRIPTION="A package of Plan 9 compatibility libraries" +HOMEPAGE="http://www.netlib.org/research/9libs/9libs-1.0.README" +SRC_URI="ftp://www.netlib.org/research/9libs/${P}.tar.bz2" + +LICENSE="PLAN9" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND=" + >=x11-libs/libX11-1.0.0 + >=x11-libs/libXt-1.0.0" +RDEPEND="${DEPEND}" + +src_prepare() { + # Bug 385387 + epatch "${FILESDIR}/${PN}-va_list.patch" +} + +src_configure() { + econf \ + --includedir=/usr/include/9libs \ + --enable-shared +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + make install DESTDIR="${D}" + dodoc README + + # rename some man pages to avoid collisions with dev-libs/libevent + local f + for f in add balloc bitblt cachechars event frame graphics rgbpix; do + mv "${D}"/usr/share/man/man3/${f}.{3,3g} || die + done +} diff --git a/dev-libs/9libs/Manifest b/dev-libs/9libs/Manifest new file mode 100644 index 000000000000..96d95f1a89ed --- /dev/null +++ b/dev-libs/9libs/Manifest @@ -0,0 +1,4 @@ +AUX 9libs-va_list.patch 2819 BLAKE2B 641d1a22c9feecb635d470c072ee28fb4e3fd0fb54d2db3c667bf6907d38f4928cc951057df1b1dc2bc0dd4c98d2d5ff16d1b94243df9db1d96d2f52608db804 SHA512 3c441f0bca520baebe06b63e099ee4ba138257c40d3870894c910173379f0d1e52f1627e984ceac61dca76ec68ac68e75cffa919895cebd4b38d09e12f271783 +DIST 9libs-1.0.tar.bz2 163744 BLAKE2B 3cc984ff83ff48969148f8fb3b78e6b85b32280634e99f552c869e650d4893a18ea2164c10ea7662a704c7d55a49bf7434caa219c3a716637895d1f3df4d2ad8 SHA512 35fdd874dbf9aca07e681d7c3f707d22a45cc8cadb2c273a1fbc5f8303886a6b512eb16fc1b81d64d7f665b16a3b19a8d678a540cd4ad453de853b90905d98d2 +EBUILD 9libs-1.0-r3.ebuild 934 BLAKE2B 11a106a9b6663c7f567c031c8d4d65b78da2983710f21b988552bc8279b09999c89b6249ea4e731b1afef10af2f9a5bf11864fe45b50d4b440e8af4d1873bde2 SHA512 e5961649f168af6f64088c3021e4ccb91cb1f2aa969aa1fab57a396a5c06f65fbf3ac5ff6b78d68893104a196f90471ad8ac22ab031fd56979a41b75ef30fc90 +MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/dev-libs/9libs/files/9libs-va_list.patch b/dev-libs/9libs/files/9libs-va_list.patch new file mode 100644 index 000000000000..eb8da368de3a --- /dev/null +++ b/dev-libs/9libs/files/9libs-va_list.patch @@ -0,0 +1,115 @@ +diff -ru 9libs-1.0/include/libc.h 9libs-1.0-fixed/include/libc.h +--- 9libs-1.0/include/libc.h 1998-11-10 22:35:27.000000000 +0000 ++++ 9libs-1.0-fixed/include/libc.h 2011-10-02 13:27:38.000000000 +0100 +@@ -57,14 +57,14 @@ + extern int fprint(int, char *, ...); + extern int sprint(char *, char *, ...); + extern int snprint(char *, int, char *, ...); +-extern int fmtinstall(int, int (*)(void *, Fconv *)); ++extern int fmtinstall(int, int (*)(va_list, Fconv *)); + extern void strconv(char *, Fconv *); + #if defined(PRINT_RUNES) + extern void Strconv(Rune *, Fconv *); + #endif +-extern int numbconv(void *, Fconv *); ++extern int numbconv(va_list, Fconv *); + extern int fltconv(double, Fconv *); +-extern char * doprint(char *, char *, char *, void *); ++extern char * doprint(char *, char *, char *, va_list); + + /* + * argument parsing - lifted from tcs +diff -ru 9libs-1.0/libplan9c/doprint.c 9libs-1.0-fixed/libplan9c/doprint.c +--- 9libs-1.0/libplan9c/doprint.c 1998-11-10 22:35:28.000000000 +0000 ++++ 9libs-1.0-fixed/libplan9c/doprint.c 2011-10-02 13:30:25.000000000 +0100 +@@ -73,12 +73,12 @@ + 0, 0, 0, 0, 0, 0, 0, 0, + }; + +-static int (*fmtfns[16])(void *, Fconv *) = { ++static int (*fmtfns[16])(va_list, Fconv *) = { + numbconv, + }; + + int +-fmtinstall(int c, int (*f)(void *, Fconv *)) ++fmtinstall(int c, int (*f)(va_list, Fconv *)) + { + int i; + +@@ -95,9 +95,8 @@ + } + + char * +-doprint(char *s, char *es, char *format, void *argp) ++doprint(char *s, char *es, char *format, va_list ap) + { +- va_list ap = argp; + int c; + int percent = 0; + int dot = 0; +@@ -218,7 +217,6 @@ + if (r < 0) + f.f3 |= ~r; + else { +- ap += r; + s = f.out; + percent = 0; + } +@@ -287,13 +285,12 @@ + #endif + + int +-numbconv(void *o, Fconv *fp) ++numbconv(va_list ap, Fconv *fp) + { + static char digits[16] = "0123456789abcdef"; + char buf[80]; /* arbitrary limit. enough digits, but no limit on f2 */ + char *s = buf+sizeof(buf)-1; + char sign = 0; +- va_list ap = o; + int uc = 0; + unsigned long u; + +@@ -362,5 +359,5 @@ + break; + } + strconv(s, fp); +- return ap-(va_list)o; ++ return 0; + } +diff -ru 9libs-1.0/libplan9c/tdp.c 9libs-1.0-fixed/libplan9c/tdp.c +--- 9libs-1.0/libplan9c/tdp.c 1998-11-10 22:35:28.000000000 +0000 ++++ 9libs-1.0-fixed/libplan9c/tdp.c 2011-10-02 13:31:58.000000000 +0100 +@@ -122,27 +122,25 @@ + } Rectangle; + + int +-Pconv(void *v, Fconv *fp) ++Pconv(va_list ap, Fconv *fp) + { + char str[50]; +- va_list ap = v; + Point *p = va_arg(ap, Point *); + + sprint(str, "(%d,%d)", p->x, p->y); + strconv(str, fp); +- return ap-(va_list)v; ++ return 0; + } + + int +-Rconv(void *v, Fconv *fp) ++Rconv(va_list ap, Fconv *fp) + { + char str[50]; +- va_list ap = v; + Rectangle *r = va_arg(ap, Rectangle *); + + sprint(str, "(%P,%P)", &r->min, &r->max); + strconv(str, fp); +- return ap-(va_list)v; ++ return 0; + } + + int diff --git a/dev-libs/9libs/metadata.xml b/dev-libs/9libs/metadata.xml new file mode 100644 index 000000000000..6f49eba8f496 --- /dev/null +++ b/dev-libs/9libs/metadata.xml @@ -0,0 +1,5 @@ + + + + + -- cgit v1.2.3