summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2020-09-17 17:36:33 +0200
committerDavid Seifert <soap@gentoo.org>2020-09-17 17:36:33 +0200
commit2d1565c671c36b6a6da9c89fa5fad0a12f3d37e1 (patch)
tree48a9c6d01d9a19ca482d667b2c4cccba7a950b64
parentwww-apps/blazeblogger: Port to EAPI 7 (diff)
downloadgentoo-2d1565c671c36b6a6da9c89fa5fad0a12f3d37e1.tar.gz
gentoo-2d1565c671c36b6a6da9c89fa5fad0a12f3d37e1.tar.bz2
gentoo-2d1565c671c36b6a6da9c89fa5fad0a12f3d37e1.zip
sys-libs/libixp: Port to EAPI 7
Closes: https://bugs.gentoo.org/706752 Closes: https://bugs.gentoo.org/732248 Closes: https://bugs.gentoo.org/740914 Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: David Seifert <soap@gentoo.org>
-rw-r--r--sys-libs/libixp/files/libixp-0.5_p20110208-gentoo.patch40
-rw-r--r--sys-libs/libixp/libixp-0.5_p20110208-r3.ebuild37
2 files changed, 56 insertions, 21 deletions
diff --git a/sys-libs/libixp/files/libixp-0.5_p20110208-gentoo.patch b/sys-libs/libixp/files/libixp-0.5_p20110208-gentoo.patch
new file mode 100644
index 00000000000..dbe101acef8
--- /dev/null
+++ b/sys-libs/libixp/files/libixp-0.5_p20110208-gentoo.patch
@@ -0,0 +1,40 @@
+--- a/cmd/ixpc.c
++++ b/cmd/ixpc.c
+@@ -10,6 +10,8 @@
+ #include <unistd.h>
+ #include <ixp_local.h>
+
++char *argv0;
++
+ /* Temporary */
+ #define fatal(...) ixp_eprint("ixpc: fatal: " __VA_ARGS__); \
+
+--- a/include/ixp.h
++++ b/include/ixp.h
+@@ -66,13 +66,13 @@
+
+ typedef unsigned char uchar;
+ typedef uint16_t ushort;
+-typedef uint32_t ulong;
++typedef unsigned long ulong;
+ typedef uint64_t uvlong;
+
+ typedef int64_t vlong;
+
+ # define respond ixp_respond
+-# define serve_9pcon ixp_serve9pconn
++# define serve_9pcon ixp_serve9conn
+ #endif
+
+ #undef uint
+--- a/include/ixp_local.h
++++ b/include/ixp_local.h
+@@ -12,7 +12,7 @@
+ typedef char* va_list;
+ #endif
+
+-char *argv0;
++extern char *argv0;
+ #define ARGBEGIN \
+ int _argtmp=0, _inargv=0; char *_argv=nil; \
+ if(!argv0) {argv0=*argv; argv++, argc--;} \
diff --git a/sys-libs/libixp/libixp-0.5_p20110208-r3.ebuild b/sys-libs/libixp/libixp-0.5_p20110208-r3.ebuild
index 8c7dc645c04..bd8a54c6e05 100644
--- a/sys-libs/libixp/libixp-0.5_p20110208-r3.ebuild
+++ b/sys-libs/libixp/libixp-0.5_p20110208-r3.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# hg clone https://hg.suckless.org/libixp
+EAPI=7
-EAPI=4
-inherit multilib toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="A stand-alone client/server 9P library including ixpc client"
HOMEPAGE="https://libs.suckless.org/deprecated/libixp"
@@ -13,29 +12,25 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-RDEPEND=""
-DEPEND="app-arch/xz-utils"
+PATCHES=(
+ # https://code.google.com/p/libixp/issues/detail?id=2
+ # https://code.google.com/p/wmii/issues/detail?id=247
+ # https://bugs.gentoo.org/393299
+ "${FILESDIR}"/${P}-gentoo.patch
+)
-pkg_setup() {
+src_configure() {
myixpconf=(
- PREFIX="/usr"
- LIBDIR="/usr/$(get_libdir)"
+ PREFIX="${EPREFIX}"/usr
+ LIBDIR="${EPREFIX}"/usr/$(get_libdir)
+ LIBS=
CC="$(tc-getCC) -c"
LD="$(tc-getCC) ${LDFLAGS}"
AR="$(tc-getAR) crs"
- MAKESO="1"
+ MAKESO=1
SOLDFLAGS="-shared"
- )
-}
-
-src_prepare() {
- # https://code.google.com/p/libixp/issues/detail?id=2
- sed -i -e 's:ixp_serve9pconn:ixp_serve9conn:' include/ixp.h || die
-
- # https://bugs.gentoo.org/393299 https://code.google.com/p/wmii/issues/detail?id=247
- sed -i -e '69s:uint32_t:unsigned long:' include/ixp.h || die
+ )
}
src_compile() {
@@ -45,5 +40,5 @@ src_compile() {
src_install() {
emake "${myixpconf[@]}" DESTDIR="${D}" install
dolib.so lib/libixp{,_pthread}.so
- dodoc NEWS
+ einstalldocs
}