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

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

3 files changed, 69 insertions, 10 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/Manifest b/sys-libs/libixp/Manifest
index c214f683c518..7c360025aa30 100644
--- a/sys-libs/libixp/Manifest
+++ b/sys-libs/libixp/Manifest
@@ -3,16 +3,17 @@ Hash: SHA1
 
 DIST libixp-0.5_p20110208.tar.xz 655956 RMD160 2704f1ef72d37e208c3891e7ae3a2f705ee95ab0 SHA1 2e23276e2667042f690763d8f531616a500cfc9e SHA256 66ce92b25486505d04b97d838fb9b102cd1edb1455d90916d00dc38369b2c06b
 EBUILD libixp-0.5_p20110208-r2.ebuild 1072 RMD160 bfa82be7c0117e80e2a14b0e0921179af9bd786c SHA1 080ec9d6b56dc804586a057618131784e5f9d023 SHA256 bcf885495284ae87013327b547f4d9dcfed8b5370f5bea010e1c241c86345793
-MISC ChangeLog 3502 RMD160 f7b7daab51147e82c8b949d72f40ba3d2cdfdb80 SHA1 07cf6c98c4ea696c6eb2deac802b2f9be94fdbe5 SHA256 5f60343548b8b5e87291c54204177c0315eeb4392e18b36743683d6afc28b9ef
+EBUILD libixp-0.5_p20110208-r3.ebuild 1219 RMD160 8a7f4a1571b82f06dc485e11373e1628c9587513 SHA1 6c3614e26f24cc13c8084297fb640be9eebb0175 SHA256 de1a4463870a3308ae76df613e069b1b148f688c13fa3ffe2dfc58950b588c67
+MISC ChangeLog 3806 RMD160 c531b08d11d3e1ed8ec423f8345676e593036f68 SHA1 7af816873f3d9f0a0bdbbb82c0b964dbacbec937 SHA256 8fab2310af497ac43acfc2938f531d857aeac1ac6f40a02f89273a4973944a1f
 MISC metadata.xml 165 RMD160 b8020f1f8aabec4b8cd485910dc5df54338df9ff SHA1 08100b521b6fe603fc93ce48c1d7a892f2ee01a9 SHA256 5c2ed5ccdbc5064106e1f0227a30ec58377fa5299087516c9ebf9701619596ac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO2+lxAAoJEEdUh39IaPFN8hEH/R/CI6lrszA7sWG9+PvvB7BX
-VANiKtT70CI8Oer3tp/dSACxwa4lVdIpKzLHwGzLrnvDcxFNkJbxTtdo7DFT/Em1
-SQ2AN+phW6zWVLsotOfFhuMmrMpxsKNyGz1n4z4DeuZTByBrP61ZtXor7syy8A0y
-SlCMREcBEgb0vhv30DMY9FNOLMMyVqu+taHCwJvDRFj/Kyi8GHSteb9451058UQw
-OdJrHXm/53OZu0AknNzd0HRGo/m4lxYyFQxkCB9vc3Ns1d9d27Fd+clCg1Q8rMXT
-/K4tYYyZ6HXw1qKDsJOwfyA/EIPO746VXxPoTG7wucHJ4wP3glGlq+IOyLe9c9w=
-=9ySx
+iQEcBAEBAgAGBQJPVME0AAoJEEdUh39IaPFNoYMH/iTmsWdP9ZfcSy+sc1W/Y+Fg
+xFMKvFzJmPxwhv1E2Y/Xl9jntQrefmobFEXtbNCTwpGd8ZzAlVS5W6fQ4uaHqi0E
+0r061VpNzutIR3B/URGzn8vTibDSt2Dil36eSAtDQkljfxqznFlCnmTmtDZBnjbP
+lyvwIfUpf2NB4N63bEHGmJHqw4NqDTOUvUNIj7H6JrzfLu6nxUU0HTrR4kztUhoZ
+fyOdjnpLy0BbYey064l4As9CLuTEnRqsVLi96B8U/Lwt5T9W7Rv+iLo00jaUckQu
+Npc7Zvu/jbUjR+Sk2meKqSMm3zpxAm9SAunRRkWV2BkB/9WWsGLmTLywJQR2/JU=
+=8r3M
 -----END PGP SIGNATURE-----
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
+}