Change typedef of ulong from uint32_t to unsigned long wrt #393299 to make libixp compatible with x11-wm/wmii-3.9.2 on x86_64 wrt #393299 by Luíza D. Utsch and others

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

2 files changed, 60 insertions, 2 deletions

diff --git a/sys-libs/libixp/ChangeLog b/sys-libs/libixp/ChangeLog
index ef9952414cd6..aab1af5249c3 100644
--- a/sys-libs/libixp/ChangeLog
+++ b/sys-libs/libixp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/libixp
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libixp/ChangeLog,v 1.20 2011/12/04 21:43:19 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libixp/ChangeLog,v 1.21 2012/03/05 13:36:50 ssuominen Exp $
+
+*libixp-0.5_p20110208-r3 (05 Mar 2012)
+
+  05 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +libixp-0.5_p20110208-r3.ebuild:
+  Change typedef of ulong from uint32_t to unsigned long wrt #393299 to make
+  libixp compatible with x11-wm/wmii-3.9.2 on x86_64 wrt #393299 by Luíza D.
+  Utsch and others
 
   04 Dec 2011; Samuli Suominen <ssuominen@gentoo.org>
   -libixp-0.5_p20110208-r1.ebuild:
diff --git a/sys-libs/libixp/libixp-0.5_p20110208-r3.ebuild b/sys-libs/libixp/libixp-0.5_p20110208-r3.ebuild
new file mode 100644
index 000000000000..9b253c592e0c
--- /dev/null
+++ b/sys-libs/libixp/libixp-0.5_p20110208-r3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libixp/libixp-0.5_p20110208-r3.ebuild,v 1.1 2012/03/05 13:36:50 ssuominen Exp $
+
+# hg clone http://hg.suckless.org/libixp
+
+EAPI=4
+inherit multilib toolchain-funcs
+
+DESCRIPTION="A stand-alone client/server 9P library including ixpc client"
+HOMEPAGE="http://libs.suckless.org/libixp"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="app-arch/xz-utils"
+
+pkg_setup() {
+	myixpconf=(
+		PREFIX="/usr"
+		LIBDIR="/usr/$(get_libdir)"
+		CC="$(tc-getCC) -c"
+		LD="$(tc-getCC) ${LDFLAGS}"
+		AR="$(tc-getAR) crs"
+		MAKESO="1"
+		SOLDFLAGS="-shared"
+		)
+}
+
+src_prepare() {
+	# http://code.google.com/p/libixp/issues/detail?id=2
+	sed -i -e 's:ixp_serve9pconn:ixp_serve9conn:' include/ixp.h || die
+
+	# http://bugs.gentoo.org/393299 http://code.google.com/p/wmii/issues/detail?id=247
+	sed -i -e '69s:uint32_t:unsigned long:' include/ixp.h || die
+}
+
+src_compile() {
+	emake "${myixpconf[@]}"
+}
+
+src_install() {
+	emake "${myixpconf[@]}" DESTDIR="${D}" install
+	dolib.so lib/libixp{,_pthread}.so
+	dodoc NEWS
+}